Merge branch 'main' into intel-mac-app

* main: (23 commits) Improve docs & extensions deploy workflow (#996) ci: run git tag commands when just tag-push (#1001) docs: cleanup (#1035) docs: added tutorial template (#1036) docs: updated spelling in documentation (#1028) really really open markdown links outside (#1002) fix: use SSL_CERT_FILE to point to CA bundle, not for mTLS client cert (#1017) feat: Add link to github project on extension cards (#1006) chore(release): release version 1.0.4 (#1000) fix: fix welcome screen azure config submit (#998) ci: checkout code to read Cargo.toml for version (#995) docs: broken link fix (#994) ci: update release processes using Justfile, make reusable workflows have optional version param (#972) docs: github tutorial (#993) chore: add tests and update url construction for azure provider (#988) chore: update docs for ollama endpoint (#992) feat: cfg electron to open links in new window (#934) fix: improve url construction in provider (#985) fix: explicitly add remember_memory tool in the instructions/system prompt (#965) feat: add azure openai provider (#960) ...
block · Feb 3, 2025 · 61941a9 · 61941a9
2 parents 783ab36 + 1960bb7
commit 61941a9
Show file tree

Hide file tree

Showing 58 changed files with 1,119 additions and 368 deletions.
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
@@ -6,7 +6,8 @@ on:
   workflow_call:
     inputs:
       version:
-        required: true
+        required: false
+        default: ""
         type: string
       # Let's allow overriding the OSes and architectures in JSON array form:
       # e.g. '["ubuntu-latest","macos-latest"]'
@@ -42,6 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Update version in Cargo.toml
+        if: ${{ inputs.version != '' }}
         run: |
           sed -i.bak 's/^version = ".*"/version = "'${{ inputs.version }}'"/' Cargo.toml
           rm -f Cargo.toml.bak
@@ -74,4 +76,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: goose-${{ matrix.architecture }}-${{ matrix.target-suffix }}
-          path: ${{ env.ARTIFACT }}
+          path: ${{ env.ARTIFACT }}
diff --git a/.github/workflows/bundle-desktop.yml b/.github/workflows/bundle-desktop.yml
@@ -8,7 +8,8 @@ on:
     inputs:
       version:
         description: 'Version to set for the build'
-        required: true
+        required: false
+        default: ""
         type: string
       signing:
         description: 'Whether to perform signing and notarization'
@@ -75,6 +76,7 @@ jobs:
 
       # Update versions before build
       - name: Update versions
+        if: ${{ inputs.version != '' }}
         run: |
           # Update version in Cargo.toml
           sed -i.bak 's/^version = ".*"/version = "'${{ inputs.version }}'"/' Cargo.toml

diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -5,7 +5,7 @@
 on:
   push:
     paths-ignore:
-      - 'documentation/**'
+      - "documentation/**"
     branches:
       - main
 
@@ -25,12 +25,15 @@ jobs:
     outputs:
       version: ${{ steps.set-version.outputs.version }}
     steps:
+      # checkout code so we can read the Cargo.toml
+      - uses: actions/checkout@v4
       - name: Generate a canary version
         id: set-version
         run: |
-          # TODO: fix this to be dynamic - extract version from repo
+          # Extract the version from Cargo.toml
           SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
-          VERSION="1.0.3-canary+${SHORT_SHA}"
+          VERSION=$(grep '^version\s*=' Cargo.toml | head -n 1 | cut -d\" -f2)
+          VERSION="${VERSION}-canary+${SHORT_SHA}"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
   # ------------------------------------
@@ -48,7 +51,7 @@ jobs:
   install-script:
     name: Upload Install Script
     runs-on: ubuntu-latest
-    needs: [ build-cli ]
+    needs: [build-cli]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/upload-artifact@v4
@@ -71,14 +74,14 @@ jobs:
       APPLE_ID: ${{ secrets.APPLE_ID }}
       APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-  
+
   # ------------------------------------
   # 5) Create/Update GitHub Release
   # ------------------------------------
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: [ build-cli, install-script, bundle-desktop ]
+    needs: [build-cli, install-script, bundle-desktop]
     permissions:
       contents: write
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,12 +1,12 @@
 on:
   push:
     paths-ignore:
-      - 'documentation/**'
+      - "documentation/**"
     branches:
       - main
   pull_request:
     paths-ignore:
-      - 'documentation/**'
+      - "documentation/**"
     branches:
       - main
   workflow_dispatch:
@@ -89,7 +89,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 'lts/*'
+          node-version: "lts/*"
 
       - name: Install Dependencies
         run: npm ci
@@ -104,5 +104,4 @@ jobs:
     uses: ./.github/workflows/bundle-desktop.yml
     if: github.event_name == 'pull_request'
     with:
-      version: 1.0.3 # TODO: fix this to be dynamic
       signing: false
diff --git a/.github/workflows/deploy-docs-and-extensions.yml b/.github/workflows/deploy-docs-and-extensions.yml
@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - main
+
+  pull_request:
+    paths:
+      - 'documentation/**'
+      - 'extensions-site/**'
 
 jobs:
   deploy:
@@ -18,6 +23,14 @@ jobs:
         with:
           node-version: 20 
 
+      - name: Cache Node.js modules (documentation)
+        uses: actions/cache@v3
+        with:
+          path: ./documentation/node_modules
+          key: ${{ runner.os }}-documentation-${{ hashFiles('./documentation/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-documentation-
+
       - name: Install dependencies and build docs
         working-directory: ./documentation
         env:
@@ -28,6 +41,14 @@ jobs:
           npm install
           npm run build
 
+      - name: Cache Node.js modules (extensions-site)
+        uses: actions/cache@v3
+        with:
+          path: ./extensions-site/node_modules
+          key: ${{ runner.os }}-extensions-${{ hashFiles('./extensions-site/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-extensions-
+
       - name: Install dependencies and build extensions-site
         working-directory: ./extensions-site
         env:
@@ -44,9 +65,8 @@ jobs:
           cp -r extensions-site/build/client/* combined-build/v1/extensions/
 
       - name: Deploy to /gh-pages
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: combined-build
-          destination_dir: . # Deploy the site to the root /goose directory
-
diff --git a/.github/workflows/pr-comment-bundle-desktop.yml b/.github/workflows/pr-comment-bundle-desktop.yml
@@ -43,7 +43,6 @@ jobs:
     if: ${{ needs.trigger-on-command.outputs.continue == 'true' }}
     uses: ./.github/workflows/bundle-desktop.yml
     with:
-      version: 1.0.3 # TODO: fix this to be dynamic
       signing: true
     secrets:
       CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
@@ -71,11 +70,11 @@ jobs:
           issue-number: ${{ needs.trigger-on-command.outputs.pr_number }}
           body: |
             ### Desktop App for this PR
-            
+
             The following build is available for testing:
-            
+
             - [📱 macOS Desktop App (arm64, signed)](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/Goose-darwin-arm64.zip)
 
             After downloading, unzip the file and drag the Goose.app to your Applications folder. The app is signed and notarized for macOS.
-            
+
             This link is provided by nightly.link and will work even if you're not logged into GitHub.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@
 on:
   push:
     paths-ignore:
-      - 'documentation/**'
+      - "documentation/**"
     tags:
       - "v1.*"
 
@@ -13,31 +13,13 @@ concurrency:
 
 jobs:
   # ------------------------------------
-  # 1) Set version variables first
-  # ------------------------------------
-  prepare-version:
-    name: Prepare Version
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.set-version.outputs.version }}
-    steps:
-      - name: Extract version
-        id: set-version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-  # ------------------------------------
-  # 3) Build CLI for multiple OS/Arch
+  # 1) Build CLI for multiple OS/Arch
   # ------------------------------------
   build-cli:
-    needs: [prepare-version]
     uses: ./.github/workflows/build-cli.yml
-    with:
-      version: ${{ needs.prepare-version.outputs.version }}
 
   # ------------------------------------
-  # 4) Upload Install CLI Script
+  # 2) Upload Install CLI Script
   # ------------------------------------
   install-script:
     name: Upload Install Script
@@ -51,13 +33,11 @@ jobs:
           path: download_cli.sh
 
   # ------------------------------------------------------------
-  # 5) Bundle Desktop App (macOS only)
+  # 3) Bundle Desktop App (macOS only)
   # ------------------------------------------------------------
   bundle-desktop:
-    needs: [prepare-version]
     uses: ./.github/workflows/bundle-desktop.yml
     with:
-      version: ${{ needs.prepare-version.outputs.version }}
       signing: true
     secrets:
       CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
@@ -67,7 +47,7 @@ jobs:
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
 
   # ------------------------------------
-  # 6) Create/Update GitHub Release
+  # 4) Create/Update GitHub Release
   # ------------------------------------
   release:
     name: Release
@@ -80,7 +60,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           merge-multiple: true
-          
+
       # Create/update the versioned release
       - name: Release versioned
         uses: ncipollo/release-action@v1
@@ -108,4 +88,3 @@ jobs:
           allowUpdates: true
           omitBody: true
           omitPrereleaseDuringUpdate: true
-
diff --git a/.intersect/intersect-config.yaml b/.intersect/intersect-config.yaml
@@ -0,0 +1,2 @@
+---
+PR_REVIEW: true
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "1.0.3"
+version = "1.0.4"
 authors = ["Block <ai-oss-tools@block.xyz>"]
 license = "Apache-2.0"
 repository = "https://github.com/block/goose"

diff --git a/Justfile b/Justfile
@@ -1,7 +1,11 @@
 # Justfile
 
+# list all tasks
+default:
+  @just --list
+
 # Default release command
-release:
+release-binary:
     @echo "Building release version..."
     cargo build --release
     @just copy-binary
@@ -34,7 +38,7 @@ copy-binary-intel:
 
 # Run UI with latest
 run-ui:
-    @just release
+    @just release-binary
     @echo "Running UI..."
     cd ui/desktop && npm install && npm run start-gui
 
@@ -50,7 +54,7 @@ run-server:
 
 # make GUI with latest binary
 make-ui:
-    @just release
+    @just release-binary
     cd ui/desktop && npm run bundle:default
 
 # make GUI with latest binary
@@ -61,4 +65,68 @@ make-ui-intel:
 # Setup langfuse server
 langfuse-server:
     #!/usr/bin/env bash
-    ./scripts/setup_langfuse.sh
+    ./scripts/setup_langfuse.sh
+
+# ensure the current branch is "main" or error
+ensure-main:
+    #!/usr/bin/env bash
+    branch=$(git rev-parse --abbrev-ref HEAD); \
+    if [ "$branch" != "main" ]; then \
+        echo "Error: You are not on the main branch (current: $branch)"; \
+        exit 1; \
+    fi
+
+    # check that main is up to date with upstream main
+    git fetch
+    # @{u} refers to upstream branch of current branch
+    if [ "$(git rev-parse HEAD)" != "$(git rev-parse @{u})" ]; then \
+        echo "Error: Your branch is not up to date with the upstream main branch"; \
+        echo "  ensure your branch is up to date (git pull)"; \
+        exit 1; \
+    fi
+
+# validate the version is semver, and not the current version
+validate version:
+    #!/usr/bin/env bash
+    if [[ ! "{{ version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.*)?$ ]]; then
+      echo "[error]: invalid version '{{ version }}'."
+      echo "  expected: semver format major.minor.patch or major.minor.patch-<suffix>"
+      exit 1
+    fi
+
+    current_version=$(just get-tag-version)
+    if [[ "{{ version }}" == "$current_version" ]]; then
+      echo "[error]: current_version '$current_version' is the same as target version '{{ version }}'"
+      echo "  expected: new version in semver format"
+      exit 1
+    fi
+
+# set cargo and app versions, must be semver
+release version: ensure-main
+    @just validate {{ version }} || exit 1
+
+    @git switch -c "release/{{ version }}"
+    @uvx --from=toml-cli toml set --toml-path=Cargo.toml "workspace.package.version" {{ version }}
+
+    @cd ui/desktop && npm version {{ version }} --no-git-tag-version --allow-same-version
+
+    @git add Cargo.toml ui/desktop/package.json ui/desktop/package-lock.json
+    @git commit --message "chore(release): release version {{ version }}"
+
+# extract version from Cargo.toml
+get-tag-version:
+    @uvx --from=toml-cli toml get --toml-path=Cargo.toml "workspace.package.version"
+
+# create the git tag from Cargo.toml, must be on main
+tag: ensure-main
+    git tag v$(just get-tag-version)
+
+# create tag and push to origin (use this when release branch is merged to main)
+tag-push: tag
+    # this will kick of ci for release
+    git push origin tag v$(just get-tag-version)
+
+# generate release notes from git commits
+release-notes:
+    #!/usr/bin/env bash
+    git log --pretty=format:"- %s" v$(just get-tag-version)..HEAD