Fix merge conflicts

Signed-off-by: raj-subhankar <subhankar.rj@gmail.com>

Author: raj-subhankar

.github/copilot-instructions.md

@@ -45,6 +45,7 @@
 - See HOWTOAI.md for AI-assisted code standards
 - MCP protocol implementations require extra scrutiny
 - Naming convention: In `documentation/docs` and `documentation/blog`, always refer to the project as "goose" (lowercase), never "Goose" (even at the start of sentences)
+- No prerelease docs: PRs should not contain updates in `/documentation` that correspond to code changes in the PR so that the public docs stay in sync with the latest released version. New topics should be marked with `unlisted: true`; other content should be removed or hidden from public view.
 
 ## CI Pipeline Context
 

.github/workflows/bundle-desktop-linux.yml

@@ -21,7 +21,7 @@ name: "Bundle Desktop (Linux)"
 jobs:
   build-desktop-linux:
     name: Build Desktop (Linux)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-x86-16core-64gb
 
     steps:
       - name: Checkout repository
@@ -76,7 +76,14 @@ jobs:
             rpm \
             fakeroot \
             dpkg-dev \
-            protobuf-compiler
+            protobuf-compiler \
+            flatpak \
+            flatpak-builder \
+            elfutils
+
+      - name: Setup Flatpak Runtimes
+        run: |
+          flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 
       - name: Activate hermit and set CARGO_HOME
         run: |
@@ -136,25 +143,25 @@ jobs:
         run: |
           source ./bin/activate-hermit
           cd ui/desktop
-          echo "Building Linux packages (.deb and .rpm)..."
+          echo "Building Linux packages (.deb, .rpm, and .flatpak)..."
 
-          # Build both .deb and .rpm packages
+          # Build all configured packages
           npm run make -- --platform=linux --arch=x64
 
           echo "Build completed. Checking output..."
           ls -la out/
-          find out/ -name "*.deb" -o -name "*.rpm" | head -10
+          find out/ -name "*.deb" -o -name "*.rpm" -o -name "*.flatpak" | head -10
 
       - name: List generated files
         run: |
           echo "=== All files in out/ directory ==="
           find ui/desktop/out/ -type f | head -20
           echo ""
           echo "=== Package files specifically ==="
-          find ui/desktop/out/ -name "*.deb" -o -name "*.rpm"
+          find ui/desktop/out/ -name "*.deb" -o -name "*.rpm" -o -name "*.flatpak"
           echo ""
           echo "=== File sizes ==="
-          find ui/desktop/out/ -name "*.deb" -o -name "*.rpm" -exec ls -lh {} \;
+          find ui/desktop/out/ -name "*.deb" -o -name "*.rpm" -o -name "*.flatpak" -exec ls -lh {} \;
 
       - name: Upload .deb package
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
@@ -170,11 +177,19 @@ jobs:
           path: ui/desktop/out/make/rpm/x64/*.rpm
           if-no-files-found: error
 
+      - name: Upload .flatpak package
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: Goose-linux-x64-flatpak
+          path: ui/desktop/out/make/flatpak/**/*.flatpak
+          if-no-files-found: error
+
       - name: Upload combined Linux packages
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: Goose-linux-x64
           path: |
             ui/desktop/out/make/deb/x64/*.deb
             ui/desktop/out/make/rpm/x64/*.rpm
+            ui/desktop/out/make/flatpak/**/*.flatpak
           if-no-files-found: error

.github/workflows/canary.yml

@@ -119,6 +119,7 @@ jobs:
             Goose*.zip
             *.deb
             *.rpm
+            *.flatpak
             download_cli.sh
           allowUpdates: true
           omitBody: true

.github/workflows/deploy-docs-and-extensions.yml

@@ -8,8 +8,12 @@ on:
       - 'documentation/**'
 
 # Use same concurrency group as PR preview workflow to prevent race conditions
-# when both workflows try to modify gh-pages branch simultaneously
-concurrency: pr-preview
+# when both workflows try to modify gh-pages branch simultaneously.
+# cancel-in-progress: false ensures production deploys queue and wait rather than
+# being cancelled by PR preview workflows.
+concurrency:
+  group: pr-preview
+  cancel-in-progress: false
 
 jobs:
   deploy:

.github/workflows/nightly.yml

@@ -121,6 +121,7 @@ jobs:
             Goose*.zip
             *.deb
             *.rpm
+            *.flatpak
             download_cli.sh
           allowUpdates: true
           omitBody: true

.github/workflows/release.yml

@@ -109,6 +109,7 @@ jobs:
             Goose*.zip
             *.deb
             *.rpm
+            *.flatpak
             download_cli.sh
           allowUpdates: true
           omitBody: true
@@ -127,6 +128,7 @@ jobs:
             Goose*.zip
             *.deb
             *.rpm
