test: fix track1 acceptance schema drift

Author: julianknutsen

cmd/gc/cmd_hook.go

@@ -158,7 +158,7 @@ func shellWorkQueryWithEnv(command, dir string, env []string) (string, error) {
 		cmd.Dir = dir
 	}
 	if env != nil {
-		cmd.Env = env
+		cmd.Env = workQueryEnvForDir(env, dir)
 	}
 	out, err := cmd.Output()
 	if err != nil {
@@ -167,6 +167,22 @@ func shellWorkQueryWithEnv(command, dir string, env []string) (string, error) {
 	return string(out), nil
 }
 
+// workQueryEnvForDir ensures the subprocess environment does not carry a
+// stale inherited PWD when exec.Cmd.Dir points somewhere else. Some shells
+// (notably macOS /bin/sh) preserve the inherited PWD instead of recomputing
+// it from the real working directory, which breaks hook work_query commands
+// that inspect $PWD.
+func workQueryEnvForDir(env []string, dir string) []string {
+	if env == nil {
+		return nil
+	}
+	if dir == "" {
+		return env
+	}
+	out := removeEnvKey(append([]string(nil), env...), "PWD")
+	return append(out, "PWD="+dir)
+}
+
 // doHook is the pure logic for gc hook. Runs the work query and outputs
 // results based on mode. Without inject: prints raw output, returns 0 if
 // work, 1 if empty. With inject: wraps in <system-reminder>, always returns 0.

cmd/gc/cmd_hook_test.go

@@ -485,6 +485,26 @@ max = 5
 	}
 }
 
+func TestWorkQueryEnvForDirOverridesInheritedPWD(t *testing.T) {
+	env := []string{
+		"PATH=/tmp/bin",
+		"PWD=/tmp/stale",
+		"GC_CITY=/tmp/city",
+	}
+
+	got := workQueryEnvForDir(env, "/tmp/rig")
+
+	if strings.Contains(strings.Join(got, "\n"), "PWD=/tmp/stale") {
+		t.Fatalf("workQueryEnvForDir preserved stale PWD: %v", got)
+	}
+	if !strings.Contains(strings.Join(got, "\n"), "PWD=/tmp/rig") {
+		t.Fatalf("workQueryEnvForDir missing updated PWD: %v", got)
+	}
+	if !strings.Contains(strings.Join(got, "\n"), "PATH=/tmp/bin") {
+		t.Fatalf("workQueryEnvForDir dropped unrelated env: %v", got)
+	}
+}
+
 func TestCmdHookExportsResolvedIdentityForFixedAgentQuery(t *testing.T) {
 	t.Setenv("GC_TMUX_SESSION", "host-session")
 	clearGCEnv(t)

examples/gastown/packs/maintenance/agents/dog/overlay/.gitkeep

@@ -0,0 +1 @@
+

test/acceptance/gastown_smoke_test.go

@@ -68,7 +68,7 @@ func TestGastownSmoke(t *testing.T) {
 			if err != nil {
 				return err
 			}
-			if info.IsDir() || !strings.HasSuffix(path, ".md.tmpl") {
+			if info.IsDir() || !strings.HasSuffix(path, ".template.md") {
 				return nil
 			}
 
@@ -99,7 +99,7 @@ func TestGastownSmoke(t *testing.T) {
 			t.Fatalf("walking packs dir: %v", err)
 		}
 		if count == 0 {
-			t.Fatal("no .md.tmpl files found in packs/")
+			t.Fatal("no .template.md files found in packs/")
 		}
 	})
 

test/acceptance/migration_regression_test.go

@@ -99,7 +99,8 @@ func TestRegression_GastownConfig(t *testing.T) {
 		}
 	})
 
