@gajae-code/coding-agent 0.12.1 → 0.12.2

package/scripts/dogfood-ralplan-review-conflicts.ts

@@ -0,0 +1,272 @@
+/**
+ * Product-surface dogfood for #2902 ralplan typed review conflicts.
+ *
+ * Uses the **compiled** `packages/coding-agent/dist/gjc` binary (not source
+ * `cli.ts`) so evidence matches the owner exact-head compiled-binary gate:
+ *   1) open conflicts fail closed (exit 2, Join blocked)
+ *   2) complete disposition document is accepted and persisted
+ *   3) stored artifact is dispositioned under ralplan.review_conflicts.v1
+ *   4) spoofed receipts fail closed against the run index
+ *
+ * Prerequisites (from monorepo root, same HEAD):
+ *   bun run build
+ *   bun packages/coding-agent/scripts/dogfood-ralplan-review-conflicts.ts
+ *
+ * Optional: GJC_BINARY=/path/to/gjc overrides the default dist path.
+ */
+import * as fsp from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../..");
+const defaultBinary = path.join(repoRoot, "packages/coding-agent/dist/gjc");
+
+async function resolveCompiledBinary(): Promise<string> {
+	const binary = process.env.GJC_BINARY?.trim() || defaultBinary;
+	try {
+		const st = await fsp.stat(binary);
+		if (!st.isFile()) throw new Error(`not a file: ${binary}`);
+		// Ensure executable bit is present for direct spawn.
+		await fsp.access(binary, fsp.constants.X_OK).catch(async () => {
+			await fsp.chmod(binary, 0o755);
+		});
+	} catch (error) {
+		throw new Error(
+			`Compiled binary missing or not executable: ${binary}. Run \`bun run build\` on this exact HEAD first. (${error instanceof Error ? error.message : String(error)})`,
+		);
+	}
+	return binary;
+}
+
+async function runGjc(
+	binary: string,
+	cwd: string,
+	args: string[],
+	env: NodeJS.ProcessEnv,
+): Promise<{ code: number; stdout: string; stderr: string }> {
+	const proc = Bun.spawn([binary, ...args], { cwd, env, stdout: "pipe", stderr: "pipe" });
+	const [code, stdout, stderr] = await Promise.all([
+		proc.exited,
+		new Response(proc.stdout).text(),
+		new Response(proc.stderr).text(),
+	]);
+	return { code, stdout, stderr };
+}
+
+async function main(): Promise<void> {
+	const binary = await resolveCompiledBinary();
+	const dogfoodRoot = await fsp.mkdtemp(path.join(os.tmpdir(), "gjc-dogfood-2902-"));
+	const sessionId = `dogfood-2902-${process.pid}`;
+	const env = { ...process.env, GJC_SESSION_ID: sessionId };
+	const full = Bun.spawnSync(["git", "-C", repoRoot, "rev-parse", "HEAD"]).stdout.toString().trim();
+	const short = Bun.spawnSync(["git", "-C", repoRoot, "rev-parse", "--short=8", "HEAD"]).stdout.toString().trim();
+	const binaryStat = await fsp.stat(binary);
+
+	console.log("# Dogfood: ralplan review conflicts (#2902) — compiled binary");
+	console.log(`root=${dogfoodRoot}`);
+	console.log(`session=${sessionId}`);
+	console.log(`binary=${binary}`);
+	console.log(`binary_size=${binaryStat.size}`);
+	console.log(`binary_mtime=${binaryStat.mtime.toISOString()}`);
+	console.log(`commit=${short}`);
+	console.log(`commit_full=${full}`);
+	console.log(`bun=${Bun.version}`);
+	console.log();
+
+	// Seed ralplan run state so --write has an active run.
+	console.log("## 1) compiled gjc ralplan seed");
+	const seed = await runGjc(binary, dogfoodRoot, ["ralplan", "--deliberate", "--json", "dogfood #2902"], env);
+	console.log(`exit=${seed.code}`);
+	console.log((seed.stdout || seed.stderr).trim());
+	if (seed.code !== 0) process.exit(1);
+
+	// Persist same-pass Architect/Critic artifacts so disposition receipts resolve.
+	console.log();
+	console.log("## 2) seed architect + critic stage artifacts (same-pass stage_n=1)");
+	const architect = await runGjc(
+		binary,
+		dogfoodRoot,
+		["ralplan", "--write", "--stage", "architect", "--stage_n", "1", "--artifact", "# architect", "--json"],
+		env,
+	);
+	console.log(`architect exit=${architect.code}`);
+	if (architect.code !== 0) {
+		console.error(architect.stderr || architect.stdout);
+		process.exit(1);
+	}
+	const critic = await runGjc(
+		binary,
+		dogfoodRoot,
+		["ralplan", "--write", "--stage", "critic", "--stage_n", "1", "--artifact", "# critic", "--json"],
+		env,
+	);
+	console.log(`critic exit=${critic.code}`);
+	if (critic.code !== 0) {
+		console.error(critic.stderr || critic.stdout);
+		process.exit(1);
+	}
+	const archReceipt = JSON.parse(architect.stdout) as { path: string; sha256: string };
+	const critReceipt = JSON.parse(critic.stdout) as { path: string; sha256: string };
+	console.log(`architect path=${archReceipt.path}`);
+	console.log(`critic path=${critReceipt.path}`);
+
+	const findings = [
+		{
+			findingId: "arch-1",
+			targetId: "contract.field",
+			action: "remove",
+			severity: "block",
+			evidence: "redundant with session identity",
+			sourceRole: "architect",
+			sourceReceipt: {
+				stage: "architect",
+				stageN: 1,
+				path: archReceipt.path,
+				sha256: archReceipt.sha256,
+			},
+		},
+		{
+			findingId: "crit-1",
+			targetId: "contract.field",
+			action: "add",
+			severity: "watch",
+			evidence: "needed for multi-repo binding",
+			sourceRole: "critic",
+			sourceReceipt: {
+				stage: "critic",
+				stageN: 1,
+				path: critReceipt.path,
+				sha256: critReceipt.sha256,
+			},
+		},
+	];
+
+	// 3) Open disposition must fail closed.
+	const openPath = path.join(dogfoodRoot, "open-disposition.json");
+	await fsp.writeFile(
+		openPath,
+		JSON.stringify({
+			schema: "ralplan.review_conflicts.v1",
+			plannerStageN: 1,
+			findings,
+			dispositions: [],
+		}),
+	);
+	console.log();
+	console.log("## 3) disposition stage with open conflicts (expect fail-closed)");
+	const open = await runGjc(
+		binary,
+		dogfoodRoot,
+		["ralplan", "--write", "--stage", "disposition", "--stage_n", "1", "--artifact", openPath],
+		env,
+	);
+	console.log(`exit=${open.code}`);
+	console.log((open.stderr || open.stdout).trim());
+	if (open.code !== 2 || !`${open.stderr}${open.stdout}`.includes("Join blocked")) {
+		console.error("FAIL: expected exit=2 and Join blocked for open conflicts");
+		process.exit(1);
+	}
+	console.log("fail_closed: ok");
+
+	// 4) Spoofed receipt must fail closed.
+	const spoofPath = path.join(dogfoodRoot, "spoof-disposition.json");
+	await fsp.writeFile(
+		spoofPath,
+		JSON.stringify({
+			schema: "ralplan.review_conflicts.v1",
+			plannerStageN: 1,
+			findings: [
+				{
+					...findings[0],
+					sourceReceipt: {
+						stage: "architect",
+						stageN: 1,
+						path: "/tmp/spoofed.md",
+						sha256: "deadbeef",
+					},
+				},
+				findings[1],
+			],
+			dispositions: [
+				{
+					conflictId: "conflict:contract.field:arch-1:crit-1",
+					choice: "accept_architect",
+					rationale: "spoof should not land",
+					decisionOwner: "ralplan-leader",
+					affectedSections: ["## Contracts"],
+				},
+			],
+		}),
+	);
+	console.log();
+	console.log("## 4) disposition with spoofed receipt (expect fail-closed)");
+	const spoof = await runGjc(
+		binary,
+		dogfoodRoot,
+		["ralplan", "--write", "--stage", "disposition", "--stage_n", "1", "--artifact", spoofPath],
+		env,
+	);
+	console.log(`exit=${spoof.code}`);
+	console.log((spoof.stderr || spoof.stdout).trim());
+	if (spoof.code !== 2 || !`${spoof.stderr}${spoof.stdout}`.includes("does not match indexed")) {
+		console.error("FAIL: expected exit=2 for spoofed receipt");
+		process.exit(1);
+	}
+	console.log("spoof_rejected: ok");
+
+	// 5) Complete disposition must accept and persist.
+	const closedPath = path.join(dogfoodRoot, "closed-disposition.json");
+	await fsp.writeFile(
+		closedPath,
+		JSON.stringify({
+			schema: "ralplan.review_conflicts.v1",
+			plannerStageN: 1,
+			findings,
+			dispositions: [
+				{
+					conflictId: "conflict:contract.field:arch-1:crit-1",
+					choice: "accept_architect",
+					rationale: "Field duplicates existing session identity.",
+					decisionOwner: "ralplan-leader",
+					affectedSections: ["## Contracts"],
+				},
+			],
+		}),
+	);
+	console.log();
+	console.log("## 5) disposition stage with complete dispositions (expect accept)");
+	const closed = await runGjc(
+		binary,
+		dogfoodRoot,
+		["ralplan", "--write", "--stage", "disposition", "--stage_n", "1", "--artifact", closedPath, "--json"],
+		env,
+	);
+	console.log(`exit=${closed.code}`);
+	console.log(closed.stdout.trim() || closed.stderr.trim());
+	if (closed.code !== 0) {
+		console.error("FAIL: expected disposition write success");
+		process.exit(1);
+	}
+	const payload = JSON.parse(closed.stdout) as { path?: string; stage?: string };
+	if (payload.stage !== "disposition" || !payload.path) {
+		console.error("FAIL: unexpected write payload", payload);
+		process.exit(1);
+	}
+	const body = await fsp.readFile(payload.path, "utf-8");
+	console.log();
+	console.log("## 6) persisted disposition artifact");
+	console.log(`path=${payload.path}`);
+	console.log(body.slice(0, 1200));
+	if (!body.includes("ralplan.review_conflicts.v1") || !body.includes("dispositioned")) {
+		console.error("FAIL: artifact missing schema or dispositioned status");
+		process.exit(1);
+	}
+
+	console.log();
+	console.log("DOGFOOD_OK");
+	console.log(`DOGFOOD_BINARY=${binary}`);
+	console.log(`DOGFOOD_HEAD=${full}`);
+}
+
+await main();

