run: load config from resolved workspace (#692) (#739)

Co-authored-by: jolestar <host-user@example.com>

Author: jolestar

cmd/holon/main.go

@@ -216,18 +216,20 @@ func resolveOutDir(workspace string) (string, bool, error) {
 	return tempDir, true, nil
 }
 
+func loadRunProjectConfig(workspace string) (*config.ProjectConfig, error) {
+	projectCfg, err := config.Load(workspace)
+	if err != nil {
+		return nil, fmt.Errorf("failed to load project config from workspace %s: %w", workspace, err)
+	}
+	return projectCfg, nil
+}
+
 var runCmd = &cobra.Command{
 	Use:   "run",
 	Short: "Run a Holon agent execution",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx := context.Background()
 
-		// Load project config
-		projectCfg, err := config.LoadFromCurrentDir()
-		if err != nil {
-			return fmt.Errorf("failed to load project config: %w", err)
-		}
-
 		agentResolution, err := resolveAgentHome("run", agentID, agentHome, true)
 		if err != nil {
 			return err
@@ -241,6 +243,13 @@ var runCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
+
+		// Load project config from the resolved workspace (not from shell CWD).
+		projectCfg, err := loadRunProjectConfig(absWorkspace)
+		if err != nil {
+			return err
+		}
+
 		// Apply config with precedence: CLI flags > project config > defaults
 		resolved := resolveWithProjectConfig(cmd, projectCfg, absWorkspace)
 

cmd/holon/main_run_config_test.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func writeRunProjectConfig(t *testing.T, root string, content string) {
+	t.Helper()
+
+	configDir := filepath.Join(root, ".holon")
+	if err := os.MkdirAll(configDir, 0755); err != nil {
+		t.Fatalf("failed to create config dir: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(configDir, "config.yaml"), []byte(content), 0644); err != nil {
+		t.Fatalf("failed to write config file: %v", err)
+	}
+}
+
+func TestLoadRunProjectConfig_DefaultWorkspaceDoesNotInheritUnrelatedConfig(t *testing.T) {
+	agentHome := t.TempDir()
+	unrelatedProject := t.TempDir()
+
+	writeRunProjectConfig(t, unrelatedProject, `base_image: "python:3.11"`)
+
+	workspace, err := resolveRunWorkspacePath(agentHome, "")
+	if err != nil {
+		t.Fatalf("resolveRunWorkspacePath() error = %v", err)
+	}
+
+	cfg, err := loadRunProjectConfig(workspace)
+	if err != nil {
+		t.Fatalf("loadRunProjectConfig() error = %v", err)
+	}
+
+	if cfg.BaseImage != "" {
+		t.Fatalf("BaseImage = %q, want empty for workspace without project config", cfg.BaseImage)
+	}
+}
+
+func TestLoadRunProjectConfig_UsesResolvedWorkspaceConfig(t *testing.T) {
+	workspace := t.TempDir()
+	writeRunProjectConfig(t, workspace, `base_image: "node:20"`)
+
+	cfg, err := loadRunProjectConfig(workspace)
+	if err != nil {
+		t.Fatalf("loadRunProjectConfig() error = %v", err)
+	}
+
+	if cfg.BaseImage != "node:20" {
+		t.Fatalf("BaseImage = %q, want %q", cfg.BaseImage, "node:20")
+	}
+}

docs/run-ga-contract.md

@@ -37,6 +37,7 @@ This document defines the compatibility contract for `holon run` in v0.11.
   - spec metadata
   - auto-discovered workspace skills
 - CLI skills have highest precedence but do not disable lower-precedence sources.
+- For `holon run`, project config (`.holon/config.yaml`) is discovered from the resolved run workspace path (and its parents), not from shell current working directory.
 
 ### 4. Default agent-home behavior