Merge pull request #1713 from entireio/fix/1123-local-settings-hooks

fix(settings): recognize local-only setup so hooks run after enable --local

Author: gtrrz-victor

cmd/entire/cli/integration_test/setup_cmd_test.go

@@ -215,3 +215,55 @@ func TestEnableDefaultStrategy(t *testing.T) {
 		t.Errorf("Expected status to show 'manual-commit', got: %s", stdout)
 	}
 }
+
+// TestHooksRunAfterLocalOnlyEnable is a full-flow reproduction of the
+// `entire enable --local` regression: only .entire/settings.local.json
+// exists, and the hooks (gated on settings.IsSetUpAndEnabled) silently
+// no-op'd because that check only looked at settings.json — so a commit
+// produced no checkpoint.
+//
+// This drives the real hook binary end-to-end: a session, a
+// user-prompt-submit, a file change, a stop, and a commit — then asserts the
+// commit actually carries an Entire-Checkpoint trailer (i.e. the hooks ran
+// and a checkpoint was saved). Complements TestHooksSilentWhenDisabled above,
+// which covers the opposite case.
+func TestHooksRunAfterLocalOnlyEnable(t *testing.T) {
+	t.Parallel()
+	env := NewTestEnv(t)
+	defer env.Cleanup()
+
+	env.InitRepo()
+	env.WriteFile("README.md", "# Test")
+	env.GitAdd("README.md")
+	env.GitCommit("Initial commit")
+	env.GitCheckoutNewBranch("feature/local-only")
+
+	// Simulate `entire enable --local`: only settings.local.json exists.
+	entireDir := filepath.Join(env.RepoDir, ".entire")
+	if err := os.MkdirAll(filepath.Join(entireDir, "tmp"), 0o755); err != nil {
+		t.Fatalf("mkdir .entire/tmp: %v", err)
+	}
+	localSettings := `{"enabled":true,"local_dev":true,"strategy_options":{"filtered_fetches":true}}`
+	if err := os.WriteFile(filepath.Join(entireDir, "settings.local.json"), []byte(localSettings), 0o644); err != nil {
+		t.Fatalf("write settings.local.json: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(entireDir, "settings.json")); err == nil {
+		t.Fatal("precondition: settings.json must not exist for the enable --local scenario")
+	}
+
+	session := env.NewSession()
+	if err := env.SimulateUserPromptSubmitWithPrompt(session.ID, "Create a hello file"); err != nil {
+		t.Fatalf("user-prompt-submit: %v", err)
+	}
+	env.WriteFile("hello.txt", "hello")
+	session.CreateTranscript("Create a hello file", []FileChange{{Path: "hello.txt", Content: "hello"}})
+	if err := env.SimulateStop(session.ID, session.TranscriptPath); err != nil {
+		t.Fatalf("stop: %v", err)
+	}
+	env.GitCommitWithShadowHooksAsAgent("add hello", "hello.txt")
+
+	cpID := env.GetCheckpointIDFromCommitMessage(env.GetHeadHash())
+	if cpID == "" {
+		t.Fatal("commit has no Entire-Checkpoint trailer — hooks silently no-op'd with only settings.local.json")
+	}
+}

cmd/entire/cli/settings/settings_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/entireio/cli/cmd/entire/cli/paths"
 	"github.com/entireio/cli/cmd/entire/cli/session"
 	"github.com/entireio/cli/cmd/entire/cli/testutil"
 )
@@ -1330,3 +1331,30 @@ func TestMergeReviewProfiles_PureAndPrecedence(t *testing.T) {
 		t.Error("merge(nil, emptyNonNil) should return a non-nil empty map, got nil")
 	}
 }
+
+// Regression: `entire enable --local` writes only .entire/settings.local.json,
+// but the hook activation check (IsSetUpAndEnabled) only looked for
+// .entire/settings.json, so hooks silently no-op'd. It must recognize a
+// local-only setup.
+func TestIsSetUpAndEnabled_LocalSettingsOnly(t *testing.T) {
+	root := t.TempDir()
+	testutil.InitRepo(t, root)
+	entireDir := filepath.Join(root, ".entire")
+	if err := os.MkdirAll(entireDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	// Only the local settings file exists (no settings.json), enabled.
+	if err := os.WriteFile(filepath.Join(entireDir, "settings.local.json"), []byte(`{"enabled":true}`), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	t.Chdir(root)
+	paths.ClearWorktreeRootCache()
+
+	if IsSetUp(context.Background()) {
+		t.Fatal("precondition: IsSetUp should be false with only settings.local.json")
+	}
+	if !IsSetUpAndEnabled(context.Background()) {
+		t.Fatal("IsSetUpAndEnabled should be true when only settings.local.json exists and is enabled")
+	}
+}