+            *.flatpak
             download_cli.sh
           allowUpdates: true
           omitBody: true

BUILDING_LINUX.md

@@ -138,8 +138,23 @@ If you see "Could not find goosed binary", ensure you've:
 - The RPM maker is disabled by default as it's not compatible with Arch-based systems
 - Use the ZIP distribution method for maximum compatibility
 
-#### Flatpak/Snap
-Building as Flatpak or Snap packages is not currently supported but may be added in the future.
+#### Flatpak
+Flatpak builds are supported via CI. To build locally:
+```bash
+# Install flatpak and flatpak-builder
+sudo apt install flatpak flatpak-builder
+
+# Add Flathub remote
+flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+# Build with Electron Forge
+npm run make -- --targets=@electron-forge/maker-flatpak
+```
+
+Output: `out/make/flatpak/x86_64/*.flatpak`
+
+#### Snap
+Building as Snap packages is not currently supported but may be added in the future.
 
 ## Development Workflow
 

CONTRIBUTING.md

@@ -62,59 +62,59 @@ sudo apt install libxcb1-dev      # libxcb1-dev is the development package for t
 
 ### Rust
 
-First let's compile goose and try it out
+First, activate the hermit environment and compile goose:
 
 ```
+source bin/activate-hermit
 cargo build
 ```
 
-when that is done, you should now have debug builds of the binaries like the goose cli:
+When that completes, debug builds of the binaries are available, including the goose CLI:
 
 ```
 ./target/debug/goose --help
 ```
 
-If you haven't used the CLI before, you can use this compiled version to do first time configuration:
+For first-time setup, run the configure command:
 
 ```
 ./target/debug/goose configure
 ```
 
-And then once you have a connection to an LLM provider working, you can run a session!
+Once a connection to an LLM provider is working, start a session:
 
 ```
 ./target/debug/goose session
 ```
 
 These same commands can be recompiled and immediately run using `cargo run -p goose-cli` for iteration.
-As you make changes to the rust code, you can try it out on the CLI, or also run checks, tests, and linter:
+When making changes to the Rust code, test them on the CLI or run checks, tests, and the linter:
 
 ```
-cargo check  # do your changes compile
-cargo test  # do the tests pass with your changes
-cargo fmt   # format your code
+cargo check  # verify changes compile
+cargo test  # run tests with changes
+cargo fmt   # format code
 ./scripts/clippy-lint.sh # run the linter
 ```
 
 ### Node
 
-Now let's make sure you can run the app.
+To run the app:
 
 ```
 just run-ui
 ```
 
-The start gui will both build a release build of rust (as if you had done `cargo build -r`) and start the electron process.
-You should see the app open a window, and drop you into first time setup. When you've gone through the setup,
-you can talk to goose!
+This command builds a release build of Rust (equivalent to `cargo build -r`) and starts the Electron process.
+The app opens a window and displays first-time setup. After completing setup, goose is ready for use.
 
-You can now make changes in the code in ui/desktop to iterate on the GUI half of goose.
+Make GUI changes in `ui/desktop`.
 
 ### Regenerating the OpenAPI schema
 
 The file `ui/desktop/openapi.json` is automatically generated during the build.
 It is written by the `generate_schema` binary in `crates/goose-server`.
-If you need to update the spec without starting the UI, run:
+To update the spec without starting the UI, run:
 
 ```
 just generate-openapi
@@ -123,29 +123,28 @@ just generate-openapi
 This command regenerates `ui/desktop/openapi.json` and then runs the UI's
 `generate-api` script to rebuild the TypeScript client from that spec.
 
-Changes to the API should be made in the Rust source under `crates/goose-server/src/`.
+API changes should be made in the Rust source under `crates/goose-server/src/`.
 
 ### Debugging
 
-To debug the Goose server, you can run it from your preferred IDE. How to configure the command
-to start the server will depend on your IDE. The command to run is:
+To debug the Goose server, run it from an IDE. The configuration will depend on the IDE. The command to run is:
 
 ```
 export GOOSE_SERVER__SECRET_KEY=test
 cargo run --package goose-server --bin goosed -- agent   # or: `just run-server`
 ```
 
-The server will start listening on port `3000` by default, but this can be changed by setting the
+The server listens on port `3000` by default; this can be changed by setting the
 `GOOSE_PORT` environment variable.
 
-Once the server is running, you can start a UI and connect it to the server by running:
+Once the server is running, start a UI and connect it to the server by running:
 
 ```
 just debug-ui
 ```
 
-The UI will now be connected to the server you started in your IDE, allowing you to set breakpoints
-and step through the server code as you interact with the UI.
+The UI connects to the server started in the IDE, allowing breakpoints
+and stepping through the server code while interacting with the UI.
 
 ## Creating a fork