package/scripts/generate-sdk-operation-inventory.ts

@@ -35,6 +35,8 @@ const LOCKED_EXCLUSIONS: Readonly<Record<string, string>> = {
 	"slash_command:transcript": "visual/local-only transcript viewer, not a user-facing SDK control seam",
 	"slash_command:sessions": "visual/local-only sessions dashboard, not a user-facing SDK control seam",
 	"agent_session:constructor": "internal accessor/plumbing, not a user-facing control seam",
+	"agent_session:registerToolSessionCleanup":
+		"internal tool lifecycle cleanup registration, not a user-facing SDK control seam",
 	"agent_session:nextToolChoice": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:setForcedToolChoice": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:getActiveSkillState": "internal accessor/plumbing, not a user-facing control seam",

package/scripts/run-acp-conformance.ts

@@ -225,6 +225,11 @@ async function checkoutAcpxSource(): Promise<AcpxCheckout> {
 	await commandOutput(["git", "clean", "-fdx", "--exclude=node_modules"], root);
 	const status = await commandOutput(["git", "status", "--porcelain"], root);
 	if (status.length > 0) throw new Error(`acpx source checkout is not clean at ${ACPX_GIT_HEAD}.`);
+	// The upstream runner resolves its own imports (`@agentclientprotocol/sdk`, `zod`)
+	// from this checkout, not from the gjc workspace, so the pin has to be installed
+	// before it can run. `git clean` deliberately preserves node_modules so a warm
+	// cache skips the reinstall.
+	await commandOutput(["bun", "install", "--no-save", "--ignore-scripts"], root);
 	return { root, head: await commandOutput(["git", "rev-parse", "HEAD"], root) };
 }
 

package/src/async/job-manager.ts

@@ -525,9 +525,9 @@ export class AsyncJobManager {
 
 				if (job.status === "cancelled") {
 					job.resultText = outcome.kind === "paused" ? outcome.note : outcome.text;
+					this.#markRecordTerminal(id, "cancelled");
 					this.#runLifecycle(id, "terminal", job);
 					this.#scheduleEviction(id);
-					this.#markRecordTerminal(id, "cancelled");
 					this.#drainResumeQueue();
 					return;
 				}
@@ -539,6 +539,7 @@ export class AsyncJobManager {
 					this.#freezeEndTime(job);
 					if (outcome.note) job.resultText = outcome.note;
 					this.#markRecordPaused(id);
+					this.#notifyChange();
 					this.#drainResumeQueue();
 					return;
 				}
@@ -547,10 +548,10 @@ export class AsyncJobManager {
 					job.setupFailureSummary = outcome.setupFailureSummary;
 					this.#freezeEndTime(job);
 					job.errorText = outcome.text;
+					this.#markRecordTerminal(id, "failed");
 					this.#enqueueDelivery(id, outcome.text);
 					this.#runLifecycle(id, "terminal", job);
 					this.#scheduleEviction(id);
-					this.#markRecordTerminal(id, "failed");
 					this.#drainResumeQueue();
 					return;
 				}
@@ -558,28 +559,28 @@ export class AsyncJobManager {
 				job.status = "completed";
 				this.#freezeEndTime(job);
 				job.resultText = outcome.text;
+				this.#markRecordTerminal(id, "completed");
 				this.#enqueueDelivery(id, outcome.text);
 				this.#runLifecycle(id, "terminal", job);
 				this.#scheduleEviction(id);
-				this.#markRecordTerminal(id, "completed");
 				this.#drainResumeQueue();
 			} catch (error) {
 				if (job.status === "cancelled") {
 					job.errorText = error instanceof Error ? error.message : String(error);
+					this.#markRecordTerminal(id, "cancelled");
 					this.#runLifecycle(id, "terminal", job);
 					this.#scheduleEviction(id);
-					this.#markRecordTerminal(id, "cancelled");
 					this.#drainResumeQueue();
 					return;
 				}
-				this.#runLifecycle(id, "terminal", job);
 				const errorText = error instanceof Error ? error.message : String(error);
 				job.status = "failed";
 				this.#freezeEndTime(job);
 				job.errorText = errorText;
+				this.#markRecordTerminal(id, "failed");
 				this.#enqueueDelivery(id, errorText);
+				this.#runLifecycle(id, "terminal", job);
 				this.#scheduleEviction(id);
-				this.#markRecordTerminal(id, "failed");
 				this.#drainResumeQueue();
 			}
 		})();
