2 files changed, 37 insertions, 0 deletions
diff --git a/internal/config/config.go b/internal/config/config.go
index f778637..754c816 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -197,6 +197,7 @@ func Load(configPath string) (*Config, error) {
 		return nil, fmt.Errorf("decode config: %w", err)
 	}
 
+	applyEnvFallbacks(cfg)
 	cfg.normalize()
 	if err := cfg.validate(); err != nil {
 		return nil, err
@@ -393,3 +394,12 @@ func setDefaults(v *viper.Viper, cfg *Config) {
 
 	v.SetDefault("prompts_dir", cfg.PromptsDir)
 }
+
+func applyEnvFallbacks(cfg *Config) {
+	if cfg == nil {
+		return
+	}
+	if cfg.API.GoogleAPIKey == "" {
+		cfg.API.GoogleAPIKey = os.Getenv("GOOGLE_API_KEY")
+	}
+}
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index f825f58..1a53486 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -101,6 +101,33 @@ narration:
 	}
 }
 
+func TestLoadFallsBackToGoogleAPIKeyEnv(t *testing.T) {
+	t.Setenv("GOOGLE_API_KEY", "fallback-key")
+
+	cfg, err := Load("")
+	if err != nil {
+		t.Fatalf("Load() error = %v", err)
+	}
+
+	if got, want := cfg.GoogleAPIKey(), "fallback-key"; got != want {
+		t.Fatalf("GoogleAPIKey() = %q, want %q", got, want)
+	}
+}
+
+func TestLoadPrefersComicForgeGoogleAPIKeyEnv(t *testing.T) {
+	t.Setenv("GOOGLE_API_KEY", "fallback-key")
+	t.Setenv("COMICFORGE_API_GOOGLE_API_KEY", "comicforge-key")
+
+	cfg, err := Load("")
+	if err != nil {
+		t.Fatalf("Load() error = %v", err)
+	}
+
+	if got, want := cfg.GoogleAPIKey(), "comicforge-key"; got != want {
+		t.Fatalf("GoogleAPIKey() = %q, want %q", got, want)
+	}
+}
+
 func TestRenderPrompt(t *testing.T) {
 	tmpDir := t.TempDir()
 	cfg := DefaultConfig()