-	// Fallback resolution: gastown's non-fallback dog overrides maintenance's fallback.
+	// Schema 2 keeps a single maintenance fallback dog, then Gastown patches
+	// it with themed runtime fields instead of replacing it with a second dog.
 	t.Run("FallbackAgentResolution", func(t *testing.T) {
 		count := agentCount(cfg, "dog")
 		if count != 1 {
@@ -108,12 +109,21 @@ func TestRegression_GastownConfig(t *testing.T) {
 
 		for _, a := range cfg.Agents {
 			if a.Name == "dog" {
-				if a.Fallback {
-					t.Error("dog agent has fallback=true; gastown's non-fallback should have won")
+				if !a.Fallback {
+					t.Error("dog agent should retain maintenance fallback=true under schema 2 patching")
 				}
 				if len(a.SessionLive) == 0 {
 					t.Error("dog agent has no session_live; expected gastown's themed dog")
 				}
+				if !strings.Contains(a.WorkDir, ".gc/agents/dogs/") {
+					t.Errorf("dog work_dir = %q, want gastown dog workdir override", a.WorkDir)
+				}
+				if !strings.Contains(a.PromptTemplate, "maintenance/agents/dog/prompt.template.md") {
+					t.Errorf("dog prompt_template = %q, want maintenance dog prompt via gastown patch", a.PromptTemplate)
+				}
+				if !strings.Contains(a.OverlayDir, "maintenance/agents/dog/overlay") {
+					t.Errorf("dog overlay_dir = %q, want maintenance dog overlay via gastown patch", a.OverlayDir)
+				}
 				break
 			}
 		}
@@ -225,21 +235,21 @@ func TestRegression_GastownPackArtifacts(t *testing.T) {
 
 	// PR #2939: prompt referenced nonexistent /ralph-loop slash command.
 	t.Run("PromptsRender", func(t *testing.T) {
-		promptDirs := []string{
-			filepath.Join(c.Dir, "packs", "gastown", "prompts"),
-			filepath.Join(c.Dir, "packs", "maintenance", "prompts"),
+		packDirs := []string{
+			filepath.Join(c.Dir, "packs", "gastown"),
+			filepath.Join(c.Dir, "packs", "maintenance"),
 		}
 
 		count := 0
-		for _, dir := range promptDirs {
+		for _, dir := range packDirs {
 			err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
 				if err != nil {
 					return err
 				}
 				if info.IsDir() {
 					return nil
 				}
-				if !strings.HasSuffix(path, ".md.tmpl") {
+				if !strings.HasSuffix(path, ".template.md") {
 					return nil
 				}
 				count++
@@ -266,7 +276,7 @@ func TestRegression_GastownPackArtifacts(t *testing.T) {
 		}
 
 		if count == 0 {
-			t.Fatal("no .md.tmpl files found in materialized packs")
+			t.Fatal("no .template.md files found in materialized packs")
 		}
 		t.Logf("validated %d prompt template files", count)
 	})

test/acceptance/tutorial_goldens/tutorial01_test.go

@@ -41,15 +41,15 @@ func TestTutorial01Cities(t *testing.T) {
 		})
 
 		t.Run("gc init ~/my-city", func(t *testing.T) {
-			ws.noteWarning("tutorial 01 documents the interactive wizard, but the acceptance harness uses the equivalent non-interactive `gc init ~/my-city --provider claude` path because the wizard requires a real TTY")
-			out, err := ws.runShell("gc init ~/my-city --provider claude", "")
+			ws.noteWarning("tutorial 01 documents the interactive wizard, but the acceptance harness uses the equivalent non-interactive `gc init ~/my-city --provider claude --skip-provider-readiness` path because the wizard requires a real TTY and CI does not carry interactive Claude auth")
+			out, err := ws.runShell("gc init ~/my-city --provider claude --skip-provider-readiness", "")
 			if err != nil {
 				t.Fatalf("gc init wizard: %v\n%s", err, out)
 			}
 			for _, want := range []string{
 				"Welcome to Gas City!",
 				`Initialized city "my-city" with default provider "claude".`,
-				"Registering city with supervisor",
+				"Skipping provider readiness checks",
 			} {
 				if !strings.Contains(out, want) {
 					t.Fatalf("gc init output missing %q:\n%s", want, out)
@@ -74,7 +74,7 @@ func TestTutorial01Cities(t *testing.T) {
 			wsProvider := newTutorialWorkspace(t)
 			wsProvider.attachDiagnostics(t, "tutorial-01-provider-branch")
 
-			out, err := wsProvider.runShell("gc init ~/my-city --provider claude", "")
+			out, err := wsProvider.runShell("gc init ~/my-city --provider claude --skip-provider-readiness", "")
 			if err != nil {
 				t.Fatalf("gc init --provider claude: %v\n%s", err, out)
 			}
@@ -98,7 +98,7 @@ func TestTutorial01Cities(t *testing.T) {
 			if err != nil {
 				t.Fatalf("ls: %v\n%s", err, out)
 			}
-			for _, want := range []string{"city.toml", "formulas", "orders", "prompts"} {
+			for _, want := range []string{"city.toml", "pack.toml", "formulas", "orders", "agents"} {
 				if !strings.Contains(out, want) {
 					t.Fatalf("ls output missing %q:\n%s", want, out)
 				}
@@ -114,7 +114,7 @@ func TestTutorial01Cities(t *testing.T) {
 				`name = "my-city"`,
 				`provider = "claude"`,
 				`name = "mayor"`,
-				`prompt_template = "prompts/mayor.md"`,
+				`prompt_template = "agents/mayor/prompt.template.md"`,
 			} {
 				if !strings.Contains(out, want) {
 					t.Fatalf("city.toml missing %q:\n%s", want, out)