@@ -599,20 +600,22 @@ export class AsyncJobManager {
 		if (!job) return false;
 		if (filter?.ownerId && job.ownerId !== filter.ownerId) return false;
 		if (job.status === "paused") {
-			this.#runLifecycle(id, "cancel");
 			// Paused jobs have no running promise to abort; transition directly.
 			// The session file is kept, so the record stays resumable by id.
 			job.status = "cancelled";
 			this.#markRecordTerminal(id, "cancelled");
+			this.#runLifecycle(id, "cancel");
 			this.#scheduleEviction(id);
 			this.#drainResumeQueue();
 			return true;
 		}
 		if (job.status !== "running") return false;
-		this.#runLifecycle(id, "cancel");
 		job.status = "cancelled";
 		this.#freezeEndTime(job);
+		this.#markRecordTerminal(id, "cancelled");
+		this.#runLifecycle(id, "cancel");
 		job.abortController.abort();
+		this.#notifyChange();
 		return true;
 	}
 
@@ -696,6 +699,7 @@ export class AsyncJobManager {
 	/** Register or replace the canonical record for a subagent. */
 	registerSubagentRecord(record: SubagentRecord): void {
 		this.#subagentRecords.set(record.subagentId, record);
+		this.#notifyChange();
 	}
 
 	/** Patch model metadata onto an existing subagent record (best-effort; no-op if unknown). */
@@ -1136,6 +1140,7 @@ export class AsyncJobManager {
 				message,
 				createdAt: rec.queued.createdAt,
 			});
