Merge pull request #89 from mostlydev/feat/cllama-model-policy-enforcement

feat: compile and enforce declared model policy

Author: mostlydev

AGENTS.md

@@ -177,7 +177,7 @@ The spike tests are the heavy end-to-end path. They build images, run Docker, an
 - Multi-arch cllama image: `docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/mostlydev/cllama:latest --push cllama/` using the `multiarch-builder` buildx builder.
 - User-defined `healthcheck:` in `claw-pod.yml` takes precedence over driver defaults. The override happens in `compose_emit.go` — check `serviceOut["healthcheck"]` before applying `result.Healthcheck`.
 - `Service.Compose` in the pod parser preserves all non-`x-claw` compose keys as a deep-copied `map[string]interface{}`. This is how user healthchecks, depends_on, command, etc. flow through.
-- Releases: use `gh release create` with semver tags. cllama has its own tag namespace (e.g. `v0.1.0`) published from the submodule repo. ghcr.io packages default to private; must be set public via GitHub UI after first push.
+- Releases: use `gh release create` with semver tags. cllama has its own tag namespace (e.g. `v0.1.0`) published from the submodule repo. ghcr.io packages default to private; must be set public via GitHub UI after first push. Pre-built `claw` binaries are published via `goreleaser` (`.goreleaser.yml` is in-tree) — do not suggest adding goreleaser, it already exists. `install.sh` downloads the latest release with checksum verification; `claw update` re-runs it.
 - `claw-api` image is not published to ghcr.io. The `ensureImage` fallback tries a git URL build which fails because the Docker builder cannot access the private cllama submodule. Build it locally from the repo root: `docker build -t ghcr.io/mostlydev/claw-api:latest -f dockerfiles/claw-api/Dockerfile .`
 - `claw-wall` image is built from `dockerfiles/claw-wall/Dockerfile` with `.` context and published to `ghcr.io/mostlydev/claw-wall:latest`. The `ensureInfraImages` fallback applies: local image → `docker pull` → local Dockerfile build. Multi-arch build: `docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/mostlydev/claw-wall:latest --push -f dockerfiles/claw-wall/Dockerfile .`
 - `hermes-base` image is built from `dockerfiles/hermes-base/` and published to `ghcr.io/mostlydev/hermes-base:<tag>` (e.g. `v2026.3.17`). It installs `hermes-agent[messaging,cron]` from the pinned upstream tag, then runs `patch-hermes-runtime.py` to apply compatibility fixes. The patch disables the `members` and `voice_states` Discord intents, makes slash-command sync non-blocking (best-effort with timeout), and — critically — sets `allowed_mentions=discord.AllowedMentions(replied_user=False)` on all `channel.send()` calls that carry a reply reference. Without this last fix, Hermes's reply feature auto-pings the original author, which in multi-agent pods creates mention loops even when `DISCORD_REQUIRE_MENTION=true`. Build: `docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/mostlydev/hermes-base:v2026.3.17 --push dockerfiles/hermes-base/`.

README.md

@@ -114,10 +114,10 @@ go build -o bin/claw ./cmd/claw
 Clawdapus moves fast — update frequently.
 
 ```bash
-curl -sSL https://raw.githubusercontent.com/mostlydev/clawdapus/master/install.sh | sh
+claw update
 ```
 
-`claw` checks for updates once a day and prints a notice at the end of any command when a newer release is available.
+`claw` checks for updates once an hour and prints a notice when a newer release is available.
 
 ### Install AI Skill
 

cllama

@@ -482,14 +482,14 @@ func runComposeUp(podFile string) error {
 						ClawdapusMD: md,
 						Feeds:       feeds,
 						ServiceAuth: ordinalAuth,
-						Metadata: map[string]interface{}{
+						Metadata: cllama.InjectCompiledModelPolicy(map[string]any{
 							"service":  name,
 							"ordinal":  i,
 							"pod":      p.Name,
 							"type":     rc.ClawType,
 							"token":    tokens[ordinalName],
 							"timezone": agentTimezone,
-						},
+						}, rc.Models),
 					})
 				}
 				continue
