Repository: edgedb/edgedb-cli
Pull request #1481 (2025-02-18 11:32:16)

Update [[watch]] in manifest to be an array
With this PR, I believe the watch & hooks are now in sync with [RFC 1028](https://github.com/edgedb/rfcs/blob/c9eea6c7be7d04d3acfb9319c7c962dadd69c20b/text/1028-cli-hooks.rst)

aljazerzen: They ought to be, if we had any. Which is something I should change.

Patch:
diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml
index fb6e67b..e7153ef 100644
--- a/.github/workflows.src/build.inc.yml
+++ b/.github/workflows.src/build.inc.yml
@@ -27,7 +27,7 @@
       shell: bash
       run: |
         rev=$(git rev-parse HEAD)
-        jq_filter='.packages[] | select(.basename == "edgedb-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | select(. != null) | . as $rev | select($REV | startswith($rev))'
+        jq_filter='.packages[] | select(.basename == "gel-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | select(. != null) | . as $rev | select($REV | startswith($rev))'
 <% for tgt in targets.linux %>
         val=true
 <% if tgt.family == "debian" %>
@@ -112,7 +112,7 @@
         PKG_PLATFORM: "<< tgt.platform >>"
         PKG_PLATFORM_VERSION: "<< tgt.platform_version >>"
         PKG_PLATFORM_ARCH: "<< tgt.arch >>"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 <% if tgt.family == "generic" %>
         BUILD_GENERIC: true
@@ -184,7 +184,7 @@
         PKG_PLATFORM: "<< tgt.platform >>"
         PKG_PLATFORM_VERSION: "<< tgt.platform_version >>"
         PKG_PLATFORM_ARCH: "<< tgt.arch >>"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         METAPKG_GIT_CACHE: disabled
 <% if tgt.family == "generic" %>
         BUILD_GENERIC: true
@@ -241,7 +241,7 @@
         PKG_PLATFORM: "<< tgt.platform >>"
         PKG_PLATFORM_VERSION: "<< tgt.platform_version >>"
         PKG_PLATFORM_ARCH: "<< tgt.arch >>"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
 <% if tgt.family == "generic" %>
         BUILD_GENERIC: true
 <% endif %>
@@ -449,19 +449,20 @@
               *.zst) \
                 cp -a "${artifact}" "/tmp/" \
                 cd "/tmp/" \
-                zstd -d "${artifact}" -o "edgedb" \
+                zstd -d "${artifact}" -o "gel" \
                 ;; \
               *) \
-                cp -a "${artifact}" "/tmp/edgedb" \
+                cp -a "${artifact}" "/tmp/gel" \
                 ;; \
             esac \
           ) \
-          && chmod +x /tmp/edgedb
+          && chmod +x /tmp/gel
 
         FROM scratch
         COPY --from=download /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-        COPY --from=download /tmp/edgedb /usr/bin/edgedb
-        ENTRYPOINT ["/usr/bin/edgedb"]
+        COPY --from=download /tmp/gel /usr/bin/gel
+        RUN ln -s gel /usr/bin/edgedb
+        ENTRYPOINT ["/usr/bin/gel"]
         EOF
     - env:
         VERSION: "${{ << pub_outputs >>.version }}"
@@ -505,7 +506,7 @@
     - name: Publish Docker Image
       uses: elgohr/Publish-Docker-Github-Action@43dc228e327224b2eda11c8883232afd5b34943b  # v5
       with:
-        name: edgedb/edgedb-cli
+        name: geldata/gel-cli
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         <%- if subdist == "nightly" %>
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 9f5a9b0..a2b9225 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -84,7 +84,7 @@ jobs:
       shell: bash
       run: |
         rev=$(git rev-parse HEAD)
-        jq_filter='.packages[] | select(.basename == "edgedb-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | select(. != null) | . as $rev | select($REV | startswith($rev))'
+        jq_filter='.packages[] | select(.basename == "gel-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | select(. != null) | . as $rev | select($REV | startswith($rev))'
 
         val=true
 
