Merge remote-tracking branch 'origin/main' into mwbrooks-2-way-manifest-sync

Author: mwbrooks

.circleci/config.yml

@@ -109,7 +109,7 @@ jobs:
         default: "dev-build"
     docker: # run the steps with Docker
       # CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
-      - image: cimg/go:1.26.3
+      - image: cimg/go:1.26.4
     steps: # steps that comprise the `build` job
       - checkout # check out source code to working directory
       - restore_cache: # restores saved cache if no changes are detected since last run
@@ -272,49 +272,34 @@ jobs:
               done
             fi
       - run:
-          name: "Update release description and upload assets to GitHub"
+          name: "Upload assets to GitHub release"
           command: |
-            # Replace double quotes with single quotes
             RELEASE_ID=$(curl -H "Accept: application/vnd.github+json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" "https://api.github.com/repos/slackapi/slack-cli/releases/tags/$RELEASE_REF" | jq -r .id);
-            PRERELEASE="true";
-            TARGET="${CIRCLE_SHA1}";
-            if [ "<< parameters.production >>" != "false" ];
-            then
-              PRERELEASE="false";
-              TARGET="main";
-            fi
-            BODY="{\"tag_name\":\"${RELEASE_REF}\",\"name\":\"${RELEASE_REF}\",\"target_commitish\":\"${TARGET}\",\"draft\":false,\"prerelease\":${PRERELEASE},"
 
             if [ "$RELEASE_ID" = "null" ]; then
