@gajae-code/coding-agent 0.2.1 → 0.2.2

package/src/modes/components/skill-hud/render.ts

@@ -1,4 +1,5 @@
 import type { SkillActiveEntry, WorkflowHudChip } from "../../../skill-state/active-state";
+import { workflowReceiptStatus } from "../../../skill-state/workflow-state-contract";
 
 const ANSI_RESET_FG = "\x1b[39m";
 const ANSI_RESET_BOLD = "\x1b[22m";
@@ -60,6 +61,9 @@ function formatEntry(entry: SkillActiveEntry): string {
 		.map(formatChip)
 		.filter((chip): chip is string => Boolean(chip));
 	if (entry.stale === true) chips.unshift("warn:stale");
+	const receiptStatus = workflowReceiptStatus(entry.receipt);
+	if (receiptStatus === "stale") chips.unshift("warn:receipt=stale");
+	if (receiptStatus === "fresh") chips.push("receipt=fresh");
 	const summary = sanitizeHudPart(entry.hud?.summary);
 	return [base, summary, ...chips].filter(Boolean).join(" ");
 }

package/src/modes/components/status-line/segments.ts

@@ -110,10 +110,9 @@ const modelSegment: StatusLineSegment = {
 	},
 };
 
-function formatGoalBudget(current: number, budget?: number): string {
+function formatGoalUsage(current: number): string {
 	const used = formatNumber(current);
-	if (budget === undefined) return used;
-	return `${used}/${formatNumber(budget)}`;
+	return used;
 }
 
 function renderGoalMode(ctx: SegmentContext, mode: { enabled: boolean; paused: boolean }): RenderedSegment {
@@ -131,10 +130,6 @@ function renderGoalMode(ctx: SegmentContext, mode: { enabled: boolean; paused: b
 			icon = theme.symbol("status.success");
 			color = "success";
 			break;
-		case "budget-limited":
-			icon = theme.symbol("status.warning");
-			color = "warning";
-			break;
 		case "dropped":
 			icon = theme.symbol("status.aborted");
 			color = "dim";
@@ -144,9 +139,9 @@ function renderGoalMode(ctx: SegmentContext, mode: { enabled: boolean; paused: b
 	}
 
 	const parts: string[] = [withIcon(icon, "Goal")];
-	const showBudget = ctx.session.settings.get("goal.statusInFooter") === true;
-	if (showBudget && goal) {
-		parts.push(formatGoalBudget(goal.tokensUsed, goal.tokenBudget));
+	const showUsage = ctx.session.settings.get("goal.statusInFooter") === true;
+	if (showUsage && goal) {
+		parts.push(formatGoalUsage(goal.tokensUsed));
 	}
 	return { content: theme.fg(color, parts.join(" ")), visible: true };
 }
@@ -169,12 +164,6 @@ const modeSegment: StatusLineSegment = {
 			return renderGoalMode(ctx, goal);
 		}
 
-		const loop = ctx.loopMode;
-		if (loop?.enabled) {
-			const content = withIcon(theme.icon.loop, "Loop");
-			return { content: theme.fg("customMessageLabel", content), visible: true };
-		}
-
 		return { content: "", visible: false };
 	},
 };

package/src/modes/components/status-line/types.ts

@@ -24,9 +24,6 @@ export interface SegmentContext {
 		enabled: boolean;
 		paused: boolean;
 	} | null;
-	loopMode: {
-		enabled: boolean;
-	} | null;
 	goalMode: {
 		enabled: boolean;
 		paused: boolean;

package/src/modes/components/status-line.ts

@@ -155,7 +155,6 @@ export class StatusLineComponent implements Component {
 	#subagentCount: number = 0;
 	#sessionStartTime: number = Date.now();
 	#planModeStatus: { enabled: boolean; paused: boolean } | null = null;
-	#loopModeStatus: { enabled: boolean } | null = null;
 	#goalModeStatus: { enabled: boolean; paused: boolean } | null = null;
 	#skillHudEntries: SkillActiveEntry[] = [];
 	#skillHudLastFetch = 0;
@@ -229,10 +228,6 @@ export class StatusLineComponent implements Component {
 		this.#planModeStatus = status ?? null;
 	}
 
-	setLoopModeStatus(status: { enabled: boolean } | undefined): void {
-		this.#loopModeStatus = status ?? null;
-	}
-
 	setGoalModeStatus(status: { enabled: boolean; paused: boolean } | undefined): void {
 		this.#goalModeStatus = status ?? null;
 	}
@@ -611,7 +606,6 @@ export class StatusLineComponent implements Component {
 			width,
 			options: this.#resolveSettings().segmentOptions ?? {},
 			planMode: this.#planModeStatus,
-			loopMode: this.#loopModeStatus,
 			goalMode: this.#goalModeStatus,
 			usageStats,
 			contextPercent,

package/src/modes/controllers/command-controller.ts

@@ -1248,7 +1248,31 @@ export class CommandController {
 			this.ctx.statusContainer.clear();
 			this.ctx.editor.onEscape = originalOnEscape;
 		}
-		this.ctx.ui.requestRender();
+	}
+
+	async handleContributionPrepCommand(customInstructions?: string): Promise<void> {
+		this.ctx.editor.setText("");
+		try {
+			const result = await this.ctx.session.prepareContributionPrep({ customInstructions, spawnWorker: true });
+			this.ctx.showStatus(
+				[
+					"Contribution prep artifacts written.",
+					`Manifest: ${result.manifestPath}`,
+					`Worker prompt: ${result.workerPromptPath}`,
+				].join("\n"),
+			);
+			this.ctx.chatContainer.addChild(
+				new Text(
+					`${theme.fg("accent", `${theme.status.success} Contribution prep ready`)}\nManifest: ${result.manifestPath}`,
+					1,
+					1,
+				),
+			);
+			this.ctx.ui.requestRender();
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			this.ctx.showError(`Contribution prep failed: ${message}`);
+		}
 	}
 }
 

package/src/modes/controllers/input-controller.ts

@@ -51,15 +51,6 @@ export class InputController {
 					this.ctx.retryEscapeHandler,
 			);
 		this.ctx.editor.onEscape = () => {
-			if (this.ctx.loopModeEnabled) {
-				this.ctx.pauseLoop();
-				if (this.ctx.session.isStreaming) {
-					void this.#abortInteractive();
-				} else {
-					this.ctx.cancelPendingSubmission();
-				}
-				return;
-			}
 			if (this.ctx.hasActiveBtw() && this.ctx.handleBtwEscape()) {
 				return;
 			}
@@ -292,12 +283,6 @@ export class InputController {
 				}
 			}
 
-			// While loop mode is on, every user-typed prompt becomes the new loop
-			// prompt that auto-resubmits after each yield.
-			if (this.ctx.loopModeEnabled) {
-				this.ctx.loopPrompt = text;
-			}
-
 			// Queue input during compaction
 			if (this.ctx.session.isCompacting) {
 				if (this.ctx.pendingImages.length > 0) {

package/src/modes/interactive-mode.ts

@@ -30,6 +30,7 @@ import { APP_NAME, adjustHsv, getProjectDir, hsvToRgb, isEnoent, logger, postmor
 import chalk from "chalk";
 import { KeybindingsManager } from "../config/keybindings";
 import { isSettingsInitialized, type Settings, settings } from "../config/settings";
+import { DEFAULT_GJC_DEFINITION_NAMES } from "../defaults/gjc-defaults";
 import type {
 	ExtensionUIContext,
 	ExtensionUIDialogOptions,
@@ -40,7 +41,7 @@ import type { CompactOptions } from "../extensibility/extensions/types";
 import { resolveSkillSlashCommands, type Skill } from "../extensibility/skills";
 import { BUILTIN_SLASH_COMMANDS, loadSlashCommands } from "../extensibility/slash-commands";
 import { consumePendingGoalModeRequest } from "../gjc-runtime/goal-mode-request";
-import type { Goal, GoalModeState } from "../goals/state";
+import { type Goal, type GoalModeState, normalizeGoal } from "../goals/state";
 import { resolveLocalUrlToPath } from "../internal-urls";
 import { LSP_STARTUP_EVENT_CHANNEL, type LspStartupEvent } from "../lsp/startup-events";
 import {
@@ -87,15 +88,6 @@ import { InputController } from "./controllers/input-controller";
 import { SelectorController } from "./controllers/selector-controller";
 import { SSHCommandController } from "./controllers/ssh-command-controller";
 import { TodoCommandController } from "./controllers/todo-command-controller";
-import {
-	consumeLoopLimitIteration,
-	createLoopLimitRuntime,
-	describeLoopLimit,
-	describeLoopLimitRuntime,
-	isLoopDurationExpired,
-	type LoopLimitRuntime,
-	parseLoopLimitArgs,
-} from "./loop-limit";
 import { OAuthManualInputManager } from "./oauth-manual-input";
 import { SessionObserverRegistry } from "./session-observer-registry";
 import { interruptHint } from "./shared";
@@ -191,9 +183,9 @@ function formatHudNoteMarker(count: number): string {
 	return theme.fg("dim", chalk.italic(` \u207a${sub}`));
 }
 
-type GoalSubcommand = "set" | "show" | "pause" | "resume" | "drop" | "budget";
+type GoalSubcommand = "set" | "show" | "pause" | "resume" | "drop";
 
-const GOAL_SUBCOMMANDS = new Set<GoalSubcommand>(["set", "show", "pause", "resume", "drop", "budget"]);
+const GOAL_SUBCOMMANDS = new Set<GoalSubcommand>(["set", "show", "pause", "resume", "drop"]);
 
 function parseGoalSubcommand(args: string): { sub: GoalSubcommand | undefined; rest: string } {
 	const trimmed = args.trim();
@@ -251,10 +243,6 @@ export class InteractiveMode implements InteractiveModeContext {
 	goalModeEnabled = false;
 	goalModePaused = false;
 	planModePlanFilePath: string | undefined = undefined;
-	loopModeEnabled = false;
-	loopPrompt: string | undefined = undefined;
-	loopLimit: LoopLimitRuntime | undefined = undefined;
-	#loopAutoSubmitTimer: NodeJS.Timeout | undefined;
 	todoPhases: TodoPhase[] = [];
 	hideThinkingBlock = false;
 	pendingImages: ImageContent[] = [];
@@ -623,7 +611,13 @@ export class InteractiveMode implements InteractiveModeContext {
 		for (const command of resolvedCommands) {
 			this.skillCommands.set(command.name, command.skill);
 		}
-		return resolvedCommands.map(command => ({ name: command.name, description: command.description }));
+		const defaultGjcNames = new Set<string>(DEFAULT_GJC_DEFINITION_NAMES);
+		return resolvedCommands.map(command => ({
+			name: command.name,
+			description: command.description,
+			// Pin the bundled GJC workflow skills above generic commands in autocomplete.
+			...(defaultGjcNames.has(command.skill.name) ? { priority: 100 } : {}),
+		}));
 	}
 
 	async getUserInput(): Promise<SubmittedUserInput> {
@@ -635,40 +629,12 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.onInputCallback = undefined;
 			resolve(input);
 		};
-		this.#scheduleLoopAutoSubmit();
 		this.#scheduleGoalContinuation();
 		return promise;
 	}
 
-	#scheduleLoopAutoSubmit(): void {
-		this.#cancelLoopAutoSubmit();
-		if (!this.loopModeEnabled || !this.loopPrompt) return;
-		const prompt = this.loopPrompt;
-		const loopAction = settings.get("loop.mode");
-		this.#deferLoopAutoSubmit(() => {
-			void this.#runLoopIteration(loopAction, prompt);
-		});
-	}
-
-	#deferLoopAutoSubmit(callback: () => void): void {
-		// Brief delay so the user has a chance to press Esc between iterations.
-		this.#loopAutoSubmitTimer = setTimeout(() => {
-			this.#loopAutoSubmitTimer = undefined;
-			if (!this.loopModeEnabled || !this.onInputCallback) return;
-			callback();
-		}, 800);
-	}
-
-	#cancelLoopAutoSubmit(): void {
-		if (this.#loopAutoSubmitTimer) {
-			clearTimeout(this.#loopAutoSubmitTimer);
-			this.#loopAutoSubmitTimer = undefined;
-		}
-	}
-
 	#scheduleGoalContinuation(): void {
 		this.#cancelGoalContinuation();
-		if (this.loopModeEnabled) return;
 		if (!this.onInputCallback) return;
 		if (!this.session.settings.get("goal.continuationModes").includes("interactive")) return;
 		if (this.planModeEnabled || this.planModePaused) return;
@@ -708,92 +674,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 	}
 
-	#isLoopAutoSubmitBlocked(): boolean {
-		return this.session.isStreaming || this.session.isCompacting || this.session.hasPostPromptWork;
-	}
-
-	#submitLoopPromptWhenReady(prompt: string): void {
-		if (!this.loopModeEnabled || this.loopPrompt !== prompt || !this.onInputCallback) return;
-		if (isLoopDurationExpired(this.loopLimit)) {
-			this.disableLoopMode("Loop time limit reached. Loop mode disabled.");
-			return;
-		}
-		if (this.#isLoopAutoSubmitBlocked()) {
-			this.#deferLoopAutoSubmit(() => this.#submitLoopPromptWhenReady(prompt));
-			return;
-		}
-		this.onInputCallback(this.startPendingSubmission({ text: prompt }));
-	}
-
-	async #runLoopIteration(action: "prompt" | "compact" | "reset", prompt: string): Promise<void> {
-		if (!this.loopModeEnabled || this.loopPrompt !== prompt || !this.onInputCallback) return;
-		if (this.#isLoopAutoSubmitBlocked()) {
-			this.#deferLoopAutoSubmit(() => {
-				void this.#runLoopIteration(action, prompt);
-			});
-			return;
-		}
-
-		if (!consumeLoopLimitIteration(this.loopLimit)) {
-			this.disableLoopMode("Loop limit reached. Loop mode disabled.");
-			return;
-		}
-
-		if (action === "compact") {
-			await this.handleCompactCommand();
-		} else if (action === "reset") {
-			await this.handleClearCommand();
-		}
-		this.#submitLoopPromptWhenReady(prompt);
-	}
-
-	disableLoopMode(message = "Loop mode disabled."): void {
-		const wasEnabled = this.loopModeEnabled;
-		this.loopModeEnabled = false;
-		this.loopPrompt = undefined;
-		this.loopLimit = undefined;
-		this.#cancelLoopAutoSubmit();
-		this.statusLine.setLoopModeStatus(undefined);
-		this.updateEditorChrome();
-		this.ui.requestRender();
-		if (wasEnabled) {
-			this.showStatus(message);
-		}
-	}
-
-	/**
-	 * Pause the loop without exiting it: drops the captured prompt and any
-	 * pending auto-resubmit. Loop mode stays enabled — the next prompt the
-	 * user submits becomes the new loop prompt and resumes iteration.
-	 */
-	pauseLoop(): void {
-		this.loopPrompt = undefined;
-		this.#cancelLoopAutoSubmit();
-	}
-
-	async handleLoopCommand(args = ""): Promise<void> {
-		if (this.loopModeEnabled) {
-			this.disableLoopMode();
-			return;
-		}
-		const parsedLimit = parseLoopLimitArgs(args);
-		if (typeof parsedLimit === "string") {
-			this.showError(parsedLimit);
-			return;
-		}
-		this.loopModeEnabled = true;
-		this.loopPrompt = undefined;
-		this.loopLimit = createLoopLimitRuntime(parsedLimit);
-		this.statusLine.setLoopModeStatus({ enabled: true });
-		this.updateEditorChrome();
-		this.ui.requestRender();
-		const limitSuffix = parsedLimit ? ` Limited to ${describeLoopLimit(parsedLimit)}.` : "";
-		const remainingSuffix = this.loopLimit ? ` ${describeLoopLimitRuntime(this.loopLimit)}.` : "";
-		this.showStatus(
-			`Loop mode enabled.${limitSuffix}${remainingSuffix} Your next prompt will repeat after each turn. Esc cancels the current iteration; /loop again to disable.`,
-		);
-	}
-
 	recordLocalSubmission(text: string, imageCount = 0): () => void {
 		if (this.isKnownSlashCommand(text)) {
 			return () => {};
@@ -1088,30 +968,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	#goalFromModeData(modeData: SessionContext["modeData"]): Goal | undefined {
-		const goal = modeData?.goal;
-		if (!goal || typeof goal !== "object") return undefined;
-		const value = goal as Record<string, unknown>;
-		if (
-			typeof value.id !== "string" ||
-			typeof value.objective !== "string" ||
-			typeof value.status !== "string" ||
-			typeof value.tokensUsed !== "number" ||
-			typeof value.timeUsedSeconds !== "number" ||
-			typeof value.createdAt !== "number" ||
-			typeof value.updatedAt !== "number"
-		) {
-			return undefined;
-		}
-		return {
-			id: value.id,
-			objective: value.objective,
-			status: value.status as Goal["status"],
-			tokenBudget: typeof value.tokenBudget === "number" ? value.tokenBudget : undefined,
-			tokensUsed: value.tokensUsed,
-			timeUsedSeconds: value.timeUsedSeconds,
-			createdAt: value.createdAt,
-			updatedAt: value.updatedAt,
-		};
+		return normalizeGoal(modeData?.goal) ?? undefined;
 	}
 
 	async #handleGoalSessionEvent(event: AgentSessionEvent): Promise<void> {
@@ -1434,7 +1291,6 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.sessionManager.appendCustomEntry("goal-completed", {
 				objective: currentState?.goal?.objective,
 				tokensUsed: currentState?.goal?.tokensUsed,
-				tokenBudget: currentState?.goal?.tokenBudget,
 				timeUsedSeconds: currentState?.goal?.timeUsedSeconds,
 			});
 		}
