@gajae-code/coding-agent 0.7.1 → 0.7.3

package/src/lsp/config.ts

@@ -88,6 +88,7 @@ function normalizeServerConfig(name: string, config: RawServerConfig): ServerCon
 		: isRecord(config.initializationOptions)
 			? config.initializationOptions
 			: undefined;
+	const supersedes = normalizeStringArray(config.supersedes);
 
 	return {
 		...config,
@@ -96,6 +97,7 @@ function normalizeServerConfig(name: string, config: RawServerConfig): ServerCon
 		fileTypes,
 		rootMarkers,
 		...(initOptions ? { initOptions } : {}),
+		...(supersedes ? { supersedes } : {}),
 	};
 }
 
@@ -144,6 +146,18 @@ function mergeServers(
 	return merged;
 }
 
+function applyServerPrecedence(servers: Record<string, ServerConfig>): Record<string, ServerConfig> {
+	const suppressed = new Set<string>();
+	for (const config of Object.values(servers)) {
+		for (const serverName of config.supersedes ?? []) {
+			suppressed.add(serverName);
+		}
+	}
+	if (suppressed.size === 0) return servers;
+
+	return Object.fromEntries(Object.entries(servers).filter(([name]) => !suppressed.has(name)));
+}
+
 function applyRuntimeDefaults(servers: Record<string, ServerConfig>): Record<string, ServerConfig> {
 	const updated: Record<string, ServerConfig> = { ...servers };
 
@@ -422,9 +436,8 @@ export function loadConfig(cwd: string): LspConfig {
 			detected[name] = { ...config, resolvedCommand: resolved };
 		}
 
-		return { servers: detected, idleTimeoutMs };
+		return { servers: applyServerPrecedence(detected), idleTimeoutMs };
 	}
-
 	// Merge overrides with defaults and filter to available servers
 	const mergedWithRuntime = applyRuntimeDefaults(mergedServers);
 	const available: Record<string, ServerConfig> = {};
@@ -437,7 +450,7 @@ export function loadConfig(cwd: string): LspConfig {
 		available[name] = { ...config, resolvedCommand: resolved };
 	}
 
-	return { servers: available, idleTimeoutMs };
+	return { servers: applyServerPrecedence(available), idleTimeoutMs };
 }
 
 // =============================================================================

package/src/lsp/defaults.json

@@ -342,6 +342,13 @@
 		"fileTypes": [".php"],
 		"rootMarkers": ["composer.json", ".phpactor.json", ".phpactor.yml"]
 	},
+	"csharp-ls": {
+		"command": "csharp-ls",
+		"args": [],
+		"fileTypes": [".cs", ".csx"],
+		"rootMarkers": ["*.sln", "*.slnx", "*.csproj", "global.json"],
+		"supersedes": ["omnisharp"]
+	},
 	"omnisharp": {
 		"command": "omnisharp",
 		"args": ["-z", "--hostPID", "$PID", "--encoding", "utf-8", "--languageserver"],

package/src/lsp/types.ts

@@ -358,6 +358,8 @@ export interface ServerConfig {
 	/** Per-server warmup timeout in milliseconds. Overrides the global WARMUP_TIMEOUT_MS for this server during startup. */
 	warmupTimeoutMs?: number;
 	capabilities?: ServerCapabilities;
+	/** Names of lower-precedence servers to drop when this server is available. */
+	supersedes?: string[];
 	/** If true, this is a linter/formatter server (e.g., Biome) - used only for diagnostics/actions, not type intelligence */
 	isLinter?: boolean;
 	/** Resolved absolute path to the command binary (set during config loading) */

package/src/modes/bridge/bridge-mode.ts

@@ -153,6 +153,14 @@ function jsonResponse(status: number, body: unknown): Response {
 	});
 }
 
