@oh-my-pi/pi-coding-agent 13.15.2 → 13.16.0

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

@@ -2,6 +2,7 @@ import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Effort } from "@oh-my-pi/pi-ai";
 import {
 	Container,
+	Input,
 	matchesKey,
 	type SelectItem,
 	SelectList,
@@ -31,6 +32,52 @@ import { getPreset } from "./status-line/presets";
 /**
  * A submenu component for selecting from a list of options.
  */
+/**
+ * Submenu component for free-text string settings.
+ * Mirrors the ConfigInputSubmenu pattern from plugin-settings.ts.
+ */
+class TextInputSubmenu extends Container {
+	#input: Input;
+
+	constructor(
+		label: string,
+		description: string,
+		currentValue: string,
+		private readonly onSubmit: (value: string) => void,
+		private readonly onCancel: () => void,
+	) {
+		super();
+
+		this.addChild(new Text(theme.bold(theme.fg("accent", label)), 0, 0));
+		if (description) {
+			this.addChild(new Spacer(1));
+			this.addChild(new Text(theme.fg("muted", description), 0, 0));
+		}
+		this.addChild(new Spacer(1));
+
+		this.#input = new Input();
+		if (currentValue) {
+			this.#input.setValue(currentValue);
+			// Move cursor to end of pre-filled value (ctrl+e = cursorLineEnd).
+			this.#input.handleInput("\x05");
+		}
+		this.#input.onSubmit = value => {
+			this.onSubmit(value); // empty string clears the setting
+		};
+		this.addChild(this.#input);
+		this.addChild(new Spacer(1));
+		this.addChild(new Text(theme.fg("dim", "  Enter to save · Esc to cancel · Clear field to unset"), 0, 0));
+	}
+
+	handleInput(data: string): void {
+		if (data === "\x1b" || data === "\x1b\x1b") {
+			this.onCancel();
+			return;
+		}
+		this.#input.handleInput(data);
+	}
+}
+
 class SelectSubmenu extends Container {
 	#selectList: SelectList;
 	#previewText: Text | null = null;
@@ -180,6 +227,7 @@ export class SettingsSelectorComponent extends Container {
 	#statusPreviewContainer: Container | null = null;
 	#statusPreviewText: Text | null = null;
 	#currentTabId: SettingTab | "plugins" = "appearance";
+	#textInputActive = false;
 
 	constructor(
 		private readonly context: SettingsRuntimeContext,
@@ -277,6 +325,15 @@ export class SettingsSelectorComponent extends Container {
 					currentValue: this.#getSubmenuCurrentValue(def.path, currentValue),
 					submenu: (cv, done) => this.#createSubmenu(def, cv, done),
 				};
+
+			case "text":
+				return {
+					id: def.path,
+					label: def.label,
+					description: def.description,
+					currentValue: (currentValue as string) ?? "",
+					submenu: (cv, done) => this.#createTextInput(def, cv, done),
+				};
 		}
 	}
 
@@ -389,6 +446,34 @@ export class SettingsSelectorComponent extends Container {
 		);
 	}
 
+	/**
+	 * Create a text input submenu for a plain string setting.
+	 */
+	#createTextInput(
+		def: SettingDef & { type: "text" },
+		currentValue: string,
+		done: (value?: string) => void,
+	): Container {
+		this.#textInputActive = true;
+		const wrappedDone = (value?: string) => {
+			this.#textInputActive = false;
+			done(value);
+		};
+		return new TextInputSubmenu(
+			def.label,
+			def.description,
+			currentValue,
+			value => {
+				// Empty string clears the setting; undefined-typed string settings
+				// store "" which the browser.ts expandPath ignores (no-op fallback).
+				this.#setSettingValue(def.path, value);
+				this.callbacks.onChange(def.path, value);
+				wrappedDone(value);
+			},
+			() => wrappedDone(),
+		);
+	}
+
 	/**
 	 * Set a setting value, handling type conversion.
 	 */
