Merge branch 'main' into ci/improve-dockerfile

Author: Brendonovich

.github/workflows/release.yml

@@ -16,7 +16,15 @@ env:
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: ubuntu-24.04-arm
     permissions:
       contents: write
       packages: write
@@ -52,9 +60,11 @@ jobs:
           context: .
           target: slim
           push: true
+          platforms: linux/${{ matrix.arch }}
           tags: |
-            ${{ env.IMAGE }}:${{ steps.version.outputs.version }}-slim
-            ${{ env.IMAGE }}:slim
+
+            ${{ env.IMAGE }}:${{ steps.version.outputs.version }}-slim-${{ matrix.arch }}
+            ${{ env.IMAGE }}:slim-${{ matrix.arch }}
           cache-from: type=gha,scope=release-slim
           cache-to: type=gha,mode=max,scope=release-slim
 
@@ -64,13 +74,55 @@ jobs:
           context: .
           target: full
           push: true
+          platforms: linux/${{ matrix.arch }}
           tags: |
-            ${{ env.IMAGE }}:${{ steps.version.outputs.version }}-full
-            ${{ env.IMAGE }}:full
-            ${{ env.IMAGE }}:latest
+            ${{ env.IMAGE }}:${{ steps.version.outputs.version }}-full-${{ matrix.arch }}
+            ${{ env.IMAGE }}:full-${{ matrix.arch }}
           cache-from: type=gha,scope=release-full
           cache-to: type=gha,mode=max,scope=release-full
 
+
+  publish-manifests:
+    runs-on: ubuntu-latest
+    needs: build-and-push
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - name: Determine version tag
+        id: version
+        run: |
+          if [ -n "${{ github.event.inputs.tag }}" ]; then
+            VERSION="${{ github.event.inputs.tag }}"
+          elif [[ "$GITHUB_REF" == refs/tags/v* ]]; then
+            VERSION="${GITHUB_REF#refs/tags/}"
+          else
+            VERSION="dev-$(echo $GITHUB_SHA | head -c 7)"
+          fi
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create multi-arch manifests
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          docker buildx imagetools create \
+            --tag ${{ env.IMAGE }}:${VERSION}-slim \
+            --tag ${{ env.IMAGE }}:slim \
+            ${{ env.IMAGE }}:${VERSION}-slim-amd64 \
+            ${{ env.IMAGE }}:${VERSION}-slim-arm64
+          docker buildx imagetools create \
+            --tag ${{ env.IMAGE }}:${VERSION}-full \
+            --tag ${{ env.IMAGE }}:full \
+            --tag ${{ env.IMAGE }}:latest \
+            ${{ env.IMAGE }}:${VERSION}-full-amd64 \
+            ${{ env.IMAGE }}:${VERSION}-full-arm64
+
       - name: Log in to Fly registry
         uses: docker/login-action@v3
         with:
@@ -80,8 +132,9 @@ jobs:
 
       - name: Push to Fly registry
         run: |
+          VERSION="${{ steps.version.outputs.version }}"
           docker buildx imagetools create \
-            --tag registry.fly.io/spacebot-image:${{ steps.version.outputs.version }} \
+            --tag registry.fly.io/spacebot-image:${VERSION} \
             --tag registry.fly.io/spacebot-image:latest \
             ${{ env.IMAGE }}:latest
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "spacebot"
-version = "0.1.2"
+version = "0.1.4"
 edition = "2024"
 
 [dependencies]

Cargo.toml