+function isBridgeControllerOwner(options: BridgeFetchHandlerOptions, ownerToken: string): boolean {
+	if (!ownerToken) return false;
+	const ownerTokens = [options.permissionBroker?.ownerToken, options.uiBroker?.ownerToken].filter(
+		(token): token is string => typeof token === "string" && token.length > 0,
+	);
+	return ownerTokens.length > 0 && ownerTokens.every(token => token === ownerToken);
+}
+
 function parseBridgeScopes(value: string | undefined): readonly BridgeCommandScope[] {
 	if (!value?.trim()) return DEFAULT_BRIDGE_SCOPES;
 	const allowed = new Set(BRIDGE_COMMAND_SCOPES);
@@ -425,6 +433,9 @@ export function createBridgeFetchHandler(options: BridgeFetchHandlerOptions): (r
 				"answer" in payload &&
 				(correlationId === (payload as RpcWorkflowGateResponse).gate_id || correlationId.startsWith("wg_"))
 			) {
+				if (!isBridgeControllerOwner(options, ownerToken)) {
+					return jsonResponse(403, { status: "rejected", code: "not_controller" });
+				}
 				try {
 					const resolution = await options.unattendedControlPlane?.resolveGate({
 						gate_id: (payload as RpcWorkflowGateResponse).gate_id,

package/src/modes/components/custom-editor.ts

@@ -18,6 +18,7 @@ type ConfigurableEditorAction = Extract<
 	| "app.editor.external"
 	| "app.history.search"
 	| "app.message.dequeue"
+	| "app.message.followUp"
 	| "app.message.queue"
 	| "app.clipboard.pasteImage"
 	| "app.clipboard.copyPrompt"
@@ -40,6 +41,7 @@ const CONFIGURABLE_EDITOR_ACTIONS = [
 	"app.thinking.toggle",
 	"app.editor.external",
 	"app.history.search",
+	"app.message.followUp",
 	"app.message.queue",
 	"app.message.dequeue",
 	"app.clipboard.pasteImage",

package/src/modes/components/footer.ts

@@ -8,6 +8,7 @@ import { shortenPath } from "../../tools/render-utils";
 import * as git from "../../utils/git";
 import { sanitizeStatusText } from "../shared";
 import { getContextUsageLevel, getContextUsageThemeColor } from "./status-line/context-thresholds";
+import { resolveCurrentBranch } from "./status-line/git-utils";
 
 /**
  * Footer component that shows pwd, token stats, and context usage
@@ -103,9 +104,7 @@ export class FooterComponent implements Component {
 			return this.#cachedBranch;
 		}
 
-		const headState = git.head.resolveSync(getProjectDir());
-		this.#cachedBranch =
-			headState === null ? null : headState.kind === "ref" ? (headState.branchName ?? headState.ref) : "detached";
+		this.#cachedBranch = resolveCurrentBranch(getProjectDir()).branch;
 		return this.#cachedBranch;
 	}
 

package/src/modes/components/model-selector.ts

@@ -221,6 +221,8 @@ export class ModelSelectorComponent extends Container {
 	#scopedModels: ReadonlyArray<ScopedModelItem>;
 	#temporaryOnly: boolean;
 	#currentModel?: Model;
+	#currentThinkingLevel?: ThinkingLevel;
+	#activeModelProfile?: string;
 	#isFastForProvider: (provider?: string) => boolean = () => false;
 	#isFastForSubagentProvider: (provider?: string) => boolean = () => false;
 	#pendingActionItem?: ModelItem | CanonicalModelItem;
@@ -258,6 +260,8 @@ export class ModelSelectorComponent extends Container {
 			sessionId?: string;
 			isFastForProvider?: (provider?: string) => boolean;
 			isFastForSubagentProvider?: (provider?: string) => boolean;
+			currentThinkingLevel?: ThinkingLevel;
+			activeModelProfile?: string;
 		},
 	) {
 		super();
@@ -271,6 +275,8 @@ export class ModelSelectorComponent extends Container {
 		this.#temporaryOnly = options?.temporaryOnly ?? false;
 		this.#authSessionId = options?.sessionId;
 		this.#currentModel = _currentModel;
+		this.#currentThinkingLevel = options?.currentThinkingLevel;
+		this.#activeModelProfile = options?.activeModelProfile;
 		this.#isFastForProvider = options?.isFastForProvider ?? (() => false);
 		this.#isFastForSubagentProvider = options?.isFastForSubagentProvider ?? (() => false);
 		const initialSearchInput = options?.initialSearchInput;
@@ -367,6 +373,12 @@ export class ModelSelectorComponent extends Container {
 				};
 			}
 		}
+		if (this.#activeModelProfile && this.#currentModel) {
+			this.#roles.default = {
+				model: this.#currentModel,
+				thinkingLevel: this.#currentThinkingLevel ?? ThinkingLevel.Inherit,
+			};
+		}
 	}
 
 	#sortModels(models: ModelItem[]): void {

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

@@ -1,3 +1,6 @@
+import type { GitHeadState } from "../../../utils/git";
+import * as git from "../../../utils/git";
+
 /**
  * Extract "owner/repo" from a GitHub remote URL.
  * Handles HTTPS, SSH (scp-style), and git:// protocols.
@@ -40,3 +43,25 @@ export function canReuseCachedPr(
 ): boolean {
 	return cachedPr !== undefined && currentContext !== null && isSamePrCacheContext(cachedContext, currentContext);
 }
+
+export interface CurrentBranchState {
+	readonly branch: string | null;
+	readonly repoId: string | null;
+}
+
+export function resolveCurrentBranch(
+	cwd: string,
+	resolveHead: (cwd: string) => GitHeadState | null = git.head.resolveSync,
+): CurrentBranchState {
+	try {
+		const head = resolveHead(cwd);
+		if (!head) return { branch: null, repoId: null };
+		return {
+			branch: head.kind === "ref" ? (head.branchName ?? head.ref) : "detached",
+			repoId: head.headPath,
+		};
+	} catch (error) {
+		if (error instanceof Error) return { branch: null, repoId: null };
+		throw error;
+	}
+}

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

@@ -20,6 +20,7 @@ import {
 	createPrCacheContext,
 	isSamePrCacheContext,
 	type PrCacheContext,
+	resolveCurrentBranch,
 } from "./status-line/git-utils";
 import { getPreset } from "./status-line/presets";
 import { renderSegment, type SegmentContext } from "./status-line/segments";
@@ -303,19 +304,13 @@ export class StatusLineComponent implements Component {
 		this.#cachedPrContext = undefined;
 	}
 	#getCurrentBranch(): string | null {
-		const head = git.head.resolveSync(getProjectDir());
-		const gitHeadPath = head?.headPath ?? null;
-		if (this.#cachedBranch !== undefined && this.#cachedBranchRepoId === gitHeadPath) {
+		const current = resolveCurrentBranch(getProjectDir());
+		if (this.#cachedBranch !== undefined && this.#cachedBranchRepoId === current.repoId) {
 			return this.#cachedBranch;
 		}
 
-		this.#cachedBranchRepoId = gitHeadPath;
-		if (!head) {
-			this.#cachedBranch = null;
-			return null;
-		}
-
-		this.#cachedBranch = head.kind === "ref" ? (head.branchName ?? head.ref) : "detached";
+		this.#cachedBranchRepoId = current.repoId;
+		this.#cachedBranch = current.branch;
 
 		return this.#cachedBranch ?? null;
 	}
@@ -680,7 +675,11 @@ export class StatusLineComponent implements Component {
 		const effectiveSettings = this.#resolveSettings();
 		const separatorDef = getSeparator(effectiveSettings.separator ?? "powerline-thin", theme);
 
-		const bgAnsi = theme.getBgAnsi("statusLineBg");
+		// Use the subtle surface tone (the same elevated background as user-message
+		// bubbles) instead of the heavy `statusLineBg` block, so the rail layers
+		// just above the base background as a quiet zone rather than a solid bar.
+		// Resolving through a semantic slot keeps it correct across every theme.
+		const bgAnsi = theme.getBgAnsi("userMessageBg");
 		const fgAnsi = theme.getFgAnsi("text");
 		const sepAnsi = theme.getFgAnsi("statusLineSep");
 

package/src/modes/components/welcome.ts

@@ -74,9 +74,8 @@ export class WelcomeComponent implements Component {
 	}
 
 	render(termWidth: number): string[] {
-		// Box dimensions - responsive with max width and small-terminal support
-		const maxWidth = 100;
-		const boxWidth = Math.min(maxWidth, Math.max(0, termWidth - 2));
+		// Box dimensions track the live viewport so wide terminals feel intentionally full-screen.
+		const boxWidth = Math.max(0, termWidth - 2);
 		if (boxWidth < 4) {
 			return [];
 		}

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

@@ -201,6 +201,7 @@ export class EventController {
 			this.ctx.statusContainer.clear();
 		}
 		this.#cancelIdleCompaction();
+		this.ctx.updateEditorBorderColor();
 		this.ctx.ensureLoadingAnimation();
 		this.ctx.ui.requestRender();
 	}
@@ -633,6 +634,7 @@ export class EventController {
 		this.#readToolCallArgs.clear();
 		this.#readToolCallAssistantComponents.clear();
 		this.#lastAssistantComponent = undefined;
+		this.ctx.updateEditorBorderColor();
 		this.ctx.ui.requestRender();
 		this.#scheduleIdleCompaction();
 		this.sendCompletionNotification();
@@ -642,6 +644,7 @@ export class EventController {
 		event: Extract<AgentSessionEvent, { type: "auto_compaction_start" }>,
 	): Promise<void> {
 		this.#cancelIdleCompaction();
+		this.ctx.updateEditorBorderColor();
 		this.ctx.autoCompactionEscapeHandler = this.ctx.editor.onEscape;
 		this.ctx.editor.onEscape = () => {
 			this.ctx.session.abortCompaction();
@@ -672,13 +675,20 @@ export class EventController {
 			this.ctx.autoCompactionLoader = undefined;
 			this.ctx.statusContainer.clear();
 		}
+		this.ctx.updateEditorBorderColor();
 		const isHandoffAction = event.action === "handoff";
+		const continuationDisabled = event.continuationSkipReason === "auto_continue_disabled_non_resumable_tail";
 		if (event.aborted) {
 			this.ctx.showStatus(isHandoffAction ? "Auto-handoff cancelled" : "Auto context-full maintenance cancelled");
 		} else if (event.result) {
 			this.ctx.rebuildChatFromMessages();
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
+			if (continuationDisabled && !isHandoffAction) {
+				this.ctx.showStatus("Context overflow recovery skipped: auto_continue_disabled_non_resumable_tail");
+			} else if (event.willRetry && !isHandoffAction) {
+				this.ctx.showStatus("Context overflow maintenance completed");
+			}
 		} else if (event.errorMessage) {
 			this.ctx.showWarning(event.errorMessage);
 		} else if (isHandoffAction) {
@@ -691,6 +701,11 @@ export class EventController {
 		} else if (event.skipped) {
 			// Benign skip: no model selected, no candidate models available, or nothing
 			// to compact yet. Not a failure — suppress the warning.
+			if (continuationDisabled) {
+				this.ctx.showStatus("Context overflow recovery skipped: auto_continue_disabled_non_resumable_tail");
+			} else if (event.willRetry && !isHandoffAction) {
+				this.ctx.showStatus("Context overflow maintenance skipped");
+			}
 		} else {
 			this.ctx.showWarning("Auto context-full maintenance failed; continuing without maintenance");
 		}

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

@@ -745,6 +745,9 @@ export class SelectorController {
 				{
 					...options,
 					sessionId: this.ctx.session.sessionId,
+					currentThinkingLevel: this.ctx.session.thinkingLevel,
+					activeModelProfile:
+						this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default"),
 					isFastForProvider: provider => this.ctx.session.isFastForProvider(provider),
 					isFastForSubagentProvider: provider => this.ctx.session.isFastForSubagentProvider(provider),
 				},

package/src/modes/interactive-mode.ts

@@ -29,7 +29,7 @@ import {
 import { APP_NAME, adjustHsv, getProjectDir, hsvToRgb, isEnoent, logger, postmortem, prompt } from "@gajae-code/utils";
 import chalk from "chalk";
 import { AsyncJobManager } from "../async";
-import { KeybindingsManager } from "../config/keybindings";
+import { type AppKeybinding, KeybindingsManager } from "../config/keybindings";
 import { isSettingsInitialized, type Settings, settings } from "../config/settings";
 import { DEFAULT_GJC_DEFINITION_NAMES } from "../defaults/gjc-defaults";
 import type {
@@ -117,6 +117,24 @@ import type { CompactionQueuedMessage, InteractiveModeContext, SubmittedUserInpu
 import { UiHelpers } from "./utils/ui-helpers";
 
 const INTERACTIVE_ABORT_CLEANUP_TIMEOUT_MS = 5_000;
+const DEFAULT_COMPOSER_PLACEHOLDER = "Type your message...";
+const FRIENDLY_KEY_PARTS: Record<string, string> = {
+	alt: "Alt",
+	cmd: "Command",
+	command: "Command",
+	ctrl: "Control",
+	enter: "Enter",
+	meta: process.platform === "darwin" ? "Command" : "Meta",
+	option: "Option",
+	shift: "Shift",
+};
+
+function formatShortcutForPlaceholder(key: string): string {
+	return key
+		.split("+")
+		.map(part => FRIENDLY_KEY_PARTS[part.toLowerCase()] ?? part)
+		.join("+");
+}
 
 const HINT_SHIMMER_PALETTE: ShimmerPalette = {
 	low: "dim",
@@ -137,11 +155,11 @@ function getShellInputPrefix(isNoContext: boolean): string {
 
 function configureDefaultComposerChrome(editor: CustomEditor): void {
 	editor.setBorderVisible(true);
-	editor.setBorderStyle("sharp");
+	editor.setBorderStyle("round");
 	editor.setClosedBorderBox(true);
 	editor.setPromptGutter(undefined);
 	editor.setInputPrefix(getDefaultInputPrefix());
-	editor.setPlaceholder("Type your message...");
+	editor.setPlaceholder(DEFAULT_COMPOSER_PLACEHOLDER);
 	editor.setPaddingX(1);
 	editor.setTopBorder(undefined);
 }
@@ -550,6 +568,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.addChild(this.hookWidgetContainerAbove);
 		this.ui.addChild(this.editorContainer);
 		this.ui.addChild(this.hookWidgetContainerBelow);
+		this.ui.setBottomPinnedComponent(this.statusLine);
 		this.ui.setFocus(this.editor);
 
 		this.#inputController.setupKeyHandlers();
@@ -903,6 +922,31 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.editor.setMaxHeight(this.#computeEditorMaxHeight());
 	}
 
+	#isPromptDeliveryBusy(): boolean {
+		return this.session.isStreaming || this.session.isCompacting;
+	}
+
+	#getFirstKeyForAction(action: AppKeybinding): string | undefined {
+		return this.keybindings.getKeys(action)[0];
+	}
+
+	#getMessageQueueShortcut(): string | undefined {
+		const preferredAction: AppKeybinding =
+			process.platform === "darwin" ? "app.message.followUp" : "app.message.queue";
+		const fallbackAction: AppKeybinding =
+			process.platform === "darwin" ? "app.message.queue" : "app.message.followUp";
+		return this.#getFirstKeyForAction(preferredAction) ?? this.#getFirstKeyForAction(fallbackAction);
+	}
+
+	#getComposerPlaceholder(): string {
+		if (!this.#isPromptDeliveryBusy()) return DEFAULT_COMPOSER_PLACEHOLDER;
+		const enterAction = this.settings.get("busyPromptMode") === "steer" ? "Steering" : "Message Queueing";
+		const parts = [`Enter: ${enterAction}`];
+		const queueKey = this.#getMessageQueueShortcut();
+		if (queueKey) parts.push(`${formatShortcutForPlaceholder(queueKey)}: Message Queueing`);
+		return `${DEFAULT_COMPOSER_PLACEHOLDER} ${parts.join(" · ")}`;
+	}
+
 	updateEditorChrome(): void {
 		if (this.isBashMode) {
 			this.editor.borderColor = this.isBashNoContext
@@ -926,6 +970,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		if (!this.isBashMode) {
 			this.editor.setInputPrefix(getDefaultInputPrefix());
 		}
+		this.editor.setPlaceholder(this.#getComposerPlaceholder());
 		this.#setComposerTopBorder();
 		this.ui.requestRender();
 	}

package/src/modes/shared/agent-wire/scopes.ts

@@ -73,7 +73,7 @@ const RPC_COMMAND_SCOPE_REGISTRY: Record<RpcCommandType, BridgeCommandScope> = {
 	get_login_providers: "admin",
 	login: "admin",
 	negotiate_unattended: "control",
-	workflow_gate_response: "prompt",
+	workflow_gate_response: "control",
 };
 
 export const RPC_COMMAND_TYPES: readonly RpcCommandType[] = Object.keys(RPC_COMMAND_SCOPE_REGISTRY) as RpcCommandType[];

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

@@ -0,0 +1,99 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/gajae-code/main/packages/coding-agent/theme-schema.json",
+	"name": "gruvbox-dark",
+	"vars": {
+		"bgHard": "#1d2021",
+		"surface": "#32302f",
+		"surfaceBright": "#504945",
+		"borderNeutral": "#504945",
+		"borderSubtle": "#3c3836",
+		"fg": "#ebdbb2",
+		"muted": "#a89984",
+		"dim": "#7c6f64",
+		"gray": "#928374",
+		"red": "#fb4934",
+		"green": "#b8bb26",
+		"yellow": "#fabd2f",
+		"blue": "#83a598",
+		"purple": "#d3869b",
+		"aqua": "#8ec07c",
+		"orange": "#fe8019",
+		"diffRemovalRed": "#cc241d"
+	},
+	"colors": {
+		"accent": "orange",
+		"border": "borderNeutral",
+		"borderAccent": "orange",
+		"borderMuted": "borderSubtle",
+		"success": "green",
+		"error": "red",
+		"warning": "yellow",
+		"muted": "muted",
+		"dim": "dim",
+		"text": "fg",
+		"thinkingText": "muted",
+		"selectedBg": "surfaceBright",
+		"userMessageBg": "surface",
+		"userMessageText": "fg",
+		"customMessageBg": "surface",
+		"customMessageText": "fg",
+		"customMessageLabel": "orange",
+		"toolPendingBg": "surface",
+		"toolSuccessBg": "#283626",
+		"toolErrorBg": "#3c2323",
+		"toolTitle": "fg",
+		"toolOutput": "muted",
+		"mdHeading": "yellow",
+		"mdLink": "blue",
+		"mdLinkUrl": "muted",
+		"mdCode": "aqua",
+		"mdCodeBlock": "fg",
+		"mdCodeBlockBorder": "borderNeutral",
+		"mdQuote": "muted",
+		"mdQuoteBorder": "borderNeutral",
+		"mdHr": "dim",
+		"mdListBullet": "orange",
+		"toolDiffAdded": "green",
+		"toolDiffRemoved": "diffRemovalRed",
+		"toolDiffContext": "muted",
+		"syntaxComment": "gray",
+		"syntaxKeyword": "red",
+		"syntaxFunction": "green",
+		"syntaxVariable": "blue",
+		"syntaxString": "green",
+		"syntaxNumber": "purple",
+		"syntaxType": "yellow",
+		"syntaxOperator": "aqua",
+		"syntaxPunctuation": "muted",
+		"thinkingOff": "dim",
+		"thinkingMinimal": "muted",
+		"thinkingLow": "aqua",
+		"thinkingMedium": "yellow",
+		"thinkingHigh": "orange",
+		"thinkingXhigh": "red",
+		"bashMode": "green",
+		"pythonMode": "yellow",
+		"statusLineBg": "bgHard",
+		"statusLineSep": "dim",
+		"statusLineModel": "orange",
+		"statusLinePath": "blue",
+		"statusLineGitClean": "green",
+		"statusLineGitDirty": "yellow",
+		"statusLineContext": "aqua",
+		"statusLineSpend": "yellow",
+		"statusLineStaged": "green",
+		"statusLineDirty": "yellow",
+		"statusLineUntracked": "diffRemovalRed",
+		"statusLineOutput": "fg",
+		"statusLineCost": "orange",
+		"statusLineSubagents": "purple"
+	},
+	"export": {
+		"pageBg": "#1d2021",
+		"cardBg": "#282828",
+		"infoBg": "#32302f"
+	},
+	"symbols": {
+		"preset": "unicode"
+	}
+}

package/src/modes/theme/defaults/index.ts

@@ -1,6 +1,7 @@
 import blue_crab from "./blue-crab.json" with { type: "json" };
 import claude_code from "./claude-code.json" with { type: "json" };
 import codex from "./codex.json" with { type: "json" };
+import gruvbox_dark from "./gruvbox-dark.json" with { type: "json" };
 import opencode from "./opencode.json" with { type: "json" };
 import red_claw from "./red-claw.json" with { type: "json" };
 
@@ -8,6 +9,7 @@ export const defaultThemes = {
 	"blue-crab": blue_crab,
 	"claude-code": claude_code,
 	codex,
+	"gruvbox-dark": gruvbox_dark,
 	opencode,
 	"red-claw": red_claw,
 };

package/src/modes/utils/context-usage.ts

@@ -204,14 +204,14 @@ export function computeContextBreakdown(
 	if (contextWindow > 0) {
 		const compactionSettings = session.settings.getGroup("compaction") as CompactionSettings;
 		if (compactionSettings.enabled && compactionSettings.strategy !== "off") {
-			const threshold = resolveThresholdTokens(contextWindow, compactionSettings, model?.maxTokens ?? 0);
+			const threshold = resolveThresholdTokens(contextWindow, compactionSettings);
 			autoCompactBufferTokens = Math.max(0, contextWindow - threshold);
 		} else {
 			autoCompactBufferTokens = 0;
 		}
 		// Even when fully disabled, fall back to a sensible reserve floor for display.
 		if (autoCompactBufferTokens === 0 && compactionSettings.enabled) {
-			autoCompactBufferTokens = effectiveReserveTokens(contextWindow, compactionSettings, model?.maxTokens ?? 0);
+			autoCompactBufferTokens = effectiveReserveTokens(contextWindow, compactionSettings);
 		}
 	}
 	autoCompactBufferTokens = Math.min(autoCompactBufferTokens, Math.max(0, contextWindow - usedTokens));

package/src/notifications/attachment-registry.ts

@@ -0,0 +1,23 @@
+/**
+ * Process-wide registry mapping a session id to a sink that delivers a local
+ * file to the session's connected Telegram chat as a document. Registered by
+ * the notifications extension; consumed by the telegram_send tool.
+ */
+
+/** Delivers a local file to the session's Telegram chat. */
+export type TelegramFileSink = (file: { path: string; caption?: string }) => Promise<{ ok: boolean; error?: string }>;
+
+const sinks = new Map<string, TelegramFileSink>();
+
+/** Register `sink` for `sessionId`. Returns a disposer that clears it. */
+export function registerTelegramFileSink(sessionId: string, sink: TelegramFileSink): () => void {
+	sinks.set(sessionId, sink);
+	return () => {
+		if (sinks.get(sessionId) === sink) sinks.delete(sessionId);
+	};
+}
+
+/** The Telegram file sink for `sessionId`, if one is registered. */
+export function getTelegramFileSink(sessionId: string): TelegramFileSink | undefined {
+	return sinks.get(sessionId);
+}