@gajae-code/coding-agent 0.18.0 → 0.18.5

package/src/session/internal/managed-session-storage.ts

@@ -165,6 +165,27 @@ function isRetryableReplacementReceiptCleanupError(error: unknown): boolean {
 	return error instanceof Error && error.message === "managed_replace_receipt_cleanup_pending:io_error";
 }
 
+/**
+ * A receipt retirement slot is named only from the receipt and predecessor
+ * identities, so every process sharing a managed scope — the publisher retiring
+ * its own receipt and each peer reconciler that listed it — claims the same
+ * slot. Native exact-unlink reports `quarantine_collision` from its no-replace
+ * claim before any rename, so a collision that carries no detached or retained
+ * path proves only that a peer owns the retirement right now: this process
+ * changed nothing, the receipt stays where a later reconciliation finds it, and
+ * the unrelated mutation that triggered the scan must not fail.
+ */
+function isPeerOwnedReceiptRetirement(result: NativeExactUnlinkResult): boolean {
+	return (
+		!result.ok &&
+		result.code === "quarantine_collision" &&
+		result.detachedPath === undefined &&
+		result.retainedSuccessorPath === undefined &&
+		result.retainedPlaceholderPath === undefined &&
+		result.retainedUnknownPath === undefined
+	);
+}
+
 /** A same-filesystem rename updates the moved root's ctime but no other tree identity. */
 function sameDirectoryTreeSnapshotAfterRename(
 	left: NativeDirectoryTreeSnapshot,
@@ -1622,6 +1643,7 @@ export class ManagedSessionDescendantStore {
 			sha256: placeholder.identity.sha256,
 			quarantineName,
 		});
+		if (isPeerOwnedReceiptRetirement(removed)) return true;
 		if (
 			(!exactUnlinkCompleted(removed) && removed.code !== "not_found") ||
 			removed.retainedSuccessorPath !== undefined ||
@@ -1660,6 +1682,7 @@ export class ManagedSessionDescendantStore {
 			detachOnly: true,
 			quarantineName,
 		});