@@ -510,12 +595,14 @@ export class SettingsSelectorComponent extends Container {
 	}
 
 	handleInput(data: string): void {
-		// Handle tab switching first (tab, shift+tab, or left/right arrows)
+		// Handle tab switching — but NOT when a text input is active, since
+		// arrow keys must reach the cursor and Tab must not switch tabs.
 		if (
-			matchesKey(data, "tab") ||
-			matchesKey(data, "shift+tab") ||
-			matchesKey(data, "left") ||
-			matchesKey(data, "right")
+			!this.#textInputActive &&
+			(matchesKey(data, "tab") ||
+				matchesKey(data, "shift+tab") ||
+				matchesKey(data, "left") ||
+				matchesKey(data, "right"))
 		) {
 			this.#tabBar.handleInput(data);
 			return;

package/src/modes/controllers/extension-ui-controller.ts

@@ -50,7 +50,8 @@ export class ExtensionUiController {
 				this.ctx.editor.handleInput(`\x1b[200~${text}\x1b[201~`);
 			},
 			getEditorText: () => this.ctx.editor.getText(),
-			editor: (title, prefill) => this.showHookEditor(title, prefill),
+			editor: (title, prefill, dialogOptions, editorOptions) =>
+				this.showHookEditor(title, prefill, dialogOptions, editorOptions),
 			get theme() {
 				return theme;
 			},
@@ -783,26 +784,53 @@ export class ExtensionUiController {
 	/**
 	 * Show a multi-line editor for hooks (with Ctrl+G support).
 	 */
-	showHookEditor(title: string, prefill?: string): Promise<string | undefined> {
+	showHookEditor(
+		title: string,
+		prefill?: string,
+		dialogOptions?: ExtensionUIDialogOptions,
+		editorOptions?: { promptStyle?: boolean },
+	): Promise<string | undefined> {
 		const { promise, resolve } = Promise.withResolvers<string | undefined>();
+		let settled = false;
+		const onAbort = () => {
+			this.hideHookEditor();
+			if (!settled) {
+				settled = true;
+				resolve(undefined);
+			}
+		};
+		const finish = (value: string | undefined) => {
+			if (settled) return;
+			settled = true;
+			dialogOptions?.signal?.removeEventListener("abort", onAbort);
+			resolve(value);
+		};
 		this.ctx.hookEditor = new HookEditorComponent(
 			this.ctx.ui,
 			title,
 			prefill,
 			value => {
 				this.hideHookEditor();
-				resolve(value);
+				finish(value);
 			},
 			() => {
 				this.hideHookEditor();
-				resolve(undefined);
+				finish(undefined);
 			},
+			editorOptions,
 		);
 
 		this.ctx.editorContainer.clear();
 		this.ctx.editorContainer.addChild(this.ctx.hookEditor);
 		this.ctx.ui.setFocus(this.ctx.hookEditor);
 		this.ctx.ui.requestRender();
+		if (dialogOptions?.signal) {
+			if (dialogOptions.signal.aborted) {
+				onAbort();
+			} else {
+				dialogOptions.signal.addEventListener("abort", onAbort, { once: true });
+			}
+		}
 		return promise;
 	}
 

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

@@ -11,6 +11,7 @@ import type { AgentSessionEvent } from "../../session/agent-session";
 import { SKILL_PROMPT_MESSAGE_TYPE, type SkillPromptDetails } from "../../session/messages";
 import { executeBuiltinSlashCommand } from "../../slash-commands/builtin-registry";
 import { getEditorCommand, openInEditor } from "../../utils/external-editor";
+import { ensureSupportedImageInput } from "../../utils/image-input";
 import { resizeImage } from "../../utils/image-resize";
 import { generateSessionTitle, setSessionTerminalTitle } from "../../utils/title-generator";
 
@@ -95,7 +96,11 @@ export class InputController {
 		this.ctx.editor.onCycleModelForward = () => this.cycleRoleModel();
 		this.ctx.editor.setActionKeys("app.model.cycleBackward", this.ctx.keybindings.getKeys("app.model.cycleBackward"));
 		this.ctx.editor.onCycleModelBackward = () => this.cycleRoleModel({ temporary: true });
-		this.ctx.editor.onQuickSelectModel = () => this.ctx.showModelSelector({ temporaryOnly: true });
+		this.ctx.editor.setActionKeys(
+			"app.model.selectTemporary",
+			this.ctx.keybindings.getKeys("app.model.selectTemporary"),
+		);
+		this.ctx.editor.onSelectModelTemporary = () => this.ctx.showModelSelector({ temporaryOnly: true });
 
 		// Global debug handler on TUI (works regardless of focus)
 		this.ctx.ui.onDebug = () => this.ctx.showDebugSelector();
@@ -498,17 +503,25 @@ export class InputController {
 			const image = await readImageFromClipboard();
 			if (image) {
 				const base64Data = image.data.toBase64();
-				let imageData = { data: base64Data, mimeType: image.mimeType };
+				let imageData = await ensureSupportedImageInput({
+					type: "image",
+					data: base64Data,
+					mimeType: image.mimeType,
+				});
+				if (!imageData) {
+					this.ctx.showStatus(`Unsupported clipboard image format: ${image.mimeType}`);
+					return false;
+				}
 				if (settings.get("images.autoResize")) {
 					try {
 						const resized = await resizeImage({
 							type: "image",
-							data: base64Data,
-							mimeType: image.mimeType,
+							data: imageData.data,
+							mimeType: imageData.mimeType,
 						});
-						imageData = { data: resized.data, mimeType: resized.mimeType };
+						imageData = { type: "image", data: resized.data, mimeType: resized.mimeType };
 					} catch {
-						imageData = { data: base64Data, mimeType: image.mimeType };
+						// Keep the normalized image when resize fails.
 					}
 				}
 
@@ -595,8 +608,8 @@ export class InputController {
 
 	async cycleRoleModel(options?: { temporary?: boolean }): Promise<void> {
 		try {
-			const roleOrder = ["smol", "default", "slow"] as const;
-			const result = await this.ctx.session.cycleRoleModels(roleOrder, options);
+			const cycleOrder = settings.get("cycleOrder");
+			const result = await this.ctx.session.cycleRoleModels(cycleOrder, options);
 			if (!result) {
 				this.ctx.showStatus("Only one role model available");
 				return;
@@ -612,7 +625,7 @@ export class InputController {
 					: "";
 			const tempLabel = options?.temporary ? " (temporary)" : "";
 			const cycleSeparator = theme.fg("dim", " > ");
-			const cycleLabel = roleOrder
+			const cycleLabel = cycleOrder
 				.map(role => {
 					if (role === result.role) {
 						return theme.bold(theme.fg("accent", role));

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

@@ -3,7 +3,7 @@ import { getOAuthProviders, type OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
 import { getAgentDbPath, getProjectDir } from "@oh-my-pi/pi-utils";
-import { MODEL_ROLES } from "../../config/model-registry";
+import { getRoleInfo } from "../../config/model-registry";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
@@ -406,7 +406,7 @@ export class SelectorController {
 							// Don't call done() - selector stays open for role assignment
 						} else {
 							// Other roles (smol, slow): just update settings, not current model
-							const roleInfo = MODEL_ROLES[role];
+							const roleInfo = getRoleInfo(role, settings);
 							const roleLabel = roleInfo?.name ?? role;
 							this.ctx.showStatus(`${roleLabel} model: ${model.id}`);
 							// Don't call done() - selector stays open

package/src/modes/interactive-mode.ts

@@ -1399,8 +1399,13 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#extensionUiController.hideHookInput();
 	}
 
-	showHookEditor(title: string, prefill?: string): Promise<string | undefined> {
-		return this.#extensionUiController.showHookEditor(title, prefill);
+	showHookEditor(
+		title: string,
+		prefill?: string,
+		dialogOptions?: ExtensionUIDialogOptions,
+		editorOptions?: { promptStyle?: boolean },
+	): Promise<string | undefined> {
+		return this.#extensionUiController.showHookEditor(title, prefill, dialogOptions, editorOptions);
 	}
 
 	hideHookEditor(): void {

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

@@ -29,6 +29,77 @@ import type {
 // Re-export types for consumers
 export type * from "./rpc-types";
 
+export type PendingExtensionRequest = {
+	resolve: (response: RpcExtensionUIResponse) => void;
+	reject: (error: Error) => void;
+};
+
+type RpcOutput = (obj: RpcResponse | RpcExtensionUIRequest | object) => void;
+
+export function requestRpcEditor(
+	pendingRequests: Map<string, PendingExtensionRequest>,
+	output: RpcOutput,
+	title: string,
+	prefill?: string,
+	dialogOptions?: ExtensionUIDialogOptions,
+	editorOptions?: { promptStyle?: boolean },
+): Promise<string | undefined> {
+	if (dialogOptions?.signal?.aborted) return Promise.resolve(undefined);
+
+	const id = Snowflake.next() as string;
+	const { promise, resolve, reject } = Promise.withResolvers<string | undefined>();
+	let settled = false;
+
+	const cleanup = () => {
+		dialogOptions?.signal?.removeEventListener("abort", onAbort);
+		pendingRequests.delete(id);
+	};
+	const finish = (value: string | undefined) => {
+		if (settled) return;
+		settled = true;
+		cleanup();
+		resolve(value);
+	};
+	const fail = (error: Error) => {
+		if (settled) return;
+		settled = true;
+		cleanup();
+		reject(error);
+	};
+	const onAbort = () => {
+		output({
+			type: "extension_ui_request",
+			id: Snowflake.next() as string,
+			method: "cancel",
+			targetId: id,
+		} as RpcExtensionUIRequest);
+		finish(undefined);
+	};
+
+	dialogOptions?.signal?.addEventListener("abort", onAbort, { once: true });
+	pendingRequests.set(id, {
+		resolve: response => {
+			if ("cancelled" in response && response.cancelled) {
+				finish(undefined);
+			} else if ("value" in response) {
+				finish(response.value);
+			} else {
+				finish(undefined);
+			}
+		},
+		reject: fail,
+	});
+	output({
+		type: "extension_ui_request",
+		id,
+		method: "editor",
+		title,
+		prefill,
+		promptStyle: editorOptions?.promptStyle,
+	} as RpcExtensionUIRequest);
+	return promise;
+}
+
 /**
  * Run in RPC mode.
  * Listens for JSON commands on stdin, outputs events and responses on stdout.
@@ -55,12 +126,6 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 		return { id, type: "response", command, success: false, error: message };
 	};
 
-	// Pending extension UI requests waiting for response
-	type PendingExtensionRequest = {
-		resolve: (response: RpcExtensionUIResponse) => void;
-		reject: (error: Error) => void;
-	};
-
 	const pendingExtensionRequests = new Map<string, PendingExtensionRequest>();
 
 	// Shutdown request flag (wrapped in object to allow mutation with const)
@@ -261,30 +326,13 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 			return "";
 		}
 
-		async editor(title: string, prefill?: string): Promise<string | undefined> {
-			const id = Snowflake.next() as string;
-			const { promise, resolve, reject } = Promise.withResolvers<string | undefined>();
-			this.pendingRequests.set(id, {
-				resolve: (response: RpcExtensionUIResponse) => {
-					this.pendingRequests.delete(id);
-					if ("cancelled" in response && response.cancelled) {
-						resolve(undefined);
-					} else if ("value" in response) {
-						resolve(response.value);
-					} else {
-						resolve(undefined);
-					}
-				},
-				reject,
-			});
-			this.output({
-				type: "extension_ui_request",
-				id,
-				method: "editor",
-				title,
-				prefill,
-			} as RpcExtensionUIRequest);
-			return promise;
+		async editor(
+			title: string,
+			prefill?: string,
+			dialogOptions?: ExtensionUIDialogOptions,
+			editorOptions?: { promptStyle?: boolean },
+		): Promise<string | undefined> {
+			return requestRpcEditor(this.pendingRequests, this.output, title, prefill, dialogOptions, editorOptions);
 		}
 
 		get theme(): Theme {

package/src/modes/rpc/rpc-types.ts

@@ -194,7 +194,15 @@ export type RpcExtensionUIRequest =
 			placeholder?: string;
 			timeout?: number;
 	  }
-	| { type: "extension_ui_request"; id: string; method: "editor"; title: string; prefill?: string }
+	| {
+			type: "extension_ui_request";
+			id: string;
+			method: "editor";
+			title: string;
+			prefill?: string;
+			promptStyle?: boolean;
+	  }
+	| { type: "extension_ui_request"; id: string; method: "cancel"; targetId: string }
 	| {
 			type: "extension_ui_request";
 			id: string;

package/src/modes/theme/theme.ts

@@ -955,6 +955,76 @@ export type ThemeColor =
 	| "statusLineCost"
 	| "statusLineSubagents";
 
+/** Set of all valid ThemeColor string values for runtime validation */
+const THEME_COLOR_RECORD = {
+	accent: true,
+	border: true,
+	borderAccent: true,
+	borderMuted: true,
+	success: true,
+	error: true,
+	warning: true,
+	muted: true,
+	dim: true,
+	text: true,
+	thinkingText: true,
+	userMessageText: true,
+	customMessageText: true,
+	customMessageLabel: true,
+	toolTitle: true,
+	toolOutput: true,
+	mdHeading: true,
+	mdLink: true,
+	mdLinkUrl: true,
+	mdCode: true,
+	mdCodeBlock: true,
+	mdCodeBlockBorder: true,
+	mdQuote: true,
+	mdQuoteBorder: true,
+	mdHr: true,
+	mdListBullet: true,
+	toolDiffAdded: true,
+	toolDiffRemoved: true,
+	toolDiffContext: true,
+	syntaxComment: true,
+	syntaxKeyword: true,
+	syntaxFunction: true,
+	syntaxVariable: true,
+	syntaxString: true,
+	syntaxNumber: true,
+	syntaxType: true,
+	syntaxOperator: true,
+	syntaxPunctuation: true,
+	thinkingOff: true,
+	thinkingMinimal: true,
+	thinkingLow: true,
+	thinkingMedium: true,
+	thinkingHigh: true,
+	thinkingXhigh: true,
+	bashMode: true,
+	pythonMode: true,
+	statusLineSep: true,
+	statusLineModel: true,
+	statusLinePath: true,
+	statusLineGitClean: true,
+	statusLineGitDirty: true,
+	statusLineContext: true,
+	statusLineSpend: true,
+	statusLineStaged: true,
+	statusLineDirty: true,
+	statusLineUntracked: true,
+	statusLineOutput: true,
+	statusLineCost: true,
+	statusLineSubagents: true,
+} satisfies Record<ThemeColor, true>;
+
+const VALID_THEME_COLORS: ReadonlySet<string> = new Set(Object.keys(THEME_COLOR_RECORD));
+
+/** Check if a string is a valid ThemeColor value */
+export function isValidThemeColor(color: string): color is ThemeColor {
+	return VALID_THEME_COLORS.has(color);
+}
+
 export type ThemeBg =
 	| "selectedBg"
 	| "userMessageBg"

package/src/modes/types.ts

@@ -243,7 +243,12 @@ export interface InteractiveModeContext {
 	hideHookSelector(): void;
 	showHookInput(title: string, placeholder?: string): Promise<string | undefined>;
 	hideHookInput(): void;
-	showHookEditor(title: string, prefill?: string): Promise<string | undefined>;
+	showHookEditor(
+		title: string,
+		prefill?: string,
+		dialogOptions?: ExtensionUIDialogOptions,
+		editorOptions?: { promptStyle?: boolean },
+	): Promise<string | undefined>;
 	hideHookEditor(): void;
 	showHookNotify(message: string, type?: "info" | "warning" | "error"): void;
 	showHookCustom<T>(

package/src/modes/utils/hotkeys-markdown.ts

@@ -40,7 +40,7 @@ export function buildHotkeysMarkdown(bindings: HotkeysMarkdownBindings): string
 		`| \`${appKey(bindings, "app.thinking.cycle")}\` | Cycle thinking level |`,
 		`| \`${appKey(bindings, "app.model.cycleForward")}\` | Cycle role models (slow/default/smol) |`,
 		`| \`${appKey(bindings, "app.model.cycleBackward")}\` | Cycle role models (temporary) |`,
-		"| `Alt+P` | Select model (temporary) |",
+		`| \`${appKey(bindings, "app.model.selectTemporary")}\` | Select model (temporary) |`,
 		`| \`${appKey(bindings, "app.model.select")}\` | Select model (set roles) |`,
 		`| \`${appKey(bindings, "app.plan.toggle")}\` | Toggle plan mode |`,
 		`| \`${appKey(bindings, "app.history.search")}\` | Search prompt history |`,

package/src/prompts/system/custom-system-prompt.md

@@ -40,6 +40,11 @@ If a skill covers your output, you **MUST** read `skill://<name>` before proceed
 {{/list}}
 </skills>
 {{/if}}
+{{#if alwaysApplyRules.length}}
+{{#each alwaysApplyRules}}
+{{content}}
+{{/each}}
+{{/if}}
 {{#if rules.length}}
 Rules are local constraints.
 You **MUST** read `rule://<name>` when working in that domain.

package/src/prompts/system/system-prompt.md

@@ -124,6 +124,12 @@ You **MUST** use the following skills, to save you time, when working in their d
 {{/each}}
 {{/if}}
 
+{{#if alwaysApplyRules.length}}
+{{#each alwaysApplyRules}}
+{{content}}
+{{/each}}
+{{/if}}
+
 {{#if rules.length}}
 # Rules
 Domain-specific rules from past experience. **MUST** read `rule://<name>` when working in their territory.

package/src/prompts/tools/ask.md

@@ -8,6 +8,7 @@ Asks user when you need clarification or input during task execution.
 - Use `recommended: <index>` to mark default (0-indexed); " (Recommended)" added automatically
 - Use `questions` for multiple related questions instead of asking one at a time
 - Set `multi: true` on question to allow multiple selections
+- `ask.timeout` only applies while choosing options; once the user selects "Other (type your own)", there is no timeout
 </instruction>
 
 <caution>

package/src/prompts/tools/hashline.md

@@ -2,8 +2,6 @@ Applies precise file edits using `LINE#ID` anchors from `read` output.
 
 Read the file first. Copy anchors exactly from the latest `read` output. In one `edit` call, batch all edits for one file. After any successful edit, re-read before editing that file again.
 
-This matters: your output is checked against the real file state. Invalid anchors, duplicated boundary lines, or semantically equivalent rewrites will fail.
-
 <operations>
 **Top level**
 - `path` — file path
@@ -61,6 +59,24 @@ Replace only the catch body. Do not target the shared boundary line `} catch (er
 ```
 </example>
 
+<example name="replace whole block including closing brace">
+Replace the entire body of `alpha`, including its closing `}`. `end` **MUST** be {{hlineref 7 "}"}} because `content` includes `}`.
+```
+{
+  path: "util.ts",
+  edits: [{
+    loc: { block: { pos: {{hlineref 6 "\tlog();"}}, end: {{hlineref 7 "}"}} } },
+    content: [
+      "\tvalidate();",
+      "\tlog();",
+      "}"
+    ]
+  }]
+}
+```
+**Wrong**: using `end: {{hlineref 6 "\tlog();"}}` with the same content — line 7 (`}`) survives the replacement AND content emits `}`, producing two closing braces.
+</example>
+
 <example name="replace one line">
 ```
 {
@@ -108,9 +124,8 @@ When adding a sibling declaration, prefer `prepend` on the next declaration.
 - Make the minimum exact edit. Do not rewrite nearby code unless the consumed range requires it.
 - Use anchors exactly as `N#ID` from the latest `read` output.
 - `block` requires both `pos` and `end`. Other anchored ops require one anchor.
-- Replace exactly the owned span. If `content` re-emits content beyond `end`, it will duplicate.
-- **Boundary duplication trap**: when replacing a block, `end` must be the **last line of the block** (e.g. the closing `}`), not the last *content* line before it. Otherwise the closing delimiter survives and your replacement adds a second copy.
-- Do not target shared boundary lines such as `} else {`, `} catch (…) {`, `}),`, or `},{`.
+- When your replacement `content` ends with a closing delimiter (`}`, `*/`, `)`, `]`), verify `end` includes the original line carrying that delimiter. If `end` stops one line too early, the original delimiter survives and your content adds a second copy.
+- **Self-check**: compare the last line of `content` with the line immediately after `end` in the file. If they match (e.g., both are `}`), extend `end` to include that line.
 - For a block, either replace only the body or replace the whole block. Do not split block boundaries.
 - `content` must be literal file content with matching indentation. If the file uses tabs, use real tabs.
 - Do not use this tool to reformat or clean up unrelated code.

package/src/sdk.ts

@@ -796,6 +796,12 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		}),
 	);
 
+	// collect alwaysApply rules — full content injected into system prompt
+	const alwaysApplyRules = rulesResult.items.filter((rule: Rule) => {
+		if (registeredTtsrRuleNames.has(rule.name)) return false;
+		return rule.alwaysApply === true;
+	});
+
 	const contextFiles = await logger.timeAsync(
 		"discoverContextFiles",
 		async () => options.contextFiles ?? (await discoverContextFiles(cwd, agentDir)),
@@ -930,7 +936,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	);
 	internalRouter.register(
 		new RuleProtocolHandler({
-			getRules: () => rulebookRules,
+			getRules: () => [...rulebookRules, ...alwaysApplyRules],
 		}),
 	);
 	internalRouter.register(new PiProtocolHandler());
@@ -1252,6 +1258,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			tools: promptTools,
 			toolNames,
 			rules: rulebookRules,
+			alwaysApplyRules,
 			skillsSettings: settings.getGroup("skills"),
 			appendSystemPrompt: appendPrompt,
 			repeatToolDescriptions,
@@ -1272,6 +1279,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				tools: promptTools,
 				toolNames,
 				rules: rulebookRules,
+				alwaysApplyRules,
 				skillsSettings: settings.getGroup("skills"),
 				customPrompt: options.systemPrompt,
 				appendSystemPrompt: appendPrompt,