@oh-my-pi/pi-coding-agent 13.11.1 → 13.12.3

package/src/memories/storage.ts

@@ -34,9 +34,16 @@ export interface GlobalClaim {
 
 const STAGE1_KIND = "memory_stage1";
 const GLOBAL_KIND = "memory_consolidate_global";
-const GLOBAL_KEY = "global";
 const DEFAULT_RETRY_REMAINING = 3;
 
+/**
+ * Per-project job key so Phase 2 consolidation is isolated to a single cwd.
+ * Previously a single "global" key caused cross-project memory contamination.
+ */
+function globalJobKey(cwd: string): string {
+	return `global:${cwd}`;
+}
+
 export function openMemoryDb(dbPath: string): Database {
 	const db = new Database(dbPath);
 	db.exec(`
@@ -119,11 +126,11 @@ VALUES (?, ?, 'pending', ?, 0, 0)
 `).run(STAGE1_KIND, threadId, DEFAULT_RETRY_REMAINING);
 }
 
-function ensureGlobalJob(db: Database): void {
+function ensureGlobalJob(db: Database, cwd: string): void {
 	db.prepare(`
 INSERT OR IGNORE INTO jobs (kind, job_key, status, retry_remaining, input_watermark, last_success_watermark)
 VALUES (?, ?, 'pending', ?, 0, 0)
-`).run(GLOBAL_KIND, GLOBAL_KEY, DEFAULT_RETRY_REMAINING);
+`).run(GLOBAL_KIND, globalJobKey(cwd), DEFAULT_RETRY_REMAINING);
 }
 
 export function claimStage1Jobs(
@@ -240,10 +247,11 @@ WHERE kind = ? AND job_key = ?
 export function enqueueGlobalWatermark(
 	db: Database,
 	sourceUpdatedAt: number,
+	cwd: string,
 	params?: { forceDirtyWhenNotAdvanced?: boolean },
 ): void {
 	const forceDirtyWhenNotAdvanced = params?.forceDirtyWhenNotAdvanced ?? false;
-	ensureGlobalJob(db);
+	ensureGlobalJob(db, cwd);
 	db.prepare(`
 UPDATE jobs
 SET
@@ -283,7 +291,7 @@ WHERE kind = ? AND job_key = ?
 		sourceUpdatedAt,
 		forceDirtyWhenNotAdvanced ? 1 : 0,
 		GLOBAL_KIND,
-		GLOBAL_KEY,
+		globalJobKey(cwd),
 	);
 }
 
@@ -297,9 +305,10 @@ export function markStage1SucceededWithOutput(
 		rolloutSummary: string;
 		rolloutSlug: string | null;
 		nowSec: number;
+		cwd: string;
 	},
 ): boolean {
-	const { threadId, ownershipToken, sourceUpdatedAt, rawMemory, rolloutSummary, rolloutSlug, nowSec } = params;
+	const { threadId, ownershipToken, sourceUpdatedAt, rawMemory, rolloutSummary, rolloutSlug, nowSec, cwd } = params;
 	const tx = db.transaction(() => {
 		const matched = db
 			.prepare(
@@ -327,7 +336,7 @@ ON CONFLICT(thread_id) DO UPDATE SET
 WHERE excluded.source_updated_at >= stage1_outputs.source_updated_at
 `).run(threadId, sourceUpdatedAt, rawMemory, rolloutSummary, rolloutSlug, nowSec);
 
-		enqueueGlobalWatermark(db, sourceUpdatedAt, { forceDirtyWhenNotAdvanced: true });
+		enqueueGlobalWatermark(db, sourceUpdatedAt, cwd, { forceDirtyWhenNotAdvanced: true });
 		return true;
 	});
 	return tx() as boolean;
@@ -335,9 +344,9 @@ WHERE excluded.source_updated_at >= stage1_outputs.source_updated_at
 
 export function markStage1SucceededNoOutput(
 	db: Database,
-	params: { threadId: string; ownershipToken: string; sourceUpdatedAt: number; nowSec: number },
+	params: { threadId: string; ownershipToken: string; sourceUpdatedAt: number; nowSec: number; cwd: string },
 ): boolean {
-	const { threadId, ownershipToken, sourceUpdatedAt, nowSec } = params;
+	const { threadId, ownershipToken, sourceUpdatedAt, nowSec, cwd } = params;
 	const tx = db.transaction(() => {
 		const matched = db
 			.prepare(
@@ -354,7 +363,7 @@ WHERE kind = ? AND job_key = ? AND ownership_token = ?
 `).run(nowSec, STAGE1_KIND, threadId, ownershipToken);
 
 		db.prepare("DELETE FROM stage1_outputs WHERE thread_id = ?").run(threadId);
-		enqueueGlobalWatermark(db, sourceUpdatedAt, { forceDirtyWhenNotAdvanced: true });
+		enqueueGlobalWatermark(db, sourceUpdatedAt, cwd, { forceDirtyWhenNotAdvanced: true });
 		return true;
 	});
 	return tx() as boolean;
@@ -379,15 +388,16 @@ WHERE kind = ? AND job_key = ? AND status = 'running' AND ownership_token = ?
 
 export function tryClaimGlobalPhase2Job(
 	db: Database,
-	params: { workerId: string; leaseSeconds: number; nowSec: number },
+	params: { workerId: string; leaseSeconds: number; nowSec: number; cwd: string },
 ): { kind: "claimed"; claim: GlobalClaim } | { kind: "skipped_not_dirty" } | { kind: "skipped_running" } {
-	const { workerId, leaseSeconds, nowSec } = params;
-	ensureGlobalJob(db);
+	const { workerId, leaseSeconds, nowSec, cwd } = params;
+	const jobKey = globalJobKey(cwd);
+	ensureGlobalJob(db, cwd);
 	const pre = db
 		.prepare(
 			"SELECT status, lease_until, input_watermark, last_success_watermark, retry_at, retry_remaining FROM jobs WHERE kind = ? AND job_key = ?",
 		)
-		.get(GLOBAL_KIND, GLOBAL_KEY) as
+		.get(GLOBAL_KIND, jobKey) as
 		| {
 				status: string;
 				lease_until: number | null;
@@ -410,11 +420,11 @@ WHERE kind = ? AND job_key = ?
 	AND retry_remaining > 0
 	AND (retry_at IS NULL OR retry_at <= ?)
 `)
-		.run(workerId, ownershipToken, nowSec, nowSec + leaseSeconds, GLOBAL_KIND, GLOBAL_KEY, nowSec, nowSec);
+		.run(workerId, ownershipToken, nowSec, nowSec + leaseSeconds, GLOBAL_KIND, jobKey, nowSec, nowSec);
 	if (Number(claimed.changes ?? 0) > 0) {
 		const row = db
 			.prepare("SELECT input_watermark FROM jobs WHERE kind = ? AND job_key = ? AND ownership_token = ?")
-			.get(GLOBAL_KIND, GLOBAL_KEY, ownershipToken) as { input_watermark: number | null } | undefined;
+			.get(GLOBAL_KIND, jobKey, ownershipToken) as { input_watermark: number | null } | undefined;
 		return {
 			kind: "claimed",
 			claim: {
@@ -443,7 +453,7 @@ WHERE kind = ? AND job_key = ?
 		.prepare(
 			"SELECT status, lease_until, input_watermark, last_success_watermark, retry_at, retry_remaining FROM jobs WHERE kind = ? AND job_key = ?",
 		)
-		.get(GLOBAL_KIND, GLOBAL_KEY) as
+		.get(GLOBAL_KIND, jobKey) as
 		| {
 				status: string;
 				lease_until: number | null;
@@ -463,30 +473,34 @@ WHERE kind = ? AND job_key = ?
 
 export function heartbeatGlobalJob(
 	db: Database,
-	params: { ownershipToken: string; leaseSeconds: number; nowSec: number },
+	params: { ownershipToken: string; leaseSeconds: number; nowSec: number; cwd: string },
 ): boolean {
-	const { ownershipToken, leaseSeconds, nowSec } = params;
+	const { ownershipToken, leaseSeconds, nowSec, cwd } = params;
 	const result = db
 		.prepare(`
 UPDATE jobs
 SET lease_until = ?
 WHERE kind = ? AND job_key = ? AND status = 'running' AND ownership_token = ?
 `)
-		.run(nowSec + leaseSeconds, GLOBAL_KIND, GLOBAL_KEY, ownershipToken);
+		.run(nowSec + leaseSeconds, GLOBAL_KIND, globalJobKey(cwd), ownershipToken);
 	return Number(result.changes ?? 0) > 0;
 }
 
-export function listStage1OutputsForGlobal(db: Database, limit: number): Stage1OutputRow[] {
+// Filter by cwd so each project only consolidates its own thread outputs.
+// Before this filter existed, whichever project ran Phase 2 first got every
+// project's data written into its memory directory (see #369).
+export function listStage1OutputsForGlobal(db: Database, limit: number, cwd: string): Stage1OutputRow[] {
 	const rows = db
 		.prepare(`
 SELECT o.thread_id, o.source_updated_at, o.raw_memory, o.rollout_summary, o.rollout_slug, o.generated_at, t.cwd
 FROM stage1_outputs o
 LEFT JOIN threads t ON t.id = o.thread_id
-WHERE TRIM(COALESCE(o.raw_memory, '')) != '' OR TRIM(COALESCE(o.rollout_summary, '')) != ''
+WHERE (TRIM(COALESCE(o.raw_memory, '')) != '' OR TRIM(COALESCE(o.rollout_summary, '')) != '')
+  AND t.cwd = ?
 ORDER BY o.source_updated_at DESC
 LIMIT ?
 `)
-		.all(limit) as Array<{
+		.all(cwd, limit) as Array<{
 		thread_id: string;
 		source_updated_at: number;
 		raw_memory: string;
@@ -508,9 +522,9 @@ LIMIT ?
 
 export function markGlobalPhase2Succeeded(
 	db: Database,
-	params: { ownershipToken: string; newWatermark: number; nowSec: number },
+	params: { ownershipToken: string; newWatermark: number; nowSec: number; cwd: string },
 ): boolean {
-	const { ownershipToken, newWatermark, nowSec } = params;
+	const { ownershipToken, newWatermark, nowSec, cwd } = params;
 	const result = db
 		.prepare(`
 UPDATE jobs
@@ -523,15 +537,15 @@ SET status = 'done', finished_at = ?, lease_until = NULL, retry_at = NULL,
 	END
 WHERE kind = ? AND job_key = ? AND status = 'running' AND ownership_token = ?
 `)
-		.run(nowSec, newWatermark, newWatermark, newWatermark, GLOBAL_KIND, GLOBAL_KEY, ownershipToken);
+		.run(nowSec, newWatermark, newWatermark, newWatermark, GLOBAL_KIND, globalJobKey(cwd), ownershipToken);
 	return Number(result.changes ?? 0) > 0;
 }
 
 export function markGlobalPhase2Failed(
 	db: Database,
-	params: { ownershipToken: string; retryDelaySeconds: number; reason: string; nowSec: number },
+	params: { ownershipToken: string; retryDelaySeconds: number; reason: string; nowSec: number; cwd: string },
 ): boolean {
-	const { ownershipToken, retryDelaySeconds, reason, nowSec } = params;
+	const { ownershipToken, retryDelaySeconds, reason, nowSec, cwd } = params;
 	const result = db
 		.prepare(`
 UPDATE jobs
@@ -540,15 +554,15 @@ SET status = 'error', finished_at = ?, lease_until = NULL, retry_at = ?,
 	last_error = ?
 WHERE kind = ? AND job_key = ? AND status = 'running' AND ownership_token = ?
 `)
-		.run(nowSec, nowSec + retryDelaySeconds, reason, GLOBAL_KIND, GLOBAL_KEY, ownershipToken);
+		.run(nowSec, nowSec + retryDelaySeconds, reason, GLOBAL_KIND, globalJobKey(cwd), ownershipToken);
 	return Number(result.changes ?? 0) > 0;
 }
 
 export function markGlobalPhase2FailedUnowned(
 	db: Database,
-	params: { retryDelaySeconds: number; reason: string; nowSec: number },
+	params: { retryDelaySeconds: number; reason: string; nowSec: number; cwd: string },
 ): boolean {
-	const { retryDelaySeconds, reason, nowSec } = params;
+	const { retryDelaySeconds, reason, nowSec, cwd } = params;
 	const result = db
 		.prepare(`
 UPDATE jobs
@@ -558,6 +572,6 @@ SET status = 'error', finished_at = ?, lease_until = NULL, retry_at = ?,
 WHERE kind = ? AND job_key = ? AND status = 'running'
 	AND (ownership_token IS NULL OR lease_until IS NULL OR lease_until <= ?)
 `)
-		.run(nowSec, nowSec + retryDelaySeconds, reason, GLOBAL_KIND, GLOBAL_KEY, nowSec);
+		.run(nowSec, nowSec + retryDelaySeconds, reason, GLOBAL_KIND, globalJobKey(cwd), nowSec);
 	return Number(result.changes ?? 0) > 0;
 }

package/src/modes/components/agent-dashboard.ts

@@ -35,7 +35,12 @@ import { isEnoent } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import { getConfigDirs } from "../../config";
 import type { ModelRegistry } from "../../config/model-registry";
-import { formatModelString, isDefaultModelAlias, resolveModelOverride } from "../../config/model-resolver";
+import {
+	formatModelString,
+	resolveAgentModelPatterns,
+	resolveConfiguredModelPatterns,
+	resolveModelOverride,
+} from "../../config/model-resolver";
 import { renderPromptTemplate } from "../../config/prompt-templates";
 import { Settings } from "../../config/settings";
 import agentCreationArchitectPrompt from "../../prompts/system/agent-creation-architect.md" with { type: "text" };
@@ -93,21 +98,8 @@ const SOURCE_LABEL: Record<AgentSource, string> = {
 
 const IDENTIFIER_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+){1,5}$/;
 
-function normalizeModelPatterns(value: string | string[] | undefined): string[] {
-	if (Array.isArray(value)) {
-		return value.map(pattern => pattern.trim()).filter(pattern => pattern.length > 0);
-	}
-	if (typeof value === "string") {
-		const normalized = value.trim();
-		if (normalized.length > 0) {
-			return [normalized];
-		}
-	}
-	return [];
-}
-
 function joinPatterns(patterns: string[]): string {
-	if (patterns.length === 0) return "(session default)";
+	if (patterns.length === 0) return "(session model)";
 	return patterns.join(", ");
 }
 
@@ -398,8 +390,7 @@ export class AgentDashboard extends Container {
 			const activeTabId = this.#tabs[this.#activeTabIndex]?.id ?? "all";
 			const { agents } = await discoverAgents(this.cwd);
 			const disabled = new Set((this.#settingsManager?.get("task.disabledAgents") as string[] | undefined) ?? []);
-			const overrides =
-				(this.#settingsManager?.get("task.agentModelOverrides") as Record<string, string> | undefined) ?? {};
+			const overrides = this.#settingsManager?.get("task.agentModelOverrides") ?? {};
 
 			this.#allAgents = agents
 				.slice()
@@ -622,10 +613,11 @@ export class AgentDashboard extends Container {
 		await modelRegistry.refresh();
 
 		const settings = this.#settingsManager ?? undefined;
-		const modelPatterns = normalizeModelPatterns(
+		const modelPatterns = resolveConfiguredModelPatterns(
 			this.modelContext.activeModelPattern ??
 				this.modelContext.defaultModelPattern ??
 				settings?.getModelRole("default"),
+			settings,
 		);
 		const { model } = resolveModelOverride(modelPatterns, modelRegistry, settings);
 		const fallbackModel = modelRegistry.getAvailable()[0];
@@ -750,26 +742,22 @@ export class AgentDashboard extends Container {
 	}
 
 	#defaultPatternsFor(agent: DashboardAgent): string[] {
-		const explicitAgentPatterns = isDefaultModelAlias(agent.model) ? [] : normalizeModelPatterns(agent.model);
-		if (explicitAgentPatterns.length > 0) {
-			return explicitAgentPatterns;
-		}
-
-		const fallback =
-			this.modelContext.activeModelPattern?.trim() ||
-			this.modelContext.defaultModelPattern?.trim() ||
-			this.#settingsManager?.getModelRole("default")?.trim() ||
-			"";
-		if (!fallback) return [];
-		return normalizeModelPatterns(fallback);
+		return resolveAgentModelPatterns({
+			agentModel: agent.model,
+			settings: this.#settingsManager ?? undefined,
+			activeModelPattern: this.modelContext.activeModelPattern,
+			fallbackModelPattern: this.modelContext.defaultModelPattern,
+		});
 	}
 
 	#effectivePatternsFor(agent: DashboardAgent, draftOverride: string | undefined): string[] {
-		const override = draftOverride?.trim() || "";
-		if (override.length > 0) {
-			return [override];
-		}
-		return this.#defaultPatternsFor(agent);
+		return resolveAgentModelPatterns({
+			settingsOverride: draftOverride,
+			agentModel: agent.model,
+			settings: this.#settingsManager ?? undefined,
+			activeModelPattern: this.modelContext.activeModelPattern,
+			fallbackModelPattern: this.modelContext.defaultModelPattern,
+		});
 	}
 
 	#resolvePatterns(patterns: string[]): ModelResolution | undefined {

package/src/modes/components/assistant-message.ts

@@ -1,6 +1,7 @@
-import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage, ImageContent, Usage } from "@oh-my-pi/pi-ai";
 import { Container, Image, ImageProtocol, Markdown, Spacer, TERMINAL, Text } from "@oh-my-pi/pi-tui";
-import { logger } from "@oh-my-pi/pi-utils";
+import { formatNumber, logger } from "@oh-my-pi/pi-utils";
+import { settings } from "../../config/settings";
 import { hasPendingMermaid, prerenderMermaid } from "../../modes/theme/mermaid-cache";
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
 
@@ -12,6 +13,7 @@ export class AssistantMessageComponent extends Container {
 	#lastMessage?: AssistantMessage;
 	#prerenderInFlight = false;
 	#toolImagesByCallId = new Map<string, ImageContent[]>();
+	#usageInfo?: Usage;
 
 	constructor(
 		message?: AssistantMessage,
@@ -52,6 +54,13 @@ export class AssistantMessageComponent extends Container {
 		}
 	}
 
+	setUsageInfo(usage: Usage): void {
+		this.#usageInfo = usage;
+		if (this.#lastMessage) {
+			this.updateContent(this.#lastMessage);
+		}
+	}
+
 	#renderToolImages(): void {
 		const images = Array.from(this.#toolImagesByCallId.values()).flat();
 		if (images.length === 0) return;
@@ -178,5 +187,19 @@ export class AssistantMessageComponent extends Container {
 				this.#contentContainer.addChild(new Text(theme.fg("error", `Error: ${errorMsg}`), 1, 0));
 			}
 		}
+
+		// Token usage metadata
+		if (settings.get("display.showTokenUsage") && this.#usageInfo) {
+			const usage = this.#usageInfo;
+			const totalInput = usage.input + usage.cacheWrite;
+			const parts: string[] = [];
+			parts.push(`${theme.icon.input} ${formatNumber(totalInput)}`);
+			parts.push(`${theme.icon.output} ${formatNumber(usage.output)}`);
+			if (usage.cacheRead > 0) {
+				parts.push(`cache: ${formatNumber(usage.cacheRead)}`);
+			}
+			this.#contentContainer.addChild(new Spacer(1));
+			this.#contentContainer.addChild(new Text(theme.fg("dim", parts.join("  ")), 1, 0));
+		}
 	}
 }

package/src/modes/components/btw-panel.ts

@@ -0,0 +1,104 @@
+import { type Component, Container, Markdown, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
+import { replaceTabs } from "../../tools/render-utils";
+import { getMarkdownTheme, theme } from "../theme/theme";
+import { DynamicBorder } from "./dynamic-border";
+
+type BtwPanelState = "running" | "complete" | "aborted" | "error";
+
+interface BtwPanelComponentOptions {
+	question: string;
+	tui: TUI;
+}
+
+export class BtwPanelComponent extends Container {
+	#question: string;
+	#tui: TUI;
+	#state: BtwPanelState = "running";
+	#answer = "";
+	#errorMessage: string | undefined;
+	#closed = false;
+
+	constructor(options: BtwPanelComponentOptions) {
+		super();
+		this.#question = options.question;
+		this.#tui = options.tui;
+		this.#rebuild();
+	}
+
+	appendText(delta: string): void {
+		if (!delta || this.#closed) return;
+		this.#answer += delta;
+		this.#rebuild();
+	}
+
+	setAnswer(text: string): void {
+		if (this.#closed) return;
+		this.#answer = text;
+		this.#rebuild();
+	}
+
+	markComplete(): void {
+		if (this.#closed) return;
+		this.#state = "complete";
+		this.#errorMessage = undefined;
+		this.#rebuild();
+	}
+
+	markAborted(): void {
+		if (this.#closed) return;
+		this.#state = "aborted";
+		this.#errorMessage = undefined;
+		this.#rebuild();
+	}
+
+	markError(message: string): void {
+		if (this.#closed) return;
+		this.#state = "error";
+		this.#errorMessage = message;
+		this.#rebuild();
+	}
+
+	close(): void {
+		this.#closed = true;
+	}
+
+	#rebuild(): void {
+		this.clear();
+		this.addChild(new DynamicBorder(str => theme.fg("dim", str)));
+		this.addChild(new Spacer(1));
+		this.addChild(new Text(theme.fg("accent", replaceTabs(this.#question)), 1, 0));
+		this.addChild(new Spacer(1));
+		this.addChild(this.#contentComponent());
+		this.addChild(new Spacer(1));
+		this.addChild(new Text(this.#footerLine(), 1, 0));
+		this.addChild(new Spacer(1));
+		this.addChild(new DynamicBorder(str => theme.fg("dim", str)));
+		this.#tui.requestRender();
+	}
+
+	#footerLine(): string {
+		switch (this.#state) {
+			case "running":
+				return theme.fg("muted", "Esc cancel /btw");
+			case "complete":
+				return theme.fg("muted", "Esc dismiss");
+			case "aborted":
+				return theme.fg("warning", `${theme.status.warning} Cancelled · Esc dismiss`);
+			case "error":
+				return theme.fg("error", `${theme.status.error} Error · Esc dismiss`);
+		}
+	}
+
+	#contentComponent(): Component {
+		if (this.#state === "error") {
+			return new Text(theme.fg("error", replaceTabs(this.#errorMessage ?? "Unknown error")), 1, 0);
+		}
+		const text = replaceTabs(this.#answer).trim();
+		if (!text) {
+			const waiting =
+				this.#state === "running" ? `${theme.status.pending} Waiting for response…` : "No text returned.";
+			return new Text(theme.fg("dim", waiting), 1, 0);
+		}
+		return new Markdown(text, 1, 0, getMarkdownTheme());
+	}
+}

package/src/modes/components/diff.ts

@@ -23,17 +23,12 @@ function visualizeIndent(text: string, filePath?: string): string {
 	const leftPadding = Math.floor(tabWidth / 2);
 	const rightPadding = Math.max(0, tabWidth - leftPadding - 1);
 	const tabMarker = `${DIM}${" ".repeat(leftPadding)}→${" ".repeat(rightPadding)}${DIM_OFF}`;
-	// Normalize: collapse configured tab-width groups into tab markers, then handle remaining spaces.
-	const normalized = indent.replaceAll("\t", indentation);
 	let visible = "";
-	let pos = 0;
-	while (pos < normalized.length) {
-		if (pos + tabWidth <= normalized.length && normalized.slice(pos, pos + tabWidth) === indentation) {
+	for (const ch of indent) {
+		if (ch === "\t") {
 			visible += tabMarker;
-			pos += tabWidth;
 		} else {
 			visible += `${DIM}·${DIM_OFF}`;
-			pos++;
 		}
 	}
 	return `${visible}${replaceTabs(rest, filePath)}`;

package/src/modes/components/extensions/state-manager.ts

@@ -2,6 +2,7 @@
  * State manager for the Extension Control Center.
  * Handles data loading, tree building, filtering, and toggle persistence.
  */
+import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
 import type { ContextFile } from "../../../capability/context-file";
 import type { ExtensionModule } from "../../../capability/extension-module";
@@ -96,7 +97,7 @@ export async function loadAllExtensions(cwd?: string, disabledIds?: string[]): P
 		}
 	}
 
-	const loadOpts = cwd ? { cwd } : {};
+	const loadOpts = cwd ? { cwd, includeDisabled: true } : { includeDisabled: true };
 
 	// Load skills
 	try {
@@ -252,7 +253,7 @@ export async function loadAllExtensions(cwd?: string, disabledIds?: string[]): P
 		const contextFiles = await loadCapability<ContextFile>("context-files", loadOpts);
 		for (const file of contextFiles.all) {
 			// Extract filename from path for display
-			const name = file.path.split("/").pop() || file.path;
+			const name = path.basename(file.path);
 			const id = makeExtensionId("context-file", `${file.level}:${name}`);
 			const isDisabled = disabledExtensions.has(id);
 			const isShadowed = (file as { _shadowed?: boolean })._shadowed;

package/src/modes/components/settings-defs.ts

@@ -82,13 +82,29 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 	// Context maintenance threshold
 	"compaction.thresholdPercent": [
 		{ value: "default", label: "Default", description: "Legacy reserve-based threshold" },
-		{ value: "70", label: "70%", description: "Very early maintenance" },
-		{ value: "75", label: "75%", description: "Early maintenance" },
-		{ value: "80", label: "80%", description: "Balanced" },
-		{ value: "85", label: "85%", description: "Typical threshold" },
-		{ value: "90", label: "90%", description: "Aggressive context usage" },
+		{ value: "10", label: "10%", description: "Extremely early maintenance" },
+		{ value: "20", label: "20%", description: "Very early maintenance" },
+		{ value: "30", label: "30%", description: "Early maintenance" },
+		{ value: "40", label: "40%", description: "Moderately early maintenance" },
+		{ value: "50", label: "50%", description: "Halfway point" },
+		{ value: "60", label: "60%", description: "Moderate context usage" },
+		{ value: "70", label: "70%", description: "Balanced" },
+		{ value: "75", label: "75%", description: "Slightly aggressive" },
+		{ value: "80", label: "80%", description: "Typical threshold" },
+		{ value: "85", label: "85%", description: "Aggressive context usage" },
+		{ value: "90", label: "90%", description: "Very aggressive" },
 		{ value: "95", label: "95%", description: "Near context limit" },
 	],
+	"compaction.thresholdTokens": [
+		{ value: "default", label: "Default", description: "Use percentage-based threshold" },
+		{ value: "25000", label: "25K tokens", description: "Quarter of a 200K window" },
+		{ value: "50000", label: "50K tokens", description: "Half of a 200K window" },
+		{ value: "100000", label: "100K tokens", description: "Half of a 200K window" },
+		{ value: "150000", label: "150K tokens", description: "Three-quarters of a 200K window" },
+		{ value: "200000", label: "200K tokens", description: "Full standard context window" },
+		{ value: "300000", label: "300K tokens", description: "Large context window" },
+		{ value: "500000", label: "500K tokens", description: "Very large context window" },
+	],
 	// Retry max retries
 	"retry.maxRetries": [
 		{ value: "1", label: "1 retry" },
@@ -190,6 +206,40 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "300", label: "5 minutes" },
 		{ value: "600", label: "10 minutes" },
 	],
+	// Artifact spill settings
+	"tools.artifactSpillThreshold": [
+		{ value: "1", label: "1 KB", description: "~250 tokens" },
+		{ value: "2.5", label: "2.5 KB", description: "~625 tokens" },
+		{ value: "5", label: "5 KB", description: "~1.25K tokens" },
+		{ value: "10", label: "10 KB", description: "~2.5K tokens" },
+		{ value: "20", label: "20 KB", description: "~5K tokens" },
+		{ value: "30", label: "30 KB", description: "~7.5K tokens" },
+		{ value: "50", label: "50 KB", description: "Default; ~12.5K tokens" },
+		{ value: "75", label: "75 KB", description: "~19K tokens" },
+		{ value: "100", label: "100 KB", description: "~25K tokens" },
+		{ value: "200", label: "200 KB", description: "~50K tokens" },
+		{ value: "500", label: "500 KB", description: "~125K tokens" },
+		{ value: "1000", label: "1 MB", description: "~250K tokens" },
+	],
+	"tools.artifactTailBytes": [
+		{ value: "1", label: "1 KB", description: "~250 tokens" },
+		{ value: "2.5", label: "2.5 KB", description: "~625 tokens" },
+		{ value: "5", label: "5 KB", description: "~1.25K tokens" },
+		{ value: "10", label: "10 KB", description: "~2.5K tokens" },
+		{ value: "20", label: "20 KB", description: "Default; ~5K tokens" },
+		{ value: "50", label: "50 KB", description: "~12.5K tokens" },
+		{ value: "100", label: "100 KB", description: "~25K tokens" },
+		{ value: "200", label: "200 KB", description: "~50K tokens" },
+	],
+	"tools.artifactTailLines": [
+		{ value: "50", label: "50 lines", description: "~250 tokens" },
+		{ value: "100", label: "100 lines", description: "~500 tokens" },
+		{ value: "250", label: "250 lines", description: "~1.25K tokens" },
+		{ value: "500", label: "500 lines", description: "Default; ~2.5K tokens" },
+		{ value: "1000", label: "1000 lines", description: "~5K tokens" },
+		{ value: "2000", label: "2000 lines", description: "~10K tokens" },
+		{ value: "5000", label: "5000 lines", description: "~25K tokens" },
+	],
 	// Read line limit
 	"read.defaultLimit": [
 		{ value: "200", label: "200 lines" },
@@ -419,7 +469,7 @@ export function getAllSettingDefs(): SettingDef[] {
 	if (cachedDefs) return cachedDefs;
 
 	const defs: SettingDef[] = [];
-	for (const tab of [...SETTING_TABS, "status"] as SettingTab[]) {
+	for (const tab of SETTING_TABS) {
 		for (const path of getPathsForTab(tab)) {
 			const def = pathToSettingDef(path);
 			if (def) defs.push(def);