gsd-pi 2.36.0-dev.d612764 → 2.36.0-dev.f887f4e

package/src/resources/extensions/search-the-web/native-search.ts

@@ -16,16 +16,6 @@ export const CUSTOM_SEARCH_TOOL_NAMES = ["search-the-web", "search_and_read", "g
 /** Thinking block types that require signature validation by the API */
 const THINKING_TYPES = new Set(["thinking", "redacted_thinking"]);
 
-/**
- * Maximum number of native web searches allowed per session (agent unit).
- * The Anthropic API's `max_uses` is per-request — it resets on each API call.
- * When `pause_turn` triggers a resubmit, the model gets a fresh budget.
- * This session-level cap prevents unbounded search accumulation (#1309).
- *
- * 15 = 3 full turns of 5 searches each — generous for research, but bounded.
- */
-export const MAX_NATIVE_SEARCHES_PER_SESSION = 15;
-
 /** When true, skip native web search injection and keep Brave/custom tools active on Anthropic. */
 export function preferBraveSearch(): boolean {
   // preferences.md takes priority over env var
@@ -84,11 +74,6 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
   let isAnthropicProvider = false;
   let modelSelectFired = false;
 
-  // Session-level native search counter (#1309).
-  // Tracks cumulative web_search_tool_result blocks across all turns in a session.
-  // Reset on session_start. Used to compute remaining budget for max_uses.
-  let sessionSearchCount = 0;
-
   // Track provider changes via model selection — also handles diagnostics
   // since model_select fires AFTER session_start and knows the provider.
   pi.on("model_select", async (event: any, ctx: any) => {
@@ -176,41 +161,13 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
     );
     payload.tools = tools;
 
-    // ── Session-level search budget (#1309) ──────────────────────────────
-    // Count web_search_tool_result blocks in the conversation history to
-    // determine how many native searches have already been used this session.
-    // The Anthropic API's max_uses resets per request, so without this guard,
-    // pause_turn → resubmit cycles allow unlimited total searches.
-    if (Array.isArray(messages)) {
-      let historySearchCount = 0;
-      for (const msg of messages) {
-        const content = msg.content;
-        if (!Array.isArray(content)) continue;
-        for (const block of content) {
-          if ((block as any)?.type === "web_search_tool_result") {
-            historySearchCount++;
-          }
-        }
-      }
-      // Sync counter from history (handles session restore / context replay)
-      sessionSearchCount = historySearchCount;
-    }
-
-    const remaining = Math.max(0, MAX_NATIVE_SEARCHES_PER_SESSION - sessionSearchCount);
-
-    if (remaining <= 0) {
-      // Budget exhausted — don't inject the search tool at all.
-      // The model will proceed without web search capability.
-      return payload;
-    }
-
     tools.push({
       type: "web_search_20250305",
       name: "web_search",
-      // Cap per-request searches to the lesser of 5 (per-turn cap) or the
-      // remaining session budget (#1309). This prevents the model from
-      // consuming unlimited searches via pause_turn → resubmit cycles.
-      max_uses: Math.min(5, remaining),
+      // Cap server-side searches per response to prevent the model from
+      // looping on web_search without synthesizing results (#817).
+      // 5 searches is generous — most queries need 1-2.
+      max_uses: 5,
     });
 
     return payload;
@@ -218,9 +175,6 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
 
   // Basic startup diagnostics — provider-specific info comes from model_select
   pi.on("session_start", async (_event: any, ctx: any) => {
-    // Reset session-level search budget (#1309)
-    sessionSearchCount = 0;
-
     const hasBrave = !!process.env.BRAVE_API_KEY;
     const hasJina = !!process.env.JINA_API_KEY;
     const hasAnswers = !!process.env.BRAVE_ANSWERS_KEY;

package/src/resources/extensions/shared/terminal.ts

@@ -7,14 +7,9 @@
 
 const UNSUPPORTED_TERMS = ["apple_terminal", "warpterm"];
 
-export function isCmuxTerminal(env: NodeJS.ProcessEnv = process.env): boolean {
-  return Boolean(env.CMUX_WORKSPACE_ID && env.CMUX_SURFACE_ID);
-}
-
 export function supportsCtrlAltShortcuts(): boolean {
   const term = (process.env.TERM_PROGRAM || "").toLowerCase();
   const jetbrains = (process.env.TERMINAL_EMULATOR || "").toLowerCase().includes("jetbrains");
-  if (isCmuxTerminal()) return true;
   return !UNSUPPORTED_TERMS.some((t) => term.includes(t)) && !jetbrains;
 }
 

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

@@ -34,8 +34,6 @@ import {
 	readIsolationMode,
 } from "./isolation.js";
 import { registerWorker, updateWorker } from "./worker-registry.js";
-import { loadEffectiveGSDPreferences } from "../gsd/preferences.js";
-import { CmuxClient, shellEscape } from "../cmux/index.js";
 
 const MAX_PARALLEL_TASKS = 8;
 const MAX_CONCURRENCY = 4;
@@ -259,70 +257,6 @@ function writePromptToTempFile(agentName: string, prompt: string): { dir: string
 	return { dir: tmpDir, filePath };
 }
 
-function buildSubagentProcessArgs(
-	agent: AgentConfig,
-	task: string,
-	tmpPromptPath: string | null,
-): string[] {
-	const args: string[] = ["--mode", "json", "-p", "--no-session"];
-	if (agent.model) args.push("--model", agent.model);
-	if (agent.tools && agent.tools.length > 0) args.push("--tools", agent.tools.join(","));
-	if (tmpPromptPath) args.push("--append-system-prompt", tmpPromptPath);
-	args.push(`Task: ${task}`);
-	return args;
-}
-
-function processSubagentEventLine(
-	line: string,
-	currentResult: SingleResult,
-	emitUpdate: () => void,
-): void {
-	if (!line.trim()) return;
-	let event: any;
-	try {
-		event = JSON.parse(line);
-	} catch {
-		return;
-	}
-
-	if (event.type === "message_end" && event.message) {
-		const msg = event.message as Message;
-		currentResult.messages.push(msg);
-
-		if (msg.role === "assistant") {
-			currentResult.usage.turns++;
-			const usage = msg.usage;
-			if (usage) {
-				currentResult.usage.input += usage.input || 0;
-				currentResult.usage.output += usage.output || 0;
-				currentResult.usage.cacheRead += usage.cacheRead || 0;
-				currentResult.usage.cacheWrite += usage.cacheWrite || 0;
-				currentResult.usage.cost += usage.cost?.total || 0;
-				currentResult.usage.contextTokens = usage.totalTokens || 0;
-			}
-			if (!currentResult.model && msg.model) currentResult.model = msg.model;
-			if (msg.stopReason) currentResult.stopReason = msg.stopReason;
-			if (msg.errorMessage) currentResult.errorMessage = msg.errorMessage;
-		}
-		emitUpdate();
-	}
-
-	if (event.type === "tool_result_end" && event.message) {
-		currentResult.messages.push(event.message as Message);
-		emitUpdate();
-	}
-}
-
-async function waitForFile(filePath: string, signal: AbortSignal | undefined, timeoutMs = 30 * 60 * 1000): Promise<boolean> {
-	const started = Date.now();
-	while (Date.now() - started < timeoutMs) {
-		if (signal?.aborted) return false;
-		if (fs.existsSync(filePath)) return true;
-		await new Promise((resolve) => setTimeout(resolve, 150));
-	}
-	return false;
-}
-
 type OnUpdateCallback = (partial: AgentToolResult<SubagentDetails>) => void;
 
 async function runSingleAgent(
@@ -352,6 +286,10 @@ async function runSingleAgent(
 		};
 	}
 
+	const args: string[] = ["--mode", "json", "-p", "--no-session"];
+	if (agent.model) args.push("--model", agent.model);
+	if (agent.tools && agent.tools.length > 0) args.push("--tools", agent.tools.join(","));
+
 	let tmpPromptDir: string | null = null;
 	let tmpPromptPath: string | null = null;
 
@@ -381,8 +319,10 @@ async function runSingleAgent(
 			const tmp = writePromptToTempFile(agent.name, agent.systemPrompt);
 			tmpPromptDir = tmp.dir;
 			tmpPromptPath = tmp.filePath;
+			args.push("--append-system-prompt", tmpPromptPath);
 		}
-		const args = buildSubagentProcessArgs(agent, task, tmpPromptPath);
+
+		args.push(`Task: ${task}`);
 		let wasAborted = false;
 
 		const exitCode = await new Promise<number>((resolve) => {
@@ -396,11 +336,48 @@ async function runSingleAgent(
 			liveSubagentProcesses.add(proc);
 			let buffer = "";
 
+			const processLine = (line: string) => {
+				if (!line.trim()) return;
+				let event: any;
+				try {
+					event = JSON.parse(line);
+				} catch {
+					return;
+				}
+
+				if (event.type === "message_end" && event.message) {
+					const msg = event.message as Message;
+					currentResult.messages.push(msg);
+
+					if (msg.role === "assistant") {
+						currentResult.usage.turns++;
+						const usage = msg.usage;
+						if (usage) {
+							currentResult.usage.input += usage.input || 0;
+							currentResult.usage.output += usage.output || 0;
+							currentResult.usage.cacheRead += usage.cacheRead || 0;
+							currentResult.usage.cacheWrite += usage.cacheWrite || 0;
+							currentResult.usage.cost += usage.cost?.total || 0;
+							currentResult.usage.contextTokens = usage.totalTokens || 0;
+						}
+						if (!currentResult.model && msg.model) currentResult.model = msg.model;
+						if (msg.stopReason) currentResult.stopReason = msg.stopReason;
+						if (msg.errorMessage) currentResult.errorMessage = msg.errorMessage;
+					}
+					emitUpdate();
+				}
+
+				if (event.type === "tool_result_end" && event.message) {
+					currentResult.messages.push(event.message as Message);
+					emitUpdate();
+				}
+			};
+
 			proc.stdout.on("data", (data) => {
 				buffer += data.toString();
 				const lines = buffer.split("\n");
 				buffer = lines.pop() || "";
-				for (const line of lines) processSubagentEventLine(line, currentResult, emitUpdate);
+				for (const line of lines) processLine(line);
 			});
 
 			proc.stderr.on("data", (data) => {
@@ -409,7 +386,7 @@ async function runSingleAgent(
 
 			proc.on("close", (code) => {
 				liveSubagentProcesses.delete(proc);
-				if (buffer.trim()) processSubagentEventLine(buffer, currentResult, emitUpdate);
+				if (buffer.trim()) processLine(buffer);
 				resolve(code ?? 0);
 			});
 
@@ -450,120 +427,6 @@ async function runSingleAgent(
 	}
 }
 
-async function runSingleAgentInCmuxSplit(
-	cmuxClient: CmuxClient,
-	direction: "right" | "down",
-	defaultCwd: string,
-	agents: AgentConfig[],
-	agentName: string,
-	task: string,
-	cwd: string | undefined,
-	step: number | undefined,
-	signal: AbortSignal | undefined,
-	onUpdate: OnUpdateCallback | undefined,
-	makeDetails: (results: SingleResult[]) => SubagentDetails,
-): Promise<SingleResult> {
-	const agent = agents.find((a) => a.name === agentName);
-	if (!agent) {
-		return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
-	}
-
-	let tmpPromptDir: string | null = null;
-	let tmpPromptPath: string | null = null;
-	let tmpOutputDir: string | null = null;
-
-	const currentResult: SingleResult = {
-		agent: agentName,
-		agentSource: agent.source,
-		task,
-		exitCode: 0,
-		messages: [],
-		stderr: "",
-		usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
-		model: agent.model,
-		step,
-	};
-
-	const emitUpdate = () => {
-		if (onUpdate) {
-			onUpdate({
-				content: [{ type: "text", text: getFinalOutput(currentResult.messages) || "(running...)" }],
-				details: makeDetails([currentResult]),
-			});
-		}
-	};
-
-	try {
-		if (agent.systemPrompt.trim()) {
-			const tmp = writePromptToTempFile(agent.name, agent.systemPrompt);
-			tmpPromptDir = tmp.dir;
-			tmpPromptPath = tmp.filePath;
-		}
-		tmpOutputDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-subagent-cmux-"));
-		const stdoutPath = path.join(tmpOutputDir, "stdout.jsonl");
-		const stderrPath = path.join(tmpOutputDir, "stderr.log");
-		const exitPath = path.join(tmpOutputDir, "exit.code");
-		const cmuxSurfaceId = await cmuxClient.createSplit(direction);
-		if (!cmuxSurfaceId) {
-			return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
-		}
-
-		const bundledPaths = (process.env.GSD_BUNDLED_EXTENSION_PATHS ?? "").split(path.delimiter).map((s) => s.trim()).filter(Boolean);
-		const extensionArgs = bundledPaths.flatMap((p) => ["--extension", p]);
-		const processArgs = [process.env.GSD_BIN_PATH!, ...extensionArgs, ...buildSubagentProcessArgs(agent, task, tmpPromptPath)];
-		const innerScript = [
-			`cd ${shellEscape(cwd ?? defaultCwd)}`,
-			"set -o pipefail",
-			`${shellEscape(process.execPath)} ${processArgs.map(shellEscape).join(" ")} 2> >(tee ${shellEscape(stderrPath)} >&2) | tee ${shellEscape(stdoutPath)}`,
-			"status=${PIPESTATUS[0]}",
-			`printf '%s' "$status" > ${shellEscape(exitPath)}`,
-		].join("; ");
-
-		const sent = await cmuxClient.sendSurface(cmuxSurfaceId, `bash -lc ${shellEscape(innerScript)}`);
-		if (!sent) {
-			return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
-		}
-
-		const finished = await waitForFile(exitPath, signal);
-		if (!finished) {
-			currentResult.exitCode = 1;
-			currentResult.stderr = "cmux split execution timed out or was aborted";
-			return currentResult;
-		}
-
-		if (fs.existsSync(stdoutPath)) {
-			const stdout = fs.readFileSync(stdoutPath, "utf-8");
-			for (const line of stdout.split("\n")) {
-				processSubagentEventLine(line, currentResult, emitUpdate);
-			}
-		}
-		if (fs.existsSync(stderrPath)) {
-			currentResult.stderr = fs.readFileSync(stderrPath, "utf-8");
-		}
-		currentResult.exitCode = Number.parseInt(fs.readFileSync(exitPath, "utf-8").trim() || "1", 10) || 0;
-		return currentResult;
-	} finally {
-		if (tmpPromptPath)
-			try {
-				fs.unlinkSync(tmpPromptPath);
-			} catch {
-				/* ignore */
-			}
-		if (tmpPromptDir)
-			try {
-				fs.rmdirSync(tmpPromptDir);
-			} catch {
-				/* ignore */
-			}
-		if (tmpOutputDir)
-			try {
-				fs.rmSync(tmpOutputDir, { recursive: true, force: true });
-			} catch {
-				/* ignore */
-			}
-	}
-}
-
 const TaskItem = Type.Object({
 	agent: Type.String({ description: "Name of the agent to invoke" }),
 	task: Type.String({ description: "Task to delegate to the agent" }),
@@ -648,8 +511,6 @@ export default function (pi: ExtensionAPI) {
 			const discovery = discoverAgents(ctx.cwd, agentScope);
 			const agents = discovery.agents;
 			const confirmProjectAgents = params.confirmProjectAgents ?? false;
-			const cmuxClient = CmuxClient.fromPreferences(loadEffectiveGSDPreferences()?.preferences);
-			const cmuxSplitsEnabled = cmuxClient.getConfig().splits;
 
 			// Resolve isolation mode
 			const isolationMode = readIsolationMode();
@@ -808,26 +669,28 @@ export default function (pi: ExtensionAPI) {
 				const batchSize = params.tasks.length;
 				const results = await mapWithConcurrencyLimit(params.tasks, MAX_CONCURRENCY, async (t, index) => {
 					const workerId = registerWorker(t.agent, t.task, index, batchSize, batchId);
-					const runTask = () => cmuxSplitsEnabled
-						? runSingleAgentInCmuxSplit(
-							cmuxClient,
-							index % 2 === 0 ? "right" : "down",
-							ctx.cwd,
-							agents,
-							t.agent,
-							t.task,
-							t.cwd,
-							undefined,
-							signal,
-							(partial) => {
-								if (partial.details?.results[0]) {
-									allResults[index] = partial.details.results[0];
-									emitParallelUpdate();
-								}
-							},
-							makeDetails("parallel"),
-						)
-						: runSingleAgent(
+					let result = await runSingleAgent(
+						ctx.cwd,
+						agents,
+						t.agent,
+						t.task,
+						t.cwd,
+						undefined,
+						signal,
+						// Per-task update callback
+						(partial) => {
+							if (partial.details?.results[0]) {
+								allResults[index] = partial.details.results[0];
+								emitParallelUpdate();
+							}
+						},
+						makeDetails("parallel"),
+					);
+
+					// Auto-retry failed tasks (likely API rate limit or transient error)
+					const isFailed = result.exitCode !== 0 || (result.messages.length === 0 && !signal?.aborted);
+					if (isFailed && MAX_RETRIES > 0 && !signal?.aborted) {
+						result = await runSingleAgent(
 							ctx.cwd,
 							agents,
 							t.agent,
@@ -843,12 +706,6 @@ export default function (pi: ExtensionAPI) {
 							},
 							makeDetails("parallel"),
 						);
-					let result = await runTask();
-
-					// Auto-retry failed tasks (likely API rate limit or transient error)
-					const isFailed = result.exitCode !== 0 || (result.messages.length === 0 && !signal?.aborted);
-					if (isFailed && MAX_RETRIES > 0 && !signal?.aborted) {
-						result = await runTask();
 					}
 
 					updateWorker(workerId, result.exitCode === 0 ? "completed" : "failed");
@@ -887,31 +744,17 @@ export default function (pi: ExtensionAPI) {
 						isolation = await createIsolation(effectiveCwd, taskId, isolationMode);
 					}
 
-					const result = cmuxSplitsEnabled
-						? await runSingleAgentInCmuxSplit(
-							cmuxClient,
-							"right",
-							ctx.cwd,
-							agents,
-							params.agent,
-							params.task,
-							isolation ? isolation.workDir : params.cwd,
-							undefined,
-							signal,
-							onUpdate,
-							makeDetails("single"),
-						)
-						: await runSingleAgent(
-							ctx.cwd,
-							agents,
-							params.agent,
-							params.task,
-							isolation ? isolation.workDir : params.cwd,
-							undefined,
-							signal,
-							onUpdate,
-							makeDetails("single"),
-						);
+					const result = await runSingleAgent(
+						ctx.cwd,
+						agents,
+						params.agent,
+						params.task,
+						isolation ? isolation.workDir : params.cwd,
+						undefined,
+						signal,
+						onUpdate,
+						makeDetails("single"),
+					);
 
 					// Capture and merge delta if isolated
 					if (isolation) {