gsd-pi 2.71.0-dev.e17e0ce → 2.72.0-dev.593fa74

package/src/resources/extensions/subagent/index.ts

@@ -24,6 +24,7 @@ import { type ExtensionAPI, getMarkdownTheme } from "@gsd/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { formatTokenCount } from "../shared/mod.js";
+import { getCurrentPhase } from "../shared/gsd-phase-state.js";
 import { type AgentConfig, type AgentScope, discoverAgents } from "./agents.js";
 import {
 	type IsolationEnvironment,
@@ -352,6 +353,23 @@ async function runSingleAgent(
 		};
 	}
 
+	// GSD phase guard: block agents that conflict with the active GSD phase
+	if (agent.conflictsWith && agent.conflictsWith.length > 0) {
+		const activePhase = getCurrentPhase();
+		if (activePhase && agent.conflictsWith.includes(activePhase)) {
+			return {
+				agent: agentName,
+				agentSource: agent.source,
+				task,
+				exitCode: 1,
+				messages: [],
+				stderr: `Agent "${agentName}" is blocked: it conflicts with the active GSD phase "${activePhase}". Use the built-in GSD workflow instead.`,
+				usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+				step,
+			};
+		}
+	}
+
 	let tmpPromptDir: string | null = null;
 	let tmpPromptPath: string | null = null;
 

package/src/resources/extensions/subagent/tests/agents-conflicts.test.ts

@@ -0,0 +1,33 @@
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import { parseConflictsWith } from "../agents.js";
+
+describe("parseConflictsWith", () => {
+	it("parses comma-separated conflict list", () => {
+		const result = parseConflictsWith("plan-milestone, plan-slice, research-milestone");
+		assert.deepEqual(result, ["plan-milestone", "plan-slice", "research-milestone"]);
+	});
+
+	it("returns undefined for undefined input", () => {
+		assert.equal(parseConflictsWith(undefined), undefined);
+	});
+
+	it("returns undefined for empty string", () => {
+		assert.equal(parseConflictsWith(""), undefined);
+	});
+
+	it("handles single value without commas", () => {
+		const result = parseConflictsWith("plan-milestone");
+		assert.deepEqual(result, ["plan-milestone"]);
+	});
+
+	it("trims whitespace from values", () => {
+		const result = parseConflictsWith("  plan-milestone ,  plan-slice  ");
+		assert.deepEqual(result, ["plan-milestone", "plan-slice"]);
+	});
+
+	it("filters out empty entries from trailing commas", () => {
+		const result = parseConflictsWith("plan-milestone,,plan-slice,");
+		assert.deepEqual(result, ["plan-milestone", "plan-slice"]);
+	});
+});