@@ -468,7 +468,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "buster"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -502,7 +502,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "buster"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -536,7 +536,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bullseye"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -570,7 +570,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bullseye"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -604,7 +604,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bookworm"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -638,7 +638,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bookworm"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -672,7 +672,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "bionic"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -706,7 +706,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "bionic"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -740,7 +740,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "focal"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -774,7 +774,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "focal"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -808,7 +808,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "jammy"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -842,7 +842,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "jammy"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -876,7 +876,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "noble"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -910,7 +910,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "noble"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -944,7 +944,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "7"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -978,7 +978,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "8"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -1012,7 +1012,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "8"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -1046,7 +1046,7 @@ jobs:
         PKG_PLATFORM: "rockylinux"
         PKG_PLATFORM_VERSION: "9"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -1080,7 +1080,7 @@ jobs:
         PKG_PLATFORM: "rockylinux"
         PKG_PLATFORM_VERSION: "9"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -1114,7 +1114,7 @@ jobs:
         PKG_PLATFORM: "linux"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
         BUILD_GENERIC: true
@@ -1152,7 +1152,7 @@ jobs:
         PKG_PLATFORM: "linux"
         PKG_PLATFORM_VERSION: "aarch64"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
         BUILD_GENERIC: true
@@ -1219,7 +1219,7 @@ jobs:
         PKG_PLATFORM: "macos"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         METAPKG_GIT_CACHE: disabled
 
         BUILD_GENERIC: true
@@ -1284,7 +1284,7 @@ jobs:
         PKG_PLATFORM: "macos"
         PKG_PLATFORM_VERSION: "aarch64"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         METAPKG_GIT_CACHE: disabled
 
         BUILD_GENERIC: true
@@ -1336,7 +1336,7 @@ jobs:
         PKG_PLATFORM: "win"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
 
       shell: bash
       run: |
@@ -2729,19 +2729,20 @@ jobs:
               *.zst) \
                 cp -a "${artifact}" "/tmp/" \
                 cd "/tmp/" \
-                zstd -d "${artifact}" -o "edgedb" \
+                zstd -d "${artifact}" -o "gel" \
                 ;; \
               *) \
-                cp -a "${artifact}" "/tmp/edgedb" \
+                cp -a "${artifact}" "/tmp/gel" \
                 ;; \
             esac \
           ) \
-          && chmod +x /tmp/edgedb
+          && chmod +x /tmp/gel
 
         FROM scratch
         COPY --from=download /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-        COPY --from=download /tmp/edgedb /usr/bin/edgedb
-        ENTRYPOINT ["/usr/bin/edgedb"]
+        COPY --from=download /tmp/gel /usr/bin/gel
+        RUN ln -s gel /usr/bin/edgedb
+        ENTRYPOINT ["/usr/bin/gel"]
         EOF
     - env:
         VERSION: "${{ needs.check-published-linux-x86_64.outputs.version }}"
@@ -2785,7 +2786,7 @@ jobs:
     - name: Publish Docker Image
       uses: elgohr/Publish-Docker-Github-Action@43dc228e327224b2eda11c8883232afd5b34943b  # v5
       with:
-        name: edgedb/edgedb-cli
+        name: geldata/gel-cli
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         tags: nightly
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dbd72c3..73cb29e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "buster"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -80,7 +80,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "buster"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -112,7 +112,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bullseye"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -144,7 +144,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bullseye"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -176,7 +176,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bookworm"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -208,7 +208,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bookworm"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -240,7 +240,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "bionic"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -272,7 +272,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "bionic"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -304,7 +304,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "focal"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -336,7 +336,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "focal"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -368,7 +368,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "jammy"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -400,7 +400,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "jammy"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -432,7 +432,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "noble"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -464,7 +464,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "noble"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -496,7 +496,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "7"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -528,7 +528,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "8"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -560,7 +560,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "8"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -592,7 +592,7 @@ jobs:
         PKG_PLATFORM: "rockylinux"
         PKG_PLATFORM_VERSION: "9"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -624,7 +624,7 @@ jobs:
         PKG_PLATFORM: "rockylinux"
         PKG_PLATFORM_VERSION: "9"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -656,7 +656,7 @@ jobs:
         PKG_PLATFORM: "linux"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
         BUILD_GENERIC: true
@@ -692,7 +692,7 @@ jobs:
         PKG_PLATFORM: "linux"
         PKG_PLATFORM_VERSION: "aarch64"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
         BUILD_GENERIC: true
@@ -757,7 +757,7 @@ jobs:
         PKG_PLATFORM: "macos"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         METAPKG_GIT_CACHE: disabled
 
         BUILD_GENERIC: true