-              BODY+="\"generate_release_notes\":true}"
-              echo "Creating a new GitHub release with: ${BODY}"
-              RELEASE_ID=$(curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" https://api.github.com/repos/slackapi/slack-cli/releases -d "${BODY}" | jq -r .id)
-              echo "... complete. RELEASE_ID=${RELEASE_ID}"
-            else
-              echo "Overwriting existing GitHub Release data; generating pre-release notes ..."
+              PRERELEASE="true"
+              TARGET="${CIRCLE_SHA1}"
+              if [ "<< parameters.production >>" != "false" ]; then
+                PRERELEASE="false"
+                TARGET="main"
+              fi
+              echo "Creating GitHub release for $RELEASE_REF..."
+              RELEASE_ID=$(curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" https://api.github.com/repos/slackapi/slack-cli/releases -d "{\"tag_name\":\"${RELEASE_REF}\",\"name\":\"${RELEASE_REF}\",\"target_commitish\":\"${TARGET}\",\"draft\":false,\"prerelease\":${PRERELEASE},\"generate_release_notes\":true}" | jq -r .id)
+            elif [ "<< parameters.production >>" = "false" ]; then
               LAST_SEMVER_TAG=$(git describe --tags --match 'v*.*.*' --abbrev=0 | cut -d"-" -f1)
-              # When generating release notes, setting the target tag_name property to an existing tag has GitHub ignore the target_commitish property
-              # So, set the tag name to the target commit to generate release notes from the last semver tag to the target commit
-              # See https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#generate-release-notes-content-for-a-release--parameters
-              # Note the following _does not change releases or tags_ - it only creates release notes, just like clicking "Generate Release Notes" on the GitHub Releases page.
-              CHANGELOG=$(curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer $GITHUB_RELEASE_TOKEN" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/slackapi/slack-cli/releases/generate-notes -d "{\"tag_name\":\"${TARGET}\",\"target_commitish\":\"${TARGET}\",\"previous_tag_name\":\"${LAST_SEMVER_TAG}\"}" | jq .body)
-              echo "Will use release notes: ${CHANGELOG}"
-              BODY+="\"body\":$CHANGELOG}"
-              echo "Updating existing GitHub pre-release ${RELEASE_ID} with ${BODY}"
-              curl -X PATCH -H "Accept: application/vnd.github+json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" https://api.github.com/repos/slackapi/slack-cli/releases/$RELEASE_ID -d "${BODY}"
-              echo "... complete."
+              CHANGELOG=$(curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer $GITHUB_RELEASE_TOKEN" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/slackapi/slack-cli/releases/generate-notes -d "{\"tag_name\":\"${CIRCLE_SHA1}\",\"target_commitish\":\"${CIRCLE_SHA1}\",\"previous_tag_name\":\"${LAST_SEMVER_TAG}\"}" | jq .body)
+              curl -X PATCH -H "Accept: application/vnd.github+json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" https://api.github.com/repos/slackapi/slack-cli/releases/$RELEASE_ID -d "{\"tag_name\":\"${RELEASE_REF}\",\"name\":\"${RELEASE_REF}\",\"target_commitish\":\"${CIRCLE_SHA1}\",\"draft\":false,\"prerelease\":true,\"body\":$CHANGELOG}"
             fi
 
-            binaries=`find << parameters.artifact_dir >>/slack_* -maxdepth 1 -not -type d`
-            for binary in $binaries
-            do
+            binaries=$(find << parameters.artifact_dir >>/slack_* -maxdepth 1 -not -type d)
+            for binary in $binaries; do
               curl -X POST \
-              -H "Authorization: token $GITHUB_RELEASE_TOKEN" \
-              -H "Accept: application/vnd.github.v3+json" \
-              -H "Content-Type: $(file -b --mime-type ${binary})" \
-              -H "Content-Length: $(wc -c <${binary} | xargs)" \
-              -T "${binary}" \
-              "https://uploads.github.com/repos/slackapi/slack-cli/releases/$RELEASE_ID/assets?name=$(basename ${binary})" | cat
+                -H "Authorization: token $GITHUB_RELEASE_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                -H "Content-Type: $(file -b --mime-type ${binary})" \
+                -H "Content-Length: $(wc -c <${binary} | xargs)" \
+                -T "${binary}" \
+                "https://uploads.github.com/repos/slackapi/slack-cli/releases/$RELEASE_ID/assets?name=$(basename ${binary})" | cat
             done
       - store_artifacts:
           path: << parameters.artifact_dir >>
@@ -448,7 +433,7 @@ workflows:
           <<: *filters-tag-triggered-workflow-job
           name: upload-to-s3-for-install-linux-feature-build
           s3-target-path: slack-cli
-          file-name: "slack_cli_*feature_linux_64-bit.tar.gz"
+          file-name: "slack_cli_*feature_linux_*.tar.gz"
           requires:
             - create-github-release-and-artifacts
           context: slack-cli-release

.claude/CLAUDE.md

@@ -207,6 +207,7 @@ See [`.github/STYLE_GUIDE.md`](../.github/STYLE_GUIDE.md) for conventions on com
 - `go.mod` - Go module dependencies and minimum Go version (see `go.mod` for current version)
 - `.circleci/config.yml` - CircleCI workflows for CI/CD pipeline
 - `.github/workflows/` - GitHub Actions for automated testing and releases
+- `.githooks/` - Opt-in Git hooks (enable with `git config core.hooksPath .githooks`)
 
 ## Commit Message Format
 
@@ -229,6 +230,10 @@ Use conventional commit format (feat:, fix:, chore:, etc.) for commit titles.
 5. Run `slack docgen ./docs/reference` to generate docs
 6. Consider adding command alias in `AliasMap` if appropriate
 
+### Command Descriptions and Documentation
+
+Command `Long` descriptions are parsed as Go `text/template` by `docgen` and rendered as MDX for the documentation site. Escape `{` and `[` as `\{` and `\[` in description text to prevent build errors on the docs site. Available template functions: `{{Emoji "name"}}`, `{{LinkText "url"}}`, `{{ToBold "text"}}`.
+
 ### Adding New Dependencies
 
 1. Update `go.mod` with the new module version

.githooks/pre-commit

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Copyright 2022-2026 Salesforce, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+# Guard against committing directly to main
+branch="$(git rev-parse --abbrev-ref HEAD)"
+if [ "$branch" = "main" ]; then
+    echo "error: commits directly to main are not allowed. Use a development branch."
+    exit 1
+fi
+
+# Run linter on staged changes
+cd "$(git rev-parse --show-toplevel)" || exit 1
+go tool golangci-lint run

.github/MAINTAINERS_GUIDE.md

@@ -207,6 +207,7 @@ Certain things are common during development and require a few commands.
 **Task outline:**
 
 - [Cloning the project](#cloning-the-project)
+  - [Git hooks](#git-hooks)
 - [Initializing the project](#initializing-the-project)
 - [Testing](#testing)
   - [Module and unit tests](#module-and-unit-tests)
@@ -233,6 +234,19 @@ git clone https://github.com/slackapi/slack-cli.git
 cd slack-cli/
 ```
 
+#### Git hooks
+
+Opt-in Git hooks are available in the `.githooks/` directory. To enable them:
+
+```zsh
+git config core.hooksPath .githooks
+```
+
+The pre-commit hook will:
+
+- Block commits directly to the `main` branch
+- Run `go tool golangci-lint run` to lint before committing
+
 ### Initializing the project
 
 When you first clone the project or after you major updates to the project, it's

.github/workflows/dependencies.yml

@@ -50,7 +50,7 @@ jobs:
           app-id: ${{ secrets.GH_APP_ID_RELEASER }}
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY_RELEASER }}
       - name: Checkout the repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: true
           ref: main

.github/workflows/license_check.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Check license headers

.github/workflows/release.yml

@@ -0,0 +1,144 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  rc:
+    name: RC
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Gather credentials
+        id: credentials
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          app-id: ${{ secrets.GH_APP_ID_RELEASER }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY_RELEASER }}
+
+      - name: Checkout repo
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          fetch-depth: 0
+          persist-credentials: true
+          ref: main
+          token: ${{ steps.credentials.outputs.token }}
+
+      - name: Set up Go
+        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        with:
+          go-version-file: go.mod
+
+      - name: Decide next version
+        id: version
+        env:
+          GH_TOKEN: ${{ steps.credentials.outputs.token }}
+        run: |
+          # Get the latest release tag
+          LATEST_TAG=$(git describe --tags --match 'v*.*.*' --abbrev=0)
+
+          # Get PR numbers since latest tag
+          PR_NUMBERS=$(git log "${LATEST_TAG}..HEAD" --oneline | grep -oP '#\K[0-9]+' || true)
+
+          if [ -z "$PR_NUMBERS" ]; then
+            echo "No new PRs since $LATEST_TAG"
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          # Search for highest semver label
+          SEMVER="patch"
+          for PR in $PR_NUMBERS; do
+            LABELS=$(gh pr view "$PR" --json labels --jq '.labels[].name' 2>/dev/null || true)
+            if echo "$LABELS" | grep -q "semver:major"; then
+              SEMVER="major"
+              break
+            elif echo "$LABELS" | grep -q "semver:minor"; then
+              SEMVER="minor"
+            fi
+          done
+
+          # Parse current version
+          VERSION="${LATEST_TAG#v}"
+          MAJOR=$(echo "$VERSION" | cut -d. -f1)
+          MINOR=$(echo "$VERSION" | cut -d. -f2)
+          PATCH=$(echo "$VERSION" | cut -d. -f3)
+
+          # Compute next version
+          case "$SEMVER" in
+            major)
+              NEXT_VERSION="$((MAJOR + 1)).0.0"
+              ;;
+            minor)
+              NEXT_VERSION="${MAJOR}.$((MINOR + 1)).0"
+              ;;
+            patch)
+              NEXT_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
+              ;;
+          esac
+
+          echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          echo "next=$NEXT_VERSION" >> "$GITHUB_OUTPUT"
+          echo "semver=$SEMVER" >> "$GITHUB_OUTPUT"
+          echo "Bumping $LATEST_TAG to v$NEXT_VERSION"
+
+      - name: Generate release commit
+        if: steps.version.outputs.has_changes == 'true'
+        env:
+          RELEASE_VERSION: ${{ steps.version.outputs.next }}
+        run: |
+          git config user.name "slack-cli-releaser[bot]"
+          git config user.email "122933866+slack-cli-releaser[bot]@users.noreply.github.com"
+          make rc RELEASE_VERSION="$RELEASE_VERSION"
+          git push origin "HEAD:refs/heads/rc" --force
+
+      - name: Create or update release PR
+        if: steps.version.outputs.has_changes == 'true'
+        env:
+          GH_TOKEN: ${{ steps.credentials.outputs.token }}
+          RELEASE_VERSION: ${{ steps.version.outputs.next }}
+          SEMVER: ${{ steps.version.outputs.semver }}
+        run: |
+          PR_TITLE="chore: release slack-cli v${RELEASE_VERSION}"
+          PR_BODY=$(cat <<EOF
+          ### Summary
+
+          Release v${RELEASE_VERSION}.
+
+          ### Testing
+
+          - [ ] Confirm unit tests and E2E tests are passing on the [`main`](https://github.com/slackapi/slack-cli/commits/main) branch.
+          - [ ] Confirm unit tests and E2E tests are passing on this PR.
+          - [ ] Confirm the [dev-build](https://github.com/slackapi/slack-cli/releases/tag/dev-build) includes all commits since last release.
+          - [ ] Review open issues or PRs on the "[Next Release](https://github.com/slackapi/slack-cli/milestones)" milestone.
+          - [ ] Confirm the new version matches the expected next version.
+
+          ### Reviewers
+
+          After merging, create a [GitHub Release](https://github.com/${{ github.repository }}/releases/new?tag=v${RELEASE_VERSION}&title=v${RELEASE_VERSION}) to tag the new version.
+
+          ### Requirements
+
+          - [x] I've read and understood the [Contributing Guidelines](https://github.com/slackapi/slack-cli/blob/main/.github/CONTRIBUTING.md) and have done my best effort to follow them.
+          - [x] I've read and agree to the [Code of Conduct](https://slackhq.github.io/code-of-conduct).
+          EOF
+          )
+
+          # Check if a PR from rc already exists
+          EXISTING_PR=$(gh pr list --head rc --base main --json number --jq '.[0].number' 2>/dev/null || true)
+
+          if [ -n "$EXISTING_PR" ]; then
+            gh pr edit "$EXISTING_PR" --remove-label "semver:patch" --remove-label "semver:minor" --remove-label "semver:major" 2>/dev/null || true
+            gh pr edit "$EXISTING_PR" --title "$PR_TITLE" --body "$PR_BODY" --milestone "Next Release" --add-label "release" --add-label "semver:${SEMVER}"
+            echo "Updated PR #$EXISTING_PR"
+          else
+            gh pr create --draft --head rc --base main --title "$PR_TITLE" --body "$PR_BODY" --milestone "Next Release" --label "release" --label "semver:${SEMVER}"
+            echo "Created new release PR"
+          fi

.github/workflows/tests.yml

@@ -13,22 +13,22 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Set up Go
         uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
-          go-version: "1.26.3"
+          go-version: "1.26.4"
       - name: Lint
         run: go tool golangci-lint run --timeout=5m
       - name: Unit Tests
         run: make test
       - name: Install Tests
         run: make test-install
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.out
@@ -43,13 +43,13 @@ jobs:
       checks: write
       contents: read
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Set up Go
         uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
-          go-version: "1.26.3"
+          go-version: "1.26.4"
       - name: Report health score
         uses: slackapi/slack-health-score@d58a419f15cdaff97e9aa7f09f95772830ab66f7 # v0.1.1
         with:

.goreleaser.yml

@@ -32,6 +32,10 @@ builds:
       - windows
     goarch:
       - amd64
+      - arm64
+    ignore:
+      - goos: windows
+        goarch: arm64
 
   - id: slack-macos
     binary: bin/slack
@@ -74,6 +78,8 @@ archives:
       {{- .Env.BUILD_VERSION }}_
       {{- if eq .Os "darwin" -}}
         macOS_{{ if eq .Arch "all" }}64-bit{{ else }}{{ .Arch }}{{ end }}
+      {{- else if eq .Os "linux" -}}
+        linux_{{ .Arch }}
       {{- else -}}
         {{ .Os }}_{{ if eq .Arch "amd64" }}64-bit{{ else }}{{ .Arch }}{{ end }}
       {{- end }}