Merge branch 'main' into sawka/layout

merge main
layout tests, checkpoint
2026-04-22 15:26:58 -07:00 · 2024-02-20 23:44:25 -08:00 · 2024-02-20 23:28:09 -08:00 · 2024-02-18 11:23:23 -08:00
341 changed files with 42334 additions and 54062 deletions
@@ -1,78 +1,100 @@
 name: "Build Helper"
 on: workflow_dispatch
 env:
-    GO_VERSION: "1.22.0"
+    WAVETERM_VERSION: 0.6.1
+    GO_VERSION: "1.21.5"
    NODE_VERSION: "21.5.0"
 jobs:
-    runbuild:
-        strategy:
-            matrix:
-                include:
-                    - platform: "darwin"
-                      arch: "universal"
-                      runner: "macos-latest-xlarge"
-                      scripthaus: "build-package"
-                    - platform: "linux"
-                      arch: "amd64"
-                      runner: "ubuntu-latest"
-                      scripthaus: "build-package-linux"
-                    - platform: "linux"
-                      arch: "arm64"
-                      runner: ubuntu-24.04-arm64-16core
-                      scripthaus: "build-package-linux"
-        runs-on: ${{ matrix.runner }}
+    runbuild-darwin-x64:
+        name: "Build MacOS x64"
+        runs-on: macos-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-go@v4
+              with:
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+            - run: brew tap scripthaus-dev/scripthaus
+            - run: brew install scripthaus
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
+            - run: yarn --frozen-lockfile
+            - run: scripthaus run build-package
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-build-darwin-x64
+                  path: out/make/zip/darwin/x64/*.zip
+                  retention-days: 2
+    runbuild-darwin-arm64:
+        name: "Build MacOS arm64"
+        runs-on: macos-latest-xlarge
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-go@v4
+              with:
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+            - run: brew tap scripthaus-dev/scripthaus
+            - run: brew install scripthaus
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
+            - run: yarn --frozen-lockfile
+            - run: scripthaus run build-package
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-build-darwin-arm64
+                  path: out/make/zip/darwin/arm64/*.zip
+                  retention-days: 2
+    runbuild-linux:
+        name: "Build Linux x64"
+        runs-on: ubuntu-latest
+        needs: [runbuild-darwin-x64, runbuild-darwin-arm64]
        steps:
            - uses: actions/checkout@v4
            - uses: actions/checkout@v4
              with:
                  repository: scripthaus-dev/scripthaus
                  path: scripthaus
-            - name: Install Linux Build Dependencies (Linux only)
-              if: matrix.platform == 'linux'
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm
-            - name: Install FPM # The version of FPM that comes bundled with electron-builder doesn't include a Linux ARM target. Installing Gems onto the runner is super quick so we'll just do this for all targets.
-              run: sudo gem install fpm
-            - uses: actions/setup-go@v5
+            - uses: actions/setup-go@v4
              with:
                  go-version: ${{env.GO_VERSION}}
                  cache-dependency-path: |
                      wavesrv/go.sum
                      waveshell/go.sum
                      scripthaus/go.sum
-            - name: Install Scripthaus
-              run: |
+            - run: |
                  go work use ./scripthaus;
                  cd scripthaus;
                  go get ./...;
                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-                  echo $PWD >> $GITHUB_PATH
            - uses: actions/setup-node@v4
              with:
                  node-version: ${{env.NODE_VERSION}}
-            - name: Install yarn
-              run: |
-                  corepack enable
-                  yarn install
-            - name: Set Version
-              id: set-version
-              run: |
-                  VERSION=$(node -e 'console.log(require("./version.js"))')
-                  echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
-            - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
-              run: scripthaus run ${{ matrix.scripthaus }}
-              env:
-                  GOARCH: ${{ matrix.arch }}
-                  USE_SYSTEM_FPM: true # Ensure that the installed version of FPM is used rather than the bundled one.
-                  CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE}}
-                  CSC_KEY_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE_PWD }}
-                  APPLE_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
-                  APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_PWD }}
-                  APPLE_TEAM_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
-            - name: Upload to S3 staging
-              run: aws s3 cp make/ s3://waveterm-github-artifacts/staging/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml"
+                  cache: "yarn"
+            - run: yarn --frozen-lockfile
+            - run: ./scripthaus/scripthaus run build-package-linux
+            - uses: actions/download-artifact@v4
+              with:
+                  merge-multiple: true
+                  path: buildtemp
+            - run: |
+                  mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip
+            - run: (cd buildtemp; zip ../waveterm-builds.zip *)
+            - run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
              env:
                  AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
                  AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
                  AWS_DEFAULT_REGION: us-west-2
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-builds
+                  path: buildtemp
+                  retention-days: 2
@@ -1,83 +0,0 @@
-# Workflow to manage bumping the package version and pushing it to the target branch with a new tag.
-# This workflow uses a GitHub App to bypass branch protection and uses the GitHub API directly to ensure commits and tags are signed.
-# For more information, see this doc: https://github.com/Nautilus-Cyberneering/pygithub/blob/main/docs/how_to_sign_automatic_commits_in_github_actions.md
-
-name: Bump Version
-run-name: "branch: ${{ github.ref_name }}; semver-bump: ${{ inputs.bump }}; prerelease: ${{ inputs.is-prerelease }}"
-on:
-    workflow_dispatch:
-        inputs:
-            bump:
-                description: SemVer Bump
-                required: true
-                type: choice
-                default: none
-                options:
-                    - none
-                    - patch
-                    - minor
-                    - major
-            is-prerelease:
-                description: Is Prerelease
-                required: true
-                type: boolean
-                default: true
-env:
-    NODE_VERSION: "22.5.1"
-jobs:
-    bump-version:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Get App Token
-              uses: actions/create-github-app-token@v1
-              id: app-token
-              with:
-                  app-id: ${{ vars.WAVE_BUILDER_APPID }}
-                  private-key: ${{ secrets.WAVE_BUILDER_KEY }}
-            - uses: actions/checkout@v4
-              with:
-                  token: ${{ steps.app-token.outputs.token }}
-
-            # General build dependencies
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: ${{env.NODE_VERSION}}
-            - name: Install Yarn
-              run: |
-                  corepack enable
-                  yarn install
-            - name: Install Task
-              uses: arduino/setup-task@v2
-              with:
-                  version: 3.x
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: "Bump Version: ${{ inputs.bump }}"
-              id: bump-version
-              run: echo "WAVETERM_VERSION=$( task version -- ${{ inputs.bump }} ${{inputs.is-prerelease}} )" >> "$GITHUB_OUTPUT"
-              shell: bash
-
-            - name: "Push version bump: ${{ steps.bump-version.outputs.WAVETERM_VERSION }}"
-              run: |
-                  # Create a new commit for the package version bump in package.json
-                  export VERSION=${{ steps.bump-version.outputs.WAVETERM_VERSION }}
-                  export MESSAGE="chore: bump package version to $VERSION"
-                  export FILE=package.json
-                  export BRANCH=${{github.ref_name}}
-                  export SHA=$( git rev-parse $BRANCH:$FILE )
-                  export CONTENT=$( base64 -i $FILE )
-                  gh api --method PUT /repos/:owner/:repo/contents/$FILE \
-                      --field branch="$BRANCH" \
-                      --field message="$MESSAGE" \
-                      --field content="$CONTENT" \
-                      --field sha="$SHA"
-
-                  # Fetch the new commit and create a tag referencing it
-                  git fetch
-                  export TAG_SHA=$( git rev-parse origin/$BRANCH )
-                  gh api --method POST /repos/:owner/:repo/git/refs \
-                      --field ref="refs/tags/v$VERSION" \
-                      --field sha="$TAG_SHA"
-              shell: bash
-              env:
-                  GH_TOKEN: ${{ steps.app-token.outputs.token }}
@@ -12,100 +12,70 @@
 name: "CodeQL"

 on:
-    push:
-        branches: ["main"]
-    pull_request:
-        branches: ["main"]
-    schedule:
-        - cron: "36 5 * * 5"
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '36 5 * * 5'

 jobs:
-    analyze:
-        name: Analyze
-        # Runner size impacts CodeQL analysis time. To learn more, please see:
-        #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-        #   - https://gh.io/supported-runners-and-hardware-resources
-        #   - https://gh.io/using-larger-runners
-        # Consider using larger runners for possible analysis time improvements.
-        runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-        timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-        permissions:
-            actions: read
-            contents: read
-            security-events: write
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write

-        strategy:
-            fail-fast: false
-            matrix:
-                language: ["go", "javascript-typescript"]
-                # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
-                # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
-                # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-                # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'javascript-typescript' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3

-            - name: Checkout Scripthaus (Go only)
-              if: matrix.language == 'go'
-              uses: actions/checkout@v4
-              with:
-                  repository: scripthaus-dev/scripthaus
-                  path: scripthaus
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.

-            - name: Setup Go (Go only)
-              uses: actions/setup-go@v5
-              if: matrix.language == 'go'
-              with:
-                  go-version: stable
-                  cache-dependency-path: |
-                      wavesrv/go.sum
-                      waveshell/go.sum
-                      scripthaus/go.sum
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality

-            - name: Install Scripthaus (Go only)
-              if: matrix.language == 'go'
-              run: |
-                  go work use ./scripthaus;
-                  cd scripthaus;
-                  go get ./...;
-                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-                  echo $PWD >> $GITHUB_PATH

-            # Initializes the CodeQL tools for scanning.
-            - name: Initialize CodeQL
-              uses: github/codeql-action/init@v3
-              with:
-                  languages: ${{ matrix.language }}
-                  # If you wish to specify custom queries, you can do so here or in a config file.
-                  # By default, queries listed here will override any specified in a config file.
-                  # Prefix the list here with "+" to use these queries and those in the config file.
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3

-                  # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-                  # queries: security-extended,security-and-quality
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

-            # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-            # If this step fails, then you should remove it and run the build manually (see below)
-            - name: Autobuild (not Go)
-              if: matrix.language != 'go'
-              uses: github/codeql-action/autobuild@v3
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

-            - name: Build (Go only)
-              if: matrix.language == 'go'
-              run: scripthaus run build-backend
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh

-            # ℹ️ Command-line programs to run using the OS shell.
-            # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-            #   If the Autobuild fails above, remove it and uncomment the following three lines.
-            #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-            # - run: |
-            #     echo "Run, Build Application using script"
-            #     ./location_of_script_within_repo/buildscript.sh
-
-            - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v3
-              with:
-                  category: "/language:${{matrix.language}}"
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
@@ -1,51 +0,0 @@
-name: TestDriver.ai Regression Testing - Waveterm
-on:
-    push:
-        branches:
-            - main
-    pull_request:
-        branches:
-            - main
-    schedule:
-        - cron: 0 21 * * *
-    workflow_dispatch: null
-
-permissions:
-    contents: read # To allow the action to read repository contents
-    pull-requests: write # To allow the action to create/update pull request comments
-
-
-jobs:
-  test:
-    name: "TestDriver"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dashcamio/testdriver@main
-        id: testdriver
-        with:
-          version: v3.9.0
-          key: ${{secrets.DASHCAM_API}}
-          os: mac
-          prerun: |
-            cd ~/actions-runner/_work/testdriver/testdriver/
-            brew install go
-            brew tap scripthaus-dev/scripthaus
-            brew install corepack
-            brew install scripthaus
-            corepack enable
-            yarn install
-            scripthaus run build-backend
-            echo "Yarn"
-            yarn
-            echo "Rebuild"
-            scripthaus run electron-rebuild
-            echo "Webpack"
-            scripthaus run webpack-build
-            echo "Starting Electron"
-            scripthaus run electron 1>/dev/null 2>&1 &
-            echo "Electron Done"
-            cd /Users/ec2-user/Downloads/td/
-            npm rebuild
-            exit       
-          prompt: |
-            1. /run /Users/ec2-user/actions-runner/_work/testdriver/testdriver/.testdriver/wave1.yml
@@ -20,14 +20,3 @@ temp.sql
 .idea/
 test/
 .vscode/
-make/
-waveterm-builds.zip
-
-# Yarn Modern
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
@@ -1,37 +0,0 @@
-version: 3.8.0
-    steps:
-      - prompt: "Focus electron"
-        commands:
-        - command: focus-application
-          name: Electron
-        - command: hover-text
-          description: Get started CTA
-          text: Get Started
-          action: click
-        - command: hover-text
-          description: Settings button
-          text: Settings
-          action: click
-        - command: hover-text
-          description: font size 13
-          text: 13px
-          action: click
-        - command: hover-text
-          description: font size 12
-          text: 12px
-          action: click
-        - command: hover-text
-          description: theme selector
-          text: Dark
-          action: click
-        - command: hover-text
-          description: theme color white
-          text: Light
-          action: click
-        - command: hover-text
-          description: workspace
-          text: workspace-1
-          action: click
-        - command: assert
-          expect: the terminal is white
-
@@ -1 +0,0 @@
-nodeLinker: node-modules
@@ -11,43 +11,35 @@ If you install the production version of Wave, you'll see a semi-transparent gra

 Download and install Go (must be at least go 1.18):

-```sh
+```
 brew install go
 ```

 Download and install ScriptHaus (to run the build commands):

-```sh
+```
 brew tap scripthaus-dev/scripthaus
 brew install scripthaus
 ```

 You also need a relatively modern nodejs with npm and yarn installed.

-Node can be installed from [https://nodejs.org](https://nodejs.org).
+-   Node can be installed from [https://nodejs.org](https://nodejs.org).
+-   npm can install yarn using:

-We use Yarn Modern to manage our packages. The recommended way to install Yarn Modern is using Corepack, a new utility shipped by NodeJS that lets you manage your package manager versioning as you would any packages.
-
-If you installed NodeJS from the official feed (via the website or using NVM), this should come preinstalled. If you use Homebrew or some other feed, you may need to manually install Corepack using `npm install -g corepack`.
-
-For more information on Corepack, check out [this link](https://yarnpkg.com/corepack).
-
-Once you've verified that you have Corepack installed, run the following script to set up Yarn for the repository:
-
-```sh
-corepack enable
-yarn install
+```
+npm install -g yarn
 ```

 ## Clone the Repo

-```sh
+```
 git clone git@github.com:wavetermdev/waveterm.git
 ```

 ## Building WaveShell / WaveSrv

-```sh
+```
 scripthaus run build-backend
 ```

@@ -57,15 +49,21 @@ This builds the Golang backends for Wave. The binaries will put in waveshell/bin

 Install modules (we use yarn):

-```sh
+```
 yarn
 ```

+Electron also requires specific builds of node_modules to work (because Electron embeds a specific node.js version that might not match your development node.js version). We use a special electron command to cross-compile those modules:
+
+```
+scripthaus run electron-rebuild
+```
+
 ## Running WebPack

 We use webpack to build both the React and Electron App Wrapper code. They are both run together using:

-```sh
+```
 scripthaus run webpack-watch
 ```

@@ -73,7 +71,7 @@ scripthaus run webpack-watch

 Now that webpack is running (and watching for file changes) we can finally run the WaveTerm Dev Client! To start the client run:

-```sh
+```
 scripthaus run electron
 ```

@@ -1,17 +1,15 @@
 <p align="center">
  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./assets/waveterm-logo-horizontal-dark.png">
-    <source media="(prefers-color-scheme: light)" srcset="./assets/waveterm-logo-horizontal-light.png">
-    <img alt="Wave Terminal Logo" src="./assets/waveterm-logo-horizontal-light.png" width="240" height="80" style="max-width: 100%;">
+    <source media="(prefers-color-scheme: dark)" srcset="./assets/wave-logo_horizontal-coloronblack.svg">
+    <source media="(prefers-color-scheme: light)" srcset="./assets/wave-logo_horizontal-coloronwhite.svg">
+    <img alt="Wave Terminal Logo" src="./assets/wave-logo_horizontal-coloronwhite.svg" width="352" height="59" style="max-width: 100%;">
  </picture>
  <br/>
 </p>

 # Wave Terminal

-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm?ref=badge_shield)
-
-Wave is an open-source AI-native terminal built for seamless workflows.
+A open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.

 Wave isn't just another terminal emulator; it's a rethink on how terminals are built. Wave combines command line with the power of the open web to help veteran CLI users and new developers alike.

@@ -19,14 +17,13 @@ Wave isn't just another terminal emulator; it's a rethink on how terminals are b
 -   Persistent sessions that can restore state across network disconnections and reboots
 -   Searchable contextual command history across all remote sessions (saved locally)
 -   Workspaces, tabs, and command blocks to keep you organized
-   CodeEdit, to edit local and remote files with a VSCode-like inline editor
 -   AI Integration with ChatGPT (or ChatGPT compatible APIs) to help write commands and get answers inline

-![WaveTerm Screenshot](./assets/wave-screenshot.png)
+![WaveTerm Screenshot](./assets/wave-screenshot.jpeg)

 ## Installation

-Wave Terminal works with MacOS and Linux.
+Wave Terminal works with MacOS and Linux (preliminary).

 Install Wave Terminal from: [www.waveterm.dev/download](https://www.waveterm.dev/download)

@@ -52,13 +49,9 @@ brew install --cask wave

 ## Contributing

-Wave uses Github Issues for issue tracking.
+Wave uses Github Project for tracking issues.

 Find more information in our [Contributions Guide](CONTRIBUTING.md), which includes:

 -   [Ways to contribute](CONTRIBUTING.md#contributing-to-wave-terminal)
 -   [Contribution guidelines](CONTRIBUTING.md#before-you-start)
-
-## License
-
-Wave Terminal is licensed under the Apache-2.0 License. For more information on our dependencies, see [here](./acknowledgements/README.md).
@@ -1,5 +1,20 @@
 # Open-Source Acknowledgements

-We make use of many amazing open-source projects to build Wave Terminal. We automatically generate license reports via FOSSA to comply with the license distribution requirements of our dependencies. Below is a summary of the licenses used by our product. For a full report, see [here](https://app.fossa.com/reports/24d13570-624b-4450-8c22-756e513060c9?full=true) (the page may take 20-30s to load).
+We make use of many amazing open-source projects to build Wave Terminal. Here are the links to the latest acknowledgements for each of our components, including license disclaimers for each dependency:

-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm?ref=badge_large)
+- [Frontend](./disclaimers/frontend.md)
+- [Backend](./disclaimers/backend.md)
+
+## Generating license disclaimers
+
+The license disclaimers for the backend are generated using the [go-licenses](https://github.com/google/go-licenses) tool. We supply a template file ([`go_licenses_report.tpl`](./go_licenses_report.tpl)) to generate a pretty print of the disclaimers for each dependency. This outputs to the file [`backend.md`](./disclaimers/backend.md).
+
+The license disclaimers for the frontend are generated using the [`yarn licenses` tool](https://classic.yarnpkg.com/lang/en/docs/cli/licenses/). This outputs to the file [`frontend.md`](./disclaimers/frontend.md).
+
+These three disclaimer files linked above will be periodically regenerated to reflect new dependencies.
+
+The [`scripthaus.md` file](../scripthaus.md) contains scripts to genrate the disclaimers and package them. To manually generate the disclaimers, run the following from the repository root directory:
+
+```bash
+scripthaus run generate-license-disclaimers
+```
@@ -0,0 +1,16 @@
+# Wave Terminal Backend Acknowledgements
+
+The following sets forth attribution notices for third party software that may be contained in portions of the Wave Terminal product.
+{{ range . }}
+## {{ .Name }}
+
+* Name: {{ .Name }}
+* Version: {{ .Version }}
+* License: [{{ .LicenseName }}]({{ .LicenseURL }})
+
+```txt
+{{ .LicenseText }}
+```
+
+-----
+{{ end }}
@@ -1,336 +0,0 @@
-[
-    {
-      "command": "system:toggleDeveloperTools",
-      "keys": ["Cmd:Option:i"],
-      "info": "Opens the chrome developer tool menu"
-    },
-    {
-      "command": "system:hideWindow",
-      "keys": ["Cmd:m"]
-    },
-    {
-      "command": "generic:cancel",
-      "keys": ["Escape"]
-    },
-    {
-      "command": "generic:confirm",
-      "keys": ["Enter"]
-    },
-    {
-      "command": "generic:expandTextInput",
-      "keys": ["Shift:Enter", "Ctrl:Enter"]
-    },
-    {
-      "command": "generic:deleteItem",
-      "keys": ["Backspace", "Delete"]
-    },
-    {
-      "command": "generic:space",
-      "keys": ["Space"]
-    },
-    {
-      "command": "generic:tab",
-      "keys": ["Tab"]
-    },
-    {
-      "command": "generic:numpad-0",
-      "keys": ["0"]
-    },
-    {
-      "command": "generic:numpad-1",
-      "keys": ["1"]
-    },
-    {
-      "command": "generic:numpad-2",
-      "keys": ["2"]
-    },
-    {
-      "command": "generic:numpad-3",
-      "keys": ["3"]
-    },
-    {
-      "command": "generic:numpad-4",
-      "keys": ["4"]
-    },
-    {
-      "command": "generic:numpad-5",
-      "keys": ["5"]
-    },
-    {
-      "command": "generic:numpad-6",
-      "keys": ["6"]
-    },
-    {
-      "command": "generic:numpad-7",
-      "keys": ["7"]
-    },
-    {
-      "command": "generic:numpad-8",
-      "keys": ["8"]
-    },
-    {
-      "command": "generic:numpad-9",
-      "keys": ["9"]
-    },
-    {
-      "command": "generic:selectAbove",
-      "keys": ["ArrowUp"]
-    },
-    {
-      "command": "generic:selectBelow",
-      "keys": ["ArrowDown"]
-    },
-    {
-      "command": "generic:selectLeft",
-      "keys": ["ArrowLeft"]
-    },
-    {
-      "command": "generic:selectRight",
-      "keys": ["ArrowRight"]
-    },
-    {
-      "command": "generic:selectPageAbove",
-      "keys": ["PageUp"]
-    },
-    {
-      "command": "generic:selectPageBelow",
-      "keys": ["PageDown"]
-    },
-    {
-      "command": "app:openHistoryView",
-      "keys": ["Cmd:h"]
-    },
-    {
-      "command": "app:openTabSearchModal",
-      "keys": ["Cmd:p"]
-    },
-    {
-      "command": "app:openConnectionsView", 
-      "keys": [],
-      "commandStr": ["/mainview connections"]
-    },
-    {
-      "command": "app:openSettingsView", 
-      "keys": [],
-      "commandStr": ["/mainview clientsettings"]
-    },
-    {
-      "command": "app:newTab",
-      "keys": ["Cmd:t"]
-    },
-    {
-      "command": "app:focusCmdInput",
-      "keys": ["Cmd:i"]
-    },
-    {
-      "command": "app:focusSelectedLine",
-      "keys": ["Cmd:l"]
-    },
-    {
-      "command": "app:restartCommand",
-      "keys": ["Cmd:r"],
-      "info": "Restarts the command running in the current selected line"
-    },
-    {
-      "command": "app:restartLastCommand",
-      "keys": ["Cmd:Shift:r"]
-    },
-    {
-      "command": "app:closeCurrentTab",
-      "keys": ["Cmd:w"]
-    },
-    {
-      "command": "app:selectLineAbove",
-      "keys": ["Cmd:ArrowUp", "Cmd:PageUp"]
-    },
-    {
-      "command": "app:selectLineBelow",
-      "keys": ["Cmd:ArrowDown", "Cmd:PageDown"]
-    },
-    {
-      "command": "app:selectTab-1",
-      "keys": ["Cmd:1"]
-    },
-    {
-      "command": "app:selectTab-2",
-      "keys": ["Cmd:2"]
-    },
-    {
-      "command": "app:selectTab-3",
-      "keys": ["Cmd:3"]
-    },
-    {
-      "command": "app:selectTab-4",
-      "keys": ["Cmd:4"]
-    },
-    {
-      "command": "app:selectTab-5",
-      "keys": ["Cmd:5"]
-    },
-    {
-      "command": "app:selectTab-6",
-      "keys": ["Cmd:6"]
-    },
-    {
-      "command": "app:selectTab-7",
-      "keys": ["Cmd:7"]
-    },
-    {
-      "command": "app:selectTab-8",
-      "keys": ["Cmd:8"]
-    },
-    {
-      "command": "app:selectTab-9",
-      "keys": ["Cmd:9"]
-    },
-    {
-      "command": "app:selectTabLeft",
-      "keys": ["Cmd:["]
-    },
-    {
-      "command": "app:selectTabRight",
-      "keys": ["Cmd:]"]
-    },
-    {
-      "command": "app:selectWorkspace-1",
-      "keys": ["Cmd:Ctrl:1"]
-    },
-    {
-      "command": "app:selectWorkspace-2",
-      "keys": ["Cmd:Ctrl:2"]
-    },
-    {
-      "command": "app:selectWorkspace-3",
-      "keys": ["Cmd:Ctrl:3"]
-    },
-    {
-      "command": "app:selectWorkspace-4",
-      "keys": ["Cmd:Ctrl:4"]
-    },
-    {
-      "command": "app:selectWorkspace-5",
-      "keys": ["Cmd:Ctrl:5"]
-    },
-    {
-      "command": "app:selectWorkspace-6",
-      "keys": ["Cmd:Ctrl:6"]
-    },
-    {
-      "command": "app:selectWorkspace-7",
-      "keys": ["Cmd:Ctrl:7"]
-    },
-    {
-      "command": "app:selectWorkspace-8",
-      "keys": ["Cmd:Ctrl:8"]
-    },
-    {
-      "command": "app:selectWorkspace-9",
-      "keys": ["Cmd:Ctrl:9"]
-    },
-    {
-      "command": "app:toggleSidebar",
-      "keys": ["Cmd:Ctrl:s"]
-    },
-    {
-      "command": "app:deleteActiveLine",
-      "keys": ["Cmd:d"]
-    },
-    {
-      "command": "app:openBookmarksView",
-      "keys": ["Cmd:b"],
-      "commandStr": ["/bookmarks:show"]
-    },
-    {
-      "command": "bookmarks:edit",
-      "keys": ["e"]
-    },
-    {
-      "command": "bookmarks:copy",
-      "keys": ["c"]
-    },
-    {
-      "command": "cmdinput:autocomplete",
-      "keys": ["Tab"]
-    },
-    {
-      "command": "cmdinput:expandInput",
-      "keys": ["Cmd:e"]
-    },
-    {
-      "command": "cmdinput:clearInput",
-      "keys": ["Ctrl:c"]
-    },
-    {
-      "command": "cmdinput:cutLineLeftOfCursor",
-      "keys": ["Ctrl:u"]
-    },
-    {
-      "command": "cmdinput:previousHistoryItem",
-      "keys": ["Ctrl:p"]
-    },
-    {
-      "command": "cmdinput:nextHistoryItem",
-      "keys": ["Ctrl:n"]
-    },
-    {
-      "command": "cmdinput:cutWordLeftOfCursor",
-      "keys": ["Ctrl:w"]
-    },
-    {
-      "command": "cmdinput:paste",
-      "keys": ["Ctrl:y"]
-    },
-    {
-      "command": "cmdinput:openHistory",
-      "keys": ["Ctrl:r"],
-      "commandStr": ["/history"]
-    },
-    {
-      "command": "history:closeHistory",
-      "keys": ["Ctrl:g", "Ctrl:c"]
-    },
-    {
-      "command": "history:toggleShowRemotes",
-      "keys": ["Cmd:r", "Ctrl:r"]
-    },
-    {
-      "command": "history:changeScope",
-      "keys": ["Ctrl:s", "Cmd:s"]
-    },
-    {
-      "command": "history:selectNextItem",
-      "keys": ["Ctrl:n"]
-    },
-    {
-      "command": "history:selectPreviousItem",
-      "keys": ["Ctrl:p"]
-    },
-    {
-      "command": "aichat:clearHistory",
-      "keys": ["Ctrl:l"]
-    },
-    {
-      "command": "terminal:copy",
-      "keys": ["Ctrl:Shift:c"]
-    },
-    {
-      "command": "terminal:paste",
-      "keys": ["Ctrl:Shift:v"]
-    },
-    {
-      "command": "codeedit:save",
-      "keys": ["Cmd:s"]
-    },
-    {
-      "command": "codeedit:close",
-      "keys": ["Cmd:d"]
-    },
-    {
-      "command": "codeedit:togglePreview",
-      "keys": ["Cmd:p"]
-    },
-    {
-      "command": "rightsidebar:toggle",
-      "keys": ["Cmd:Shift:Space"]
-    }
-  ]
@@ -34,23 +34,20 @@ You'll now have to move the built `scripthaus` binary to a directory in your pat
 sudo cp scripthaus /usr/local/bin
 ```

-## Install nodejs and yarn
+## Install nodejs, npm, and yarn

-You also need a relatively modern nodejs with npm and yarn installed.
+We use [nvm](https://github.com/nvm-sh/nvm) to install nodejs on Linux (you can use an alternate installer if you wish). You must have a relatively recent version of node in order to build the terminal. Different distributions and shells will require different setup instructions. These instructions work for Ubuntu 22 using bash (will install node v20.8.1):

-Node can be installed from [https://nodejs.org](https://nodejs.org).
+```
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
+source ~/.bashrc
+nvm install v20.8.1
+```

-We use Yarn Modern to manage our packages. The recommended way to install Yarn Modern is using Corepack, a new utility shipped by NodeJS that lets you manage your package manager versioning as you would any packages.
+Now we can install yarn:

-If you installed NodeJS from the official feed (via the website or using NVM), this should come preinstalled. If you use Homebrew or some other feed, you may need to manually install Corepack using `npm install -g corepack`.
-
-For more information on Corepack, check out [this link](https://yarnpkg.com/corepack).
-
-Once you've verified that you have Corepack installed, run the following script to set up Yarn for the repository:
-
-```sh
-corepack enable
-yarn install
+```
+npm install -g yarn
 ```

 ## Clone the Wave Repo
@@ -1,4 +1,3 @@
-*builds/
-*-staged/
+temp/
 *.zip
-*.dmg
+*.dmg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sawka	9a9ee68604	Merge branch 'main' into sawka/layout	2024-02-20 23:44:25 -08:00
sawka	6613f480e3	merge main	2024-02-20 23:28:09 -08:00
sawka	e0427e5ed4	layout tests, checkpoint	2024-02-18 11:23:23 -08:00