@@ -507,13 +507,13 @@ func runComposeUp(podFile string) error {
 				ClawdapusMD: md,
 				Feeds:       feeds,
 				ServiceAuth: svcAuth,
-				Metadata: map[string]interface{}{
+				Metadata: cllama.InjectCompiledModelPolicy(map[string]any{
 					"service":  name,
 					"pod":      p.Name,
 					"type":     rc.ClawType,
 					"token":    tokens[name],
 					"timezone": agentTimezone,
-				},
+				}, rc.Models),
 			})
 		}
 		if err := cllama.GenerateContextDir(runtimeDir, contextInputs); err != nil {
@@ -2062,6 +2062,8 @@ var seedKeyDefs = []seedKeyDef{
 	{"OPENAI_API_KEY", "openai", "seed:OPENAI_API_KEY", "primary"},
 	{"OPENAI_API_KEY_1", "openai", "seed:OPENAI_API_KEY_1", "backup-1"},
 	{"OPENAI_API_KEY_2", "openai", "seed:OPENAI_API_KEY_2", "backup-2"},
+	{"XAI_API_KEY", "xai", "seed:XAI_API_KEY", "primary"},
+	{"XAI_API_KEY_1", "xai", "seed:XAI_API_KEY_1", "backup-1"},
 	{"ANTHROPIC_API_KEY", "anthropic", "seed:ANTHROPIC_API_KEY", "primary"},
 	{"ANTHROPIC_API_KEY_1", "anthropic", "seed:ANTHROPIC_API_KEY_1", "backup-1"},
 	{"OPENROUTER_API_KEY", "openrouter", "seed:OPENROUTER_API_KEY", "primary"},
@@ -2098,6 +2100,7 @@ type v2KeyEntry struct {
 
 var defaultBaseURLs = map[string]string{
 	"openai":     "https://api.openai.com/v1",
+	"xai":        "https://api.x.ai/v1",
 	"anthropic":  "https://api.anthropic.com/v1",
 	"openrouter": "https://openrouter.ai/api/v1",
 }
@@ -2147,6 +2150,7 @@ func mergeProviderSeeds(authDir string, p *pod.Pod) error {
 	// Also collect base URLs from cllama-env.
 	baseURLEnvMap := map[string]string{
 		"OPENAI_BASE_URL":     "openai",
+		"XAI_BASE_URL":        "xai",
 		"ANTHROPIC_BASE_URL":  "anthropic",
 		"OPENROUTER_BASE_URL": "openrouter",
 	}

cmd/claw/compose_up.go

@@ -1779,6 +1779,59 @@ func TestMergeProviderSeedsWritesV2File(t *testing.T) {
 	}
 }
 
+func TestMergeProviderSeedsWritesXAIProvider(t *testing.T) {
+	dir := t.TempDir()
+	p := &pod.Pod{
+		Services: map[string]*pod.Service{
+			"trader": {
+				Claw: &pod.ClawBlock{
+					CllamaEnv: map[string]string{
+						"XAI_API_KEY": "xai-primary",
+					},
+				},
+			},
+		},
+	}
+	if err := mergeProviderSeeds(dir, p); err != nil {
+		t.Fatalf("mergeProviderSeeds: %v", err)
+	}
+
+	data, err := os.ReadFile(filepath.Join(dir, "providers.json"))
+	if err != nil {
+		t.Fatalf("read providers.json: %v", err)
+	}
+
+	var probe struct {
+		Providers map[string]struct {
+			BaseURL string `json:"base_url"`
+			Keys    []struct {
+				ID     string `json:"id"`
+				Secret string `json:"secret"`
+			} `json:"keys"`
+		} `json:"providers"`
+	}
+	if err := json.Unmarshal(data, &probe); err != nil {
+		t.Fatalf("parse providers.json: %v", err)
+	}
+
+	xai, ok := probe.Providers["xai"]
+	if !ok {
+		t.Fatal("xai missing from output")
+	}
+	if xai.BaseURL != "https://api.x.ai/v1" {
+		t.Fatalf("expected xai base URL, got %q", xai.BaseURL)
+	}
+	if len(xai.Keys) != 1 {
+		t.Fatalf("expected 1 xai key, got %d", len(xai.Keys))
+	}
+	if xai.Keys[0].ID != "seed:XAI_API_KEY" {
+		t.Fatalf("expected xai key id seed:XAI_API_KEY, got %q", xai.Keys[0].ID)
+	}
+	if xai.Keys[0].Secret != "xai-primary" {
+		t.Fatalf("expected xai secret preserved, got %q", xai.Keys[0].Secret)
+	}
+}
+
 func TestMergeProviderSeedsPreservesExistingRuntimeKeys(t *testing.T) {
 	dir := t.TempDir()
 

cmd/claw/compose_up_test.go

@@ -54,11 +54,15 @@ func TestSpikeRollCall(t *testing.T) {
 	if env["DISCORD_BOT_ID"] == "" {
 		t.Skip("DISCORD_BOT_ID not set — skipping")
 	}
-	if env["OPENROUTER_API_KEY"] == "" && env["ANTHROPIC_API_KEY"] == "" {
+	if env["OPENROUTER_API_KEY"] == "" && env["ANTHROPIC_API_KEY"] == "" && env["XAI_API_KEY"] == "" {
 		t.Skip("No LLM API key set — skipping")
 	}
+	xaiKey := strings.TrimSpace(env["XAI_API_KEY"])
 	anthropicKey := strings.TrimSpace(env["ANTHROPIC_API_KEY"])
 	openrouterKey := strings.TrimSpace(env["OPENROUTER_API_KEY"])
+	if _, ok := env["XAI_API_KEY"]; !ok {
+		env["XAI_API_KEY"] = ""
+	}
 	if _, ok := env["ANTHROPIC_API_KEY"]; !ok {
 		env["ANTHROPIC_API_KEY"] = ""
 	}
@@ -78,7 +82,7 @@ func TestSpikeRollCall(t *testing.T) {
 	botToken := env["DISCORD_BOT_TOKEN"]
 	botID := env["DISCORD_BOT_ID"]
 	webhookURL := env["DISCORD_WEBHOOK_URL"]
-	proxyRequest := chooseRollcallProxyRequest(t, anthropicKey, openrouterKey)
+	proxyRequest := chooseRollcallProxyRequest(t, xaiKey, anthropicKey, openrouterKey)
 	if webhookURL == "" {
 		t.Fatal("DISCORD_WEBHOOK_URL not set in rollcall/.env")
 	}
@@ -88,10 +92,10 @@ func TestSpikeRollCall(t *testing.T) {
 	// and the script may change. Real runtimes are expensive to build and
 	// are skipped when they already exist locally.
 	baseImages := []struct {
-		tag          string
-		dockerfile   string
-		contextDir   string // empty = use rollcall dir
-		alwaysRebuild bool  // true for stubs that embed discord-responder.sh
+		tag           string
+		dockerfile    string
+		contextDir    string // empty = use rollcall dir
+		alwaysRebuild bool   // true for stubs that embed discord-responder.sh
 	}{
 		{"openclaw:latest", "Dockerfile.openclaw-base", "", true},
 		{"nullclaw:latest", "Dockerfile.nullclaw-base", "", true},
@@ -112,7 +116,7 @@ func TestSpikeRollCall(t *testing.T) {
 			spikeBuildImage(t, ctxDir, b.tag, b.dockerfile)
 		}
 	}
-	spikeEnsureCllamaPassthroughImage(t)
+	spikeEnsureCllamaPassthroughImage(t, repoRoot)
 
 	// Build agent images (Clawfile on top of base)
 	agentImages := []struct {
@@ -274,12 +278,15 @@ type rollcallProxyRequest struct {
 	CllamaEnv map[string]string
 }
 
-func chooseRollcallProxyRequest(t *testing.T, anthropicKey, openrouterKey string) rollcallProxyRequest {
+func chooseRollcallProxyRequest(t *testing.T, xaiKey, anthropicKey, openrouterKey string) rollcallProxyRequest {
 	t.Helper()
 
 	cfg := rollcallProxyRequest{
 		CllamaEnv: make(map[string]string),
 	}
+	if xaiKey != "" {
+		cfg.CllamaEnv["XAI_API_KEY"] = xaiKey
+	}
 	if anthropicKey != "" {
 		cfg.CllamaEnv["ANTHROPIC_API_KEY"] = anthropicKey
 	}
@@ -288,6 +295,9 @@ func chooseRollcallProxyRequest(t *testing.T, anthropicKey, openrouterKey string
 	}
 
 	switch {
+	case xaiKey != "":
+		cfg.APIFormat = "openai"
+		cfg.Model = "xai/grok-4-1-fast-reasoning"
 	case anthropicKey != "":
 		cfg.APIFormat = "anthropic"
 		cfg.Model = "claude-sonnet-4"

cmd/claw/spike_rollcall_test.go

@@ -107,7 +107,7 @@ func TestSpikeComposeUp(t *testing.T) {
 	spikeBuildImage(t, dir, "trading-desk-microclaw:latest", "Clawfile.microclaw")
 	spikeBuildImage(t, dir, "trading-desk-hermes:latest", "Clawfile.hermes")
 	spikeBuildImage(t, dir, "trading-api:latest", "Dockerfile.trading-api")
-	spikeEnsureCllamaPassthroughImage(t)
+	spikeEnsureCllamaPassthroughImage(t, repoRoot)
 
 	// Write a pre-expanded spike pod YAML so Go YAML parser sees real IDs.
 	rawPod := spikeReadFile(t, filepath.Join(dir, "claw-pod.yml"))
@@ -833,16 +833,26 @@ func spikeBuildImage(t *testing.T, contextDir, tag, dockerfile string) {
 }
 
 // spikeEnsureCllamaPassthroughImage guarantees a local image exists for
-// ghcr.io/mostlydev/cllama:latest. It tries, in order:
-//  1. Skip if the image already exists locally.
-//  2. Build from the GitHub cllama repo.
-//  3. Fall back to a stub image (healthcheck-only, no real proxy).
-func spikeEnsureCllamaPassthroughImage(t *testing.T) {
+// ghcr.io/mostlydev/cllama:latest. For spike coverage we prefer the local
+// submodule under test over any cached image, then fall back to GitHub, then
+// finally to a stub image if no real build is possible.
+func spikeEnsureCllamaPassthroughImage(t *testing.T, repoRoot string) {
 	t.Helper()
 	const tag = "ghcr.io/mostlydev/cllama:latest"
-	if spikeImageExists(tag) {
-		t.Logf("cllama image already exists")
-		return
+
+	localContext := filepath.Join(repoRoot, "cllama")
+	localDockerfile := filepath.Join(localContext, "Dockerfile")
+	if repoRoot != "" {
+		if _, err := os.Stat(localDockerfile); err == nil {
+			t.Logf("building local cllama image from %s", localContext)
+			cmd := exec.Command("docker", "build", "-t", tag, localContext)
+			out, err := cmd.CombinedOutput()
+			if err == nil {
+				t.Logf("built local cllama image from working tree")
+				return
+			}
+			t.Logf("local cllama build failed, falling back to GitHub: %v\n%s", err, out)
+		}
 	}
 
 	// Try building from the GitHub repo.

cmd/claw/spike_test.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"os"
+	"os/exec"
+
+	"github.com/spf13/cobra"
+)
+
+var updateCmd = &cobra.Command{
+	Use:   "update",
+	Short: "Update claw to the latest release",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		sh, err := exec.LookPath("sh")
+		if err != nil {
+			return err
+		}
+		curl := exec.Command("curl", "-sSL",
+			"https://raw.githubusercontent.com/mostlydev/clawdapus/master/install.sh")
+		install := exec.Command(sh)
+		install.Stdin, err = curl.StdoutPipe()
+		if err != nil {
+			return err
+		}
+		install.Stdout = os.Stdout
+		install.Stderr = os.Stderr
+		if err := curl.Start(); err != nil {
+			return err
+		}
+		if err := install.Start(); err != nil {
+			return err
+		}
+		if err := curl.Wait(); err != nil {
+			return err
+		}
+		return install.Wait()
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(updateCmd)
+}

cmd/claw/update.go

@@ -12,7 +12,7 @@ import (
 
 const (
 	updateCheckURL      = "https://api.github.com/repos/mostlydev/clawdapus/releases/latest"
-	updateCheckInterval = 24 * time.Hour
+	updateCheckInterval = time.Hour
 	updateCheckFile     = ".claw-update-check"
 )
 
@@ -91,7 +91,7 @@ func writeCache(c *updateCheckCache) {
 }
 
 // maybeNotifyUpdate prints an update notice if a newer release is available.
-// Checks at most once per day; never blocks on network errors.
+// Checks at most once per hour; never blocks on network errors.
 func maybeNotifyUpdate() {
 	if version == "dev" {
 		return
@@ -117,5 +117,5 @@ func maybeNotifyUpdate() {
 }
 
 func printUpdateNotice(latest string) {
-	fmt.Fprintf(os.Stderr, "\n  Update available: v%s → v%s\n  Run: curl -sSL https://raw.githubusercontent.com/mostlydev/clawdapus/master/install.sh | sh\n\n", version, latest)
+	fmt.Fprintf(os.Stderr, "\n  Update available: v%s → v%s  (run: claw update)\n\n", version, latest)
 }