@@ -820,7 +820,7 @@ jobs:
         PKG_PLATFORM: "macos"
         PKG_PLATFORM_VERSION: "aarch64"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         METAPKG_GIT_CACHE: disabled
 
         BUILD_GENERIC: true
@@ -870,7 +870,7 @@ jobs:
         PKG_PLATFORM: "win"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
 
       shell: bash
       run: |
@@ -2218,19 +2218,20 @@ jobs:
               *.zst) \
                 cp -a "${artifact}" "/tmp/" \
                 cd "/tmp/" \
-                zstd -d "${artifact}" -o "edgedb" \
+                zstd -d "${artifact}" -o "gel" \
                 ;; \
               *) \
-                cp -a "${artifact}" "/tmp/edgedb" \
+                cp -a "${artifact}" "/tmp/gel" \
                 ;; \
             esac \
           ) \
-          && chmod +x /tmp/edgedb
+          && chmod +x /tmp/gel
 
         FROM scratch
         COPY --from=download /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-        COPY --from=download /tmp/edgedb /usr/bin/edgedb
-        ENTRYPOINT ["/usr/bin/edgedb"]
+        COPY --from=download /tmp/gel /usr/bin/gel
+        RUN ln -s gel /usr/bin/edgedb
+        ENTRYPOINT ["/usr/bin/gel"]
         EOF
     - env:
         VERSION: "${{ needs.check-published-linux-x86_64.outputs.version }}"
@@ -2274,7 +2275,7 @@ jobs:
     - name: Publish Docker Image
       uses: elgohr/Publish-Docker-Github-Action@43dc228e327224b2eda11c8883232afd5b34943b  # v5
       with:
-        name: edgedb/edgedb-cli
+        name: geldata/gel-cli
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         tags: "${{ steps.tags.outputs.tags }}"
diff --git a/src/highlight.rs b/src/highlight.rs
index 2675e35..13ff993 100644
--- a/src/highlight.rs
+++ b/src/highlight.rs
@@ -143,6 +143,10 @@ fn token_style(kind: Kind, value: &str) -> Option<Style> {
         T::BacktickName => None,
         T::Substitution => Some(S::Decorator),
 
-        t => unreachable!("unexpected token kind: {:?}", t),
+        T::StrInterpStart => Some(S::String),
+        T::StrInterpCont => Some(S::String),
+        T::StrInterpEnd => Some(S::String),
+
+        _ => None,
     }
 }
diff --git a/src/portable/project/init.rs b/src/portable/project/init.rs
index 09bec73..aba24f5 100644
--- a/src/portable/project/init.rs
+++ b/src/portable/project/init.rs
@@ -632,7 +632,7 @@ fn init_new(
             },
             project: None,
             hooks: None,
-            watch: None,
+            watch: Vec::new(),
         };
         project::manifest::write(&location.manifest, &manifest)?;
         let ctx = project::Context { location, manifest };
@@ -697,7 +697,7 @@ fn init_new(
                 },
                 project: Default::default(),
                 hooks: None,
-                watch: None,
+                watch: Vec::new(),
             };
             project::manifest::write(&location.manifest, &manifest)?;
             let ctx = project::Context { location, manifest };
@@ -763,7 +763,7 @@ fn init_new(
                 },
                 project: Default::default(),
                 hooks: None,
-                watch: None,
+                watch: Vec::new(),
             };
 
             project::manifest::write(&location.manifest, &manifest)?;
diff --git a/src/portable/project/manifest.rs b/src/portable/project/manifest.rs
index 93e9ce2..7064923 100644
--- a/src/portable/project/manifest.rs
+++ b/src/portable/project/manifest.rs
@@ -1,6 +1,6 @@
 //# Project manifest
 
-use std::collections::{BTreeMap, HashMap};
+use std::collections::BTreeMap;
 use std::fs;
 use std::path::{Path, PathBuf};
 