+			this.#notifyChange();
 			return { ok: true, queued: true, status: "queued" };
 		}
 		return this.#startResume(rec, message, descriptor);
@@ -1160,6 +1165,7 @@ export class AsyncJobManager {
 		rec.currentJobId = newJobId;
 		rec.status = this.#jobs.get(newJobId)?.status ?? "running";
 		rec.queued = undefined;
+		this.#notifyChange();
 		return { ok: true, status: rec.status, jobId: newJobId };
 	}
 
@@ -1202,16 +1208,15 @@ export class AsyncJobManager {
 		if (!rec) return false;
 		if (rec.status === "running" && rec.currentJobId) return this.cancel(rec.currentJobId, filter);
 		if (rec.status === "paused") {
-			if (rec.currentJobId) {
-				const job = this.#jobs.get(rec.currentJobId);
-				if (job && job.status === "paused") {
-					job.status = "cancelled";
-					this.#scheduleEviction(rec.currentJobId);
-				}
-			}
+			const currentJobId = rec.currentJobId;
+			const job = currentJobId ? this.#jobs.get(currentJobId) : undefined;
+			const shouldScheduleEviction = job?.status === "paused";
+			if (shouldScheduleEviction) job.status = "cancelled";
 			rec.status = "cancelled";
 			this.#liveHandles.delete(rec.subagentId);
 			this.#subagentProgress.delete(rec.subagentId);
+			if (shouldScheduleEviction && currentJobId) this.#scheduleEviction(currentJobId);
+			else this.#notifyChange();
 			this.#drainResumeQueue();
 			return true;
 		}
@@ -1221,6 +1226,7 @@ export class AsyncJobManager {
 			rec.status = "cancelled";
 			rec.queued = undefined;
 			this.#subagentProgress.delete(rec.subagentId);
+			this.#notifyChange();
 			return true;
 		}
 		return false;
@@ -1471,11 +1477,7 @@ export class AsyncJobManager {
 	 */
 	cancelAll(filter?: AsyncJobFilter): void {
 		for (const job of this.getRunningJobs(filter)) {
-			this.#runLifecycle(job.id, "cancel");
-			job.status = "cancelled";
-			this.#freezeEndTime(job);
-			job.abortController.abort();
-			this.#scheduleEviction(job.id);
+			if (this.cancel(job.id, filter)) this.#scheduleEviction(job.id);
 		}
 	}
 

package/src/config/settings-schema.ts

@@ -873,8 +873,8 @@ export const SETTINGS_SCHEMA = {
 		default: true,
 		ui: {
 			tab: "appearance",
-			label: "Status Line Action Hints",
-			description: "Show contextual keyboard shortcuts in the status line",
+			label: "Composer Shortcut Hints",
+			description: "Show contextual keyboard shortcuts in the composer placeholder",
 		},
 	},
 

package/src/debug/index.ts

@@ -11,6 +11,7 @@ import { getSessionsDir } from "@gajae-code/utils";
 import { DynamicBorder } from "../modes/components/dynamic-border";
 import { getSelectListTheme, getSymbolTheme, theme } from "../modes/theme/theme";
 import type { InteractiveModeContext } from "../modes/types";
+import { suspendInteractiveActivityIndicator } from "../modes/types";
 import { formatBytes } from "../tools/render-utils";
 import { openPath } from "../utils/open";
 import { DebugLogViewerComponent } from "./log-viewer";
@@ -77,10 +78,12 @@ export class DebugSelectorComponent extends Container {
 	}
 
 	handleInput(keyData: string): void {
+		if (this.ctx.isStopped?.()) return;
 		this.#selectList.handleInput(keyData);
 	}
 
 	async #handleSelection(value: string): Promise<void> {
+		if (this.ctx.isStopped?.()) return;
 		switch (value) {
 			case "open-artifacts":
 				await this.#handleOpenArtifacts();
@@ -115,12 +118,23 @@ export class DebugSelectorComponent extends Container {
 		}
 	}
 
+	#finishStatusLoader(loader: Loader, releaseActivityIndicator: () => void): void {
+		loader.stop();
+		if (!this.ctx.isStopped?.()) this.ctx.statusContainer.clear();
+		releaseActivityIndicator();
+	}
+
 	async #handlePerformanceReport(): Promise<void> {
 		// Start profiling
 		let session: ProfilerSession;
 		try {
 			session = await startCpuProfile();
+			if (this.ctx.isStopped?.()) {
+				await session.stop().catch(() => {});
+				return;
+			}
 		} catch (err) {
+			if (this.ctx.isStopped?.()) return;
 			this.ctx.showError(`Failed to start profiler: ${err instanceof Error ? err.message : String(err)}`);
 			return;
 		}
@@ -151,9 +165,17 @@ export class DebugSelectorComponent extends Container {
 			resolve();
 		};
 
-		await promise;
+		const stopped = Promise.withResolvers<void>();
+		const unsubscribeStop = this.ctx.onStop?.(() => stopped.resolve());
+		const stopWon = await Promise.race([promise.then(() => false), stopped.promise.then(() => true)]);
+		unsubscribeStop?.();
+		if (stopWon || this.ctx.isStopped?.()) {
+			await session.stop().catch(() => {});
+			return;
+		}
 
 		// Stop profiling and create report
+		const releaseActivityIndicator = suspendInteractiveActivityIndicator(this.ctx);
 		const loader = new Loader(
 			this.ctx.ui,
 			spinner => theme.fg("accent", spinner),
@@ -174,8 +196,8 @@ export class DebugSelectorComponent extends Container {
 				workProfile,
 			});
 
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			this.ctx.chatContainer.addChild(
@@ -184,8 +206,8 @@ export class DebugSelectorComponent extends Container {
 			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", formatFileHyperlink(result.path)), 1, 0));
 			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", `Files: ${result.files.length}`), 1, 0));
 		} catch (err) {
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 			this.ctx.showError(`Failed to create report: ${err instanceof Error ? err.message : String(err)}`);
 		}
 
@@ -219,6 +241,7 @@ export class DebugSelectorComponent extends Container {
 	}
 
 	async #handleDumpReport(): Promise<void> {
+		const releaseActivityIndicator = suspendInteractiveActivityIndicator(this.ctx);
 		const loader = new Loader(
 			this.ctx.ui,
 			spinner => theme.fg("accent", spinner),
@@ -235,8 +258,8 @@ export class DebugSelectorComponent extends Container {
 				settings: this.#getResolvedSettings(),
 			});
 
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			this.ctx.chatContainer.addChild(
@@ -245,8 +268,8 @@ export class DebugSelectorComponent extends Container {
 			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", formatFileHyperlink(result.path)), 1, 0));
 			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", `Files: ${result.files.length}`), 1, 0));
 		} catch (err) {
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 			this.ctx.showError(`Failed to create report: ${err instanceof Error ? err.message : String(err)}`);
 		}
 
@@ -254,6 +277,7 @@ export class DebugSelectorComponent extends Container {
 	}
 
 	async #handleMemoryReport(): Promise<void> {
+		const releaseActivityIndicator = suspendInteractiveActivityIndicator(this.ctx);
 		const loader = new Loader(
 			this.ctx.ui,
 			spinner => theme.fg("accent", spinner),
@@ -274,8 +298,8 @@ export class DebugSelectorComponent extends Container {
 				heapSnapshot,
 			});
 
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			this.ctx.chatContainer.addChild(
@@ -284,8 +308,8 @@ export class DebugSelectorComponent extends Container {
 			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", formatFileHyperlink(result.path)), 1, 0));
 			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", `Files: ${result.files.length}`), 1, 0));
 		} catch (err) {
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 			this.ctx.showError(`Failed to create report: ${err instanceof Error ? err.message : String(err)}`);
 		}
 
@@ -405,6 +429,7 @@ export class DebugSelectorComponent extends Container {
 		}
 
 		// Clear cache
+		const releaseActivityIndicator = suspendInteractiveActivityIndicator(this.ctx);
 		const loader = new Loader(
 			this.ctx.ui,
 			spinner => theme.fg("accent", spinner),
@@ -418,8 +443,8 @@ export class DebugSelectorComponent extends Container {
 		try {
 			const result = await clearArtifactCache(sessionsDir, 30);
 
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			this.ctx.chatContainer.addChild(
@@ -430,8 +455,8 @@ export class DebugSelectorComponent extends Container {
 				),
 			);
 		} catch (err) {
-			loader.stop();
-			this.ctx.statusContainer.clear();
+			this.#finishStatusLoader(loader, releaseActivityIndicator);
+			if (this.ctx.isStopped?.()) return;
 			this.ctx.showError(`Failed to clear cache: ${err instanceof Error ? err.message : String(err)}`);
 		}