+		if (isPeerOwnedReceiptRetirement(detached)) return;
 		if (
 			!detached.ok &&
 			detached.code === "not_found" &&

package/src/task/index.ts

@@ -32,11 +32,11 @@ import { resolveProfileBindings } from "../config/model-profiles";
 import { resolveAgentModelPatterns } from "../config/model-resolver";
 import type { Theme } from "../modes/theme/theme";
 import planModeSubagentPrompt from "../prompts/system/plan-mode-subagent.md" with { type: "text" };
-import taskDescriptionTemplate from "../prompts/tools/task.md" with { type: "text" };
 import taskSummaryTemplate from "../prompts/tools/task-summary.md" with { type: "text" };
 import type { ForkContextSeed } from "../session/agent-session";
 import { splitSelectorThinkingSuffix } from "../thinking";
 import { formatBytes, formatDuration } from "../tools/render-utils";
+import { renderTaskDescription } from "../tools/session-descriptions";
 import { escapeXmlAttribute } from "../utils/xml-escape";
 import {
 	type AgentDefinition,
@@ -317,57 +317,26 @@ export {
 	taskSchema,
 } from "./types";
 
-/**
- * Render the tool description from a cached agent list and current settings.
- */
 function hasAvailableIrcTool(session: ToolSession): boolean {
 	return session.settings.get("irc.enabled") === true && session.getToolByName?.("irc") !== undefined;
 }
 
-function renderDescription(
-	agents: AgentDefinition[],
-	maxConcurrency: number,
-	isolationEnabled: boolean,
-	asyncEnabled: boolean,
-	disabledAgents: string[],
-	simpleMode: TaskSimpleMode,
-	ircEnabled: boolean,
-	parentSpawns: string,
-	autoroutingActive: boolean,
-): string {
-	const spawningDisabled = parentSpawns === "";
-	let filteredAgents = filterVisibleAgents(agents);
-	filteredAgents =
-		disabledAgents.length > 0 ? filteredAgents.filter(a => !disabledAgents.includes(a.name)) : filteredAgents;
-	if (spawningDisabled) {
-		filteredAgents = [];
-	} else if (parentSpawns !== "*") {
-		const allowed = new Set(
-			parentSpawns
-				.split(",")
-				.map(s => s.trim())
-				.filter(Boolean),
-		);
-		filteredAgents = filteredAgents.filter(a => allowed.has(a.name));
-	}
-	const { contextEnabled, customSchemaEnabled } = getTaskSimpleModeCapabilities(simpleMode);
-	const description = prompt.render(taskDescriptionTemplate, {
-		agents: filteredAgents,
-		spawningDisabled,
-		MAX_CONCURRENCY: maxConcurrency,
-		isolationEnabled,
-		asyncEnabled,
-		contextEnabled,
-		customSchemaEnabled,
-		ircEnabled,
-		defaultMode: simpleMode === "default",
-		schemaFreeMode: simpleMode === "schema-free",
-		independentMode: simpleMode === "independent",
-		autoroutingActive,
-	});
-	return description;
+function callableAgents(agents: readonly AgentDefinition[], session: ToolSession): AgentDefinition[] {
+	const disabledAgents = new Set(session.settings.get("task.disabledAgents"));
+	const parentSpawns = session.getSessionSpawns() ?? "*";
+	const allowedSpawns =
+		parentSpawns === "*"
+			? undefined
+			: new Set(
+					parentSpawns
+						.split(",")
+						.map(agent => agent.trim())
+						.filter(Boolean),
+				);
+	return filterVisibleAgents(agents).filter(
+		agent => !disabledAgents.has(agent.name) && (allowedSpawns === undefined || allowedSpawns.has(agent.name)),
+	);
 }
-
 function createTaskModeError(text: string): AgentToolResult<TaskToolDetails> {
 	return {
 		content: [{ type: "text", text }],
@@ -614,22 +583,8 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 		return renderTaskCall(args as TaskParams, options, theme);
 	}
 
-	/** Dynamic description that reflects current disabled-agent settings */
 	get description(): string {
-		const disabledAgents = this.session.settings.get("task.disabledAgents") as string[];
-		const maxConcurrency = this.session.settings.get("task.maxConcurrency");
-		const isolationMode = this.session.settings.get("task.isolation.mode");
-		return renderDescription(
-			this.#discoveredAgents,
-			maxConcurrency,
-			isolationMode !== "none",
-			true,
-			disabledAgents,
-			this.#getTaskSimpleMode(),
-			hasAvailableIrcTool(this.session),
-			this.session.getSessionSpawns() ?? "*",
-			this.session.settings.getEffectiveAutorouting().active,
-		);
+		return renderTaskDescription(this.session);
 	}
 	readonly #sessionRepositoryBinding: RepositoryBinding;
 	#testRunSubprocess: typeof runSubprocess | undefined;
@@ -945,8 +900,8 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 		const agent = getAgent(this.#discoveredAgents, params.agent);
 		if (!agent) {
 			const available =
-				filterVisibleAgents(this.#discoveredAgents)
-					.map(a => a.name)
+				callableAgents(this.#discoveredAgents, this.session)
+					.map(agent => agent.name)
 					.join(", ") || "none";
 			return {
 				content: [{ type: "text", text: `Unknown agent "${params.agent}". Available: ${available}` }],
@@ -1714,8 +1669,8 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 		const agent = getAgent(agents, agentName);
 		if (!agent) {
 			const available =
-				filterVisibleAgents(agents)
-					.map(a => a.name)
+				callableAgents(agents, this.session)
+					.map(agent => agent.name)
 					.join(", ") || "none";
 			return {
 				content: [

package/src/tools/bash.ts

@@ -10,10 +10,26 @@ import { type BashArtifactSaveResult, type BashResult, executeBash } from "../ex
 
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { buildGjcRuntimeSessionEnv } from "../gjc-runtime/goal-mode-request";
+import {
+	MANAGED_OWNER_PREDECESSOR_GENERATION_ENV,
+	MANAGED_OWNER_PREDECESSOR_INCARNATION_ENV,
+	MANAGED_OWNER_PREDECESSOR_RUN_ID_ENV,
+	MANAGED_OWNER_PREDECESSOR_TOKEN_ENV,
+	MANAGED_OWNER_TRANSCRIPT_PATH_ENV,
+} from "../gjc-runtime/managed-owner-admission";
+import {
+	MANAGED_OWNER_CHILD_TOKEN_ENV,
+	MANAGED_OWNER_GENERATION_ENV,
+	MANAGED_OWNER_INCARNATION_ENV,
+	MANAGED_OWNER_RUN_ID_ENV,
+	MANAGED_OWNER_STATE_DIR_ENV,
+} from "../gjc-runtime/managed-owner-supervisor";
 import {
 	GJC_RALPLAN_ARTIFACT_ENV,
 	GJC_RESTRICTED_ROLE_AGENT_BASH_ENV,
 } from "../gjc-runtime/restricted-role-agent-bash";
+import { GJC_TMUX_OWNER_SERVER_KEY_ENV } from "../gjc-runtime/session-state-sidecar";
+import { GJC_TMUX_LAUNCHED_ENV } from "../gjc-runtime/windows-powershell-command";
 import { InternalUrlRouter } from "../internal-urls";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
 import { highlightCode, type Theme } from "../modes/theme/theme";
@@ -94,6 +110,27 @@ const ARTIFACT_SAVE_DIAGNOSTIC_MAX_BYTES = 256;
 const BASH_ENV_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const MASTER_CAPABILITY_ENV = "GJC_MASTER_CAPABILITY";
 const MASTER_OWNER_SESSION_ENV = "GJC_MASTER_OWNER_SESSION_ID";
+// Managed-owner env vars that must be scrubbed from child processes.
+// Exported for testing the env scrubbing behavior.
+export const MANAGED_OWNER_BASH_ENV = [
+	MANAGED_OWNER_STATE_DIR_ENV,
+	MANAGED_OWNER_GENERATION_ENV,
+	MANAGED_OWNER_RUN_ID_ENV,
+	MANAGED_OWNER_INCARNATION_ENV,
+	MANAGED_OWNER_CHILD_TOKEN_ENV,
+	MANAGED_OWNER_PREDECESSOR_TOKEN_ENV,
+	MANAGED_OWNER_PREDECESSOR_GENERATION_ENV,
+	MANAGED_OWNER_PREDECESSOR_RUN_ID_ENV,
+	MANAGED_OWNER_PREDECESSOR_INCARNATION_ENV,
+	MANAGED_OWNER_TRANSCRIPT_PATH_ENV,
+	// The rest of the tmux-owner tuple (tmux-sessions.ts managedEnvironment): leaving
+	// either behind makes ownerTerminalContextFromEnvironment() report "invalid" in a
+	// nested gjc, because a server key or GJC_TMUX_LAUNCHED=1 without generation/state
+	// dir is an incomplete owner context.
+	GJC_TMUX_OWNER_SERVER_KEY_ENV,
+	GJC_TMUX_LAUNCHED_ENV,
+] as const;
+
 const COORDINATOR_ONLY_BASH_ENV = [
 	"GJC_COORDINATOR_SESSION_STATE_FILE",
 	"GJC_COORDINATOR_SESSION_ID",
@@ -102,6 +139,8 @@ const COORDINATOR_ONLY_BASH_ENV = [
 	"GJC_COORDINATOR_SESSION_READINESS_FILE",
 	"GJC_COORDINATOR_SIDECAR_SIGNATURE_REQUIRED",
 	"GJC_COORDINATOR_SIDECAR_KEY_ID",
+	// Managed-owner env family from managed-owner-supervisor.ts and managed-owner-admission.ts
+	...MANAGED_OWNER_BASH_ENV,
 ] as const;
 const DEFAULT_AUTO_BACKGROUND_THRESHOLD_MS = 60_000;
 const ACP_RELEASE_TIMEOUT_MS = 1_000;

package/src/tools/descriptors.ts

@@ -11,6 +11,12 @@ import {
 	validateDeferredAskArguments,
 	validateDeferredTodoArguments,
 } from "./descriptor-validation";
+import {
+	evalToolDescriptionForSession,
+	renderTaskDescription,
+	searchToolDescriptionForSession,
+	taskParametersForSession,
+} from "./session-descriptions";
 import { TOOL_CATALOG, type ToolCatalogEntry } from "./tool-catalog.generated";
 import { ToolError } from "./tool-errors";
 
@@ -33,6 +39,11 @@ export interface ToolDescriptorMetadata {
 	readonly intent?: AgentTool<any, any, any>["intent"];
 	readonly parametersForSession?: (session?: ToolSession) => TSchema;
 	readonly parameters?: TSchema;
+	/**
+	 * Renders the description the loaded tool will report for this session. Tools whose prompt text
+	 * depends on session settings need it, or the advertised text changes on first load (#5992).
+	 */
+	readonly descriptionForSession?: (session: ToolSession) => string;
 	readonly description?: string;
 	readonly label?: string;
 	readonly customWireName?: string;
@@ -121,8 +132,10 @@ export class LazyAgentTool implements AgentTool<any, any, any> {
 		return this.#tool?.name ?? this.descriptor.metadata.name;
 	}
 	get description(): string {
+		const session = this.#session;
 		return (
 			this.#tool?.description ??
+			(session ? this.descriptor.metadata.descriptionForSession?.(session) : undefined) ??
 			this.descriptor.metadata.description ??
 			this.descriptor.presentation.summary ??
 			this.descriptor.metadata.summary ??
@@ -393,6 +406,7 @@ function descriptor(spec: DescriptorSpec): ToolDescriptor {
 		inline: catalog?.inline ?? spec.inline,
 		rawArgumentValidation: spec.rawArgumentValidation,
 		parametersForSession: spec.parametersForSession,
+		descriptionForSession: spec.descriptionForSession,
 		intent: catalog?.intent ?? spec.intent,
 		description: catalog?.description ?? spec.description,
 		parameters: spec.parameters ?? (catalog?.parameters as TSchema | undefined),
@@ -465,6 +479,15 @@ const names: Array<[name: string, label: string, summary: string | undefined, lo
 		["move_session", "Move Session", undefined, "essential"],
 	];
 
+const sessionDescriptions: Readonly<Record<string, ToolDescriptorMetadata["descriptionForSession"]>> = {
+	eval: evalToolDescriptionForSession,
+	search: searchToolDescriptionForSession,
+	task: renderTaskDescription,
+};
+
+const sessionParameters: Readonly<Record<string, ToolDescriptorMetadata["parametersForSession"]>> = {
+	task: taskParametersForSession,
+};
 const descriptorRawArgumentValidations: Readonly<Record<string, ToolDescriptorMetadata["rawArgumentValidation"]>> = {
 	ask: validateDeferredAskArguments,
 	todo_write: validateDeferredTodoArguments,
@@ -487,7 +510,10 @@ const builtins = names
 					: undefined,
 			parameters: name === "ask" ? deferredAskParameters : undefined,
 			parametersForSession:
-				name === "ask" ? session => selectAskParameters(session?.getDeepInterviewAskStage?.()) : undefined,
+				name === "ask"
+					? session => selectAskParameters(session?.getDeepInterviewAskStage?.())
+					: sessionParameters[name],
+			descriptionForSession: sessionDescriptions[name],
 			rawArgumentValidation: descriptorRawArgumentValidations[name],
 			intent: deferredIntentPolicies[name],
 			loader: loaders[name],

package/src/tools/eval-backends.ts

@@ -0,0 +1,95 @@
+/**
+ * Eval backend allowance (`GJC_PY`, legacy `PI_PY` / `PI_JS`, then `eval.py` / `eval.js` settings).
+ * Kept out of the tools index so lightweight modules, such as the pre-load tool descriptions, can
+ * resolve it without importing the whole registry.
+ */
+import { $env } from "@gajae-code/utils";
+import type { ToolSession } from ".";
+
+export interface EvalBackendsAllowance {
+	python: boolean;
+	js: boolean;
+}
+
+/**
+ * Parse the `GJC_PY` multi-value token into per-backend booleans.
+ *
+ * Tokens (case-insensitive):
+ * - `0` / `bash` → JavaScript only (`{ py: false, js: true }`)
+ * - `1` / `py`   → Python only (`{ py: true, js: false }`)
+ * - `js`         → JavaScript only (`{ py: false, js: true }`)
+ * - `mix` / `both` → both backends (`{ py: true, js: true }`)
+ *
+ * Returns `null` when `GJC_PY` is unset, empty, or holds an unrecognized
+ * token, so the caller can fall back to the legacy `PI_PY` / `PI_JS` flags or
+ * per-key settings. This matches the documented contract that invalid values
+ * are ignored.
+ */
+export function parseGjcPy(env: Record<string, string | undefined>): { py: boolean; js: boolean } | null {
+	const raw = env.GJC_PY;
+	if (raw === undefined) return null;
+	const token = raw.trim().toLowerCase();
+	if (token === "") return null;
+	switch (token) {
+		case "0":
+		case "bash":
+			return { py: false, js: true };
+		case "1":
+		case "py":
+			return { py: true, js: false };
+		case "js":
+			return { py: false, js: true };
+		case "mix":
+		case "both":
+			return { py: true, js: true };
+		default:
+			return null;
+	}
+}
+
+function isTruthyPythonFlag(value: string | undefined): boolean {
+	return value !== undefined && ["1", "true", "yes", "on", "y"].includes(value.trim().toLowerCase());
+}
+
+/**
+ * Parse legacy `PI_PY` / `PI_JS` boolean flags. Each is a boolean flag; unset
+ * means "not specified, defer to settings". Returns `null` when neither is set
+ * so the caller can fall through to `readEvalBackendsAllowance` per key.
+ */
+function parseLegacyEvalEnvFlags(env: Record<string, string | undefined>): EvalBackendsAllowance | null {
+	const pyEnv = env.PI_PY;
+	const jsEnv = env.PI_JS;
+	if (pyEnv === undefined && jsEnv === undefined) return null;
+	return {
+		python: pyEnv === undefined ? true : isTruthyPythonFlag(pyEnv),
+		js: jsEnv === undefined ? true : isTruthyPythonFlag(jsEnv),
+	};
+}
+
+/**
+ * Resolve eval-backend allowance from environment only. `GJC_PY` wins when set
+ * to a recognized token; otherwise the legacy `PI_PY` / `PI_JS` flags apply.
+ * Returns `null` when no env override is set so the caller can defer to settings.
+ */
+export function resolveEvalBackendsFromEnv(env: Record<string, string | undefined>): EvalBackendsAllowance | null {
+	const gjc = parseGjcPy(env);
+	if (gjc) return { python: gjc.py, js: gjc.js };
+	return parseLegacyEvalEnvFlags(env);
+}
+
+/** Read per-backend allowance from settings (defaults true). */
+export function readEvalBackendsAllowance(session: ToolSession): EvalBackendsAllowance {
+	return {
+		python: session.settings.get("eval.py") ?? true,
+		js: session.settings.get("eval.js") ?? true,
+	};
+}
+
+/**
+ * Materialize the active eval backend allowance. `GJC_PY` takes precedence
+ * over the legacy `PI_PY` / `PI_JS` env flags, which in turn override the
+ * per-key settings (defaults true). When no env override is set, settings win.
+ */
+export function resolveEvalBackends(session: ToolSession): EvalBackendsAllowance {
+	return resolveEvalBackendsFromEnv($env) ?? readEvalBackendsAllowance(session);
+}

package/src/tools/eval.ts

@@ -2,7 +2,6 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { ImageContent } from "@gajae-code/ai/core";
 import type { Component } from "@gajae-code/tui";
 import { Markdown, Text } from "@gajae-code/tui";
-import { prompt } from "@gajae-code/utils";
 import * as z from "zod/v4";
 import { jsBackend, pythonBackend } from "../eval";
 import type { ExecutorBackend } from "../eval/backend";
@@ -10,7 +9,6 @@ import type { EvalCellResult, EvalDisplayOutput, EvalLanguage, EvalStatusEvent,
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
 import { getMarkdownTheme, type Theme } from "../modes/theme/theme";
-import evalDescription from "../prompts/tools/eval.md" with { type: "text" };
 import { DEFAULT_MAX_BYTES, OutputSink, type OutputSummary, TailBuffer } from "../session/streaming-output";
 import { getTreeBranch, getTreeContinuePrefix, renderCodeCell } from "../tui";
 import { resolveEvalBackends, type ToolSession } from ".";
@@ -21,6 +19,7 @@ import {
 	stripOutputNotice,
 } from "./output-meta";
 import { formatTitle, replaceTabs, shortenPath, truncateToWidth, wrapBrackets } from "./render-utils";
+import { evalToolDescriptionForSession } from "./session-descriptions";
 import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { clampTimeout } from "./tool-timeouts";
@@ -134,16 +133,7 @@ function renderJsonTree(value: unknown, theme: Theme, expanded: boolean, maxDept
 	return renderNode(value, "", 0, true);
 }
 
-export interface EvalToolDescriptionOptions {
-	py?: boolean;
-	js?: boolean;
-}
-
-export function getEvalToolDescription(options: EvalToolDescriptionOptions = {}): string {
-	const py = options.py ?? true;
-	const js = options.js ?? true;
-	return prompt.render(evalDescription, { py, js });
-}
+export { type EvalToolDescriptionOptions, getEvalToolDescription } from "./session-descriptions";
 
 export interface EvalToolOptions {
 	proxyExecutor?: EvalProxyExecutor;
@@ -204,9 +194,7 @@ export class EvalTool implements AgentTool<typeof evalSchema> {
 	readonly loadMode = "discoverable";
 	readonly label = "Eval";
 	get description(): string {
-		if (!this.session) return getEvalToolDescription();
-		const backends = resolveEvalBackends(this.session);
-		return getEvalToolDescription({ py: backends.python, js: backends.js });
+		return evalToolDescriptionForSession(this.session);
 	}
 	readonly parameters = evalSchema;
 	readonly concurrency = "exclusive";

package/src/tools/index.ts

@@ -1,6 +1,6 @@
 import type { AgentTelemetryConfig, AgentTool } from "@gajae-code/agent-core";
 import type { Model, ServiceTier, ToolChoice } from "@gajae-code/ai/core";
-import { $env, logger } from "@gajae-code/utils";
+import { logger } from "@gajae-code/utils";
 import type { AsyncJobManager, FoldReason } from "../async";
 import type { PromptTemplate } from "../config/prompt-templates";
 import type { Settings } from "../config/settings";
@@ -37,6 +37,7 @@ import {
 	resolveEffectiveDiscoveryMode,
 	type ToolAvailabilityContext,
 } from "./descriptors";
+import { resolveEvalBackends } from "./eval-backends";
 import { wrapToolWithMetaNotice } from "./output-meta";
 import type { TodoPhase } from "./todo-write";
 
@@ -491,93 +492,13 @@ const GOAL_MODE_TOOL_NAMES = [] as const;
 
 export type ToolName = keyof typeof BUILTIN_TOOLS;
 
-export interface EvalBackendsAllowance {
-	python: boolean;
-	js: boolean;
-}
-
-/**
- * Parse the `GJC_PY` multi-value token into per-backend booleans.
- *
- * Tokens (case-insensitive):
- * - `0` / `bash` → JavaScript only (`{ py: false, js: true }`)
- * - `1` / `py`   → Python only (`{ py: true, js: false }`)
- * - `js`         → JavaScript only (`{ py: false, js: true }`)
- * - `mix` / `both` → both backends (`{ py: true, js: true }`)
- *
- * Returns `null` when `GJC_PY` is unset, empty, or holds an unrecognized
- * token, so the caller can fall back to the legacy `PI_PY` / `PI_JS` flags or
- * per-key settings. This matches the documented contract that invalid values
- * are ignored.
- */
-export function parseGjcPy(env: Record<string, string | undefined>): { py: boolean; js: boolean } | null {
-	const raw = env.GJC_PY;
-	if (raw === undefined) return null;
-	const token = raw.trim().toLowerCase();
-	if (token === "") return null;
-	switch (token) {
-		case "0":
-		case "bash":
-			return { py: false, js: true };
-		case "1":
-		case "py":
-			return { py: true, js: false };
-		case "js":
-			return { py: false, js: true };
-		case "mix":
-		case "both":
-			return { py: true, js: true };
-		default:
-			return null;
-	}
-}
-
-function isTruthyPythonFlag(value: string | undefined): boolean {
-	return value !== undefined && ["1", "true", "yes", "on", "y"].includes(value.trim().toLowerCase());
-}
-
-/**
- * Parse legacy `PI_PY` / `PI_JS` boolean flags. Each is a boolean flag; unset
- * means "not specified, defer to settings". Returns `null` when neither is set
- * so the caller can fall through to `readEvalBackendsAllowance` per key.
- */
-function parseLegacyEvalEnvFlags(env: Record<string, string | undefined>): EvalBackendsAllowance | null {
-	const pyEnv = env.PI_PY;
-	const jsEnv = env.PI_JS;
-	if (pyEnv === undefined && jsEnv === undefined) return null;
-	return {
-		python: pyEnv === undefined ? true : isTruthyPythonFlag(pyEnv),
-		js: jsEnv === undefined ? true : isTruthyPythonFlag(jsEnv),
-	};
-}
-
-/**
- * Resolve eval-backend allowance from environment only. `GJC_PY` wins when set
- * to a recognized token; otherwise the legacy `PI_PY` / `PI_JS` flags apply.
- * Returns `null` when no env override is set so the caller can defer to settings.
- */
-export function resolveEvalBackendsFromEnv(env: Record<string, string | undefined>): EvalBackendsAllowance | null {
-	const gjc = parseGjcPy(env);
-	if (gjc) return { python: gjc.py, js: gjc.js };
-	return parseLegacyEvalEnvFlags(env);
-}
-
-/** Read per-backend allowance from settings (defaults true). */
-export function readEvalBackendsAllowance(session: ToolSession): EvalBackendsAllowance {
-	return {
-		python: session.settings.get("eval.py") ?? true,
-		js: session.settings.get("eval.js") ?? true,
-	};
-}
-
-/**
- * Materialize the active eval backend allowance. `GJC_PY` takes precedence
- * over the legacy `PI_PY` / `PI_JS` env flags, which in turn override the
- * per-key settings (defaults true). When no env override is set, settings win.
- */
-export function resolveEvalBackends(session: ToolSession): EvalBackendsAllowance {
-	return resolveEvalBackendsFromEnv($env) ?? readEvalBackendsAllowance(session);
-}
+export {
+	type EvalBackendsAllowance,
+	parseGjcPy,
+	readEvalBackendsAllowance,
+	resolveEvalBackends,
+	resolveEvalBackendsFromEnv,
+} from "./eval-backends";
 
 /**
  * Create tools from the descriptor registry.

package/src/tools/search.ts

@@ -5,12 +5,10 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { GrepMatch, GrepResult, grep as grepFn } from "@gajae-code/natives";
 import type { Component } from "@gajae-code/tui";
 import { Text } from "@gajae-code/tui";
-import { prompt } from "@gajae-code/utils";
 import * as z from "zod/v4";
 import { getFileReadCache } from "../edit/file-read-cache";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
-import searchDescription from "../prompts/tools/search.md" with { type: "text" };
 import { DEFAULT_MAX_COLUMN, type TruncationResult, truncateHead } from "../session/streaming-output";
 import { Ellipsis, fileHyperlink, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
@@ -35,6 +33,7 @@ import {
 	PREVIEW_LIMITS,
 	splitGroupsByBlankLine,
 } from "./render-utils";
+import { searchToolDescriptionForSession } from "./session-descriptions";
 import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 
@@ -259,11 +258,7 @@ export class SearchTool implements AgentTool<typeof searchSchema, SearchToolDeta
 	readonly loadMode = "discoverable";
 	readonly summary = "Search file contents using ripgrep (fast text search)";
 	get description(): string {
-		const displayMode = resolveFileDisplayMode(this.session);
-		return prompt.render(searchDescription, {
-			IS_HL_MODE: displayMode.hashLines,
-			IS_LINE_NUMBER_MODE: !displayMode.hashLines && displayMode.lineNumbers,
-		});
+		return searchToolDescriptionForSession(this.session);
 	}
 	readonly parameters = searchSchema;
 	readonly strict = true;