ultimate-pi 0.22.0 → 0.22.2

package/.pi/extensions/policy-gate.ts

@@ -24,6 +24,7 @@ import {
 	isPlanPhaseAllowedMutation,
 	isPlanPhaseScopedWrite,
 	normalizeHarnessPath,
+	parseHarnessSlashInput,
 	readPlanPacketFromPath,
 	saveProjectActiveRun,
 	saveRunContextToDisk,
@@ -152,6 +153,9 @@ async function handlePolicyBeforeAgentStart(args: {
 	const bootstrapPrompt = isHarnessBootstrapPrompt(userPrompt);
 	const abortSignal = hasHarnessAbortSignal(userPrompt);
 
+	const parsed = parseHarnessSlashInput(userPrompt);
+	const isHarnessClear = parsed?.command === "harness-clear";
+
 	if (bootstrapPrompt) {
 		state.phase = "execute";
 		state.approvedPlan = true;
@@ -186,13 +190,22 @@ async function handlePolicyBeforeAgentStart(args: {
 				content: [
 					"Harness run aborted safely.",
 					"Mutating tools are now blocked until a new approved plan is attached.",
-					'Next step: /harness-plan "<task>"',
+					'Next step: /harness-plan "<task>" or /harness-auto "<task>"',
 				].join("\n"),
 			},
 			systemPrompt: `${event.systemPrompt}\n\n[PolicyGate]\nAbort lock active. Mutating tools must remain blocked until a new approved plan is attached.`,
 		};
 	}
 
+	if (
+		parsed?.command === "harness-plan" ||
+		parsed?.command === "harness-auto"
+	) {
+		stateRef.current.aborted = false;
+		stateRef.current.abortReason = null;
+		stateRef.current.abortedAt = null;
+	}
+
 	const nextPhase = inferHarnessPhase(entries, userPrompt);
 	const planSignal = hasApprovedPlanSignal(userPrompt, entries);
 	const transitionBlock = getPolicyTransitionBlock(userPrompt, entries);
@@ -206,7 +219,7 @@ async function handlePolicyBeforeAgentStart(args: {
 		};
 	}
 
-	if (nextPhase === "plan") {
+	if (nextPhase === "plan" || isHarnessClear) {
 		stateRef.current.approvedPlan = false;
 		stateRef.current.planId = null;
 	}

package/.pi/harness/agents.manifest.json

@@ -1,9 +1,9 @@
 {
 	"schema_version": "1.0.0",
 	"package": "ultimate-pi",
-	"package_version": "0.21.0",
-	"generated_at": "2026-05-27T07:05:16.312Z",
-	"policy_sha256": "799782453e74a1d2d15a28715c985c1b5dc4566701ddcce475ec4725294437e4",
+	"package_version": "0.22.1",
+	"generated_at": "2026-05-27T15:57:32.501Z",
+	"policy_sha256": "1a631333f1abed3b411961d3527bcae2d4fcd2f715b09a689b0b83b3ea0f54f3",
 	"agents": {
 		"pi-pi/agent-expert": {
 			"path": ".pi/agents/pi-pi/agent-expert.md",
@@ -51,7 +51,7 @@
 		},
 		"harness/ls-lint-steward": {
 			"path": ".pi/agents/harness/ls-lint-steward.md",
-			"sha256": "e35bf59adf2785e7369a7428793a26691cea43d630e02a9541398cb5a5b1f5dc"
+			"sha256": "abbb43da45a2c9c080cd2043384d481a143acaf440e52b657493425218cb951f"
 		},
 		"harness/sentrux-bootstrap": {
 			"path": ".pi/agents/harness/sentrux-bootstrap.md",
@@ -59,11 +59,11 @@
 		},
 		"harness/sentrux-repair-advisor": {
 			"path": ".pi/agents/harness/sentrux-repair-advisor.md",
-			"sha256": "057618de561d90e597be7a319f3abfa2adaa128d4e92850c50b3e35a447f0371"
+			"sha256": "3c9722806338f680db3d165e633a877e087c1485ad74c2b38781d7ba989b48f0"
 		},
 		"harness/sentrux-steward": {
 			"path": ".pi/agents/harness/sentrux-steward.md",
-			"sha256": "d806cbf2c2e211c6b4c95e35893bc250c8a0fab6fae92190766eab16cd091d51"
+			"sha256": "019740bd4313426edaa36f7fa96471088731abe616282a6e5109e9c538ae34eb"
 		},
 		"harness/trace-librarian": {
 			"path": ".pi/agents/harness/trace-librarian.md",
@@ -95,7 +95,7 @@
 		},
 		"harness/running/executor": {
 			"path": ".pi/agents/harness/running/executor.md",
-			"sha256": "0b602c27f8842af3b1bc702623649de8ba775e77fe59bc156bfabf91b5303d85"
+			"sha256": "e8710179def62a9adaa63ba5b05c3f36dee95da6fd751ef34be773bbee65a5c2"
 		},
 		"harness/reviewing/adversary": {
 			"path": ".pi/agents/harness/reviewing/adversary.md",
@@ -111,19 +111,19 @@
 		},
 		"harness/planning/decompose": {
 			"path": ".pi/agents/harness/planning/decompose.md",
-			"sha256": "ef552be75ff92667e6be90a85768e0804501d00e517b753ca37d174b2561618a"
+			"sha256": "35965f8f8eaa19caee72de1b708178f5ce7bba185f25bed28b9b2ff66c51eaed"
 		},
 		"harness/planning/execution-plan-author": {
 			"path": ".pi/agents/harness/planning/execution-plan-author.md",
-			"sha256": "3b83edca1eb393941e04213c5cabe0e4b180e52df59169ba24904341a369ead5"
+			"sha256": "f0251ac5fb423dda3d6b0b4cff1f63a8e5adfa40806b99454a649c1b0fe3adae"
 		},
 		"harness/planning/hypothesis-validator": {
 			"path": ".pi/agents/harness/planning/hypothesis-validator.md",
-			"sha256": "ee68aa5c04b903320116cfa21cea8f130199fd21e1fd1a8a747830bf53920fdb"
+			"sha256": "70d755da14e146755932c2cb3eb9b828ccd6406b4962d61baeba27c38d9f73dc"
 		},
 		"harness/planning/hypothesis": {
 			"path": ".pi/agents/harness/planning/hypothesis.md",
-			"sha256": "c974f5381aa562589942e8d52b48bdace6663e10caed6bf5f2fb9ce11d84b0bc"
+			"sha256": "5dac1020bc1d5a4100150959d52d983a4860210aa9cbda9120214191c2a17f1d"
 		},
 		"harness/planning/implementation-researcher": {
 			"path": ".pi/agents/harness/planning/implementation-researcher.md",
@@ -131,15 +131,15 @@
 		},
 		"harness/planning/plan-adversary": {
 			"path": ".pi/agents/harness/planning/plan-adversary.md",
-			"sha256": "305cfa6cd0d4e6493a2dad2f01d8cb0b0dddc06df11f871746f6da7124c9d16b"
+			"sha256": "0c9abc088ced31705598baff143df992d435df751b01a9faad9d4af94df16c5a"
 		},
 		"harness/planning/plan-evaluator": {
 			"path": ".pi/agents/harness/planning/plan-evaluator.md",
-			"sha256": "1a6f465f4d400bcf32b9e82a1032ae789354f264af31c8d358b2a0dde7df81bf"
+			"sha256": "f85aba0adbbc7e726a51bfe2d6aa857ab39c8240cd08f06493bc1883ff387c5e"
 		},
 		"harness/planning/plan-synthesizer": {
 			"path": ".pi/agents/harness/planning/plan-synthesizer.md",
-			"sha256": "5bc3ec109179790c196df1328d362c1485cd5ff9295c31c3de93c050330295da"
+			"sha256": "3508126385d338b03f583aaa1f5d75f1cd1fcac8559fed52cd7db11ba1205536"
 		},
 		"harness/planning/planning-context": {
 			"path": ".pi/agents/harness/planning/planning-context.md",
@@ -147,11 +147,11 @@
 		},
 		"harness/planning/review-integrator": {
 			"path": ".pi/agents/harness/planning/review-integrator.md",
-			"sha256": "3f60c41768cad24150718b4a415b9636b0df6892195986a90fc77e2d0a6be537"
+			"sha256": "ea810e3ecf50afe16cf70d12ca3107af94f2272434a72acc5f206bdf7ee89699"
 		},
 		"harness/planning/sprint-contract-auditor": {
 			"path": ".pi/agents/harness/planning/sprint-contract-auditor.md",
-			"sha256": "402c585168c5510b5f22837d2fb157726b928fa59108a8580437ac6ac08d04f5"
+			"sha256": "615feafa48481af0a94b3d6ea9903d58b532575447f5482e60c65e6eb780bfc0"
 		},
 		"harness/planning/stack-researcher": {
 			"path": ".pi/agents/harness/planning/stack-researcher.md",

package/.pi/harness/agents.policy.yaml

@@ -9,17 +9,28 @@ kinds:
       - grep
       - find
       - ls
+      - bash
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     extensions: false
     read_only: true
   executor:
     tools:
       - read
-      - write
-      - edit
-      - bash
       - grep
       - find
       - ls
+      - bash
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
+      - write
+      - edit
     extensions: true
     extension_bundle: executor
     read_only: false
@@ -29,6 +40,12 @@ kinds:
       - grep
       - find
       - ls
+      - bash
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     extensions: false
     read_only: true
   adversary:
@@ -37,6 +54,12 @@ kinds:
       - grep
       - find
       - ls
+      - bash
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     extensions: false
     read_only: true
   tie_breaker:
@@ -45,6 +68,12 @@ kinds:
       - grep
       - find
       - ls
+      - bash
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     extensions: false
     read_only: true
   trace:
@@ -53,6 +82,12 @@ kinds:
       - grep
       - find
       - ls
+      - bash
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     extensions: false
     read_only: true
   incident:
@@ -61,6 +96,12 @@ kinds:
       - grep
       - find
       - ls
+      - bash
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     extensions: false
     read_only: true
   other:
@@ -196,6 +237,16 @@ agents:
     submit_tool: submit_execution_plan_brief
   harness/planning/hypothesis-validator:
     kind: planner
+    tools_deny:
+      - bash
+      - grep
+      - find
+      - ls
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     tools_add:
       - submit_hypothesis_validation
     extensions: false
@@ -212,6 +263,12 @@ agents:
     submit_tool: submit_hypothesis_brief
   harness/planning/implementation-researcher:
     kind: planner
+    tools_deny:
+      - bash
+      - find
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
     tools_add:
       - submit_implementation_research
     extensions: false
@@ -251,6 +308,15 @@ agents:
     submit_tool: submit_planning_context
   harness/planning/review-integrator:
     kind: planner
+    tools_deny:
+      - bash
+      - grep
+      - find
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_search
+      - ctx_fetch_and_index
     tools_add:
       - submit_review_round_draft
     extensions: false
@@ -259,6 +325,13 @@ agents:
     submit_tool: submit_review_round_draft
   harness/planning/sprint-contract-auditor:
     kind: planner
+    tools_deny:
+      - bash
+      - find
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
+      - ctx_fetch_and_index
     tools_add:
       - submit_sprint_audit
     extensions: false
@@ -267,6 +340,12 @@ agents:
     submit_tool: submit_sprint_audit
   harness/planning/stack-researcher:
     kind: planner
+    tools_deny:
+      - bash
+      - find
+      - ctx_batch_execute
+      - ctx_execute
+      - ctx_execute_file
     tools_add:
       - submit_stack_brief
     extensions: false

package/.pi/harness/specs/plan-task-clarification.schema.json

@@ -24,7 +24,7 @@
 		"schema_version": { "type": "string", "const": "1.0.0" },
 		"status": {
 			"type": "string",
-			"enum": ["draft", "needs_user", "ready"]
+			"enum": ["draft", "needs_user", "needs_clarification", "ready"]
 		},
 		"source_task": { "type": "string", "minLength": 1 },
 		"clarified_task": { "type": "string", "minLength": 1 },
@@ -83,6 +83,15 @@
 				"summary": { "type": "string" }
 			},
 			"additionalProperties": true
+		},
+		"user_engagement": {
+			"type": "object",
+			"properties": {
+				"source": { "type": "string", "minLength": 1 },
+				"recorded_at": { "type": "string" }
+			},
+			"required": ["source"],
+			"additionalProperties": false
 		}
 	}
 }

package/.pi/lib/agents-policy.mjs

@@ -14,6 +14,9 @@ const BUILTIN_DENY_TOOLS = new Set([
 	"blackboard",
 ]);
 
+/** Debate inspectors may only run ast-grep via bash (no repo-wide shell exploration). */
+const DEBATE_SG_BASH_ALLOW = /^\s*sg\s+(-p|--pattern)\s+/;
+
 const PLANNING_BASH_DENY_PATTERNS = [
 	/\bgraphify\s+update\b/i,
 	/\bgraphify\s+extract\b/i,
@@ -29,6 +32,32 @@ const PLANNING_ARTIFACT_JSON_WRITE = /artifacts\/[^\s'"`;]+\.json\b/i;
 
 const MUTATING_TOOLS = new Set(["write", "edit"]);
 
+/** Blind R1: hypothesis-validator may only read task + hypothesis brief. */
+const AGENT_READ_PATH_ALLOW = {
+	"harness/planning/hypothesis-validator": [
+		"artifacts/task-clarification.yaml",
+		"artifacts/hypothesis.yaml",
+	],
+};
+
+function normalizeReadToolPath(toolInput) {
+	const raw = String(
+		toolInput.path ?? toolInput.file_path ?? toolInput.filePath ?? "",
+	).replace(/\\/g, "/");
+	if (!raw.trim()) return "";
+	const idx = raw.indexOf("artifacts/");
+	if (idx >= 0) return raw.slice(idx);
+	return raw.replace(/^\.\//, "");
+}
+
+function deniesAgentReadPath(agentId, toolInput) {
+	const allowed = AGENT_READ_PATH_ALLOW[agentId];
+	if (!allowed) return false;
+	const rel = normalizeReadToolPath(toolInput);
+	if (!rel) return true;
+	return !allowed.includes(rel);
+}
+
 const cache = new Map();
 
 const EXTENSION_BUNDLE_MODULES = {
@@ -334,6 +363,10 @@ export function allowsAgentTool(input) {
 
 	if (MUTATING_TOOLS.has(toolName) && spec.readOnly) return false;
 
+	if (toolName === "read" && deniesAgentReadPath(agentId, toolInput)) {
+		return false;
+	}
+
 	if (toolName === "ctx_batch_execute" && spec.readOnly) {
 		if (deniesReadOnlyBatchExecute(toolInput)) return false;
 	}
@@ -343,7 +376,15 @@ export function allowsAgentTool(input) {
 	}
 
 	if (toolName === "bash" && spec.readOnly) {
-		if (deniesReadOnlyBash(agentId, toolInput)) return false;
+		if (
+			agentId === "harness/planning/plan-evaluator" ||
+			agentId === "harness/planning/plan-adversary"
+		) {
+			const command = String(toolInput.command ?? "");
+			if (!command || !DEBATE_SG_BASH_ALLOW.test(command)) return false;
+		} else if (deniesReadOnlyBash(agentId, toolInput)) {
+			return false;
+		}
 	}
 
 	return true;

package/.pi/lib/agt/build-evaluation-context.ts

@@ -264,7 +264,9 @@ export async function buildHarnessAgtEvaluationContext(
 		agentKind,
 	});
 
-	const spawnDecision = evaluateSubagentToolCall(input.toolName, agentId);
+	const spawnDecision = evaluateSubagentToolCall(input.toolName, agentId, {
+		isParentOrchestrator,
+	});
 
 	const toolAllowed = allowsAgentTool({
 		packageRoot: input.packageRoot,

package/.pi/lib/agt/kill-switch-state.ts

@@ -1,4 +1,18 @@
 const denyCounts = new Map<string, number>();
+/** Sessions cleared after /harness-plan or /harness-auto starts a fresh plan attempt. */
+const disarmedKillSwitchSessions = new Set<string>();
+
+export function disarmHarnessKillSwitch(sessionId: string): void {
+	disarmedKillSwitchSessions.add(sessionId);
+}
+
+export function armHarnessKillSwitch(sessionId: string): void {
+	disarmedKillSwitchSessions.delete(sessionId);
+}
+
+export function isHarnessKillSwitchDisarmed(sessionId: string): boolean {
+	return disarmedKillSwitchSessions.has(sessionId);
+}
 
 export function recordHarnessPolicyDeny(sessionId: string): number {
 	const n = (denyCounts.get(sessionId) ?? 0) + 1;

package/.pi/lib/agt/legacy-evaluate.ts

@@ -26,7 +26,9 @@ export async function evaluateLegacyHarnessToolPolicy(
 	const isSubprocess = process.env.PI_HARNESS_SUBPROCESS === "1";
 	const isParent = agentId === "parent-orchestrator";
 
-	const spawn = evaluateSubagentToolCall(toolName, agentId);
+	const spawn = evaluateSubagentToolCall(toolName, agentId, {
+		isParentOrchestrator: isParent,
+	});
 	if (spawn.action === "block") {
 		return { allowed: false, reason: spawn.reason ?? "spawn policy" };
 	}

package/.pi/lib/ask-user/index.ts

@@ -14,11 +14,13 @@ export { formatResultText, toToolDetails } from "./format.js";
 export { applyAskUserToTaskClarification } from "./merge-task-clarification.js";
 export {
 	assertSubagentCannotAskUser,
+	isCursorAgentContext,
 	isHarnessNonInteractive,
 	isPlanApprovalAskUser,
 	nonInteractiveAskUserResult,
 	PLAN_APPROVE_OPTION,
 	PLAN_CANCEL_OPTION,
+	shouldPreferTuiOverGlimpse,
 } from "./policy.js";
 export {
 	glimpseHealthCheck,

package/.pi/lib/ask-user/merge-task-clarification.ts

@@ -93,6 +93,11 @@ export function applyAskUserToTaskClarification(
 	if (next.status === "draft" || next.status === "needs_user") {
 		next.status = "needs_user";
 	}
+	next.user_engagement = {
+		source: "ask_user",
+		recorded_at: new Date().toISOString(),
+	};
+	next.clarification_rounds = (Number(next.clarification_rounds) || 0) + 1;
 
 	return next;
 }

package/.pi/lib/ask-user/policy.ts

@@ -56,10 +56,33 @@ export function isPlanApprovalAskUser(input: {
 export function isHarnessNonInteractive(): boolean {
 	return (
 		process.env.HARNESS_NON_INTERACTIVE === "1" ||
+		process.env.HARNESS_PLAN_NONINTERACTIVE === "1" ||
+		process.argv.some((a) => a === "-p" || a === "--print") ||
 		process.argv.some((a) => a.includes("non-interactive"))
 	);
 }
 
+/** Prefer headless ask_user UI (print mode, CI, or non-TTY stdin). */
+export function isHeadlessAskUserContext(): boolean {
+	return isHarnessNonInteractive() || !process.stdin.isTTY;
+}
+
+/** Cursor Composer / agent runs set CURSOR_AGENT=1; Glimpse WebView often returns null there. */
+export function isCursorAgentContext(): boolean {
+	const v = process.env.CURSOR_AGENT;
+	return v === "1" || v === "true";
+}
+
+/**
+ * Prefer terminal TUI over Glimpse when auto-routing (unless HARNESS_ASK_USER_UI=glimpse).
+ */
+export function shouldPreferTuiOverGlimpse(): boolean {
+	const forced = process.env.HARNESS_ASK_USER_UI?.toLowerCase();
+	if (forced === "glimpse") return false;
+	if (forced === "tui" || forced === "headless") return forced === "tui";
+	return isCursorAgentContext();
+}
+
 export function assertSubagentCannotAskUser(agentType: string | undefined): {
 	blocked: boolean;
 	reason?: string;

package/.pi/lib/ask-user/presenters/glimpse.ts

@@ -95,7 +95,14 @@ export async function runGlimpsePresenter(
 			unknown
 		> | null;
 
-		const cancelled = raw === null || raw?.__cancelled === true;
+		const explicitCancel = raw?.__cancelled === true;
+		if (raw === null && !explicitCancel) {
+			throw new Error(
+				"glimpse prompt returned null without user cancel — degrade to TUI",
+			);
+		}
+
+		const cancelled = raw === null || explicitCancel;
 		const response = parseGlimpseRawResult(raw, cancelled);
 
 		return {

package/.pi/lib/ask-user/presenters/headless.ts

@@ -5,6 +5,7 @@ import {
 	mergeQuestionnaireResults,
 	questionToFlatParams,
 } from "../core/questionnaire.js";
+import { isHarnessNonInteractive } from "../policy.js";
 import type { DialogResult, ValidatedAskParams } from "../types.js";
 
 async function runFlatHeadless(
@@ -17,6 +18,20 @@ async function runFlatHeadless(
 	const title = context ? `${context}\n\n${question}` : question;
 	const labels = options.map((o) => o.title);
 
+	if (isHarnessNonInteractive() && labels.length > 0) {
+		const preferred =
+			labels.find((l) =>
+				/^(approve(d)?(\s+plan)?|yes,?\s+proceed|looks\s+good|yes|proceed|continue)$/i.test(
+					l.trim(),
+				),
+			) ?? labels[0];
+		return {
+			response: { kind: "selection", selections: [preferred] },
+			cancelled: false,
+			ui_backend: "headless",
+		};
+	}
+
 	if (labels.length === 0) {
 		if (!allowFreeform) {
 			return { response: null, cancelled: true, ui_backend: "headless" };

package/.pi/lib/ask-user/presenters/select.ts

@@ -1,3 +1,7 @@
+import {
+	isHeadlessAskUserContext,
+	shouldPreferTuiOverGlimpse,
+} from "../policy.js";
 import type { DialogResult, UiBackend, ValidatedAskParams } from "../types.js";
 import { isGlimpseAvailable, runGlimpsePresenter } from "./glimpse.js";
 import { runHeadlessPresenter } from "./headless.js";
@@ -10,6 +14,7 @@ export function resolvePresenterChoice(
 	validated: ValidatedAskParams,
 	hasUI: boolean,
 ): PresenterChoice {
+	if (isHeadlessAskUserContext()) return "headless";
 	if (validated.displayMode === "inline") return "tui";
 
 	const forced = process.env.HARNESS_ASK_USER_UI?.toLowerCase();
@@ -17,6 +22,11 @@ export function resolvePresenterChoice(
 	if (forced === "glimpse") return "glimpse";
 	if (forced === "headless") return "headless";
 
+	if (shouldPreferTuiOverGlimpse()) {
+		if (hasUI) return "tui";
+		return "headless";
+	}
+
 	if (hasUI && isGlimpseAvailable()) return "glimpse";
 	if (hasUI) return "tui";
 	return "headless";
@@ -44,13 +54,12 @@ export async function presentAskUser(
 	validated: ValidatedAskParams,
 	ctx: PresenterContext,
 ): Promise<DialogResult> {
-	let choice = resolvePresenterChoice(validated, ctx.hasUI);
+	const choice = resolvePresenterChoice(validated, ctx.hasUI);
 
 	if (choice === "glimpse") {
 		try {
 			return await runPresenter("glimpse", validated, ctx);
 		} catch {
-			choice = "tui";
 			const outcome = await runPresenter("tui", validated, ctx);
 			return { ...outcome, ui_degraded: true };
 		}

package/.pi/lib/ask-user/validate-core.mjs

@@ -210,6 +210,18 @@ function isGlimpseAvailable() {
 	}
 }
 
+function isCursorAgentContext() {
+	const v = process.env.CURSOR_AGENT;
+	return v === "1" || v === "true";
+}
+
+function shouldPreferTuiOverGlimpse() {
+	const forced = process.env.HARNESS_ASK_USER_UI?.toLowerCase();
+	if (forced === "glimpse") return false;
+	if (forced === "tui" || forced === "headless") return forced === "tui";
+	return isCursorAgentContext();
+}
+
 /** @param {import('./types.js').ValidatedAskParams} validated @param {boolean} hasUI */
 export function resolvePresenterChoice(validated, hasUI) {
 	if (validated.displayMode === "inline") return "tui";
@@ -218,6 +230,10 @@ export function resolvePresenterChoice(validated, hasUI) {
 	if (forced === "tui") return "tui";
 	if (forced === "glimpse") return "glimpse";
 	if (forced === "headless") return "headless";
+	if (shouldPreferTuiOverGlimpse()) {
+		if (hasUI) return "tui";
+		return "headless";
+	}
 	if (hasUI && isGlimpseAvailable()) return "glimpse";
 	if (hasUI) return "tui";
 	return "headless";