@@ -21,7 +21,7 @@ pub struct Manifest {
     pub instance: Instance,
     pub project: Option<Project>,
     pub hooks: Option<Hooks>,
-    pub watch: Option<Watch>,
+    pub watch: Vec<WatchScript>,
 }
 
 impl Manifest {
@@ -98,8 +98,9 @@ pub struct Hook {
 }
 
 #[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
-pub struct Watch {
-    pub files: Option<HashMap<String, String>>,
+pub struct WatchScript {
+    pub files: Vec<String>,
+    pub script: String,
 }
 
 #[context("error reading project config `{}`", path.display())]
@@ -128,7 +129,7 @@ pub fn read(path: &Path) -> anyhow::Result<Manifest> {
                 .map(|s| PathBuf::from(s.into_inner())),
         }),
         hooks: val.hooks,
-        watch: val.watch,
+        watch: val.watch.unwrap_or_default(),
     });
 }
 
@@ -249,7 +250,7 @@ pub struct SrcManifest {
     pub instance: SrcInstance,
     pub project: Option<SrcProject>,
     pub hooks: Option<Hooks>,
-    pub watch: Option<Watch>,
+    pub watch: Option<Vec<WatchScript>>,
     #[serde(flatten)]
     pub extra: BTreeMap<String, toml::Value>,
 }
diff --git a/src/watch/migrate.rs b/src/watch/migrate.rs
index fb947a4..29512aa 100644
--- a/src/watch/migrate.rs
+++ b/src/watch/migrate.rs
@@ -13,7 +13,7 @@ use crate::connect::{Connection, Connector};
 use crate::migrations::{self, dev_mode};
 use crate::print;
 