@@ -1702,32 +1558,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 	}
 
-	async #handleGoalBudgetCommand(rawBudget: string): Promise<void> {
-		const state = this.session.getGoalModeState();
-		if (!this.goalModeEnabled || !state?.enabled) {
-			this.showWarning("No active goal.");
-			return;
-		}
-		if (state.goal.status === "complete") {
-			this.showStatus("Goal is already complete.");
-			return;
-		}
-		const trimmed = rawBudget.trim().toLowerCase();
-		let nextBudget: number | undefined;
-		if (trimmed !== "off") {
-			const parsed = Number.parseInt(trimmed, 10);
-			if (!Number.isInteger(parsed) || parsed <= 0) {
-				this.showError("Goal budget must be a positive integer or `off`.");
-				return;
-			}
-			nextBudget = parsed;
-		}
-		await this.session.goalRuntime.onBudgetMutated(nextBudget);
-		this.#resetGoalContinuationSuppression();
-		this.#scheduleGoalContinuation();
-		this.showStatus(nextBudget === undefined ? "Goal budget cleared." : `Goal budget set to ${nextBudget}.`);
-	}
-
 	async handleGoalModeCommand(rest?: string): Promise<void> {
 		try {
 			if (this.planModeEnabled || this.planModePaused) {
@@ -1791,19 +1621,6 @@ export class InteractiveMode implements InteractiveModeContext {
 			case "drop":
 				await this.#confirmAndDropGoal();
 				return;
-			case "budget":
-				if (!this.goalModeEnabled) {
-					this.showWarning(
-						this.#getPausedGoalState() ? "Resume the goal before adjusting the budget." : "No active goal.",
-					);
-					return;
-				}
-				if (!rest) {
-					await this.#promptGoalBudgetEdit();
-					return;
-				}
-				await this.#handleGoalBudgetCommand(rest);
-				return;
 		}
 	}
 
@@ -1812,19 +1629,13 @@ export class InteractiveMode implements InteractiveModeContext {
 		if (!goal) return;
 		const summary = goal.objective.length > 48 ? `${goal.objective.slice(0, 47)}…` : goal.objective;
 		const title = state === "active" ? `Goal: ${summary} (${goal.status})` : `Goal paused: ${summary}`;
-		const items =
-			state === "active"
-				? ["Show details", "Adjust budget…", "Pause", "Drop"]
-				: ["Resume", "Show details", "Adjust budget…", "Drop"];
+		const items = state === "active" ? ["Show details", "Pause", "Drop"] : ["Resume", "Show details", "Drop"];
 		const choice = await this.showHookSelector(title, items);
 		if (!choice) return;
 		switch (choice) {
 			case "Show details":
 				this.#showGoalDetails();
 				return;
-			case "Adjust budget…":
-				await this.#promptGoalBudgetEdit();
-				return;
 			case "Pause":
 				await this.#pauseGoalAction();
 				return;
@@ -1845,31 +1656,15 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 		const used = goal.tokensUsed.toLocaleString();
-		const budgetLine =
-			goal.tokenBudget !== undefined
-				? `${used} / ${goal.tokenBudget.toLocaleString()} (${Math.max(0, goal.tokenBudget - goal.tokensUsed).toLocaleString()} left)`
-				: `${used} (no budget)`;
 		const lines = [
 			`Objective: ${goal.objective}`,
 			`Status: ${goal.status}${state?.enabled ? "" : " (paused)"}`,
-			`Tokens: ${budgetLine}`,
+			`Tokens used: ${used}`,
 			`Time spent: ${formatDuration(goal.timeUsedSeconds * 1000)}`,
 		];
 		this.showStatus(lines.join("\n"));
 	}
 
-	async #promptGoalBudgetEdit(): Promise<void> {
-		const goal = this.session.getGoalModeState()?.goal;
-		const prefill = goal?.tokenBudget !== undefined ? String(goal.tokenBudget) : "";
-		const input = (
-			await this.showHookEditor("Goal budget (number, `off`, or empty to cancel)", prefill, undefined, {
-				promptStyle: true,
-			})
-		)?.trim();
-		if (!input) return;
-		await this.#handleGoalBudgetCommand(input);
-	}
-
 	async #pauseGoalAction(): Promise<void> {
 		if (!this.goalModeEnabled) {
 			this.showWarning("No active goal to pause.");
@@ -2524,6 +2319,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#commandController.handleHandoffCommand(customInstructions);
 	}
 
+	handleContributionPrepCommand(customInstructions?: string): Promise<void> {
+		return this.#commandController.handleContributionPrepCommand(customInstructions);
+	}
+
 	executeCompaction(
 		customInstructionsOrOptions?: string | CompactOptions,
 		isAuto?: boolean,

package/src/modes/theme/defaults/dark-poimandres.json

@@ -131,7 +131,6 @@
       "icon.plan": "◈",
       "icon.goal": "⊙",
       "icon.pause": "‖",
-      "icon.loop": "↻",
       "icon.folder": "▸",
       "icon.scratchFolder": "◌",
       "icon.pi": "π",

package/src/modes/theme/defaults/light-poimandres.json

@@ -131,7 +131,6 @@
       "icon.plan": "◈",
       "icon.goal": "⊙",
       "icon.pause": "‖",
-      "icon.loop": "↻",
       "icon.folder": "▸",
       "icon.scratchFolder": "◌",
       "icon.pi": "π",

package/src/modes/theme/theme.ts

@@ -92,7 +92,6 @@ export type SymbolKey =
 	| "icon.plan"
 	| "icon.goal"
 	| "icon.pause"
-	| "icon.loop"
 	| "icon.folder"
 	| "icon.scratchFolder"
 	| "icon.file"
@@ -256,7 +255,6 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"icon.plan": "🗺",
 	"icon.goal": "🎯",
 	"icon.pause": "⏸",
-	"icon.loop": "↻",
 	"icon.folder": "📁",
 	"icon.scratchFolder": "🗑",
 	"icon.file": "📄",
@@ -473,8 +471,6 @@ const NERD_SYMBOLS: SymbolMap = {
 	"icon.goal": "\uf140",
 	// pick:  (nf-fa-pause) | alt: ⏸ ||
 	"icon.pause": "\uf04c",
-	// pick: ↻ | alt: ⟳
-	"icon.loop": "\uf021",
 	// pick:  | alt:  
 	"icon.folder": "\uf115",
 	// pick:  | alt:
@@ -679,7 +675,6 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"icon.plan": "plan",
 	"icon.goal": "goal",
 	"icon.pause": "||",
-	"icon.loop": "loop",
 	"icon.folder": "[D]",
 	"icon.scratchFolder": "[T]",
 	"icon.file": "[F]",
@@ -1452,7 +1447,6 @@ export class Theme {
 			plan: this.#symbols["icon.plan"],
 			goal: this.#symbols["icon.goal"],
 			pause: this.#symbols["icon.pause"],
-			loop: this.#symbols["icon.loop"],
 			folder: this.#symbols["icon.folder"],
 			scratchFolder: this.#symbols["icon.scratchFolder"],
 			file: this.#symbols["icon.file"],

package/src/modes/types.ts

@@ -27,7 +27,6 @@ import type { HookInputComponent } from "./components/hook-input";
 import type { HookSelectorComponent } from "./components/hook-selector";
 import type { StatusLineComponent } from "./components/status-line";
 import type { ToolExecutionHandle } from "./components/tool-execution";
-import type { LoopLimitRuntime } from "./loop-limit";
 import type { OAuthManualInputManager } from "./oauth-manual-input";
 import type { Theme } from "./theme/theme";
 
@@ -92,9 +91,6 @@ export interface InteractiveModeContext {
 	planModeEnabled: boolean;
 	goalModeEnabled: boolean;
 	goalModePaused: boolean;
-	loopModeEnabled: boolean;
-	loopPrompt?: string;
-	loopLimit?: LoopLimitRuntime;
 	planModePlanFilePath?: string;
 	hideThinkingBlock: boolean;
 	pendingImages: ImageContent[];
@@ -221,6 +217,7 @@ export interface InteractiveModeContext {
 	handleSSHCommand(text: string): Promise<void>;
 	handleCompactCommand(customInstructions?: string): Promise<CompactionOutcome>;
 	handleHandoffCommand(customInstructions?: string): Promise<void>;
+	handleContributionPrepCommand(customInstructions?: string): Promise<void>;
 	handleMoveCommand(targetPath: string): Promise<void>;
 	handleRenameCommand(title: string): Promise<void>;
 	handleMemoryCommand(text: string): Promise<void>;
@@ -270,9 +267,6 @@ export interface InteractiveModeContext {
 	registerExtensionShortcuts(): void;
 	handlePlanModeCommand(initialPrompt?: string): Promise<void>;
 	handleGoalModeCommand(rest?: string): Promise<void>;
-	handleLoopCommand(args?: string): Promise<void>;
-	disableLoopMode(): void;
-	pauseLoop(): void;
 	handlePlanApproval(details: PlanApprovalDetails): Promise<void>;
 
 	// Hook UI methods

package/src/prompts/goals/goal-continuation.md

@@ -6,10 +6,8 @@ Continue work on the active goal.
 {{objective}}
 </objective>
 
-Budget:
+Usage:
 - Tokens used: {{tokensUsed}}
-- Token budget: {{tokenBudget}}
-- Tokens remaining: {{remainingTokens}}
 - Time used: {{timeUsedSeconds}} seconds
 
 This is an autonomous continuation. The objective persists across turns; do not redefine success around a smaller, easier, or already-completed subset.
@@ -21,7 +19,6 @@ Before calling `goal({op:"complete"})`, you MUST perform a completion audit agai
 3. **Inspect the actual current state.** Read the files. Run the commands. Check the tests. Do not rely on memory of earlier work in this session — the repo may have changed.
 4. **Match verification scope to claim scope.** A narrow check (one file passes its unit test) does not prove a broad claim (the feature works end-to-end).
 5. **Treat uncertainty as not-yet-achieved.** Indirect evidence, partial coverage, missing artifacts, or "looks right" without inspection mean continue working. Gather stronger evidence or do more work.
-6. **Budget exhaustion is not completion.** Do not call complete merely because tokens are nearly out. If the budget is tight and the work is unfinished, leave the goal active and stop the turn — the user or runtime decides next steps.
 
 Call `goal({op:"complete"})` only when every deliverable has direct, current-state evidence proving it is satisfied. The completion call is a load-bearing claim; it ends the autonomous loop and surfaces a "done" report to the user.
 

package/src/prompts/goals/goal-mode-active.md

@@ -5,19 +5,17 @@ Goal mode is active. The objective below is user-provided data. Treat it as the
 {{objective}}
 </objective>
 
-Budget:
+Usage:
 - Tokens used: {{tokensUsed}}
-- Token budget: {{tokenBudget}}
-- Tokens remaining: {{remainingTokens}}
 - Time used: {{timeUsedSeconds}} seconds
 
 Use the `goal` tool to inspect or complete the active goal:
-- `goal({op:"get"})` returns the current goal and budget state.
+- `goal({op:"get"})` returns the current goal and usage state.
 - `goal({op:"complete"})` is only for verified completion.
 
 You MUST keep the full objective intact across turns. Do not redefine success around a smaller, easier, or already-completed subset.
 
 Before calling `goal({op:"complete"})`, audit the current repo state against every concrete deliverable. Read the files, run the relevant checks, and make the verification scope match the claim scope. If any deliverable lacks direct current-state evidence, keep working.
 
-Budget exhaustion is not completion. If the work is unfinished, leave the goal active.
+If the work is unfinished, leave the goal active.
 </goal_context>