@@ -311,7 +311,7 @@ Read the full vision in [docs/spacedrive.md](docs/spacedrive.md).
 ### Prerequisites
 
 - **Rust** 1.85+ ([rustup](https://rustup.rs/))
-- An LLM API key (OpenRouter, Anthropic, OpenAI, Z.ai, etc.)
+- An LLM API key from any supported provider (Anthropic, OpenAI, OpenRouter, Z.ai, Groq, Together, Fireworks, DeepSeek, xAI, Mistral, or OpenCode Zen)
 
 ### Build and Run
 
@@ -326,22 +326,23 @@ cargo build --release
 Create `config.toml`:
 
 ```toml
-[providers.openrouter]
-api_key = "env:OPENROUTER_API_KEY"
+[llm]
+openrouter_key = "env:OPENROUTER_API_KEY"
 
 [defaults.routing]
-default_model = "anthropic/claude-sonnet-4"
-worker_model = "anthropic/claude-sonnet-4"
+channel = "anthropic/claude-sonnet-4"
+worker = "anthropic/claude-sonnet-4"
 
-[agents.my-agent]
+[[agents]]
+id = "my-agent"
 
 [messaging.discord]
-bot_token = "env:DISCORD_BOT_TOKEN"
+token = "env:DISCORD_BOT_TOKEN"
 
 [[bindings]]
-platform = "discord"
-channel_id = "your-discord-channel-id"
-agent = "my-agent"
+agent_id = "my-agent"
+channel = "discord"
+guild_id = "your-discord-guild-id"
 ```
 
 ```bash

README.md

@@ -18,7 +18,7 @@ The full message-in → LLM → response-out pipeline is wired end-to-end across
 - **Config** — hierarchical TOML with `Config`, `AgentConfig`, `ResolvedAgentConfig`, `Binding`, `MessagingConfig`. File watcher with event filtering and content hash debounce for hot-reload.
 - **Multi-agent** — per-agent database isolation, `Agent` struct bundles all dependencies
 - **Database connections** — SQLite + LanceDB + redb per-agent, migrations for all tables
-- **LLM** — `SpacebotModel` implements Rig's `CompletionModel`, routes through `LlmManager` via HTTP with retries and fallback chains across 4 providers (Anthropic, OpenAI, OpenRouter, Zhipu)
+- **LLM** — `SpacebotModel` implements Rig's `CompletionModel`, routes through `LlmManager` via HTTP with retries and fallback chains across 11 providers (Anthropic, OpenAI, OpenRouter, Z.ai, Groq, Together, Fireworks, DeepSeek, xAI, Mistral, OpenCode Zen)
 - **Model routing** — `RoutingConfig` with process-type defaults, task overrides, fallback chains
 - **Memory** — full stack: types, SQLite store (CRUD + graph), LanceDB (embeddings + vector + FTS), fastembed, hybrid search (RRF fusion). `memory_type` filter wired end-to-end through SearchConfig. `total_cmp` for safe sorting.
 - **Memory maintenance** — decay + prune implemented
@@ -35,7 +35,7 @@ The full message-in → LLM → response-out pipeline is wired end-to-end across
 - **Discord adapter** — full Serenity implementation (message handling, streaming via edit, typing indicators, guild/channel/DM filtering)
 - **Telegram adapter** — full teloxide implementation (long polling, typing indicators, attachment extraction, chat/DM filtering, 4096 char splitting)
 - **Slack adapter** — full slack-morphism implementation (Socket Mode, thread replies, file upload v2, reactions, streaming via edit, workspace/channel/DM filtering via hot-reloadable permissions)
-- **Webhook adapter** — Axum HTTP server (POST /send, GET /poll/{id}, GET /health)
+- **Webhook adapter** — Axum HTTP server (POST /send, GET `/poll/{id}`, GET /health)
 - **Tools** — 16 tools implement Rig's `Tool` trait with real logic (reply, branch, spawn_worker, route, cancel, skip, react, memory_save, memory_recall, set_status, shell, file, exec, browser, cron, web_search)
 - **Workspace containment** — file tool validates paths stay within workspace boundary, shell/exec tools block instance directory traversal, sensitive file access, and secret env var leakage
 - **Conversation persistence** — `ConversationLogger` with fire-and-forget SQLite writes, compaction archiving