-use super::{Context, ExecutionOrder, Matcher};
+use super::{Context, ExecutionOrder, Watcher};
 
 pub struct Migrator {
     ctx: Arc<Context>,
@@ -37,7 +37,7 @@ impl Migrator {
     pub async fn run(
         mut self,
         mut input: UnboundedReceiver<ExecutionOrder>,
-        matcher: Arc<Matcher>,
+        matcher: Arc<Watcher>,
     ) {
         while let Some(order) = ExecutionOrder::recv(&mut input).await {
             order.print(&matcher, self.ctx.as_ref());
diff --git a/src/watch/mod.rs b/src/watch/mod.rs
index be98c9d..6b606dd 100644
--- a/src/watch/mod.rs
+++ b/src/watch/mod.rs
@@ -15,6 +15,7 @@ use tokio::task::JoinSet;
 
 #[allow(unused_imports)]
 use crate::branding::{BRANDING_CLI_CMD, MANIFEST_FILE_DISPLAY_NAME};
+use crate::hint::HintExt;
 use crate::options::Options;
 use crate::portable::project;
 use crate::print::{self, AsRelativeToCurrentDir, Highlight};
@@ -43,7 +44,7 @@ pub async fn run(options: &Options, cmd: &Command) -> anyhow::Result<()> {
     });
 
     // determine what we will be watching
-    let matchers = assemble_matchers(cmd, &ctx.project)?;
+    let matchers = assemble_watchers(cmd, &ctx.project)?;
 
     if cmd.migrate {
         print::msg!(
@@ -66,7 +67,7 @@ pub async fn run(options: &Options, cmd: &Command) -> anyhow::Result<()> {
     );
     print::msg!("");
     for m in &matchers {
-        print::msg!("  {}: {}", m.glob, m.target.to_string().muted());
+        print::msg!("  {}: {}", m.name, m.target.to_string().muted());
     }
     print::msg!("");
 
@@ -95,15 +96,15 @@ struct Context {
     cmd: Command,
 }
 
-struct Matcher {
-    glob: String,
-    matcher: globset::GlobMatcher,
+struct Watcher {
+    name: String,
+    matchers: Vec<globset::GlobMatcher>,
     target: Target,
 }
 
-impl Matcher {
+impl Watcher {
     fn name(&self) -> &str {
-        self.glob.as_str()
+        self.name.as_str()
     }
 }
 
@@ -124,33 +125,40 @@ impl std::fmt::Display for Target {
     }
 }
 
-fn assemble_matchers(
+fn assemble_watchers(
     cmd: &Command,
     project: &project::Context,
-) -> anyhow::Result<Vec<Arc<Matcher>>> {
-    let watch = project.manifest.watch.as_ref();
-    let files = match watch.and_then(|x| x.files.as_ref()) {
-        Some(files) => files.clone(),
-        None if cmd.migrate => Default::default(),
-        None => {
-            return Err(anyhow::anyhow!(
-                "[watch.files] table missing in {}",
-                MANIFEST_FILE_DISPLAY_NAME
-            ));
-        }
-    };
+) -> anyhow::Result<Vec<Arc<Watcher>>> {
+    let watch_scripts = &project.manifest.watch;
+    if watch_scripts.is_empty() && !cmd.migrate {
+        return Err(
+            anyhow::anyhow!("Missing [[watch]] entries in {MANIFEST_FILE_DISPLAY_NAME}")
+                .with_hint(|| {
+                    "For auto-apply migrations in dev mode (the old behavior \
+                    of `edgedb watch`) use `--migrate` flag."
+                        .to_string()
+                })
+                .into(),
+        );
+    }
 
-    let mut matchers = Vec::new();
-    for (glob_str, script) in files {
-        let glob = globset::Glob::new(&glob_str)?;
+    let mut watchers = Vec::new();
+    for watch_script in watch_scripts {
+        let mut watcher = Watcher {
+            name: watch_script.files.join(","),
+            matchers: Vec::with_capacity(watch_script.files.len()),
+            target: Target::Script(watch_script.script.clone()),
+        };
 
-        matchers.push(Arc::new(Matcher {
-            glob: glob_str,
-            matcher: glob.compile_matcher(),
-            target: Target::Script(script),
-        }));
+        for glob in &watch_script.files {
+            let glob = globset::Glob::new(glob)?;
+
+            watcher.matchers.push(glob.compile_matcher());
+        }
+
+        watchers.push(Arc::new(watcher));
     }
-    matchers.sort_by(|a, b| b.glob.cmp(&a.glob));
+    watchers.sort_by(|a, b| b.name.cmp(&a.name));
 
     if cmd.migrate {
         let schema_dir = project.manifest.project().get_schema_dir();
@@ -159,18 +167,19 @@ fn assemble_matchers(
             .ok_or_else(|| anyhow::anyhow!("bad path: {}", schema_dir.display()))?;
         let glob_str = format!("{schema_dir}/**/*.{{gel,esdl}}");
         let glob = globset::Glob::new(&glob_str)?;
-        matchers.push(Arc::new(Matcher {
-            glob: glob_str,
-            matcher: glob.compile_matcher(),
+
+        watchers.push(Arc::new(Watcher {
+            name: "--migrate".into(),
+            matchers: vec![glob.compile_matcher()],
             target: Target::MigrateDevMode,
         }));
     }
 
-    Ok(matchers)
+    Ok(watchers)
 }
 
 async fn start_executors(
-    matchers: &[Arc<Matcher>],
+    matchers: &[Arc<Watcher>],
     ctx: &Arc<Context>,
 ) -> anyhow::Result<(Vec<UnboundedSender<ExecutionOrder>>, JoinSet<()>)> {
     let mut senders = Vec::with_capacity(matchers.len());
@@ -192,7 +201,7 @@ async fn start_executors(
 }
 
 async fn watch_and_match(
-    matchers: &[Arc<Matcher>],
+    watchers: &[Arc<Watcher>],
     tx: &[UnboundedSender<ExecutionOrder>],
     ctx: &Arc<Context>,
 ) -> anyhow::Result<()> {
@@ -225,11 +234,11 @@ async fn watch_and_match(
             .collect();
 
         // run all matching scripts
-        for (matcher, tx) in std::iter::zip(matchers, tx) {
+        for (watcher, tx) in std::iter::zip(watchers, tx) {
             // does it match?
             let matched_paths = changed_paths
                 .iter()
-                .filter(|x| matcher.matcher.is_match_candidate(&x.1))
+                .filter(|x| watcher.matchers.iter().any(|m| m.is_match_candidate(&x.1)))
                 .map(|x| x.0.display().to_string())
                 .collect::<Vec<_>>();
             if matched_paths.is_empty() {
@@ -266,7 +275,7 @@ impl ExecutionOrder {
         Some(order)
     }
 
-    fn print(&self, matcher: &Matcher, ctx: &Context) {
+    fn print(&self, matcher: &Watcher, ctx: &Context) {
         // print
         print::msg!(
             "{}",
diff --git a/src/watch/scripts.rs b/src/watch/scripts.rs
index a973201..48c1878 100644
--- a/src/watch/scripts.rs
+++ b/src/watch/scripts.rs
@@ -7,11 +7,11 @@ use crate::print;
 use crate::process;
 
 use super::Target;
-use super::{Context, ExecutionOrder, Matcher};
+use super::{Context, ExecutionOrder, Watcher};
 
 pub async fn execute(
     mut input: UnboundedReceiver<ExecutionOrder>,
-    matcher: Arc<Matcher>,
+    matcher: Arc<Watcher>,
     ctx: Arc<Context>,
 ) {
     let project_root = &ctx.project.location.root;


Test patch:
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 3a43da0..2220955 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -49,7 +49,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "buster"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -82,7 +82,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "buster"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -115,7 +115,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bullseye"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -148,7 +148,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bullseye"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -181,7 +181,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bookworm"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -214,7 +214,7 @@ jobs:
         PKG_PLATFORM: "debian"
         PKG_PLATFORM_VERSION: "bookworm"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -247,7 +247,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "bionic"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -280,7 +280,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "bionic"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -313,7 +313,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "focal"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -346,7 +346,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "focal"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -379,7 +379,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "jammy"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -412,7 +412,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "jammy"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -445,7 +445,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "noble"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -478,7 +478,7 @@ jobs:
         PKG_PLATFORM: "ubuntu"
         PKG_PLATFORM_VERSION: "noble"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -511,7 +511,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "7"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -544,7 +544,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "8"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -577,7 +577,7 @@ jobs:
         PKG_PLATFORM: "centos"
         PKG_PLATFORM_VERSION: "8"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -610,7 +610,7 @@ jobs:
         PKG_PLATFORM: "rockylinux"
         PKG_PLATFORM_VERSION: "9"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -643,7 +643,7 @@ jobs:
         PKG_PLATFORM: "rockylinux"
         PKG_PLATFORM_VERSION: "9"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
 
@@ -676,7 +676,7 @@ jobs:
         PKG_PLATFORM: "linux"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
         BUILD_GENERIC: true
@@ -713,7 +713,7 @@ jobs:
         PKG_PLATFORM: "linux"
         PKG_PLATFORM_VERSION: "aarch64"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         EXTRA_OPTIMIZATIONS: "true"
 
         BUILD_GENERIC: true
@@ -779,7 +779,7 @@ jobs:
         PKG_PLATFORM: "macos"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         METAPKG_GIT_CACHE: disabled
 
         BUILD_GENERIC: true
@@ -843,7 +843,7 @@ jobs:
         PKG_PLATFORM: "macos"
         PKG_PLATFORM_VERSION: "aarch64"
         PKG_PLATFORM_ARCH: "aarch64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
         METAPKG_GIT_CACHE: disabled
 
         BUILD_GENERIC: true
@@ -894,7 +894,7 @@ jobs:
         PKG_PLATFORM: "win"
         PKG_PLATFORM_VERSION: "x86_64"
         PKG_PLATFORM_ARCH: "x86_64"
-        PACKAGE: edgedbpkg.edgedbcli:EdgeDBCLI
+        PACKAGE: edgedbpkg.edgedbcli:GelCLI
 
       shell: bash
       run: |
@@ -2287,19 +2287,20 @@ jobs:
               *.zst) \
                 cp -a "${artifact}" "/tmp/" \
                 cd "/tmp/" \
-                zstd -d "${artifact}" -o "edgedb" \
+                zstd -d "${artifact}" -o "gel" \
                 ;; \
               *) \
-                cp -a "${artifact}" "/tmp/edgedb" \
+                cp -a "${artifact}" "/tmp/gel" \
                 ;; \
             esac \
           ) \
-          && chmod +x /tmp/edgedb
+          && chmod +x /tmp/gel
 
         FROM scratch
         COPY --from=download /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-        COPY --from=download /tmp/edgedb /usr/bin/edgedb
-        ENTRYPOINT ["/usr/bin/edgedb"]
+        COPY --from=download /tmp/gel /usr/bin/gel
+        RUN ln -s gel /usr/bin/edgedb
+        ENTRYPOINT ["/usr/bin/gel"]
         EOF
     - env:
         VERSION: "${{ needs.check-published-linux-x86_64.outputs.version }}"
@@ -2343,7 +2344,7 @@ jobs:
     - name: Publish Docker Image
       uses: elgohr/Publish-Docker-Github-Action@43dc228e327224b2eda11c8883232afd5b34943b  # v5
       with:
-        name: edgedb/edgedb-cli
+        name: geldata/gel-cli
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         tags: "${{ steps.tags.outputs.tags }}"