jeopi-cli 16.4.3 → 16.4.4

package/dist/types/advisor/advise-tool.d.ts

@@ -51,6 +51,9 @@ export declare function isAdvisorInterruptImmuneTurnActive(opts: {
  * - An interrupting `concern`/`blocker` is normally steered into the agent: into
  *   the live turn while one is streaming, or (when idle) a triggered turn so the
  *   advice is acted on immediately.
+ * - If the primary tail is already a terminal text answer and there is no queued
+ *   work, late interrupting advice is preserved as a visible card instead of
+ *   waking the primary to restate completion.
  * - After a deliberate user interrupt (`autoResumeSuppressed`) the advisor must
  *   not auto-resume the stopped run. While the agent is idle — or still tearing
  *   the interrupted turn down (`aborting`) — the note is preserved as a visible
@@ -60,13 +63,14 @@ export declare function isAdvisorInterruptImmuneTurnActive(opts: {
  *   run instead strands it (it never reaches the running agent) and the withheld
  *   notes dump as one burst at the next user prompt — the bug this guards.
  * - During the post-interrupt immune-turn window, further `concern`/`blocker`
- *   notes are downgraded to asides; suppression preservation still wins.
+ *   notes are downgraded to asides; preservation still wins.
  */
 export declare function resolveAdvisorDeliveryChannel(opts: {
     severity: AdvisorSeverity | undefined;
     autoResumeSuppressed: boolean;
     streaming: boolean;
     aborting: boolean;
+    terminalAnswerNoQueuedWork?: boolean;
     interruptImmuneTurnActive?: boolean;
 }): AdvisorDeliveryChannel;
 /**

package/dist/types/advisor/runtime.d.ts

@@ -1,4 +1,5 @@
 import type { AgentMessage } from "jeopi-agent-core";
+import type { AssistantMessage } from "jeopi-ai";
 import { type SecretObfuscator } from "../secrets/obfuscator";
 /**
  * Minimal slice of `Agent` the runtime drives — satisfied by pi-agent-core
@@ -58,6 +59,20 @@ export interface AdvisorRuntimeOptions {
     /** Render the primary's thinking blocks into advisor deltas (default true). */
     includeThinking?: boolean;
 }
+/** Signals that an advisor response was discarded before it could become model-visible context. */
+export declare class AdvisorOutputQuarantinedError extends Error {
+    constructor(message: string);
+}
+/**
+ * Replaces an advisor assistant turn that requested unavailable tools or generated
+ * output-only destructive directives with a sanitized error before dispatch.
+ */
+export declare function quarantineAdvisorUnsafeOutput(message: AssistantMessage, availableToolNames: ReadonlySet<string>, sourceText?: string): string | undefined;
+/**
+ * Builds the provenance text used to decide whether hazardous advisor output was
+ * generated by the advisor or came from model-visible primary/tool context.
+ */
+export declare function buildAdvisorQuarantineSourceText(currentInput: string, messages: readonly AgentMessage[]): string;
 export declare function isRefusalError(error: unknown): boolean;
 export declare class AdvisorRuntime {
     #private;

package/dist/types/config/model-registry.d.ts

@@ -74,7 +74,7 @@ export declare class ModelRegistry {
         fetch?: FetchImpl;
     });
     /**
-     * Reload models from disk (built-in + custom from models.json).
+     * Reload models from disk (built-in + custom config).
      */
     refresh(strategy?: ModelRefreshStrategy): Promise<void>;
     refreshInBackground(strategy?: ModelRefreshStrategy): void;
@@ -94,12 +94,12 @@ export declare class ModelRegistry {
      */
     refreshRuntimeProviders(strategy?: ModelRefreshStrategy): Promise<void>;
     /**
-     * Get any error from loading models.json (undefined if no error).
+     * Get any error from loading custom models config (undefined if no error).
      */
     getError(): ConfigError | undefined;
     /**
      * Get all models (built-in + custom).
-     * If models.json had errors, returns only built-in models.
+     * If custom config had errors, returns only built-in models.
      */
     getAll(): Model<Api>[];
     /**

package/dist/types/config/models-config.d.ts

@@ -1,5 +1,5 @@
 /**
- * models.json config file handle and provider configuration validation.
+ * Custom model/provider config file handle and validation.
  */
 import type { Api, ModelSpec } from "jeopi-ai/types";
 import { ConfigFile } from "./config-file";

package/dist/types/config/settings-schema.d.ts

@@ -3332,16 +3332,6 @@ export declare const SETTINGS_SCHEMA: {
         readonly type: "array";
         readonly default: BashInterceptorRule[];
     };
-    readonly "bash.stripTrailingHeadTail": {
-        readonly type: "boolean";
-        readonly default: true;
-        readonly ui: {
-            readonly tab: "shell";
-            readonly group: "Bash";
-            readonly label: "Strip head/tail Pipes";
-            readonly description: "Silently drop trailing `| head`/`| tail` pipes from single-line bash commands. Output is already truncated automatically.";
-        };
-    };
     readonly "shellMinimizer.enabled": {
         readonly type: "boolean";
         readonly default: true;

package/dist/types/modes/rpc/host-tools.d.ts

@@ -12,5 +12,7 @@ export declare class RpcHostToolBridge {
     handleUpdate(frame: RpcHostToolUpdate): boolean;
     requestExecution(definition: RpcHostToolDefinition, toolCallId: string, args: Record<string, unknown>, signal?: AbortSignal, onUpdate?: AgentToolUpdateCallback<unknown>): Promise<AgentToolResult<unknown>>;
     rejectAllPending(message: string): void;
+    /** Reject active and future host tool requests after the RPC client disconnects. */
+    close(message: string): void;
 }
 export {};

package/dist/types/modes/rpc/rpc-mode.d.ts

@@ -8,6 +8,13 @@ export type PendingExtensionRequest = {
     resolve: (response: RpcExtensionUIResponse) => void;
     reject: (error: Error) => void;
 };
+/** Pending extension UI request map that can fail closed when the RPC client disconnects. */
+export declare class RpcPendingExtensionRequests extends Map<string, PendingExtensionRequest> {
+    #private;
+    set(id: string, request: PendingExtensionRequest): this;
+    /** Reject every active and future extension UI request. */
+    rejectAll(message: string): void;
+}
 type RpcOutput = (obj: RpcResponse | RpcExtensionUIRequest | RpcHostToolCallRequest | RpcHostToolCancelRequest | RpcHostUriRequest | RpcHostUriCancelRequest | object) => void;
 export type RpcSessionChangeCommand = Extract<RpcCommand, {
     type: "new_session";
@@ -38,7 +45,7 @@ export type RpcSkillCommandSession = Pick<AgentSession, "promptCustomMessage" |
 export type RpcSkillCommandResult = {
     agentInvoked: true;
 };
-export declare function tryRunRpcSkillCommand(session: RpcSkillCommandSession, text: string): Promise<RpcSkillCommandResult | false>;
+export declare function tryRunRpcSkillCommand(session: RpcSkillCommandSession, text: string, streamingBehavior?: "steer" | "followUp"): Promise<RpcSkillCommandResult | false>;
 export declare function reportLocalOnlyPromptResult(input: {
     id: string | undefined;
     prompt: Promise<boolean>;
@@ -84,15 +91,16 @@ export interface RpcInputFrameDeps {
     onHostToolUpdate: (frame: RpcHostToolUpdate) => void;
     onHostUriResult: (frame: RpcHostUriResult) => void;
 }
+/** Dispatch side-channel frames that must overtake the serialized command queue. */
+export declare function dispatchRpcControlFrame(parsed: unknown, deps: RpcInputFrameDeps): boolean;
 /**
  * Dispatch a single parsed frame from the RPC input stream.
  *
- * Bash commands are dispatched in the background so the caller (the stdin loop
- * in {@link runRpcMode}) can keep reading subsequent frames while a shell
- * command is still running. This lets a client send `abort_bash` (or any other
- * command) while a long-running `bash` is in flight. Response correlation is
- * preserved via each command's `id`; ordering across concurrent commands is
- * not guaranteed and clients MUST match on `id`.
+ * Bash commands are dispatched in the background so the caller can keep reading
+ * subsequent frames while a shell command is still running. This lets a client
+ * send `abort_bash` while a long-running `bash` is in flight. Response
+ * correlation is preserved via each command's `id`; ordering across concurrent
+ * commands is not guaranteed and clients MUST match on `id`.
  *
  * @returns `undefined` when the frame was routed to a side-channel handler
  *   (extension UI response, host tool/URI frames) or dispatched in the
@@ -101,6 +109,18 @@ export interface RpcInputFrameDeps {
  *   on non-`bash` commands propagate; the caller is expected to wrap them.
  */
 export declare function dispatchRpcInputFrame(parsed: unknown, deps: RpcInputFrameDeps): Promise<void> | undefined;
+/** Serializes ordinary RPC commands while allowing control frames to dispatch immediately. */
+export declare class RpcInputDispatcher {
+    #private;
+    constructor(options: {
+        deps: RpcInputFrameDeps;
+        afterSerialCommand?: () => Promise<void>;
+    });
+    /** Accept a parsed input frame without blocking the stdin reader. */
+    dispatch(parsed: unknown): void;
+    /** Await every accepted serial command, including commands queued before EOF. */
+    drain(): Promise<void>;
+}
 /**
  * Coordinates deferred shutdown with in-flight background input tasks.
  *

package/dist/types/modes/utils/transcript-render-helpers.d.ts

@@ -38,6 +38,15 @@ export declare function buildFileMentionBlock(files: FileMentionMessage["files"]
  * canonicalization) — i.e. content that closes the current read-tool run.
  */
 export declare function assistantHasVisibleContent(message: AssistantAgentMessage): boolean;
+/**
+ * Split mixed assistant turns into visible text before tool execution and
+ * visible text segments that must render immediately after the preceding tool.
+ */
+export declare function splitAssistantMessageToolTimeline(message: AssistantAgentMessage): {
+    beforeTools: AssistantAgentMessage;
+    afterToolCalls: ReadonlyMap<string, AssistantAgentMessage>;
+    hasToolCalls: boolean;
+};
 /**
  * Normalize raw tool-call arguments to a plain record, collapsing non-object or
  * array values to an empty object.

package/dist/types/session/agent-session.d.ts

@@ -816,6 +816,7 @@ export declare class AgentSession {
         triggerTurn?: boolean;
         deliverAs?: "steer" | "followUp" | "nextTurn";
         queueChipText?: string;
+        acceptTerminalEmptyStop?: boolean;
     }): Promise<boolean>;
     /**
      * Send a user message to the agent.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "jeopi-cli",
-	"version": "16.4.3",
+	"version": "16.4.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/akillness/jeopi",
 	"author": "Can Boluk",
@@ -57,17 +57,17 @@
 		"@agentclientprotocol/sdk": "0.25.0",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"jeopi-hashline": "16.4.3",
-		"jeopi-stats": "16.4.3",
-		"jeopi-agent-core": "16.4.3",
-		"jeopi-ai": "16.4.3",
-		"jeopi-catalog": "16.4.3",
-		"jeopi-mnemopi": "16.4.3",
-		"jeopi-natives": "16.4.3",
-		"jeopi-tui": "16.4.3",
-		"jeopi-utils": "16.4.3",
-		"jeopi-wire": "16.4.3",
-		"jeopi-snapcompact": "16.4.3",
+		"jeopi-hashline": "16.4.4",
+		"jeopi-stats": "16.4.4",
+		"jeopi-agent-core": "16.4.4",
+		"jeopi-ai": "16.4.4",
+		"jeopi-catalog": "16.4.4",
+		"jeopi-mnemopi": "16.4.4",
+		"jeopi-natives": "16.4.4",
+		"jeopi-tui": "16.4.4",
+		"jeopi-utils": "16.4.4",
+		"jeopi-wire": "16.4.4",
+		"jeopi-snapcompact": "16.4.4",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",

package/src/advisor/advise-tool.ts

@@ -94,6 +94,9 @@ export function isAdvisorInterruptImmuneTurnActive(opts: {
  * - An interrupting `concern`/`blocker` is normally steered into the agent: into
  *   the live turn while one is streaming, or (when idle) a triggered turn so the
  *   advice is acted on immediately.
+ * - If the primary tail is already a terminal text answer and there is no queued
+ *   work, late interrupting advice is preserved as a visible card instead of
+ *   waking the primary to restate completion.
  * - After a deliberate user interrupt (`autoResumeSuppressed`) the advisor must
  *   not auto-resume the stopped run. While the agent is idle — or still tearing
  *   the interrupted turn down (`aborting`) — the note is preserved as a visible
@@ -103,17 +106,19 @@ export function isAdvisorInterruptImmuneTurnActive(opts: {
  *   run instead strands it (it never reaches the running agent) and the withheld
  *   notes dump as one burst at the next user prompt — the bug this guards.
  * - During the post-interrupt immune-turn window, further `concern`/`blocker`
- *   notes are downgraded to asides; suppression preservation still wins.
+ *   notes are downgraded to asides; preservation still wins.
  */
 export function resolveAdvisorDeliveryChannel(opts: {
 	severity: AdvisorSeverity | undefined;
 	autoResumeSuppressed: boolean;
 	streaming: boolean;
 	aborting: boolean;
+	terminalAnswerNoQueuedWork?: boolean;
 	interruptImmuneTurnActive?: boolean;
 }): AdvisorDeliveryChannel {
 	if (!isInterruptingSeverity(opts.severity)) return "aside";
 	if (opts.autoResumeSuppressed && (opts.aborting || !opts.streaming)) return "preserve";
+	if (opts.terminalAnswerNoQueuedWork && !opts.streaming && !opts.aborting) return "preserve";
 	if (opts.interruptImmuneTurnActive) return "aside";
 	return "steer";
 }

package/src/advisor/runtime.ts

@@ -65,6 +65,94 @@ export interface AdvisorRuntimeOptions {
 	includeThinking?: boolean;
 }
 
+const ADVISOR_QUARANTINE_PREFIX = "Advisor response quarantined";
+
+/** Signals that an advisor response was discarded before it could become model-visible context. */
+export class AdvisorOutputQuarantinedError extends Error {
+	constructor(message: string) {
+		super(message);
+		this.name = "AdvisorOutputQuarantinedError";
+	}
+}
+
+interface AdvisorOutputHazard {
+	label: string;
+	pattern: RegExp;
+}
+
+const ADVISOR_OUTPUT_ONLY_HAZARDS: readonly AdvisorOutputHazard[] = [
+	{ label: "account-deletion claim", pattern: /\buser\b.{0,80}\b(?:deleted|erased)\b.{0,80}\baccount\b/i },
+	{
+		label: "instruction override",
+		pattern: /\bignore\s+(?:all\s+)?(?:prior|previous|earlier)\s+(?:user\s+)?instructions\b/i,
+	},
+	{ label: "destructive shell command", pattern: /\brm\s+-[a-z]*r[a-z]*f[a-z]*(?:\s|$)/i },
+	{ label: "denial instruction", pattern: /\bdeny\s+(?:this|it|the\s+request)\s+if\s+(?:asked|questioned)\b/i },
+];
+
+/**
+ * Replaces an advisor assistant turn that requested unavailable tools or generated
+ * output-only destructive directives with a sanitized error before dispatch.
+ */
+export function quarantineAdvisorUnsafeOutput(
+	message: AssistantMessage,
+	availableToolNames: ReadonlySet<string>,
+	sourceText = "",
+): string | undefined {
+	const reasons: string[] = [];
+	const unavailableToolNames = new Set<string>();
+	const generatedParts: string[] = [];
+	for (const block of message.content) {
+		if (block.type === "toolCall" && !availableToolNames.has(block.name)) unavailableToolNames.add(block.name);
+		if (block.type === "toolCall" && block.name === "advise" && typeof block.arguments.note === "string") {
+			generatedParts.push(block.arguments.note);
+		}
+		if (block.type === "text") generatedParts.push(block.text);
+	}
+	if (unavailableToolNames.size > 0) {
+		const names = [...unavailableToolNames].sort();
+		const toolLabel = names.length === 1 ? "tool" : "tools";
+		reasons.push(`requested unavailable ${toolLabel} ${names.join(", ")}`);
+	}
+
+	const generatedText = generatedParts.join("\n");
+	if (generatedText) {
+		const labels: string[] = [];
+		for (const hazard of ADVISOR_OUTPUT_ONLY_HAZARDS) {
+			if (hazard.pattern.test(generatedText) && !hazard.pattern.test(sourceText)) labels.push(hazard.label);
+		}
+		if (labels.includes("destructive shell command") || labels.length >= 3) {
+			reasons.push(`generated output-only destructive directives: ${labels.join(", ")}`);
+		}
+	}
+
+	if (reasons.length === 0) return undefined;
+
+	const messageText = `${ADVISOR_QUARANTINE_PREFIX}: ${reasons.join("; ")}`;
+	message.content = [{ type: "text", text: messageText }];
+	message.stopReason = "error";
+	message.stopDetails = undefined;
+	message.providerPayload = undefined;
+	message.errorMessage = messageText;
+	return messageText;
+}
+
+/**
+ * Builds the provenance text used to decide whether hazardous advisor output was
+ * generated by the advisor or came from model-visible primary/tool context.
+ */
+export function buildAdvisorQuarantineSourceText(currentInput: string, messages: readonly AgentMessage[]): string {
+	const parts: string[] = [];
+	if (currentInput) parts.push(currentInput);
+	for (const message of messages) {
+		if (message.role !== "toolResult") continue;
+		for (const block of message.content) {
+			if (block.type === "text") parts.push(block.text);
+		}
+	}
+	return parts.join("\n");
+}
+
 /**
  * Match the stable `Refusal` / `Refusal (…)` message prefix pi-ai emits for a
  * provider classifier refusal (`stop_details.type === "refusal"` mapped in
@@ -384,10 +472,18 @@ export class AdvisorRuntime {
 					// successful empty cycle.
 					const promptError = this.agent.state.error;
 					if (promptError) throw new Error(promptError);
+					const emptyResponseError = getAdvisorEmptyResponseError(
+						this.agent.state.messages.slice(messageSnapshot),
+					);
+					if (emptyResponseError) throw emptyResponseError;
 					success = true;
 					this.#consecutiveFailures = 0;
 					this.#failureNotified = false;
 				} catch (err) {
+					if (err instanceof AdvisorOutputQuarantinedError) {
+						this.#resetAdvisorContext(true, true);
+						continue;
+					}
 					// reset()/dispose() aborts the in-flight prompt; the rejection is the
 					// reset itself, not a transient advisor failure. Drop the stale batch
 					// (reset already cleared #pending and rewound the cursor) instead of
@@ -457,6 +553,37 @@ export class AdvisorRuntime {
 }
 
 type TextualContent = string | readonly (TextContent | ImageContent)[];
+function getAdvisorEmptyResponseError(messages: readonly AgentMessage[]): Error | undefined {
+	let sawAssistant = false;
+	for (const message of messages) {
+		if (message.role !== "assistant") continue;
+		sawAssistant = true;
+		if (message.stopReason !== "stop") return undefined;
+		if (hasAdvisorResponseContent(message)) return undefined;
+	}
+	if (sawAssistant) return new Error("Advisor turn returned an empty stop response without advice");
+	if (messages.length > 0) return new Error("Advisor turn ended without an assistant response");
+	return undefined;
+}
+
+function hasAdvisorResponseContent(message: AssistantMessage): boolean {
+	return message.content.some(block => {
+		switch (block.type) {
+			case "text":
+				return block.text.trim().length > 0;
+			case "thinking":
+				return block.thinking.trim().length > 0;
+			case "redactedThinking":
+				return block.data.length > 0;
+			case "toolCall":
+				return block.name.trim().length > 0;
+			case "fallback":
+				return false;
+			default:
+				return false;
+		}
+	});
+}
 
 function obfuscateTextualContent(obfuscator: SecretObfuscator, content: TextualContent): TextualContent {
 	if (typeof content === "string") return obfuscator.obfuscate(content);

package/src/autolearn/controller.ts

@@ -160,7 +160,7 @@ export class AutoLearnController {
 					display: false,
 					attribution: "user",
 				},
-				{ deliverAs: "nextTurn", triggerTurn: true },
+				{ deliverAs: "nextTurn", triggerTurn: true, acceptTerminalEmptyStop: true },
 			)
 			.then(started => {
 				if (!started) this.#suppressNext = false;

package/src/config/config-file.ts

@@ -11,9 +11,9 @@ interface ConfigSchemaError {
 }
 
 /**
- * Module-private cache of (jsonPath, ymlPath) pairs we already migrated this
- * process. Prevents `ConfigFile.relocate()` / repeated `tryLoad()` calls from
- * re-running the migration over and over on the boot path.
+ * Module-private cache of JSON → YAML migrations this process already ran.
+ * Prevents `ConfigFile.relocate()` / repeated `tryLoad()` calls from re-running
+ * the migration over and over on the boot path.
  */
 const migratedPaths = new Set<string>();
 
@@ -123,6 +123,7 @@ export type LoadResult<T> =
 
 export class ConfigFile<T> implements IConfigFile<T> {
 	readonly #basePath: string;
+	readonly #yamlFallbackPath: string | null;
 	readonly #jsonMigrationPath: string | null;
 	#cache?: LoadResult<T>;
 	#auxValidate?: (value: T) => void;
@@ -134,13 +135,17 @@ export class ConfigFile<T> implements IConfigFile<T> {
 	) {
 		this.#basePath = configPath;
 		if (configPath.endsWith(".yml")) {
+			this.#yamlFallbackPath = `${configPath.slice(0, -4)}.yaml`;
 			this.#jsonMigrationPath = `${configPath.slice(0, -4)}.json`;
 		} else if (configPath.endsWith(".yaml")) {
+			this.#yamlFallbackPath = null;
 			this.#jsonMigrationPath = `${configPath.slice(0, -5)}.json`;
 		} else if (configPath.endsWith(".json") || configPath.endsWith(".jsonc")) {
+			this.#yamlFallbackPath = null;
 			// JSON configs are still supported without migration.
 			this.#jsonMigrationPath = null;
 		} else {
+			this.#yamlFallbackPath = null;
 			throw new Error(`Invalid config file path: ${configPath}`);
 		}
 	}
@@ -150,9 +155,21 @@ export class ConfigFile<T> implements IConfigFile<T> {
 	 * Sync callers (tests, settings init) hit this implicitly via {@link tryLoad}.
 	 */
 	#ensureMigrated(): void {
-		if (this.#jsonMigrationPath) {
-			migrateJsonToYml(this.#jsonMigrationPath, this.#basePath);
+		if (!this.#jsonMigrationPath) return;
+		if (this.#yamlFallbackPath && !fs.existsSync(this.#basePath) && fs.existsSync(this.#yamlFallbackPath)) {
+			return;
 		}
+		migrateJsonToYml(this.#jsonMigrationPath, this.#basePath);
+	}
+
+	#resolveReadPath(): string {
+		if (fs.existsSync(this.#basePath)) {
+			return this.#basePath;
+		}
+		if (this.#yamlFallbackPath && fs.existsSync(this.#yamlFallbackPath)) {
+			return this.#yamlFallbackPath;
+		}
+		return this.#basePath;
 	}
 
 	relocate(configPath?: string): ConfigFile<T> {
@@ -165,7 +182,7 @@ export class ConfigFile<T> implements IConfigFile<T> {
 
 	getMtimeMs(): number | null {
 		try {
-			return fs.statSync(this.path()).mtimeMs;
+			return fs.statSync(this.#resolveReadPath()).mtimeMs;
 		} catch (err) {
 			if (isEnoent(err)) return null;
 			throw err;
@@ -211,12 +228,13 @@ export class ConfigFile<T> implements IConfigFile<T> {
 	#parseContent(content: string): LoadResult<T> {
 		try {
 			let parsed: unknown;
-			if (this.#basePath.endsWith(".json") || this.#basePath.endsWith(".jsonc")) {
+			const readPath = this.#resolveReadPath();
+			if (readPath.endsWith(".json") || readPath.endsWith(".jsonc")) {
 				parsed = JSONC.parse(content);
-			} else if (this.#basePath.endsWith(".yml") || this.#basePath.endsWith(".yaml")) {
+			} else if (readPath.endsWith(".yml") || readPath.endsWith(".yaml")) {
 				parsed = YAML.parse(content);
 			} else {
-				throw new Error(`Invalid config file path: ${this.#basePath}`);
+				throw new Error(`Invalid config file path: ${readPath}`);
 			}
 
 			const checked = this.schema(parsed);
@@ -255,7 +273,7 @@ export class ConfigFile<T> implements IConfigFile<T> {
 
 		let content: string;
 		try {
-			content = fs.readFileSync(this.path(), "utf-8").trim();
+			content = fs.readFileSync(this.#resolveReadPath(), "utf-8").trim();
 		} catch (error) {
 			if (isEnoent(error)) {
 				return this.#storeCache({ status: "not-found" });
@@ -275,7 +293,7 @@ export class ConfigFile<T> implements IConfigFile<T> {
 
 		let content: string;
 		try {
-			content = (await Bun.file(this.path()).text()).trim();
+			content = (await Bun.file(this.#resolveReadPath()).text()).trim();
 		} catch (error) {
 			if (isEnoent(error)) {
 				return this.#storeCache({ status: "not-found" });
@@ -306,7 +324,7 @@ export class ConfigFile<T> implements IConfigFile<T> {
 	}
 
 	path(): string {
-		return this.#basePath;
+		return this.#resolveReadPath();
 	}
 
 	invalidate() {

package/src/config/model-registry.ts

@@ -234,7 +234,7 @@ export interface ProviderDiscoveryState {
 	error?: string;
 }
 
-/** Result of loading custom models from models.json */
+/** Result of loading custom models config. */
 interface CustomModelsResult {
 	models?: CustomModelOverlay[];
 	overrides?: Map<string, ProviderOverride>;
@@ -271,7 +271,7 @@ interface CommandApiKeyResolution {
 	value?: string;
 }
 /**
- * Resolve a models.yml secret/config value to an actual value.
+ * Resolve a models.yml/models.yaml secret/config value to an actual value.
  * `!cmd` runs a shell command and returns trimmed stdout, otherwise env vars are
  * checked first and the input falls back to a literal value.
  */
@@ -784,7 +784,7 @@ export class ModelRegistry {
 	}
 
 	/**
-	 * Reload models from disk (built-in + custom from models.json).
+	 * Reload models from disk (built-in + custom config).
 	 */
 	async refresh(strategy: ModelRefreshStrategy = "online-if-uncached"): Promise<void> {
 		this.#reloadStaticModels();
@@ -889,7 +889,7 @@ export class ModelRegistry {
 	#reloadStaticModels(): void {
 		const currentMtime = this.#modelsConfigFile.getMtimeMs();
 		if (currentMtime !== null && currentMtime === this.#lastStaticLoadMtime) {
-			// models.json unchanged since last load; reloading would be redundant.
+			// Models config unchanged since last load; reloading would be redundant.
 			return;
 		}
 		this.#modelsConfigFile.invalidate();
@@ -913,14 +913,14 @@ export class ModelRegistry {
 	}
 
 	/**
-	 * Get any error from loading models.json (undefined if no error).
+	 * Get any error from loading custom models config (undefined if no error).
 	 */
 	getError(): ConfigError | undefined {
 		return this.#configError;
 	}
 
 	#loadModels() {
-		// Load custom models from models.json first (to know which providers to override)
+		// Load custom config first (to know which providers to override).
 		const {
 			models: customModels = [],
 			overrides = new Map(),
@@ -1823,7 +1823,7 @@ export class ModelRegistry {
 
 	/**
 	 * Get all models (built-in + custom).
-	 * If models.json had errors, returns only built-in models.
+	 * If custom config had errors, returns only built-in models.
 	 */
 	getAll(): Model<Api>[] {
 		return this.#models;

package/src/config/models-config.ts

@@ -1,5 +1,5 @@
 /**
- * models.json config file handle and provider configuration validation.
+ * Custom model/provider config file handle and validation.
  */
 
 import type { Api, ModelSpec } from "jeopi-ai/types";

package/src/config/settings-schema.ts

@@ -3189,18 +3189,6 @@ export const SETTINGS_SCHEMA = {
 	},
 	"bashInterceptor.patterns": { type: "array", default: DEFAULT_BASH_INTERCEPTOR_RULES },
 
-	"bash.stripTrailingHeadTail": {
-		type: "boolean",
-		default: true,
-		ui: {
-			tab: "shell",
-			group: "Bash",
-			label: "Strip head/tail Pipes",
-			description:
-				"Silently drop trailing `| head`/`| tail` pipes from single-line bash commands. Output is already truncated automatically.",
-		},
-	},
-
 	// Shell output minimizer
 	"shellMinimizer.enabled": {
 		type: "boolean",