scream-code 0.10.7 → 0.10.9

package/dist/{app-BZwFbrNj.mjs → app-CwHfTwUZ.mjs}

@@ -7,7 +7,7 @@ import { i as __require, o as __toESM, r as __exportAll, t as __commonJSMin } fr
 import "./suppress-sqlite-warning-C2VB0doZ.mjs";
 import { C as join$1, D as resolve$1, E as relative$1, S as isAbsolute$1, T as parse$7, a as isSupportedFile, b as basename$1, i as ingestFile, r as ingestDirectory, t as multiSearch, w as normalize, x as dirname$2, y as KnowledgeStore } from "./src-BH9W5k24.mjs";
 import { t as require_base64_js } from "./base64-js-DzVmk6Nb.mjs";
-import { a as setLocale, i as getLocale, n as assertScreamHostIdentity, o as t, r as createScreamDefaultHeaders, t as TextInputDialogComponent } from "./text-input-dialog-BWp39mq8.mjs";
+import { a as setLocale, i as getLocale, n as assertScreamHostIdentity, o as t, r as createScreamDefaultHeaders, t as TextInputDialogComponent } from "./text-input-dialog-DRUaPOEQ.mjs";
 import { createRequire } from "node:module";
 import { createHash, randomBytes, randomInt, randomUUID } from "node:crypto";
 import * as fs$1 from "node:fs/promises";
@@ -28,6 +28,8 @@ import Vt, { appendFileSync, chmodSync, closeSync, constants, createReadStream,
 import * as path$8 from "node:path";
 import path, { basename, dirname as dirname$1, extname, isAbsolute, join, posix, relative, resolve, sep, win32 } from "node:path";
 import { z } from "zod";
+import { exec, execFile, execSync, spawn, spawnSync } from "node:child_process";
+import { promisify } from "node:util";
 import { DatabaseSync } from "node:sqlite";
 import * as nodeOs from "node:os";
 import { homedir, tmpdir } from "node:os";
@@ -35,7 +37,6 @@ import { EventEmitter as EventEmitter$1 } from "node:events";
 import { StringDecoder } from "node:string_decoder";
 import Pi from "assert";
 import ro from "node:assert";
-import { exec, execFile, execSync, spawn, spawnSync } from "node:child_process";
 import * as posixPath from "node:path/posix";
 import * as win32Path from "node:path/win32";
 import { createServer } from "node:http";
@@ -51,10 +52,9 @@ import { AsyncLocalStorage } from "node:async_hooks";
 import { Command, Option } from "commander";
 import { createInterface } from "node:readline/promises";
 import chalk, { chalkStderr } from "chalk";
-import { CombinedAutocompleteProvider, Container, Editor, Image, Input, Key, Markdown, ProcessTerminal, Spacer, TUI, Text, decodeKittyPrintable, deleteAllKittyImages, fuzzyFilter, fuzzyMatch, getCapabilities, getImageDimensions, isKeyRelease, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@liutod-scream/pi-tui";
+import { CombinedAutocompleteProvider, Container, Editor, Image, Input, Key, Markdown, ProcessTerminal, Spacer, TUI, Text, decodeKittyPrintable, deleteAllKittyImages, fuzzyFilter, fuzzyMatch, getCapabilities, getImageDimensions, isKeyRelease, matchesKey, setTightMode, sliceByColumn, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@liutod-scream/pi-tui";
 import { highlight, supportsLanguage } from "cli-highlight";
 import { diffWords } from "diff";
-import { promisify } from "node:util";
 import { gt, valid } from "semver";
 import { createInterface as createInterface$1 } from "node:readline";
 //#region ../../packages/agent-core/src/errors/codes.ts
@@ -10336,7 +10336,7 @@ var require_gaxios = /* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 		static async #getFetch() {
 			const hasWindow = typeof window !== "undefined" && !!window;
-			this.#fetch ||= hasWindow ? window.fetch : (await import("./src-BMbOMRuY.mjs")).default;
+			this.#fetch ||= hasWindow ? window.fetch : (await import("./src-C8lOjRbK.mjs")).default;
 			return this.#fetch;
 		}
 		/**
@@ -49870,6 +49870,7 @@ async function generate(provider, systemPrompt, tools, history, callbacks, optio
 	const hasText = message.content.some((p) => p.type === "text" && p.text.trim().length > 0);
 	const hasToolCalls = message.toolCalls.length > 0;
 	if (hasThink && !hasText && !hasToolCalls) throw new APIEmptyResponseError(`The API returned a response containing only thinking content without any text or tool calls. This usually indicates the stream was interrupted or the output token budget was exhausted during reasoning. Provider: ${provider.name}, model: ${provider.modelName}. If this persists, reduce reasoning effort or switch to a model with a larger output budget.`);
+	if (!hasText && !hasToolCalls && message.content.some((p) => p.type === "text")) throw new APIEmptyResponseError(`The API returned a response containing only empty or whitespace text. This usually indicates a truncated or malformed stream. Provider: ${provider.name}, model: ${provider.modelName}.`);
 	if (callbacks?.onToolCall !== void 0) for (const toolCall of message.toolCalls) {
 		await throwIfAborted$1(options?.signal, stream);
 		await callbacks.onToolCall(toolCall);
@@ -50801,6 +50802,14 @@ function resolveGlobalLogPath(homeDir) {
 //#endregion
 //#region ../../packages/agent-core/src/utils/tokens.ts
 /**
+* WeakMap cache for per-message token estimates. Messages are immutable once
+* settled (streaming `partial` messages never enter compaction paths), so the
+* cache is safe. Spread copies created by micro-compaction ({ ...msg, content })
+* are new objects → natural cache miss → re-estimated. Original objects retain
+* their cached count, avoiding O(n²) re-scans during compaction detection.
+*/
+const messageTokenCache = /* @__PURE__ */ new WeakMap();
+/**
 * Estimate token count from text using a character-based heuristic.
 *   - ASCII (~4 chars per token)
 *   - CJK and other non-ASCII (~1 char per token)
@@ -50830,12 +50839,15 @@ function estimateTokensForTools(tools) {
 	return total;
 }
 function estimateTokensForMessage(message) {
+	const cached = messageTokenCache.get(message);
+	if (cached !== void 0) return cached;
 	let total = estimateTokens$1(message.role);
 	for (const part of message.content) total += estimateTokensForContentPart(part);
 	if (message.toolCalls !== void 0) for (const call of message.toolCalls) {
 		total += estimateTokens$1(call.name);
 		total += estimateTokens$1(JSON.stringify(call.arguments));
 	}
+	messageTokenCache.set(message, total);
 	return total;
 }
 function estimateTokensForContentPart(part) {
@@ -54165,7 +54177,7 @@ function matchRuleSubjects(ruleArgs, subjects, matchesPositivePattern) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/background/task-list.md
-var task_list_default = "List background tasks and their current status.\n\nUse this tool to discover which background tasks exist and where each one\nstands. It is the entry point for inspecting background work: it returns a\ntask ID, status, command, description, and PID for every task it reports,\nplus the exit code and stop reason for tasks that have already finished.\n\nGuidelines:\n\n- After a context compaction, or whenever you are unsure which background\n  tasks are running or what their task IDs are, call this tool to\n  re-enumerate them instead of guessing a task ID.\n- Prefer the default `active_only=true`, which lists only non-terminal tasks.\n  Pass `active_only=false` only when you specifically need to see tasks that\n  have already finished. With `active_only=false` the result may also include\n  `lost` tasks — tasks left over from a previous process that can no longer be\n  inspected or controlled; treat them as already terminated.\n- `limit` caps how many tasks are returned. It accepts a value between 1 and\n  100 and defaults to 20 when omitted.\n- This tool only lists tasks; it does not return their output. Use it first\n  to locate the task ID you need, then call `TaskOutput` with that ID to read\n  the task's output and details.\n- This tool is read-only and does not change any state, so it is always safe\n  to call, including in plan mode.\n";
+var task_list_default = "List background tasks and their current status.\n\nUse this tool to discover which background tasks exist and where each one\nstands. It is the entry point for inspecting background work: it returns a\ntask ID, status, command, description, and PID for every task it reports,\nplus the exit code and stop reason for tasks that have already finished.\n\nGuidelines:\n\n- After a context compaction, or whenever you are unsure which background\n  tasks are running or what their task IDs are, call this tool to\n  re-enumerate them instead of guessing a task ID.\n- Pass `active_only=false` only when you specifically need to see tasks that\n  have already finished. With `active_only=false` the result may also include\n  `lost` tasks — tasks left over from a previous process that can no longer be\n  inspected or controlled; treat them as already terminated.\n- This tool only lists tasks; it does not return their output. Use it first\n  to locate the task ID you need, then call `TaskOutput` with that ID to read\n  the task's output and details.\n- This tool is read-only and does not change any state, so it is always safe\n  to call, including in plan mode.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/background/task-list.ts
 /**
@@ -54739,7 +54751,7 @@ function oneShotJitteredNextCronRunMs(task, idealMs, config = DEFAULT_CRON_JITTE
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/cron/cron-create.md
-var cron_create_default = "Schedule a prompt to be enqueued at a future time. Use for both recurring schedules and one-shot reminders.\n\nUses standard 5-field cron in the user's local timezone: minute hour day-of-month month day-of-week. `0 9 * * *` means 9am local — no timezone conversion needed.\n\n## One-shot tasks (recurring: false)\n\nFor \"remind me at X\" or \"at <time>, do Y\" requests — fire once then auto-delete.\nPin minute/hour/day-of-month/month to specific values:\n  \"remind me at 2:30pm today to check the deploy\" → cron: \"30 14 <today_dom> <today_month> *\", recurring: false\n  \"tomorrow morning, run the smoke test\" → cron: \"57 8 <tomorrow_dom> <tomorrow_month> *\", recurring: false\n\n## Recurring jobs (recurring: true, the default)\n\nFor \"every N minutes\" / \"every hour\" / \"weekdays at 9am\" requests:\n  \"*/5 * * * *\" (every 5 min), \"0 * * * *\" (hourly), \"0 9 * * 1-5\" (weekdays at 9am local)\n\n## Avoid the :00 and :30 minute marks when the task allows it\n\nEvery user who asks for \"9am\" gets `0 9`, and every user who asks for \"hourly\" gets `0 *` — which means requests from across the planet land on the API at the same instant. When the user's request is approximate, pick a minute that is NOT 0 or 30:\n  \"every morning around 9\" → \"57 8 * * *\" or \"3 9 * * *\" (not \"0 9 * * *\")\n  \"hourly\" → \"7 * * * *\" (not \"0 * * * *\")\n  \"in an hour or so, remind me to...\" → pick whatever minute you land on, don't round\n\nOnly use minute 0 or 30 when the user names that exact time and clearly means it (\"at 9:00 sharp\", \"at half past\", coordinating with a meeting). When in doubt, nudge a few minutes early or late — the user will not notice, and the fleet will.\n\n## Coalesce semantics\n\nIf the scheduler slept past multiple ideal fire times (laptop closed, long-running turn, etc.), only **one** fire is delivered when it wakes up. The origin carries `coalescedCount` showing how many ideal fires were collapsed into this single delivery. You should treat `coalescedCount > 1` as \"I missed some checks; only the latest state matters\" rather than running the prompt that many times.\n\n## Cron-fire envelope\n\nWhen a cron task fires, the prompt you scheduled is re-injected wrapped in an XML envelope that exposes the fire context:\n\n```\n<cron-fire jobId=\"...\" cron=\"...\" recurring=\"true|false\" coalescedCount=\"N\" stale=\"true|false\">\n<prompt>\nyour original prompt text, verbatim\n</prompt>\n</cron-fire>\n```\n\nThe envelope is parseable. Use `coalescedCount > 1` to know multiple ideal fires were collapsed into a single delivery (treat as \"only the latest state matters\"), and `stale=\"true\"` as a cue that the task is past its 7-day threshold.\n\n## 7-day stale behavior\n\nRecurring tasks that have been alive for more than 7 days fire one\nfinal time with `stale: true` on the envelope, and the system then\nauto-deletes the task. The flag is the model's notice that this is\nthe last delivery. If the schedule is still wanted, call `CronCreate`\nagain with the same `cron` and `prompt` — that resets `createdAt` and\nstarts a fresh 7-day window. One-shot tasks are never marked stale.\n\nBench / acceptance runs can set `SCREAM_CRON_NO_STALE=1` to disable the\njudgment entirely.\n\n## Jitter behavior\n\nAnti-herd jitter is applied deterministically per task id:\n  - Recurring: ideal fire time is shifted **forward** by an offset ≤ min(10% of the cron period, 15 minutes). A `*/5 * * * *` task can drift up to 30s; a `0 9 * * *` task can drift up to 15 minutes.\n  - One-shot: only when the ideal fire lands on `:00` or `:30` of the hour, the fire is pulled **earlier** by ≤ 90 seconds. Other minutes pass through unchanged.\n\nBench / acceptance tests can set `SCREAM_CRON_NO_JITTER=1` to disable jitter entirely.\n\n## One-shot vs recurring — when to pick which\n\nUse `recurring: false` for \"remind me at X\" style requests, single deadlines, \"in N minutes do Y\", and any task that should not repeat. Use `recurring: true` for periodic polling (CI status, build watchers, scheduled reports), workday rituals, and anything the user explicitly described as recurring.\n\n## Session lifetime\n\nCron tasks live in the current scream CLI session. When you exit, they\nare persisted under the session homedir; the next `scream resume` of the\nsame session reloads them and the scheduler resumes from each task's\n`createdAt`. Fire times that fell during the offline window are\ncollapsed into a single delivery via `coalescedCount` (and recurring\ntasks past their 7-day window arrive with `stale: true` as their final\ndelivery).\n\nTasks do **not** carry over into a brand-new session — they are scoped\nto the resumed session id, not to the working directory.\n\n## Returned fields\n\n`id` (8-hex), `humanSchedule` (English summary), `recurring`,\n`nextFireAt` (ISO timestamp or null). `id` is needed by `CronDelete`.\n";
+var cron_create_default = "Schedule a prompt to be enqueued at a future time. Use for both recurring schedules and one-shot reminders.\n\n`0 9 * * *` means 9am local — no timezone conversion needed.\n\n## One-shot tasks (recurring: false)\n\nFor \"remind me at X\" or \"at <time>, do Y\" requests — fire once then auto-delete.\nPin minute/hour/day-of-month/month to specific values:\n  \"remind me at 2:30pm today to check the deploy\" → cron: \"30 14 <today_dom> <today_month> *\", recurring: false\n  \"tomorrow morning, run the smoke test\" → cron: \"57 8 <tomorrow_dom> <tomorrow_month> *\", recurring: false\n\n## Recurring jobs\n\nFor \"every N minutes\" / \"every hour\" / \"weekdays at 9am\" requests:\n  \"*/5 * * * *\" (every 5 min), \"0 * * * *\" (hourly), \"0 9 * * 1-5\" (weekdays at 9am local)\n\n## Avoid the :00 and :30 minute marks when the task allows it\n\nEvery user who asks for \"9am\" gets `0 9`, and every user who asks for \"hourly\" gets `0 *` — which means requests from across the planet land on the API at the same instant. When the user's request is approximate, pick a minute that is NOT 0 or 30:\n  \"every morning around 9\" → \"57 8 * * *\" or \"3 9 * * *\" (not \"0 9 * * *\")\n  \"hourly\" → \"7 * * * *\" (not \"0 * * * *\")\n  \"in an hour or so, remind me to...\" → pick whatever minute you land on, don't round\n\nOnly use minute 0 or 30 when the user names that exact time and clearly means it (\"at 9:00 sharp\", \"at half past\", coordinating with a meeting). When in doubt, nudge a few minutes early or late — the user will not notice, and the fleet will.\n\n## Coalesce semantics\n\nIf the scheduler slept past multiple ideal fire times (laptop closed, long-running turn, etc.), only **one** fire is delivered when it wakes up. The origin carries `coalescedCount` showing how many ideal fires were collapsed into this single delivery. You should treat `coalescedCount > 1` as \"I missed some checks; only the latest state matters\" rather than running the prompt that many times.\n\n## Cron-fire envelope\n\nWhen a cron task fires, the prompt you scheduled is re-injected wrapped in an XML envelope that exposes the fire context:\n\n```\n<cron-fire jobId=\"...\" cron=\"...\" recurring=\"true|false\" coalescedCount=\"N\" stale=\"true|false\">\n<prompt>\nyour original prompt text, verbatim\n</prompt>\n</cron-fire>\n```\n\nThe envelope is parseable. Use `coalescedCount > 1` to know multiple ideal fires were collapsed into a single delivery (treat as \"only the latest state matters\"), and `stale=\"true\"` as a cue that the task is past its 7-day threshold.\n\n## 7-day stale behavior\n\nRecurring tasks that have been alive for more than 7 days fire one\nfinal time with `stale: true` on the envelope, and the system then\nauto-deletes the task. The flag is the model's notice that this is\nthe last delivery. If the schedule is still wanted, call `CronCreate`\nagain with the same `cron` and `prompt` — that resets `createdAt` and\nstarts a fresh 7-day window. One-shot tasks are never marked stale.\n\nBench / acceptance runs can set `SCREAM_CRON_NO_STALE=1` to disable the\njudgment entirely.\n\n## Jitter behavior\n\nAnti-herd jitter is applied deterministically per task id:\n  - Recurring: ideal fire time is shifted **forward** by an offset ≤ min(10% of the cron period, 15 minutes). A `*/5 * * * *` task can drift up to 30s; a `0 9 * * *` task can drift up to 15 minutes.\n  - One-shot: only when the ideal fire lands on `:00` or `:30` of the hour, the fire is pulled **earlier** by ≤ 90 seconds. Other minutes pass through unchanged.\n\nBench / acceptance tests can set `SCREAM_CRON_NO_JITTER=1` to disable jitter entirely.\n\n## One-shot vs recurring — when to pick which\n\nUse one-shot for \"remind me at X\" style requests, single deadlines, and any task that should not repeat. Use recurring for periodic polling (CI status, build watchers, scheduled reports), workday rituals, and anything the user explicitly described as recurring.\n\n## Session lifetime\n\nCron tasks live in the current scream CLI session. When you exit, they\nare persisted under the session homedir; the next `scream resume` of the\nsame session reloads them and the scheduler resumes from each task's\n`createdAt`. Fire times that fell during the offline window are\ncollapsed into a single delivery via `coalescedCount` (and recurring\ntasks past their 7-day window arrive with `stale: true` as their final\ndelivery).\n\nTasks do **not** carry over into a brand-new session — they are scoped\nto the resumed session id, not to the working directory.\n\n## Returned fields\n\n`id` (8-hex), `humanSchedule` (English summary), `recurring`,\n`nextFireAt` (ISO timestamp or null). `id` is needed by `CronDelete`.\n";
 /**
 * Hard ceiling on `prompt` byte length (UTF-8). The zod `.max(...)`
 * upstream is in code units, which underflows multi-byte input
@@ -54860,7 +54872,7 @@ function formatOutput(o) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/cron/cron-delete.md
-var cron_delete_default = "Cancel a scheduled cron job by id.\n\nUse this tool to remove a cron task previously scheduled with\n`CronCreate`. The `id` is the 8-hex value returned by `CronCreate`, or\nshown in the `id:` column of `CronList` — quote it verbatim, no\nprefix.\n\nBehaviour by task kind:\n\n- **Recurring task** (`recurring: true`): stops all future fires\n  immediately. The scheduler picks up the deletion on its next tick.\n- **One-shot task** (`recurring: false`): cancels the pending fire if\n  it has not happened yet. One-shots that have already fired\n  auto-delete themselves, so calling `CronDelete` on a fired one-shot\n  returns \"no cron job with id ...\".\n\nNot-found is reported as an error (not a silent no-op) so you can\ncorrect yourself — typically by calling `CronList` to see which ids\nare actually live, rather than re-trying with the same stale id.\n\nRefresh pattern (use when you want a stale recurring schedule to\ncontinue):\n\nStale recurring tasks are auto-deleted by the system after their final\nfire — there is nothing for `CronDelete` to remove at that point. To\nkeep the schedule running, just call `CronCreate` with the same `cron`\nand `prompt`. Use `CronList`'s `prompt` field to recall the original\ntext after a context compaction.\n\n`CronDelete` remains the right call when you want to cancel a task\nthat is still live (recurring not yet stale, or a one-shot still\npending).\n\nGuidelines:\n\n- Cron deletion is irreversible — there is no undo. If you delete the\n  wrong task, you must re-create it with `CronCreate`.\n- If the model is unsure which id is current (e.g. after a context\n  compaction), call `CronList` first rather than guessing.\n";
+var cron_delete_default = "Cancel a scheduled cron job by id.\n\nUse this tool to remove a cron task previously scheduled with\n`CronCreate`. Quote the id verbatim, no prefix.\n\nBehaviour by task kind:\n\n- **Recurring task** (`recurring: true`): stops all future fires\n  immediately. The scheduler picks up the deletion on its next tick.\n- **One-shot task** (`recurring: false`): cancels the pending fire if\n  it has not happened yet. One-shots that have already fired\n  auto-delete themselves, so calling `CronDelete` on a fired one-shot\n  returns \"no cron job with id ...\".\n\nNot-found is reported as an error (not a silent no-op) so you can\ncorrect yourself — typically by calling `CronList` to see which ids\nare actually live, rather than re-trying with the same stale id.\n\nRefresh pattern (use when you want a stale recurring schedule to\ncontinue):\n\nStale recurring tasks are auto-deleted by the system after their final\nfire — there is nothing for `CronDelete` to remove at that point. To\nkeep the schedule running, just call `CronCreate` with the same `cron`\nand `prompt`. Use `CronList`'s `prompt` field to recall the original\ntext after a context compaction.\n\n`CronDelete` remains the right call when you want to cancel a task\nthat is still live (recurring not yet stale, or a one-shot still\npending).\n\nGuidelines:\n\n- Cron deletion is irreversible — there is no undo. If you delete the\n  wrong task, you must re-create it with `CronCreate`.\n- If the model is unsure which id is current (e.g. after a context\n  compaction), call `CronList` first rather than guessing.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/cron/cron-delete.ts
 /**
@@ -55471,7 +55483,7 @@ function filterSubagentsBySpawns$1(subagents, allowedSpawns) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/ask-user.md
-var ask_user_default = "Use this tool when you need to ask the user questions with structured options during execution. This allows you to:\n1. Collect user preferences or requirements before proceeding\n2. Resolve ambiguous or underspecified instructions\n3. Let the user decide between implementation approaches as you work\n4. Present concrete options when multiple valid directions exist\n\n**When NOT to use:**\n- When you can infer the answer from context — be decisive and proceed\n- Trivial decisions that don't materially affect the outcome\n\nOverusing this tool interrupts the user's flow. Only use it when the user's input genuinely changes your next action.\n\n**Usage notes:**\n- Users always have an \"Other\" option for custom input — don't create one yourself\n- Use multi_select to allow multiple answers to be selected for a question\n- Keep option labels concise (1-5 words), use descriptions for trade-offs and details\n- Each question should have 2-4 meaningful, distinct options\n- You can ask 1-4 questions at a time; group related questions to minimize interruptions\n- If you recommend a specific option, list it first and append \"(Recommended)\" to its label";
+var ask_user_default = "Use this tool when you need to ask the user questions with structured options during execution. This allows you to:\n1. Collect user preferences or requirements before proceeding\n2. Resolve ambiguous or underspecified instructions\n3. Let the user decide between implementation approaches as you work\n4. Present concrete options when multiple valid directions exist\n\n**When NOT to use:**\n- When you can infer the answer from context - be decisive and proceed\n- Trivial decisions that don't materially affect the outcome\n\nOverusing this tool interrupts the user's flow. Only use it when the user's input genuinely changes your next action.\n\n**Usage notes:**\n- Group related questions to minimize interruptions.\n- If you recommend a specific option, list it first.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/ask-user.ts
 /**
@@ -55719,7 +55731,7 @@ const SetGoalBudgetToolInputSchema = z.object({
 var SetGoalBudgetTool = class {
 	agent;
 	name = "SetGoalBudget";
-	description = "Set a hard budget limit for the current goal. Accepts one limit at a time (turns, tokens, or time). The goal will be blocked when the budget is reached.";
+	description = "Set a hard budget limit for the current goal. The goal will be blocked when the budget is reached.";
 	parameters = toInputJsonSchema(SetGoalBudgetToolInputSchema);
 	constructor(agent) {
 		this.agent = agent;
@@ -55791,14 +55803,32 @@ const MAX_GOAL_OBJECTIVE_LENGTH = 4e3;
 /** Consecutive markBlocked calls with the same reason required before blocking. */
 const BLOCKED_STREAK_THRESHOLD = 3;
 /** Maximum number of working notes kept per goal. */
-const MAX_GOAL_NOTES = 30;
+const MAX_GOAL_NOTES = 60;
 /** Maximum characters per note. */
-const MAX_NOTE_LENGTH = 200;
+const MAX_NOTE_LENGTH = 400;
 const GOAL_CANCELLED_REMINDER = [
 	"The user cancelled the current goal.",
 	"Ignore earlier active-goal reminders for that goal.",
 	"Handle the next user request normally unless the user starts or resumes a goal."
 ].join(" ");
+/**
+* Returns true when any configured budget has less than `threshold` of its
+* allowance remaining (e.g. 0.2 = under 20% left). Budgets that are not
+* configured (null) are ignored. Used to steer the model toward convergence
+* before a hard over-budget block fires.
+*/
+function isBudgetNearExhaustion(budget, threshold) {
+	if (budget.turnBudget !== null && budget.remainingTurns !== null && budget.turnBudget > 0) {
+		if (budget.remainingTurns / budget.turnBudget < threshold) return true;
+	}
+	if (budget.tokenBudget !== null && budget.remainingTokens !== null && budget.tokenBudget > 0) {
+		if (budget.remainingTokens / budget.tokenBudget < threshold) return true;
+	}
+	if (budget.wallClockBudgetMs !== null && budget.remainingWallClockMs !== null && budget.wallClockBudgetMs > 0) {
+		if (budget.remainingWallClockMs / budget.wallClockBudgetMs < threshold) return true;
+	}
+	return false;
+}
 const GOAL_COMPLETION_REMINDER_NAME = "goal_completion_summary";
 const GOAL_BLOCKED_REMINDER_NAME = "goal_blocked_reason";
 var GoalMode = class {
@@ -55858,6 +55888,7 @@ var GoalMode = class {
 			state.wallClockResumedAt = void 0;
 		}
 		if (record.budgetLimits !== void 0) state.budgetLimits = record.budgetLimits;
+		if (record.objective !== void 0) state.objective = record.objective;
 	}
 	restoreClear(_record) {
 		this.state = void 0;
@@ -55958,6 +55989,23 @@ var GoalMode = class {
 		this.appendGoalUpdate({ budgetLimits: state.budgetLimits });
 		return this.toSnapshot(state);
 	}
+	async updateObjective(input, _actor = "user") {
+		const state = this.requireState();
+		const objective = input.objective.trim();
+		if (objective.length === 0) throw new ScreamError(ErrorCodes.GOAL_OBJECTIVE_EMPTY, "Goal objective cannot be empty");
+		if (state.status === "complete") throw new ScreamError(ErrorCodes.GOAL_STATUS_INVALID, "Cannot update a completed goal.");
+		if (state.status === "blocked") throw new ScreamError(ErrorCodes.GOAL_STATUS_INVALID, "Cannot update a blocked goal. Resume it first.");
+		state.objective = objective;
+		const noteContent = `Goal objective updated by user: ${objective}`.slice(0, MAX_NOTE_LENGTH);
+		state.notes.push({
+			content: noteContent,
+			time: Date.now()
+		});
+		if (state.notes.length > MAX_GOAL_NOTES) state.notes = state.notes.slice(-60);
+		this.persistState(state);
+		this.appendGoalUpdate({ objective });
+		return this.toSnapshot(state);
+	}
 	async cancelGoal(actor = "user") {
 		const state = this.requireState();
 		const snapshot = this.toSnapshot(state);
@@ -56041,7 +56089,7 @@ var GoalMode = class {
 			content: trimmed,
 			time: Date.now()
 		});
-		if (state.notes.length > MAX_GOAL_NOTES) state.notes = state.notes.slice(-30);
+		if (state.notes.length > MAX_GOAL_NOTES) state.notes = state.notes.slice(-60);
 		this.persistState(state, { silent: true });
 		return this.toSnapshot(state);
 	}
@@ -56187,6 +56235,85 @@ function formatTokens$2(tokens) {
 	return `${(tokens / 1e6).toFixed(1)}M`;
 }
 //#endregion
+//#region ../../packages/agent-core/src/tools/builtin/goal/emission-guard.ts
+/**
+* Grader emission guard - deduplicates and filters grader (referee) feedback
+* before it is injected into the agent context.
+*
+* Without this guard, a grader that repeatedly returns the same FAIL reason
+* (e.g. "redo", "not right") causes the identical feedback to be appended to
+* context on every submission. This wastes context budget and can trap the
+* agent in a loop where it keeps retrying without new information.
+*
+* Inspired by oh-my-pi's `advisor/emission-guard.ts`, but adapted for
+* scream-code's grader model: the grader is called once per `complete`
+* submission (not continuously), so per-round limiting is unnecessary. The
+* guard focuses on normalization, content-free filtering, and exact-text
+* deduplication keyed by goal objective.
+*/
+/** Short phrases that carry no actionable feedback. */
+const CONTENT_FREE_PHRASES = new Set([
+	"stop",
+	"done",
+	"lgtm",
+	"no issue",
+	"redo",
+	"try again",
+	"not good enough",
+	"fix it",
+	"wrong",
+	"incorrect",
+	"bad",
+	"重做",
+	"不对",
+	"不行",
+	"继续",
+	"再做",
+	"错误",
+	"不行",
+	"不好",
+	"改"
+]);
+/** Maximum number of historically seen feedback texts retained per goal. */
+const MAX_SEEN_PER_GOAL = 16;
+/** Phrases at or below this length are checked against the content-free set. */
+function isContentFree(text) {
+	const lower = text.toLowerCase().trim();
+	return CONTENT_FREE_PHRASES.has(lower);
+}
+/**
+* Filters grader feedback before injection into the agent context.
+*
+* Returns the denoised feedback text if it should be injected, or `null` if
+* the feedback is empty, content-free, or an exact duplicate of a previously
+* seen feedback for the same goal. The caller should skip injection when
+* `null` is returned.
+*
+* @param reason The raw grader FAIL reason.
+* @param goalKey A stable identifier for the current goal (e.g. the objective
+*   text). Different goals get independent deduplication buckets.
+*/
+var GraderEmissionGuard = class {
+	seenByGoal = /* @__PURE__ */ new Map();
+	filter(reason, goalKey) {
+		const normalized = reason.normalize("NFKC").trim();
+		if (normalized.length === 0) return null;
+		if (isContentFree(normalized)) return null;
+		const key = normalized.toLowerCase();
+		const bucket = this.seenByGoal.get(goalKey);
+		if (bucket !== void 0 && bucket.includes(key)) return null;
+		const next = bucket ?? [];
+		next.push(key);
+		if (next.length > MAX_SEEN_PER_GOAL) next.shift();
+		this.seenByGoal.set(goalKey, next);
+		return normalized;
+	}
+	/** Clear the deduplication bucket for a goal (e.g. on goal change). */
+	resetGoal(goalKey) {
+		this.seenByGoal.delete(goalKey);
+	}
+};
+//#endregion
 //#region ../../packages/agent-core/src/tools/builtin/goal/update-goal.ts
 const UpdateGoalToolInputSchema = z.object({
 	status: z.enum([
@@ -56198,6 +56325,13 @@ const UpdateGoalToolInputSchema = z.object({
 	reason: z.string().optional().describe("Optional reason for the status change, especially for blocked.")
 }).strict();
 const MAX_GRADER_OUTPUT_CHARS = 4e3;
+/** Maximum characters of `git diff --stat HEAD` to append to the grader input. */
+const MAX_DIFF_STAT_CHARS = 2e3;
+/**
+* Module-level emission guard. Deduplicates grader FAIL feedback per goal so
+* the referee cannot trap the agent in a loop by repeating the same reason.
+*/
+const graderEmissionGuard = new GraderEmissionGuard();
 function extractRecentOutput(history) {
 	const parts = [];
 	for (let i = history.length - 1; i >= 0; i--) {
@@ -56210,6 +56344,51 @@ function extractRecentOutput(history) {
 	const joined = parts.join("\n\n");
 	return joined.length > MAX_GRADER_OUTPUT_CHARS ? `${joined.slice(0, MAX_GRADER_OUTPUT_CHARS)}…` : joined;
 }
+/**
+* Append cross-turn working notes to the output seen by the grader. Notes are
+* written by the agent across continuation turns, so they provide focused
+* context (key findings, constraints, partial results) without exposing the
+* full text of previously rejected outputs.
+*/
+function appendGoalNotes(output, notes) {
+	if (notes.length === 0) return output;
+	return `${output}\n\n## Cross-turn working notes\n${notes.map((note) => `• ${note.content}`).join("\n")}`;
+}
+const execFileAsync = promisify(execFile);
+/**
+* Fetch a concise git diff stat against HEAD for the current working directory.
+* Using HEAD includes both staged and unstaged changes, so the reviewer sees
+* every file touched during the turn even if the agent ran `git add`. Returns
+* `null` when there are no changes. Throws when git is unavailable or the
+* directory is not a git repository.
+*/
+/** Exported for testing only. */
+async function fetchGitDiffStat(cwd) {
+	const { stdout } = await execFileAsync("git", [
+		"diff",
+		"--stat",
+		"HEAD"
+	], { cwd });
+	const stat = stdout.trim();
+	return stat.length > 0 ? stat : null;
+}
+/**
+* Append a git diff stat to the grader input so the reviewer can correlate the
+* agent's claims with the actual files changed during the turn. Very large
+* stats are truncated to avoid overflowing the reviewer's context window. When
+* git is unavailable, a note is appended so the reviewer knows why no diff is
+* present.
+*/
+async function appendGitDiffStat(output, cwd) {
+	let stat;
+	try {
+		stat = await fetchGitDiffStat(cwd);
+	} catch {
+		return `${output}\n\n## Changes this turn\n(Git diff unavailable — workspace may not be a git repository or git is not installed.)`;
+	}
+	if (stat === null) return output;
+	return `${output}\n\n## Changes this turn\n${stat.length > MAX_DIFF_STAT_CHARS ? `${stat.slice(0, MAX_DIFF_STAT_CHARS)}…\n(diff stat truncated)` : stat}`;
+}
 var UpdateGoalTool = class {
 	agent;
 	grader;
@@ -56256,7 +56435,7 @@ var UpdateGoalTool = class {
 	async handleComplete(goal) {
 		const goalState = goal.getGoal().goal;
 		if (!goalState) return { output: "No active goal." };
-		const output = extractRecentOutput(this.agent.context.history);
+		const outputWithContext = await appendGitDiffStat(appendGoalNotes(extractRecentOutput(this.agent.context.history), goalState.notes), this.agent.config?.cwd ?? "");
 		try {
 			await goal.pauseGoal({ reason: "verifying" }, "system");
 		} catch (error) {
@@ -56264,7 +56443,7 @@ var UpdateGoalTool = class {
 		}
 		let rawGrade;
 		try {
-			rawGrade = await this.grader(goalState.objective, goalState.completionCriterion, output);
+			rawGrade = await this.grader(goalState.objective, goalState.completionCriterion, outputWithContext);
 		} catch (error) {
 			const resumeError = await resumeAfterGrading(goal);
 			if (resumeError !== void 0) return resumeError;
@@ -56289,6 +56468,7 @@ var UpdateGoalTool = class {
 		if (grade.pass) {
 			try {
 				const completed = await goal.markComplete({}, "model");
+				graderEmissionGuard.resetGoal(goalState.objective);
 				if (completed === null) return toolError("Failed to mark verified goal complete", goal);
 				this.agent.context.appendSystemReminder(buildGoalCompletionSummaryPrompt(completed), {
 					kind: "system_trigger",
@@ -56302,8 +56482,12 @@ var UpdateGoalTool = class {
 				stopTurn: true
 			};
 		}
-		this.appendGradingFeedback(grade.reason);
-		return { output: `Verification failed: ${grade.reason}. Continue working.` };
+		const denoised = graderEmissionGuard.filter(grade.reason, goalState.objective);
+		if (denoised !== null) {
+			this.appendGradingFeedback(denoised);
+			return { output: `Verification failed: ${denoised}. Continue working.` };
+		}
+		return { output: "Previous verification feedback still applies. Address the earlier feedback and retry." };
 	}
 	appendGradingFeedback(reason) {
 		this.agent.context.appendSystemReminder(buildGradingFeedbackPrompt(reason), {
@@ -56340,11 +56524,11 @@ function errorMessage$4(error) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/goal/write-goal-note.ts
-const WriteGoalNoteInputSchema = z.object({ content: z.string().min(1).max(200).describe("A concise note about what you learned, verified, or decided. Notes are injected into future continuation turns so you can build on prior work.") }).strict();
+const WriteGoalNoteInputSchema = z.object({ content: z.string().min(1).max(400).describe("A concise note about what you learned, verified, or decided. Notes are injected into future continuation turns so you can build on prior work.") }).strict();
 var WriteGoalNoteTool = class {
 	agent;
 	name = "WriteGoalNote";
-	description = "Record a working note during goal execution. Notes persist across continuation turns and are injected automatically. Use this to record facts you verified, dead ends you hit, decisions you made, or anything future-you should not re-derive.";
+	description = "Record a working note during goal execution. Use this for dead ends you hit, decisions you made, or anything future-you should not re-derive.";
 	parameters = toInputJsonSchema(WriteGoalNoteInputSchema);
 	constructor(agent) {
 		this.agent = agent;
@@ -57577,6 +57761,16 @@ function parseMemoryMemos(text) {
 	}
 	return memos;
 }
+/**
+* Strip injected memory-memo content from text before writing it back to the
+* store, preventing feedback loops where recalled/compacted content gets
+* re-stored. Removes fenced ```memory-memo blocks (the format emitted by
+* compaction and exit-time extraction) and any <memories>...</memories>
+* wrapper an injector might use.
+*/
+function stripMemoryTags(text) {
+	return text.replaceAll(/```memory-memo[\s\S]*?```/gi, "").replaceAll(/<memories>[\s\S]*?<\/memories>/gi, "").trim();
+}
 /** System prompt for exit-time extraction — instructs the LLM how to extract. */
 const EXIT_EXTRACTION_SYSTEM_PROMPT = "你是一个任务经验提取助手。任务是从对话记录中识别已完成的任务闭环，提炼出任务经验记录。用对话的主要语言输出（中文对话用中文，英文对话用英文）。只输出指定的 JSON 格式，不要调用任何工具。";
 /** Build the user prompt for exit-time extraction, including a conversation sample. */
@@ -58210,7 +58404,7 @@ const MemoryLookupInputSchema = z.object({
 var MemoryLookupTool = class {
 	agent;
 	name = "MemoryLookup";
-	description = "Search the memory memo store for historical experiences from past user tasks. Call this when the current task may benefit from prior work, when you encounter a repeating error or pattern, or when you are unsure of the best approach. Returns memos ranked by relevance, including the approach taken, the outcome, what failed, what worked, project, and tags. By default searches globally; use scope: project to restrict results to the current project.";
+	description = "Search the memory memo store for historical experiences from past user tasks. Call this when the current task may benefit from prior work, when you encounter a repeating error or pattern, or when you are unsure of the best approach. Returns memos ranked by relevance, including the approach taken, the outcome, what failed, what worked, project, and tags.";
 	parameters = toInputJsonSchema(MemoryLookupInputSchema);
 	constructor(agent) {
 		this.agent = agent;
@@ -58312,7 +58506,7 @@ const MemoryWriteInputSchema = z.object({
 var MemoryWriteTool = class {
 	agent;
 	name = "MemoryWrite";
-	description = "Write a new memory memo to the global memory memo store. Call this when the user explicitly asks to save an experience, lesson, or summary to memory, for example \"保存到记忆\", \"保存到备忘录\", \"总结并保存\", \"永久记忆\", \"记录我的记忆\", \"记住这个\", \"添加到记忆\", or \"存入记忆库\". Summarize the user need, approach taken, final outcome, what failed, what worked, and 3-5 tags.";
+	description = "Write a new memory memo to the global memory memo store. Call this when the user explicitly asks to save an experience, lesson, or summary to memory, for example \"保存到记忆\", \"保存到备忘录\", \"总结并保存\", \"永久记忆\", \"记录我的记忆\", \"记住这个\", \"添加到记忆\", or \"存入记忆库\".";
 	parameters = toInputJsonSchema(MemoryWriteInputSchema);
 	constructor(agent) {
 		this.agent = agent;
@@ -58329,17 +58523,20 @@ var MemoryWriteTool = class {
 				};
 				const sessionId = this.agent.homedir ? basename$1(dirname$2(dirname$2(this.agent.homedir))) : "unknown";
 				const sourceSessionTitle = await this.agent.getSessionTitle();
-				const whatFailed = args.whatFailed?.trim();
-				const whatWorked = args.whatWorked?.trim();
-				const tags = normalizeTags(args.tags !== void 0 && args.tags.length > 0 ? args.tags : generateTags(`${args.userNeed} ${args.approach}`));
+				const userNeed = stripMemoryTags(args.userNeed);
+				const approach = stripMemoryTags(args.approach);
+				const outcome = stripMemoryTags(args.outcome);
+				const whatFailed = stripMemoryTags(args.whatFailed ?? "");
+				const whatWorked = stripMemoryTags(args.whatWorked ?? "");
+				const tags = normalizeTags(args.tags !== void 0 && args.tags.length > 0 ? args.tags : generateTags(`${userNeed} ${approach}`));
 				const memo = createMemoryMemo({
 					sourceSessionId: sessionId,
 					sourceSessionTitle,
-					userNeed: args.userNeed,
-					approach: args.approach,
-					outcome: args.outcome,
-					whatFailed: whatFailed === void 0 || whatFailed.length === 0 ? "none" : whatFailed,
-					whatWorked: whatWorked === void 0 || whatWorked.length === 0 ? "none" : whatWorked,
+					userNeed,
+					approach,
+					outcome,
+					whatFailed: whatFailed.length === 0 ? "none" : whatFailed,
+					whatWorked: whatWorked.length === 0 ? "none" : whatWorked,
 					tags,
 					extractionSource: "manual",
 					projectDir: this.agent.config.cwd
@@ -58875,8 +59072,7 @@ var LspTool = class {
 	lspRegistry;
 	name = "LSP";
 	description = [
-		"Query a language server for code intelligence.",
-		"Use 'references' to find all usages of a symbol, 'definition' to jump to where a symbol is defined, 'diagnostics' to get type errors and warnings for a file, and 'rename' to rename a symbol across all its references.",
+		"Query a language server for code intelligence: find usages, jump to definitions, get diagnostics, or rename a symbol across all references.",
 		"The language server is started automatically for supported file types (TypeScript/JavaScript, Python, Rust, Go).",
 		"Rename requires the typescript-language-server (or equivalent) binary on PATH for the file type."
 	].join(" ");
@@ -71155,7 +71351,7 @@ function validateSkillPlan(plan, nameHint) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/wolfpack.md
-var wolfpack_default = "Use WolfPack to spawn multiple subagents in parallel for batch operations.\nThis is ideal when processing many independent items (files, checks, searches)\nthat all use the same subagent type and follow a similar pattern.\n\nInput:\n- description: Brief (3-5 word) task summary.\n- subagent_type: Subagent profile name. Defaults to \"coder\". Choose the profile\n  that best matches the batch task — using the right type materially improves\n  output quality. See the agent type list below for which type fits which job.\n- prompt_template: A prompt pattern where each item value is substituted in\n  to produce a per-item prompt. See the parameter schema for placeholder syntax.\n- items: Array of item strings. Each item gets its own subagent (no limit).\n\nItems must be independent — no subagent depends on another's output.\nIf items depend on each other, use separate Agent calls instead.\n\nChoosing subagent_type for the batch:\n- Batch code review, audit, or bug-finding across files → reviewer\n- Batch writing, reports, or long-form content → writer\n- Batch read-only exploration (find files, grep, understand modules) → explore\n- Batch verification (run build/test/lint per item) → verify\n- Batch deep debugging or architecture decisions → oracle\n- Batch planning or design work → plan\n- General engineering tasks with no specialised match → coder (default)\n\nExample: review source files for OWASP vulnerabilities by setting items to the file\npaths, subagent_type to \"reviewer\", and prompt_template to the review instruction.\nAll items are processed in parallel.\n\n";
+var wolfpack_default = "Use WolfPack to spawn multiple subagents in parallel for batch operations.\nThis is ideal when processing many independent items (files, checks, searches)\nthat all use the same subagent type and follow a similar pattern.\n\nItems must be independent - no subagent depends on another's output.\nIf items depend on each other, use separate Agent calls instead.\n\nChoosing subagent_type for the batch:\n- Batch code review, audit, or bug-finding across files -> reviewer\n- Batch writing, reports, or long-form content -> writer\n- Batch read-only exploration (find files, grep, understand modules) -> explore\n- Batch verification (run build/test/lint per item) -> verify\n- Batch deep debugging or architecture decisions -> oracle\n- Batch planning or design work -> plan\n- General engineering tasks with no specialised match -> coder (default)\n\nExample: review source files for OWASP vulnerabilities by setting items to the file\npaths, subagent_type to \"reviewer\", and prompt_template to the review instruction.\nAll items are processed in parallel.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/wolfpack.ts
 /**
@@ -71353,6 +71549,68 @@ function withTimeout$1(promise, timeoutMs, parentSignal) {
 	});
 }
 //#endregion
+//#region ../../packages/agent-core/src/tools/support/scan-cache.ts
+var FsScanCache = class {
+	cache = /* @__PURE__ */ new Map();
+	ttlMs;
+	maxEntries;
+	constructor({ ttlMs = 1e3, maxEntries = 16 } = {}) {
+		this.ttlMs = ttlMs;
+		this.maxEntries = maxEntries;
+	}
+	key(root, pattern, includeDirs) {
+		return `${root}\0${pattern}\0${String(includeDirs)}`;
+	}
+	/**
+	* Returns the cached output if present and not expired. Expired entries are
+	* deleted on access.
+	*/
+	get(root, pattern, includeDirs) {
+		const k = this.key(root, pattern, includeDirs);
+		const entry = this.cache.get(k);
+		if (entry === void 0) return void 0;
+		if (Date.now() - entry.createdAt > this.ttlMs) {
+			this.cache.delete(k);
+			return;
+		}
+		return entry.output;
+	}
+	/** Cache a scan output. Evicts the oldest entry when at capacity. */
+	set(root, pattern, includeDirs, output) {
+		if (this.cache.size >= this.maxEntries) {
+			let oldestKey;
+			let oldestTime = Infinity;
+			for (const [k, v] of this.cache) if (v.createdAt < oldestTime) {
+				oldestTime = v.createdAt;
+				oldestKey = k;
+			}
+			if (oldestKey !== void 0) this.cache.delete(oldestKey);
+		}
+		this.cache.set(this.key(root, pattern, includeDirs), {
+			output,
+			createdAt: Date.now()
+		});
+	}
+	/** Invalidate all cached entries rooted under the given directory path. */
+	invalidateByRoot(root) {
+		const prefix = `${root}\0`;
+		for (const k of this.cache.keys()) if (k.startsWith(prefix)) this.cache.delete(k);
+	}
+	/** Clear the entire cache (useful for tests). */
+	clear() {
+		this.cache.clear();
+	}
+	/** Number of cached entries (for tests / introspection). */
+	size() {
+		return this.cache.size;
+	}
+};
+/**
+* Module-level singleton shared by Glob (producer) and Edit/Write (invalidator).
+* Importing this instance ensures all tools reference the same cache.
+*/
+const scanCache = new FsScanCache();
+//#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/conflict-detect.ts
 /**
 * Detect unresolved git merge conflict markers in read output.
@@ -71599,7 +71857,7 @@ function hashEditPayload(input) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/edit.md
-var edit_default = "Perform exact string replacements against the text view returned by Read.\n\n- When copying from Read output, omit the line-number prefix and tab; match only the file content.\n- By default, old_string must occur exactly once. If it matches multiple locations, add surrounding context or set replace_all when every occurrence should change.\n- Prefer Edit for targeted changes to existing files; use Write only for new files or complete overwrites.\n- To modify a file, always use Edit; do not run a Shell `sed` command for edits.\n- When making several independent changes, issue multiple Edit calls in parallel within a single response; edits to the same file are serialized automatically by a write lock.\n- When several parallel Edit calls target the same file, a write lock serializes them; they apply in the order the calls appear in your response. An edit fails with `old_string not found` if its old_string was taken from text an earlier edit already replaced — base every old_string on the latest Read view and order dependent edits accordingly.\n- For pure CRLF files, Read shows LF and Edit.old_string/new_string should use LF; Edit writes the file back with CRLF preserved.\n- For mixed line endings or lone carriage returns, Read displays carriage returns as \\r; include actual \\r escapes in old_string/new_string for those positions.\n- When Read returned an `Anchor:` value in its status block, pass it as `anchor` to verify the file has not changed since it was read. If the anchor does not match, re-read the file before editing.\n- Edit refuses if `old_string` lands inside an unresolved merge conflict block, or if `new_string` would introduce `<<<<<<<`/`=======`/`>>>>>>>` markers. To clean up a conflict, include the markers in `old_string` so Edit replaces them.";
+var edit_default = "Perform exact string replacements against the text view returned by Read.\n\n- By default, old_string must occur exactly once. If it matches multiple locations, add surrounding context.\n- Prefer Edit for targeted changes to existing files; use Write only for new files or complete overwrites.\n- To modify a file, always use Edit; do not run a Shell `sed` command for edits.\n- When making several independent changes, issue multiple Edit calls in parallel within a single response; edits to the same file are serialized automatically by a write lock.\n- When several parallel Edit calls target the same file, a write lock serializes them; they apply in the order the calls appear in your response. An edit fails with `old_string not found` if its old_string was taken from text an earlier edit already replaced - base every old_string on the latest Read view and order dependent edits accordingly.\n- Edit refuses if `old_string` lands inside an unresolved merge conflict block, or if `new_string` would introduce `<<<<<<<`/`=======`/`>>>>>>>` markers. To clean up a conflict, include the markers in `old_string` so Edit replaces them.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/edit.ts
 const EditInputSchema = z.object({
@@ -71648,10 +71906,11 @@ var EditTool = class {
 				pathClass: this.jian.pathClass(),
 				homeDir: this.jian.gethome()
 			}),
-			execute: () => this.execution(args, path)
+			execute: ({ signal }) => this.execution(args, path, signal)
 		};
 	}
-	async execution(args, safePath) {
+	async execution(args, safePath, signal) {
+		signal?.throwIfAborted();
 		const result = await this.executionCore(args, safePath);
 		const inputHash = hashEditPayload({
 			path: args.path,
@@ -71748,6 +72007,7 @@ var EditTool = class {
 				}
 				const newContent = replaceOnceLiteral(content, args.old_string, args.new_string);
 				await this.jian.writeText(safePath, materializeModelText(newContent, modelView.lineEndingStyle));
+				scanCache.clear();
 				const { notice, hasErrors } = await this.appendDiagnostics(safePath);
 				const output = `Replaced 1 occurrence in ${args.path}${notice}`;
 				return hasErrors ? {
@@ -71766,6 +72026,7 @@ var EditTool = class {
 			}
 			const newContent = parts.join(args.new_string);
 			await this.jian.writeText(safePath, materializeModelText(newContent, modelView.lineEndingStyle));
+			scanCache.clear();
 			const { notice, hasErrors } = await this.appendDiagnostics(safePath);
 			const output = `Replaced ${String(replacementCount)} occurrences in ${args.path}${notice}`;
 			return hasErrors ? {
@@ -71862,7 +72123,7 @@ async function listDirectory(jian, workDir = jian.getcwd()) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/glob.md
-var glob_default = "Find files (and optionally directories) by glob pattern, sorted by modification time (most recent first).\n\nGood patterns:\n- `*.ts` — files in the current directory matching an extension\n- `src/**/*.ts` — recursive with a subdirectory anchor and extension\n- `test_*.py` — files whose name starts with a literal prefix\n\nRejected patterns (no literal anchor — nothing bounds the result set):\n- `**`, `**/*`, `*/*` — pure wildcards. Add an extension or subdirectory to give the walk a concrete target.\n- Anything that starts with `**/` (e.g. `**/*.md`, `**/main/*.py`). The leading `**/` has no literal anchor in front of it. Anchor it with a top-level subdirectory like `src/**/*.md`.\n- `*.{ts,tsx}` — brace expansion is not supported. Issue two calls: `*.ts` and `*.tsx`.\n\nLarge-directory warning — avoid recursing into dependency/build output even with an anchor:\n- `node_modules/**/*.js`, `.venv/**/*.py`, `__pycache__/**`, `target/**` all match technically but\n  typically produce thousands of results that truncate at the match cap and waste the caller context.\n  Prefer specific subpaths like `node_modules/react/src/**/*.js`.";
+var glob_default = "Find files (and optionally directories) by glob pattern, sorted by modification time (most recent first).\n\nGood patterns:\n- `*.ts` — files in the current directory matching an extension\n- `src/**/*.ts` — recursive with a subdirectory anchor and extension\n- `test_*.py` — files whose name starts with a literal prefix\n\nRejected patterns (no literal anchor — nothing bounds the result set):\n- `**`, `**/*`, `*/*` — pure wildcards. Add an extension or subdirectory to give the walk a concrete target.\n- Anything that starts with `**/` (e.g. `**/*.md`, `**/main/*.py`). The leading `**/` has no literal anchor in front of it. Anchor it with a top-level subdirectory like `src/**/*.md`.\n- `*.{ts,tsx}` — brace expansion is not supported. Issue two calls: `*.ts` and `*.tsx`.\n\nLarge-directory warning — avoid recursing into dependency/build output even with an anchor:\n- `node_modules/**/*.js`, `.venv/**/*.py`, `__pycache__/**`, `target/**` all match technically but\n  typically produce thousands of results that truncate at the {{ MAX_MATCHES }}-match cap and waste the caller context.\n  Prefer specific subpaths like `node_modules/react/src/**/*.js`.";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/glob.ts
 const GlobInputSchema = z.object({
@@ -71871,6 +72132,7 @@ const GlobInputSchema = z.object({
 	include_dirs: z.boolean().default(true).optional().describe("Whether to include directories in results. Defaults to true. Set false to return only files.")
 });
 const MAX_MATCHES = 1e3;
+const GLOB_DESCRIPTION = renderPrompt(glob_default, { MAX_MATCHES });
 /**
 * Path-shape hint appended to the tool description only on a Windows
 * (`win32` path class) backend. The `path` argument accepts both native
@@ -71900,7 +72162,7 @@ var GlobTool = class {
 	constructor(jian, workspace) {
 		this.jian = jian;
 		this.workspace = workspace;
-		this.description = this.jian.pathClass() === "win32" ? glob_default + WINDOWS_PATH_HINT : glob_default;
+		this.description = this.jian.pathClass() === "win32" ? GLOB_DESCRIPTION + WINDOWS_PATH_HINT : GLOB_DESCRIPTION;
 	}
 	async resolveExecution(args) {
 		let path;
@@ -71924,10 +72186,11 @@ var GlobTool = class {
 			},
 			approvalRule: literalRulePattern(this.name, args.pattern),
 			matchesRule: (ruleArgs) => matchesGlobRuleSubject(ruleArgs, args.pattern),
-			execute: () => this.execution(args, searchRoots)
+			execute: ({ signal }) => this.execution(args, searchRoots, signal)
 		};
 	}
-	async execution(args, searchRoots) {
+	async execution(args, searchRoots, signal) {
+		signal?.throwIfAborted();
 		if (startsWithDoubleStarPrefix(args.pattern)) {
 			let tree;
 			try {
@@ -71976,6 +72239,8 @@ var GlobTool = class {
 			}
 		}
 		try {
+			const cachedOutput = scanCache.get(searchRoots[0], args.pattern, includeDirs);
+			if (cachedOutput !== void 0) return { output: cachedOutput };
 			const seen = /* @__PURE__ */ new Set();
 			const entries = [];
 			const YIELD_SAFETY_CAP = MAX_MATCHES * 2;
@@ -71983,6 +72248,7 @@ var GlobTool = class {
 			let truncated = false;
 			outer: for (const root of searchRoots) for await (const filePath of this.jian.glob(root, args.pattern, { allowedRoots: [root] })) {
 				yielded++;
+				if (signal && yielded % 128 === 0) signal.throwIfAborted();
 				if (yielded >= YIELD_SAFETY_CAP) {
 					truncated = true;
 					break outer;
@@ -72011,16 +72277,22 @@ var GlobTool = class {
 			const pathClass = this.jian.pathClass();
 			const relBase = searchRoots[0] ?? this.workspace.workspaceDir;
 			const displayLines = paths.map((p) => relativizeIfUnder$1(p, relBase, pathClass));
-			if (entries.length === 0 && !truncated) return { output: "No matches found" };
-			const lines = [];
-			if (truncated) {
-				lines.push(`[Truncated at ${String(MAX_MATCHES)} matches — use a more specific pattern]`);
-				lines.push(`Only the first ${String(MAX_MATCHES)} matches are returned.`);
+			let output;
+			if (entries.length === 0 && !truncated) output = "No matches found";
+			else {
+				const lines = [];
+				if (truncated) {
+					lines.push(`[Truncated at ${String(MAX_MATCHES)} matches — use a more specific pattern]`);
+					lines.push(`Only the first ${String(MAX_MATCHES)} matches are returned.`);
+				}
+				lines.push(...displayLines);
+				if (!truncated && entries.length === 1e3) lines.push(`Found ${String(entries.length)} matches`);
+				output = lines.join("\n");
 			}
-			lines.push(...displayLines);
-			if (!truncated && entries.length === 1e3) lines.push(`Found ${String(entries.length)} matches`);
-			return { output: lines.join("\n") };
+			scanCache.set(searchRoots[0], args.pattern, includeDirs, output);
+			return { output };
 		} catch (error) {
+			if (signal?.aborted) throw error;
 			if (error !== null && typeof error === "object" && "code" in error) {
 				const code = error.code;
 				const path = searchRoots[0] ?? this.workspace.workspaceDir;
@@ -75297,6 +75569,85 @@ function rgUnavailableMessage(cause) {
 Error: ${cause instanceof Error ? cause.message : typeof cause === "string" ? cause : "unknown error"}\n\nFix options:\n  macOS:   brew install ripgrep\n  Ubuntu:  sudo apt-get install ripgrep\n  Other:   https://github.com/BurntSushi/ripgrep#installation\n\nAlternatively, drop a static rg binary at ${join$1(getShareDir(), "bin", rgBinaryName())}`;
 }
 //#endregion
+//#region ../../packages/agent-core/src/tools/support/rg-pattern-sanitize.ts
+/**
+* Ripgrep pattern sanitization and error detection.
+*
+* Users frequently search for code fragments that contain regex metacharacters
+* (e.g. `fetchFoo(`, `${platform}`, `a{3`). ripgrep uses the Rust `regex`
+* crate, which rejects unescaped `{`/`}` that do not form a valid repetition
+* quantifier (`{N}`, `{N,}`, `{N,M}`). This module pre-cleans such braces so
+* the common case "search for a literal-ish fragment" succeeds without a
+* syntax error.
+*
+* When sanitization is insufficient (e.g. unbalanced parentheses), the caller
+* can detect the regex error from ripgrep stderr and retry with
+* `--fixed-strings`, which treats the pattern as a literal string.
+*/
+/** Matches the inner content of a valid repetition quantifier: `N`, `N,`, `N,M`. */
+const QUANTIFIER_INNER_RE = /^\d+(?:,\d*)?$/;
+/**
+* Escape `{` and `}` that cannot form a valid repetition quantifier so they
+* are treated as literals by the regex engine.
+*
+* Already-escaped braces (`\{`, `\}`) are preserved. Valid quantifiers
+* (`{3}`, `{2,}`, `{1,5}`) are preserved. Everything else is escaped.
+*
+* Escaping braces inside character classes (e.g. `[{]`) is also safe:
+* `\{` inside `[...]` matches a literal `{` just like an unescaped `{` would.
+*/
+function sanitizeRgPattern(pattern) {
+	let result = "";
+	let i = 0;
+	while (i < pattern.length) {
+		const ch = pattern[i];
+		if (ch === "\\" && i + 1 < pattern.length) {
+			result += pattern.slice(i, i + 2);
+			i += 2;
+			continue;
+		}
+		if (ch === "{") {
+			const closeIdx = pattern.indexOf("}", i + 1);
+			if (closeIdx !== -1) {
+				const inner = pattern.slice(i + 1, closeIdx);
+				if (QUANTIFIER_INNER_RE.test(inner)) {
+					result += pattern.slice(i, closeIdx + 1);
+					i = closeIdx + 1;
+					continue;
+				}
+			}
+			result += "\\{";
+			i++;
+			continue;
+		}
+		if (ch === "}") {
+			result += "\\}";
+			i++;
+			continue;
+		}
+		result += ch;
+		i++;
+	}
+	return result;
+}
+/** Substrings that indicate ripgrep failed to parse the regex pattern. */
+const REGEX_ERROR_MARKERS = [
+	"regex parse error",
+	"unrecognized escape",
+	"unclosed group",
+	"unbalanced",
+	"unexpected repetition"
+];
+/**
+* Detect whether ripgrep's stderr indicates a regex syntax error (as opposed
+* to a filesystem or runtime error). Used to decide whether a
+* `--fixed-strings` fallback retry is worthwhile.
+*/
+function isRegexSyntaxError(stderr) {
+	const lower = stderr.toLowerCase();
+	return REGEX_ERROR_MARKERS.some((marker) => lower.includes(marker));
+}
+//#endregion
 //#region ../../packages/agent-core/src/tools/support/result-builder.ts
 const DEFAULT_MAX_CHARS = 5e4;
 const DEFAULT_TAIL_CHARS = 2e4;
@@ -75307,17 +75658,25 @@ var ToolResultBuilder = class {
 	maxChars;
 	maxTailChars;
 	maxLineLength;
+	artifactSink;
+	maxFullOutputChars;
 	buffer = [];
 	nCharsValue = 0;
 	truncationHappened = false;
 	headTruncated = false;
 	tailBuf = [];
 	tailCharsValue = 0;
+	fullOutput;
+	fullOutputChars = 0;
+	totalLinesWritten = 0;
 	constructor(options = {}) {
 		this.maxChars = options.maxChars ?? DEFAULT_MAX_CHARS;
 		this.maxTailChars = options.maxTailChars ?? DEFAULT_TAIL_CHARS;
 		this.maxLineLength = options.maxLineLength === void 0 ? DEFAULT_MAX_LINE_LENGTH : options.maxLineLength;
 		if (this.maxLineLength !== null && this.maxLineLength <= 14) throw new Error("maxLineLength must be greater than the truncation marker length.");
+		this.artifactSink = options.artifactSink;
+		this.maxFullOutputChars = options.maxFullOutputChars ?? 1e6;
+		if (this.artifactSink !== void 0) this.fullOutput = [];
 	}
 	get nChars() {
 		return this.nCharsValue + this.tailCharsValue;
@@ -75327,12 +75686,19 @@ var ToolResultBuilder = class {
 		if (!this.headTruncated || this.tailCharsValue === 0) return head;
 		this.trimTail();
 		const tail = this.tailBuf.join("");
-		return `${head}${head.endsWith("\n") ? "" : "\n"}${TRUNCATION_MARKER}\n${tail}`;
+		const separator = head.endsWith("\n") ? "" : "\n";
+		const elided = this.computeElidedLines(head, tail);
+		return `${head}${separator}${elided > 0 ? `[…${String(elided)} lines elided…]\n${TRUNCATION_MARKER}` : TRUNCATION_MARKER}\n${tail}`;
 	}
 	write(text) {
 		if (text.length === 0) return 0;
 		const lines = text.match(/[^\r\n]*(?:\r\n|[\n\r])|[^\r\n]+/g) ?? [];
 		if (lines.length === 0) return 0;
+		this.totalLinesWritten += lines.length;
+		if (this.fullOutput !== void 0 && this.fullOutputChars < this.maxFullOutputChars) {
+			this.fullOutput.push(text);
+			this.fullOutputChars += text.length;
+		}
 		let charsWritten = 0;
 		for (const originalLine of lines) if (this.nCharsValue < this.maxChars) {
 			const remainingChars = this.maxChars - this.nCharsValue;
@@ -75380,11 +75746,36 @@ var ToolResultBuilder = class {
 		this.tailBuf.push(trimmed);
 		this.tailCharsValue = trimmed.length;
 	}
-	ok(message = "", options = {}) {
+	computeElidedLines(head, tail) {
+		if (this.totalLinesWritten === 0) return 0;
+		if (this.fullOutput !== void 0) {
+			const total = countLines(this.fullOutput.join(""));
+			return Math.max(0, total - countLines(head) - countLines(tail));
+		}
+		return Math.max(0, this.totalLinesWritten - countLines(head) - countLines(tail));
+	}
+	async maybeWriteArtifact() {
+		if (this.artifactSink === void 0 || this.fullOutput === void 0) return void 0;
+		if (!this.truncationHappened) return void 0;
+		const full = this.fullOutput.join("");
+		if (full.length === 0) return void 0;
+		try {
+			return await this.artifactSink(full);
+		} catch {
+			return;
+		}
+	}
+	appendArtifactRef(output, ref) {
+		const line = `[full output saved: ${ref}]`;
+		return output.length === 0 ? line : output.endsWith("\n") ? `${output}${line}` : `${output}\n${line}`;
+	}
+	async ok(message = "", options = {}) {
 		let finalMessage = message;
 		if (finalMessage.length > 0 && !finalMessage.endsWith(".")) finalMessage += ".";
 		if (this.truncationHappened) finalMessage = finalMessage.length === 0 ? TRUNCATION_MESSAGE : `${finalMessage} ${TRUNCATION_MESSAGE}`;
-		const output = this.toString();
+		const baseOutput = this.toString();
+		const artifactRef = await this.maybeWriteArtifact();
+		const output = artifactRef === void 0 ? baseOutput : this.appendArtifactRef(baseOutput, artifactRef);
 		return {
 			isError: false,
 			output: finalMessage.length > 0 && (this.truncationHappened || output.length === 0) ? output.length === 0 ? finalMessage : output.endsWith("\n") ? `${output}${finalMessage}` : `${output}\n${finalMessage}` : output,
@@ -75393,9 +75784,11 @@ var ToolResultBuilder = class {
 			brief: options.brief
 		};
 	}
-	error(message, options = {}) {
+	async error(message, options = {}) {
 		const finalMessage = this.truncationHappened ? message.length === 0 ? TRUNCATION_MESSAGE : `${message} ${TRUNCATION_MESSAGE}` : message;
-		const output = this.toString();
+		const baseOutput = this.toString();
+		const artifactRef = await this.maybeWriteArtifact();
+		const output = artifactRef === void 0 ? baseOutput : this.appendArtifactRef(baseOutput, artifactRef);
 		return {
 			isError: true,
 			output: finalMessage.length === 0 ? output : output.length === 0 ? finalMessage : output.endsWith("\n") ? `${output}${finalMessage}` : `${output}\n${finalMessage}`,
@@ -75405,9 +75798,13 @@ var ToolResultBuilder = class {
 		};
 	}
 };
+function countLines(text) {
+	if (text.length === 0) return 0;
+	return text.split("\n").length - (text.endsWith("\n") ? 1 : 0);
+}
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/grep.md
-var grep_default = "Search file contents using regular expressions (powered by ripgrep).\n\nUse Grep when the task is to find unknown content or unknown file locations. Do not use shell `grep` or `rg` directly; this tool applies workspace path policy, output limits, and sensitive-file filtering.\nALWAYS use Grep tool instead of running `grep` or `rg` from a shell — direct shell calls bypass workspace policy, output limits, and sensitive-file filtering.\nIf you already know a concrete file path and need to inspect its contents, use Read directly instead.\n\nWrite patterns in ripgrep regex syntax, which differs from POSIX `grep` syntax. For example, braces are special, so escape them as `\\{` to match a literal `{`.\n\nHidden files (dotfiles such as `.gitlab-ci.yml` or `.eslintrc.json`) are searched by default. To also search files excluded by `.gitignore` (such as `node_modules` or build outputs), set `include_ignored` to `true`. Sensitive files (such as `.env`) are always skipped for safety, even when `include_ignored` is `true`.\n";
+var grep_default = "Search file contents using regular expressions (powered by ripgrep).\n\nUse Grep when the task is to find unknown content or unknown file locations. Do not use shell `grep` or `rg` directly; this tool applies workspace path policy, output limits, and sensitive-file filtering.\nALWAYS use Grep tool instead of running `grep` or `rg` from a shell - direct shell calls bypass workspace policy, output limits, and sensitive-file filtering.\n\nWrite patterns in ripgrep regex syntax, which differs from POSIX `grep` syntax. For example, braces are special, so escape them as `\\{` to match a literal `{`.\n\nHidden files (dotfiles such as `.gitlab-ci.yml` or `.eslintrc.json`) are searched by default.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/grep.ts
 const GrepInputSchema = z.object({
@@ -75475,11 +75872,12 @@ const SENSITIVE_GLOBS_TO_EXCLUDE = [
 	"**/.gcp/credentials/**"
 ];
 const CONTENT_LINE_RE = /^(.*?)([:-])(\d+)\2/;
+const GREP_DESCRIPTION = renderPrompt(grep_default, { DEFAULT_HEAD_LIMIT });
 var GrepTool = class {
 	jian;
 	workspace;
 	name = "Grep";
-	description = grep_default;
+	description = GREP_DESCRIPTION;
 	parameters = toInputJsonSchema(GrepInputSchema);
 	constructor(jian, workspace) {
 		this.jian = jian;
@@ -75536,6 +75934,15 @@ var GrepTool = class {
 			runResult = await runRipgrepOnce(this.jian, buildRgArgs(rgPath, args, searchPaths, true), signal);
 			if (runResult.kind === "tool-error") return runResult.result;
 		}
+		if (runResult.exitCode !== 0 && runResult.exitCode !== 1 && !runResult.timedOut && isRegexSyntaxError(runResult.stderrText)) {
+			const fallback = await runRipgrepOnce(this.jian, buildRgArgs(rgPath, args, searchPaths, false, true), signal);
+			if (fallback.kind === "tool-error") return fallback.result;
+			if (shouldRetryRipgrepEagain(fallback)) {
+				const retry = await runRipgrepOnce(this.jian, buildRgArgs(rgPath, args, searchPaths, true, true), signal);
+				if (retry.kind === "tool-error") return retry.result;
+				if (retry.exitCode === 0 || retry.exitCode === 1) runResult = retry;
+			} else if (fallback.exitCode === 0 || fallback.exitCode === 1) runResult = fallback;
+		}
 		const { exitCode, stderrText, bufferTruncated, stderrTruncated, timedOut } = runResult;
 		let { stdoutText } = runResult;
 		if (exitCode !== 0 && exitCode !== 1 && !timedOut) return {
@@ -75594,7 +76001,7 @@ var GrepTool = class {
 		const combined = visibleBody === "" && messages.length === 0 ? emptyResultMessage : messages.length > 0 ? visibleBody === "" ? messages.join("\n") : `${visibleBody}\n${messages.join("\n")}` : visibleBody;
 		const builder = new ToolResultBuilder();
 		builder.write(combined);
-		const result = builder.ok(sideChannelMessages.join("\n"));
+		const result = await builder.ok(sideChannelMessages.join("\n"));
 		const display = buildSearchResultsDisplay(args, limited, mode, contentIncludesLineNumbers);
 		if (display === void 0) return result;
 		if (result.isError === true) return result;
@@ -75790,10 +76197,11 @@ async function mapWithConcurrency(items, concurrency, signal, mapper) {
 	if (signal.aborted) throw new GrepAbortedError();
 	return results;
 }
-function buildRgArgs(rgPath, args, searchPaths, singleThreaded = false) {
+function buildRgArgs(rgPath, args, searchPaths, singleThreaded = false, literal = false) {
 	const cmd = [rgPath];
 	if (singleThreaded) cmd.push("-j", "1");
 	cmd.push("--hidden");
+	if (literal) cmd.push("--fixed-strings");
 	const mode = args.output_mode ?? "files_with_matches";
 	if (mode !== "content") cmd.push("--max-columns", String(RG_MAX_COLUMNS));
 	cmd.push("--null");
@@ -75816,7 +76224,8 @@ function buildRgArgs(rgPath, args, searchPaths, singleThreaded = false) {
 	if (args.multiline) cmd.push("-U", "--multiline-dotall");
 	if (args.include_ignored) cmd.push("--no-ignore");
 	for (const glob of SENSITIVE_GLOBS_TO_EXCLUDE) cmd.push("--glob", `!${glob}`);
-	cmd.push("--", args.pattern, ...searchPaths);
+	const pattern = literal ? args.pattern : sanitizeRgPattern(args.pattern);
+	cmd.push("--", pattern, ...searchPaths);
 	return cmd;
 }
 function splitRgLines(text) {
@@ -76530,7 +76939,7 @@ async function partitionExistingPaths(paths, jian, workspace) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/read.md
-var read_default = "Read a text file from the local filesystem.\n\nIf the user provides a concrete file path to a text file, call Read directly. Do not `Glob`, `ls`, or otherwise pre-check known text file paths; missing or invalid file paths return errors you can handle. Do not use Read for directories; use `ls` via Bash for a known directory, or Glob when you need files/directories matching a pattern. Use `Grep` only when the task is to search for unknown content or locations.\n\nWhen you need several files, prefer to read them in parallel: emit multiple `Read` calls in a single response instead of reading one file per turn.\n\n- Relative paths resolve against the working directory; a path outside the working directory must be absolute.\n- Returns up to {{ MAX_LINES }} lines or {{ MAX_BYTES_KB }} KB per call, whichever comes first; lines longer than {{ MAX_LINE_LENGTH }} chars are truncated mid-line.\n- Page larger files with `line_offset` (1-based start line) and `n_lines`. Omit `n_lines` to read up to the {{ MAX_LINES }}-line cap.\n- Sensitive files (`.env` files, credential stores, SSH keys, and similar secrets) are refused to protect secrets; do not attempt to read them.\n- Only UTF-8 text files can be read. Non-UTF-8 encodings, binary files, and files containing NUL bytes are refused; use `ReadMediaFile` for images or video, and Bash or an MCP tool for other binary formats.\n- Negative line_offset reads from the end of the file (for example, -100 reads the last 100 lines); the absolute value cannot exceed {{ MAX_LINES }}.\n- Output format: `<line-number>\\t<content>` per line.\n- A `<system>...</system>` status block is appended after the file content; it summarizes how much was read (line and byte counts, truncation, line-ending notes) and is not part of the file itself. The status block includes an `Anchor: <hash>` value that can be passed to `Edit.anchor` to verify the file has not changed before editing.\n- Pure CRLF files are displayed with LF line endings; `Edit` matches this output and preserves CRLF when writing back.\n- Mixed or lone carriage-return line endings are shown as `\\r` and require exact `Edit.old_string` escapes.\n- After a successful `Edit`/`Write`, do not re-read solely to prove the write landed. When the task depends on an exact file, API, or output shape, inspect the final external contract before finishing.\n";
+var read_default = "Read a text file from the local filesystem.\n\nIf the user provides a concrete file path to a text file, call Read directly. Do not `Glob`, `ls`, or otherwise pre-check known text file paths; missing or invalid file paths return errors you can handle. Do not use Read for directories; use `ls` via Bash for a known directory, or Glob when you need files/directories matching a pattern. Use `Grep` only when the task is to search for unknown content or locations.\n\nWhen you need several files, prefer to read them in parallel: emit multiple `Read` calls in a single response instead of reading one file per turn.\n\n- Returns up to {{ MAX_BYTES_KB }} KB per call; lines longer than {{ MAX_LINE_LENGTH }} chars are truncated mid-line.\n- Sensitive files (`.env` files, credential stores, SSH keys, and similar secrets) are refused to protect secrets; do not attempt to read them.\n- Only UTF-8 text files can be read. Non-UTF-8 encodings, binary files, and files containing NUL bytes are refused; use `ReadMediaFile` for images or video, and Bash or an MCP tool for other binary formats.\n- Output format: `<line-number>\\t<content>` per line.\n- A `<system>...</system>` status block is appended after the file content; it summarizes how much was read (line and byte counts, truncation, line-ending notes) and is not part of the file itself. The status block includes an `Anchor: <hash>` value that can be passed to `Edit.anchor` to verify the file has not changed before editing.\n- Pure CRLF files are displayed with LF line endings; `Edit` matches this output and preserves CRLF when writing back.\n- Mixed or lone carriage-return line endings are shown as `\\r` and require exact `Edit.old_string` escapes.\n- After a successful `Edit`/`Write`, do not re-read solely to prove the write landed. When the task depends on an exact file, API, or output shape, inspect the final external contract before finishing.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/read.ts
 const MAX_LINES = 1e3;
@@ -76886,7 +77295,7 @@ var ReadTool = class {
 		if (input.maxLinesReached) parts.push(`Max ${String(MAX_LINES)} lines reached.`);
 		else if (input.maxBytesReached) parts.push(`Max ${String(MAX_BYTES)} bytes reached.`);
 		else if (lineCount < input.requestedLines) parts.push("End of file reached.");
-		if (input.truncatedLineNumbers.length > 0) parts.push(`Lines [${input.truncatedLineNumbers.join(", ")}] were truncated.`);
+		if (input.truncatedLineNumbers.length > 0) parts.push(`Lines [${input.truncatedLineNumbers.join(", ")}] exceed the ${String(MAX_LINE_LENGTH)}-char limit and were truncated. Re-read with line_offset and n_lines=1 to view individual long lines in full.`);
 		if (input.lineEndingStyle === "mixed") parts.push("Mixed or lone carriage-return line endings are shown as \\r. Use exact \\r\\n or \\r escapes in Edit.old_string for those lines.");
 		parts.push(`Anchor: ${input.anchor}`);
 		return parts.join(" ");
@@ -77285,7 +77694,7 @@ var ReadMediaFileTool = class {
 };
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/write.md
-var write_default = "Overwrite or append to a file with content exactly as provided, creating the file if needed; the parent directory must already exist. Defaults to overwrite; append adds content to the end without adding a newline. Write does not use the Read/Edit model text view and does not preserve or infer the previous line-ending style: \\n stays LF, \\r\\n stays CRLF. Use Edit for targeted changes to existing files. When the content is very large, you can split it across multiple calls: write the first chunk with overwrite, then add the remaining chunks with append. Write refuses content containing `<<<<<<<`/`=======`/`>>>>>>>` merge conflict markers — resolve conflicts first.\n";
+var write_default = "Write does not preserve or infer the previous line-ending style: \\n stays LF, \\r\\n stays CRLF. Use Edit for targeted changes to existing files. When the content is very large, you can split it across multiple calls: write the first chunk with overwrite, then add the remaining chunks with append. Write refuses content containing `<<<<<<<`/`=======`/`>>>>>>>` merge conflict markers - resolve conflicts first.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/write.ts
 /** Mask isolating the file-type bits of a stat mode. */
@@ -77333,10 +77742,11 @@ var WriteTool = class {
 				pathClass: this.jian.pathClass(),
 				homeDir: this.jian.gethome()
 			}),
-			execute: () => this.execution(args, path)
+			execute: ({ signal }) => this.execution(args, path, signal)
 		};
 	}
-	async execution(args, safePath) {
+	async execution(args, safePath, signal) {
+		signal?.throwIfAborted();
 		const parentError = await this.checkParentDirectory(safePath);
 		if (parentError !== void 0) return {
 			isError: true,
@@ -77351,6 +77761,7 @@ var WriteTool = class {
 			const mode = args.mode ?? "overwrite";
 			if (mode === "append") await this.jian.writeText(safePath, args.content, { mode: "a" });
 			else await this.jian.writeText(safePath, args.content);
+			scanCache.clear();
 			const bytesWritten = Buffer.byteLength(args.content, "utf8");
 			const { notice, hasErrors } = await this.appendDiagnostics(safePath);
 			const output = `${mode === "append" ? "Appended" : "Wrote"} ${String(bytesWritten)} bytes to ${args.path}${notice}`;
@@ -77400,7 +77811,7 @@ var WriteTool = class {
 };
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/planning/enter-plan-mode.md
-var enter_plan_mode_default = "Use this tool proactively when you're about to start a non-trivial implementation task.\nGetting user sign-off on your approach via ExitPlanMode before writing code prevents wasted effort.\n\n## Planning Modes\n\nThe host supports two planning strategies. You can request either one via this tool:\n\n- **Normal plan** (default): You investigate the codebase, design a single implementation approach, write it to the plan file, and present it for approval. Best when the task is straightforward or you are already confident about the right approach.\n- **Fusion plan**: Invoke the FusionPlan tool to spawn multiple independent planning subagents in parallel, each exploring a different angle, then synthesize their outputs into one consolidated plan. Best when the task is ambiguous, has many valid approaches, crosses many files, or when exploration itself adds significant value. Fusion plan may take longer but tends to surface risks and alternatives you might miss.\n\nTo request a fusion plan, include `mode: 'fusion'` in your tool arguments. When in fusion strategy, call the FusionPlan tool to generate the plan.\n\n### When to choose which mode\n\nPrefer **normal plan** when:\n1. The user gave specific, detailed instructions.\n2. The change is small or localized (1-3 files, single concern).\n3. You are confident about the codebase structure and the right approach.\n4. Speed matters more than exploring alternatives.\n\nPrefer **fusion plan** when:\n1. The task is open-ended or ambiguous (e.g. \"improve performance\", \"refactor auth\").\n2. Multiple valid architectures or approaches exist.\n3. The change spans more than 3-5 files or touches core abstractions.\n4. You are unfamiliar with the relevant code paths and want parallel exploration.\n5. The user explicitly asked for a thorough plan or mentioned comparing options.\n\nIf unsure, choose normal plan for small fixes and fusion plan for larger design tasks.\n\n## When to Use\n\nUse this tool when ANY of these conditions apply:\n\n1. New Feature Implementation - e.g. \"Add a caching layer to the API\"\n2. Multiple Valid Approaches - e.g. \"Optimize database queries\" (indexing vs rewrite vs caching)\n3. Code Modifications - e.g. \"Refactor auth module to support OAuth\"\n4. Architectural Decisions - e.g. \"Add WebSocket support\"\n5. Multi-File Changes - involves more than 2-3 files\n6. Unclear Requirements - need exploration to understand scope\n7. User Preferences Matter - if user input would materially change the implementation approach, use EnterPlanMode to structure the decision\n\nPermission mode notes:\n- EnterPlanMode enters plan mode automatically without an approval prompt in all permission modes.\n- In yolo and manual modes, ExitPlanMode still presents the plan to the user for approval.\n- In auto permission mode, do not use AskUserQuestion; make the best decision from available context.\n- In auto permission mode, ExitPlanMode exits plan mode without asking the user.\n- Use EnterPlanMode only when planning itself adds value.\n\nWhen NOT to use:\n- Single-line or few-line fixes (typos, obvious bugs, small tweaks)\n- User gave very specific, detailed instructions\n- Pure research/exploration tasks\n\n## What Happens in Plan Mode\nIn plan mode, you will:\n1. Identify 2-3 key questions about the codebase that are critical to your plan. If you are not confident about the codebase structure or relevant code paths, use `Agent(subagent_type=\"explore\")` to investigate these questions first - this is strongly recommended for non-trivial tasks.\n2. Explore the codebase using Glob, Grep, Read, and other read-only tools for any remaining quick lookups. Use Bash only when needed; Bash follows the normal permission mode and rules.\n3. Design an implementation approach based on your findings (or, for fusion plan, call FusionPlan to generate the synthesized plan).\n4. Review the generated plan, fill in any gaps, and ensure it matches the user's intent.\n5. Present your plan to the user via ExitPlanMode for approval\n\nFor fusion plan, the FusionPlan tool performs the parallel exploration and synthesis for you; you should still review the result before exiting plan mode.\n";
+var enter_plan_mode_default = "Use this tool proactively when you're about to start a non-trivial implementation task.\nGetting user sign-off on your approach via ExitPlanMode before writing code prevents wasted effort.\n\n## Planning Modes\n\n- **Normal plan**: You investigate the codebase, design a single approach, write it to the plan file, and present it for approval.\n- **Fusion plan**: Invoke the FusionPlan tool to spawn parallel planning subagents, each exploring a different angle, then synthesize their outputs into one plan. Fusion plan may take longer but tends to surface risks and alternatives you might miss.\n\n### When to choose which mode\n\nPrefer **normal plan** when:\n1. The user gave specific, detailed instructions.\n2. The change is small or localized (1-3 files, single concern).\n3. You are confident about the codebase structure and the right approach.\n4. Speed matters more than exploring alternatives.\n\nPrefer **fusion plan** when:\n1. The task is open-ended or ambiguous (e.g. \"improve performance\", \"refactor auth\").\n2. Multiple valid architectures or approaches exist.\n3. The change spans more than 3-5 files or touches core abstractions.\n4. You are unfamiliar with the relevant code paths and want parallel exploration.\n5. The user explicitly asked for a thorough plan or mentioned comparing options.\n\nIf unsure, choose normal plan for small fixes and fusion plan for larger design tasks.\n\n## When to Use\n\nUse this tool when ANY of these conditions apply:\n\n1. New Feature Implementation - e.g. \"Add a caching layer to the API\"\n2. Multiple Valid Approaches - e.g. \"Optimize database queries\" (indexing vs rewrite vs caching)\n3. Code Modifications - e.g. \"Refactor auth module to support OAuth\"\n4. Architectural Decisions - e.g. \"Add WebSocket support\"\n5. Multi-File Changes - involves more than 2-3 files\n6. Unclear Requirements - need exploration to understand scope\n7. User Preferences Matter - if user input would materially change the implementation approach, use EnterPlanMode to structure the decision\n\nPermission mode notes:\n- EnterPlanMode enters plan mode automatically without an approval prompt in all permission modes.\n- In yolo and manual modes, ExitPlanMode still presents the plan to the user for approval.\n- In auto permission mode, do not use AskUserQuestion; make the best decision from available context.\n- In auto permission mode, ExitPlanMode exits plan mode without asking the user.\n- Use EnterPlanMode only when planning itself adds value.\n\nWhen NOT to use:\n- Single-line or few-line fixes (typos, obvious bugs, small tweaks)\n- User gave very specific, detailed instructions\n- Pure research/exploration tasks\n\n## What Happens in Plan Mode\nIn plan mode, you will:\n1. Identify 2-3 key questions about the codebase that are critical to your plan. If you are not confident about the codebase structure or relevant code paths, use `Agent(subagent_type=\"explore\")` to investigate these questions first - this is strongly recommended for non-trivial tasks.\n2. Explore the codebase using Glob, Grep, Read, and other read-only tools for any remaining quick lookups. Use Bash only when needed; Bash follows the normal permission mode and rules.\n3. Design an implementation approach based on your findings (or, for fusion plan, call FusionPlan to generate the synthesized plan).\n4. Review the generated plan, fill in any gaps, and ensure it matches the user's intent.\n5. Present your plan to the user via ExitPlanMode for approval\n\nFor fusion plan, the FusionPlan tool performs the parallel exploration and synthesis for you; you should still review the result before exiting plan mode.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/planning/enter-plan-mode.ts
 const EnterPlanModeInputSchema = z.object({ mode: z.enum(["normal", "fusion"]).default("normal").describe("Planning strategy. 'normal' (default): you design the plan. 'fusion': the host spawns parallel planning subagents and synthesizes a single plan for you to review. Use 'fusion' for ambiguous, large, or multi-approach tasks.") }).strict();
@@ -77485,7 +77896,7 @@ function enteredPlanModeMessage(mode, planPath) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/planning/exit-plan-mode.md
-var exit_plan_mode_default = "Use this tool when you are in plan mode and have finished writing your plan to the plan file and are ready for user approval.\n\n## How This Tool Works\n- You should have already written your plan to the plan file specified in the plan mode reminder.\n- This tool does NOT take the plan content as a parameter - it reads the plan from the file you wrote.\n- The user will see the contents of your plan file when they review it. In auto permission mode, the tool reads the file and exits plan mode without asking the user.\n\n## When to Use\nOnly use this tool for tasks that require planning implementation steps. For research tasks (searching files, reading code, understanding the codebase), do NOT use this tool.\n\n## Multiple Approaches\nIf your plan contains multiple alternative approaches:\n- Pass them via the `options` parameter so the user can choose which approach to execute.\n- Each option should have a concise label and a brief description of trade-offs.\n- If you recommend one option, append \"(Recommended)\" to its label.\n- In yolo and manual modes, the user will see all options alongside Reject and Revise choices.\n- Provide up to 3 options; the host adds the standard rejection and revision controls. When the plan offers a real choice, 2-3 distinct approaches work best.\n- Passing a single option is allowed and is equivalent to a plain plan approval (no approach choice is surfaced to the user).\n- Do NOT use \"Reject\", \"Reject and Exit\", \"Revise\", or \"Approve\" as option labels - these are reserved by the system.\n\n## Before Using\n- In auto permission mode, do NOT use AskUserQuestion; make the best decision from available context.\n- In auto permission mode, this tool exits plan mode without asking the user.\n- In yolo and manual modes, this tool still presents the plan to the user for approval.\n- If auto permission mode is not active and you have unresolved questions, use AskUserQuestion first.\n- If auto permission mode is not active and you have multiple approaches and haven't narrowed down yet, consider using AskUserQuestion first to let the user choose, then write a plan for the chosen approach only.\n- Once your plan is finalized, use THIS tool to request approval.\n- Do NOT use AskUserQuestion to ask \"Is this plan OK?\" or \"Should I proceed?\" - that is exactly what ExitPlanMode does.\n- If rejected, revise based on feedback and call ExitPlanMode again.\n";
+var exit_plan_mode_default = "Use this tool when you are in plan mode and have finished writing your plan to the plan file and are ready for user approval.\n\n## How This Tool Works\n- You should have already written your plan to the plan file specified in the plan mode reminder.\n- This tool does NOT take the plan content as a parameter - it reads the plan from the file you wrote.\n- The user will see the contents of your plan file when they review it. In auto permission mode, the tool reads the file and exits plan mode without asking the user.\n\n## When to Use\nOnly use this tool for tasks that require planning implementation steps. For research tasks (searching files, reading code, understanding the codebase), do NOT use this tool.\n\n## Multiple Approaches\nIf your plan contains multiple alternative approaches:\n- If you recommend one option, append \"(Recommended)\" to its label.\n- In yolo and manual modes, the user will see all options alongside Reject and Revise choices.\n- Passing a single option is allowed and is equivalent to a plain plan approval (no approach choice is surfaced to the user).\n\n## Before Using\n- In auto permission mode, do NOT use AskUserQuestion; make the best decision from available context.\n- In auto permission mode, this tool exits plan mode without asking the user.\n- In yolo and manual modes, this tool still presents the plan to the user for approval.\n- If auto permission mode is not active and you have unresolved questions, use AskUserQuestion first.\n- If auto permission mode is not active and you have multiple approaches and haven't narrowed down yet, consider using AskUserQuestion first to let the user choose, then write a plan for the chosen approach only.\n- Once your plan is finalized, use THIS tool to request approval.\n- Do NOT use AskUserQuestion to ask \"Is this plan OK?\" or \"Should I proceed?\" - that is exactly what ExitPlanMode does.\n- If rejected, revise based on feedback and call ExitPlanMode again.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/planning/exit-plan-mode.ts
 const RESERVED_OPTION_LABELS = new Set([
@@ -77814,6 +78225,30 @@ function truncateUtf8$1(input, maxBytes) {
 var bash_default = "Execute a `{{ SHELL_NAME }}` command. Use this for shell semantics — pipes, env, processes, git, package managers, build/test runners, anything genuinely interactive or multi-step.\n\n**Translate these to a dedicated tool instead:**\n- `cat` / `head` / `tail` (known path) → `Read`\n- `sed` / `awk` (in-place edit) → `Edit`\n- `echo > file` / `cat <<EOF` → `Write`\n- `find` / recursive `ls` to locate files by name pattern → `Glob` (plain `ls <known-directory>` is fine for listing a directory)\n- `grep` / `rg` (search file contents) → `Grep`\n- `echo` / `printf` (talk to the user) → just output text directly\n\nThe dedicated tools render in the per-tool permission UI and keep raw stdout out of the conversation; that is why they are worth reaching for whenever one fits.\n\n**Output:**\nThe stdout and stderr will be combined and returned as a string. The output may be truncated if it is too long. If the command failed, the output will end with a `Command failed with exit code: N` line stating the non-zero exit code.\n\nIf `run_in_background=true`, the command will be started as a background task and this tool will return a task ID instead of waiting for command completion. When doing that, you must provide a short `description`. Background commands default to a {{ DEFAULT_BACKGROUND_TIMEOUT_S }}s timeout and `timeout` is capped at {{ MAX_BACKGROUND_TIMEOUT_S }}s; set `disable_timeout=true` only when the task should run without a timeout. You will be automatically notified when the task completes. Use `TaskOutput` for a non-blocking status/output snapshot, and only set `block=true` when you explicitly want to wait for completion. Use `TaskStop` only if the task must be cancelled. If a human user wants to inspect background tasks themselves, point them to the `/tasks` command, which opens an interactive panel; it has no subcommands.\n\n**Guidelines for safety and security:**\n- Each shell tool call will be executed in a fresh shell environment. The shell variables, current working directory changes, and the shell history is not preserved between calls.\n- The tool call will return after the command is finished. You shall not use this tool to execute an interactive command or a command that may run forever. For possibly long-running foreground commands, set the `timeout` argument in seconds. Foreground commands default to {{ DEFAULT_TIMEOUT_S }}s and allow up to {{ MAX_TIMEOUT_S }}s.\n- Avoid using `..` to access files or directories outside of the working directory.\n- Avoid modifying files outside of the working directory unless explicitly instructed to do so.\n- Never run commands that require superuser privileges unless explicitly instructed to do so.\n\n**Guidelines for efficiency:**\n- For multiple related commands, use `&&` to chain them in a single call, e.g. `cd /path && ls -la`\n- Use `;` to run commands sequentially regardless of success/failure\n- Use `||` for conditional execution (run second command only if first fails)\n- Use pipe operations (`|`) and redirections (`>`, `>>`) to chain input and output between commands\n- Always quote file paths containing spaces with double quotes (e.g., cd \"/path with spaces/\")\n- Compose multi-step logic in a single call with `if` / `case` / `for` / `while` control flows.\n- Prefer `run_in_background=true` for long-running builds, tests, watchers, or servers when you need the conversation to continue before the command finishes.\n\n**Commands available:**\nThe following common command categories are usually available. Availability still depends on the host, so when in doubt run `which <command>` first to confirm a command exists before relying on it.\n- Navigation and inspection: `ls`, `pwd`, `cd`, `stat`, `file`, `du`, `df`, `tree`\n- File and directory management: `cp`, `mv`, `rm`, `mkdir`, `touch`, `ln`, `chmod`, `chown`\n- Text and data processing: `wc`, `sort`, `uniq`, `cut`, `tr`, `diff`, `xargs`\n- Archives and compression: `tar`, `gzip`, `gunzip`, `zip`, `unzip`\n- Networking and transfer: `curl`, `wget`, `ping`, `ssh`, `scp`\n- Version control: `git`\n- Process and system: `ps`, `kill`, `top`, `env`, `date`, `uname`, `whoami`\n- Language and package toolchains: `node`, `npm`, `pnpm`, `yarn`, `python`, `pip` (use whichever the project actually relies on)\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/shell/bash.ts
+/**
+* BashTool — execute shell commands.
+*
+* Invokes bash (POSIX) according to an injected `Environment`. On Windows
+* the shell is Git Bash; the path is resolved by `detectEnvironment`.
+*
+* Dependencies injected via constructor:
+*   - `Jian`        — shell execution abstraction (exec / execWithEnv)
+*   - `cwd`         — default working directory for commands
+*   - `Environment` — cross-platform probe (shellName / shellPath)
+*   - `BackgroundProcessManager?` — optional: required iff run_in_background=true
+*
+* Execution goes through Jian, never directly via node:child_process.
+*
+* Hardening:
+*   - `args.timeout` (seconds) and the ambient `signal` both drive
+*     `Promise.race`; fire-a-kill on either edge.
+*   - stdin is closed immediately so interactive commands (`cat`, `read`,
+*     `python -c 'input()'`) receive EOF instead of hanging.
+*   - Two-phase kill: SIGTERM → 5s grace → SIGKILL (Jian honours this
+*     contract cross-platform).
+*   - stdout/stderr stream into ToolResultBuilder; excess is replaced with a
+*     truncation marker so a runaway command cannot OOM the host.
+*/
 const MS_PER_SECOND = 1e3;
 const DEFAULT_TIMEOUT_S = 60;
 const MAX_TIMEOUT_S = 300;
@@ -78064,7 +78499,11 @@ var BashTool = class {
 			killProc();
 		}, timeoutMs);
 		try {
-			const builder = new ToolResultBuilder();
+			const builder = new ToolResultBuilder({ artifactSink: async (fullOutput) => {
+				const artifactPath = join(tmpdir(), `scream-bash-output-${randomUUID()}.log`);
+				await writeFile(artifactPath, fullOutput, "utf8");
+				return artifactPath;
+			} });
 			const [, exitCode] = await Promise.all([Promise.all([readStreamIntoBuilder(proc.stdout, builder), readStreamIntoBuilder(proc.stderr, builder)]), proc.wait()]);
 			if (timedOut) {
 				const timeoutLabel = timeoutMs % 1e3 === 0 ? `${String(timeoutMs / 1e3)}s` : `${String(timeoutMs)}ms`;
@@ -79655,7 +80094,8 @@ const DEFAULT_CONFIG = {
 	minContentTokens: 100,
 	minContextUsageRatio: .5,
 	truncatedMarker: "[Old tool result content cleared]",
-	uselessMarker: "[Uneventful result elided]"
+	uselessMarker: "[Uneventful result elided]",
+	noMatchesMarker: "[no matches]"
 };
 /**
 * Compute the cutoff index: everything at index < cutoff is eligible for
@@ -79676,30 +80116,107 @@ function computeCutoff(messages, config) {
 	}
 	return cutoff;
 }
+/** Tool names whose results are file reads eligible for supersede pruning. */
+const READ_TOOL_NAMES = new Set(["Read", "ReadGroup"]);
+/** Tool names whose empty results can be elided as a no-match marker. */
+const SEARCH_TOOL_NAMES = new Set(["Grep", "Glob"]);
+/** Exact tool-result texts that indicate a zero-match search result. */
+const ZERO_MATCH_TEXTS = new Set(["No matches found", "No non-sensitive matches found"]);
+/**
+* Parse a tool call's arguments JSON. Returns undefined for null or malformed
+* JSON - persisted history can carry truncated arguments that must not crash
+* compaction. `ToolCall.arguments` is a JSON string (or null), never a parsed
+* object, so every consumer must go through this helper.
+*/
+function parseToolCallArguments$1(argumentsJson) {
+	if (argumentsJson === null || argumentsJson === void 0) return void 0;
+	try {
+		const parsed = JSON.parse(argumentsJson);
+		return typeof parsed === "object" && parsed !== null ? parsed : void 0;
+	} catch {
+		return;
+	}
+}
 /**
-* Walk the message list and find Read tool calls whose file paths were
-* superseded by a later Read of the same path. Returns a map from the
-* superseded tool call's ID to the file path (for the marker text).
+* Extract the file paths targeted by a read tool call. `Read` carries a
+* single `path`; `ReadGroup` carries a `paths` array. Returns an empty array
+* for non-read tools or calls whose arguments don't yield usable paths.
+*/
+function extractReadFilePaths(name, args) {
+	if (args === void 0) return [];
+	if (name === "Read") {
+		const path = typeof args["path"] === "string" ? args["path"] : void 0;
+		return path !== void 0 && path.length > 0 ? [path] : [];
+	}
+	if (name === "ReadGroup") {
+		const paths = args["paths"];
+		if (!Array.isArray(paths)) return [];
+		return paths.filter((p) => typeof p === "string" && p.length > 0);
+	}
+	return [];
+}
+/** Concatenate the `text` parts of a message's content into a single string. */
+function extractTextContent(content) {
+	let text = "";
+	for (const part of content) if (typeof part === "object" && part !== null && part.type === "text") text += part.text;
+	return text;
+}
+/** Build a toolCallId -> tool-name map by scanning assistant messages. */
+function buildToolCallNameMap(messages) {
+	const names = /* @__PURE__ */ new Map();
+	for (const msg of messages) {
+		if (msg.role !== "assistant") continue;
+		for (const tc of msg.toolCalls) names.set(tc.id, tc.name);
+	}
+	return names;
+}
+/**
+* Whether a tool result is a zero-match Grep/Glob result eligible for elision.
+* Only exact-match the canonical empty-result texts so results carrying extra
+* information (sensitive-file filter notices, pagination notices, errors) are
+* preserved verbatim.
+*/
+function isZeroMatchSearchResult(toolName, content) {
+	if (toolName === void 0 || !SEARCH_TOOL_NAMES.has(toolName)) return false;
+	const text = extractTextContent(content).trim();
+	return ZERO_MATCH_TEXTS.has(text);
+}
+/**
+* Walk the message list and find Read/ReadGroup tool calls whose file paths
+* were superseded by a later read of the same path. Returns a map from the
+* superseded tool call's ID to the list of file paths covered by the newer
+* read (a ReadGroup can cover several).
 *
-* Only considers tool results before the cutoff line — newer reads are
-* protected and their results are kept verbatim.
+* Only considers tool results before the cutoff line - newer reads are
+* protected and their results are kept verbatim. The comparison uses the raw
+* path strings from the tool arguments; path canonicalization would need
+* workspace context the compaction layer doesn't have, so the same file read
+* via two different spellings is treated as two different files (safe: it
+* just misses a supersede opportunity rather than dropping a distinct result).
 */
 function findSupersededPaths(messages, cutoff) {
 	const superseded = /* @__PURE__ */ new Map();
-	const readCalls = /* @__PURE__ */ new Map();
+	const latestReadByPath = /* @__PURE__ */ new Map();
 	for (let i = 0; i < messages.length; i++) {
 		const msg = messages[i];
 		if (msg === void 0) continue;
-		if (msg.role === "assistant" && msg.toolCalls.length > 0) {
-			for (const tc of msg.toolCalls) if (tc.name === "Read" && tc.id !== void 0 && tc.arguments !== void 0) {
-				const filePath = typeof tc.arguments === "object" && tc.arguments !== null ? tc.arguments["file_path"] : void 0;
-				if (filePath !== void 0) {
-					for (const [prevId, prev] of readCalls) if (prev.filePath === filePath && prev.index < cutoff) superseded.set(prevId, filePath);
-					readCalls.set(tc.id, {
-						filePath,
-						index: i
-					});
-				}
+		if (msg.role !== "assistant" || msg.toolCalls.length === 0) continue;
+		for (const tc of msg.toolCalls) {
+			if (!READ_TOOL_NAMES.has(tc.name)) continue;
+			const args = parseToolCallArguments$1(tc.arguments);
+			const paths = extractReadFilePaths(tc.name, args);
+			if (paths.length === 0) continue;
+			for (const filePath of paths) {
+				const prev = latestReadByPath.get(filePath);
+				if (prev !== void 0 && prev.index < cutoff) {
+					const existing = superseded.get(prev.toolCallId);
+					if (existing === void 0) superseded.set(prev.toolCallId, [filePath]);
+					else if (!existing.includes(filePath)) superseded.set(prev.toolCallId, [...existing, filePath]);
+				}
+				latestReadByPath.set(filePath, {
+					toolCallId: tc.id,
+					index: i
+				});
 			}
 		}
 	}
@@ -79748,25 +80265,33 @@ var MicroCompaction = class {
 		const nextCutoff = computeCutoff(history, config);
 		if (nextCutoff <= this.cutoff) return;
 		const { beforeTokens, afterTokens } = this.measureEffect(history, nextCutoff);
-		if (beforeTokens - afterTokens < config.pruneMinReclaimTokens) return;
+		const reclaimTokens = beforeTokens - afterTokens;
+		if (reclaimTokens < config.pruneMinReclaimTokens) return;
+		if (estimateTokensForMessages(history.slice(nextCutoff)) * 1.15 > reclaimTokens) return;
 		this.apply(nextCutoff);
 	}
 	/**
 	* Apply micro-compaction to a message list: replace old tool results
-	* before the cutoff line with truncated markers. Read results for files
-	* that were re-read later get a supersede marker so the model knows
-	* the old content is stale. Tool results explicitly marked useless are
-	* elided with a short notice regardless of size, since they carry no
-	* actionable information.
+	* before the cutoff line with truncated markers. Read/ReadGroup results
+	* for files that were re-read later get a supersede marker (listing the
+	* covered paths) so the model knows the old content is stale. Zero-match
+	* Grep/Glob results are elided to a short `[no matches]` notice regardless
+	* of size. Tool results explicitly marked useless are elided with a short
+	* notice regardless of size, since they carry no actionable information.
 	*/
 	compact(messages) {
 		const config = this.config;
 		const superseded = findSupersededPaths(messages, this.cutoff);
+		const toolNames = buildToolCallNameMap(messages);
 		const result = [];
 		let i = 0;
 		for (const msg of messages) {
-			const isUseless = i < this.cutoff && msg.role === "tool" && msg.toolCallId !== void 0 && msg.useless === true;
-			const isOversizedTruncatable = i < this.cutoff && msg.role === "tool" && msg.toolCallId !== void 0 && estimateTokensForMessages([msg]) >= config.minContentTokens;
+			const isOld = i < this.cutoff;
+			const toolCallId = msg.toolCallId;
+			const isTool = msg.role === "tool" && toolCallId !== void 0;
+			const isUseless = isOld && isTool && msg.useless === true;
+			const isZeroMatch = isOld && isTool && toolCallId !== void 0 && isZeroMatchSearchResult(toolNames.get(toolCallId), msg.content);
+			const isOversizedTruncatable = isOld && isTool && estimateTokensForMessages([msg]) >= config.minContentTokens;
 			if (isUseless) result.push({
 				...msg,
 				content: [{
@@ -79774,8 +80299,16 @@ var MicroCompaction = class {
 					text: config.uselessMarker
 				}]
 			});
+			else if (isZeroMatch) result.push({
+				...msg,
+				content: [{
+					type: "text",
+					text: config.noMatchesMarker
+				}]
+			});
 			else if (isOversizedTruncatable) {
-				const marker = msg.toolCallId !== void 0 && superseded.has(msg.toolCallId) ? `[Superseded by a newer read of ${superseded.get(msg.toolCallId)}]` : config.truncatedMarker;
+				const paths = toolCallId !== void 0 ? superseded.get(toolCallId) : void 0;
+				const marker = paths !== void 0 && paths.length > 0 ? `[Superseded by a newer read of ${paths.join(", ")}]` : config.truncatedMarker;
 				result.push({
 					...msg,
 					content: [{
@@ -79800,20 +80333,28 @@ var MicroCompaction = class {
 	measureEffect(messages, cutoff) {
 		let markerTokenCount;
 		let uselessMarkerTokenCount;
+		let noMatchesMarkerTokenCount;
 		let truncatedToolResultCount = 0;
 		let beforeTokens = 0;
 		let afterTokens = 0;
+		const toolNames = buildToolCallNameMap(messages);
 		for (let i = 0; i < messages.length && i < cutoff; i++) {
 			const message = messages[i];
 			if (message?.role !== "tool" || message.toolCallId === void 0) continue;
 			const contentTokens = estimateTokensForMessages([message]);
 			const isUseless = message.useless === true;
-			if (!isUseless && contentTokens < this.config.minContentTokens) continue;
+			const isZeroMatch = isZeroMatchSearchResult(toolNames.get(message.toolCallId), message.content);
+			if (!isUseless && !isZeroMatch && contentTokens < this.config.minContentTokens) continue;
 			if (isUseless) {
 				uselessMarkerTokenCount ??= estimateTokens$1(this.config.uselessMarker);
 				truncatedToolResultCount += 1;
 				beforeTokens += contentTokens;
 				afterTokens += uselessMarkerTokenCount;
+			} else if (isZeroMatch) {
+				noMatchesMarkerTokenCount ??= estimateTokens$1(this.config.noMatchesMarker);
+				truncatedToolResultCount += 1;
+				beforeTokens += contentTokens;
+				afterTokens += noMatchesMarkerTokenCount;
 			} else {
 				markerTokenCount ??= estimateTokens$1(this.config.truncatedMarker);
 				truncatedToolResultCount += 1;
@@ -80822,6 +81363,71 @@ var ConfigState = class {
 	}
 };
 //#endregion
+//#region ../../packages/agent-core/src/agent/context/prefix-fingerprint.ts
+/**
+* Deterministic non-crypto string hash (djb2). Fast and sufficient for change
+* detection; not used for any security purpose. Returns a compact base36
+* string so an array of fingerprints stays small.
+*/
+function hashString(input) {
+	let hash = 5381;
+	for (let i = 0; i < input.length; i++) hash = (hash << 5) + hash + (input.codePointAt(i) ?? 0) | 0;
+	return (hash >>> 0).toString(36);
+}
+/**
+* Stable JSON serialization that sorts object keys so key insertion order
+* can't affect the fingerprint. Only used for media parts whose payload is
+* already a stable base64/url string; text/think parts have a dedicated
+* fast path.
+*/
+function stableJson(value) {
+	if (value === null || typeof value !== "object") return JSON.stringify(value);
+	if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
+	const obj = value;
+	return `{${Object.keys(obj).toSorted().map((k) => `${JSON.stringify(k)}:${stableJson(obj[k])}`).join(",")}}`;
+}
+function serializeContentPart(part) {
+	switch (part.type) {
+		case "text": return `text:${part.text}`;
+		case "think": return `think:${part.think}${part.encrypted !== void 0 ? `\u0003${part.encrypted}` : ""}`;
+		default: return `${part.type}:${stableJson(part)}`;
+	}
+}
+function serializeToolCall(tc) {
+	return `function|${tc.id}|${tc.name}|${tc.arguments ?? ""}`;
+}
+/**
+* Serialize a message to a deterministic string covering all
+* provider-visible bytes. Two messages with the same serialization produce
+* identical provider bytes (modulo serialization the provider adapter
+* normalizes). Separator bytes (\x00-\x03) are used so concatenated fields
+* can't alias.
+*/
+function serializeMessage$1(message) {
+	const content = message.content.map(serializeContentPart).join("
");
+	const toolCalls = message.toolCalls.map(serializeToolCall).join("");
+	return `${message.role}\u0000${message.name ?? ""}\u0000${message.toolCallId ?? ""}\u0000${content}\u0000${toolCalls}`;
+}
+/** Per-message fingerprint. Equal fingerprints => equal provider bytes. */
+function messageFingerprint(message) {
+	return hashString(serializeMessage$1(message));
+}
+/**
+* Longest common prefix length by provider-visible bytes. This is the number
+* of leading messages a provider prompt cache could reuse from the previous
+* call. When this is less than the previous call's message count, an early
+* message mutated and the cache broke from that index.
+*
+* `prev` is the array of per-message fingerprints captured last call;
+* `current` is the live messages this call.
+*/
+function stablePrefixLength(prev, current) {
+	const n = Math.min(prev.length, current.length);
+	let i = 0;
+	for (; i < n; i++) if (prev[i] !== messageFingerprint(current[i])) break;
+	return i;
+}
+//#endregion
 //#region ../../packages/agent-core/src/agent/context/types.ts
 const USER_PROMPT_ORIGIN = { kind: "user" };
 //#endregion
@@ -80844,6 +81450,18 @@ var ContextMemory = class {
 	openSteps = /* @__PURE__ */ new Map();
 	pendingToolResultIds = /* @__PURE__ */ new Set();
 	deferredMessages = [];
+	/**
+	* Per-message fingerprints captured from the last message list handed to
+	* the LLM via {@link messagesForLLM}. Used to measure prefix stability
+	* across calls: a provider prompt cache only hits when the leading
+	* messages are byte-identical to the previous request, so the length of
+	* the matching prefix here approximates the cacheable prefix length.
+	*
+	* Reset on {@link clear}; a compaction naturally produces a 0-length
+	* stable prefix (the summary replaces the head), which is the correct
+	* cache-break signal rather than a reset.
+	*/
+	lastSentFingerprints = [];
 	constructor(agent) {
 		this.agent = agent;
 	}
@@ -80893,6 +81511,7 @@ var ContextMemory = class {
 		this.openSteps.clear();
 		this.pendingToolResultIds.clear();
 		this.deferredMessages = [];
+		this.lastSentFingerprints = [];
 		this.agent.injection.onContextClear();
 		this.agent.emitStatusUpdated();
 	}
@@ -80937,6 +81556,19 @@ var ContextMemory = class {
 		}
 		if (!this.agent.records.restoring && (stoppedAtBoundary || removedUserCount < count)) {}
 	}
+	/**
+	* Apply a full compaction summary.
+	*
+	* Prefix-stability note: this is a **replaceHead** operation, not a
+	* replaceTail. The first `compactedCount` messages are collapsed into a
+	* single summary message; the trailing recent messages are preserved
+	* verbatim. This necessarily breaks the provider prompt cache for the
+	* whole prefix (the summary is new content), which is inherent to
+	* summarization and cannot be avoided. After compaction the new prefix
+	* `[summary, ...tail]` is stable again until the next compaction or
+	* micro-compaction cutoff advance, so subsequent append-only steps resume
+	* hitting the cache.
+	*/
 	applyCompaction(summary) {
 		this.agent.records.logRecord({
 			type: "context.apply_compaction",
@@ -80980,6 +81612,48 @@ var ContextMemory = class {
 		this.agent.microCompaction.detect();
 		return project(this.agent.microCompaction.compact(this.history));
 	}
+	/**
+	* Build the message list for an LLM call, with prefix-stability
+	* observation.
+	*
+	* This is the LLM-bound counterpart of the {@link messages} getter: it
+	* runs the same detect + compact + project pipeline, then fingerprints
+	* the result and logs how much of the prefix survived since the last
+	* call. A stable prefix length equal to the previous message count means
+	* the provider prompt cache should hit; a smaller value means an early
+	* message mutated (compaction summary, micro-compaction truncation, or a
+	* projection repair) and the cache broke from that index.
+	*
+	* Behavior is otherwise identical to the getter - this is observation
+	* only, it does not alter the messages returned.
+	*/
+	messagesForLLM() {
+		this.agent.microCompaction.detect();
+		const messages = project(this.agent.microCompaction.compact(this.history));
+		this.observePrefixStability(messages);
+		return messages;
+	}
+	/**
+	* Compare the projected messages against the last LLM-bound batch and
+	* log the stable-prefix length. Pure observation: no state that affects
+	* message content is mutated, only the fingerprint baseline used by the
+	* next call's comparison.
+	*/
+	observePrefixStability(messages) {
+		const prev = this.lastSentFingerprints;
+		const stable = stablePrefixLength(prev, messages);
+		this.lastSentFingerprints = messages.map(messageFingerprint);
+		if (prev.length === 0) return;
+		const appended = messages.length - prev.length;
+		if (stable >= prev.length) return;
+		this.agent.log.debug("prefix-stability: provider prompt cache prefix broke", {
+			stablePrefixLength: stable,
+			prevMessageCount: prev.length,
+			currentMessageCount: messages.length,
+			appendedSinceLast: appended,
+			breakIndex: stable
+		});
+	}
 	appendLoopEvent(event) {
 		this.agent.records.logRecord({
 			type: "context.append_loop_event",
@@ -81089,22 +81763,38 @@ function toolResultOutputForModel(result) {
 	}, ...truncateContentParts(output)];
 	return truncateContentParts(output);
 }
-/** Truncate a plain-text tool output that exceeds MAX_TOOL_RESULT_TOKENS. */
+/** Truncate a plain-text tool output that exceeds MAX_TOOL_RESULT_TOKENS.
+*  Tail-biased: keeps 25% head + 75% tail so error messages and test
+*  failures (usually at the end) survive truncation. */
 function truncateToolOutput(text) {
 	if (estimateTokens$1(text) <= MAX_TOOL_RESULT_TOKENS) return text;
 	const budget = MAX_TOOL_RESULT_TOKENS - estimateTokens$1(TOOL_TRUNCATION_NOTICE);
 	if (budget <= 0) return TOOL_TRUNCATION_NOTICE.trim();
-	let kept = "";
-	let tokens = 0;
+	const headBudget = Math.floor(budget * .25);
+	const tailBudget = budget - headBudget;
+	let head = "";
+	let headTokens = 0;
 	for (const ch of text) {
 		const chTokens = ch.codePointAt(0) <= 127 ? 1 / 4 : 1;
-		if (tokens + chTokens > budget) break;
-		kept += ch;
-		tokens += chTokens;
+		if (headTokens + chTokens > headBudget) break;
+		head += ch;
+		headTokens += chTokens;
+	}
+	const reversed = [...text].toReversed();
+	const tailChars = [];
+	let tailTokens = 0;
+	for (const ch of reversed) {
+		const chTokens = ch.codePointAt(0) <= 127 ? 1 / 4 : 1;
+		if (tailTokens + chTokens > tailBudget) break;
+		tailChars.push(ch);
+		tailTokens += chTokens;
 	}
-	return kept + TOOL_TRUNCATION_NOTICE;
+	const tail = tailChars.toReversed().join("");
+	const notice = `\n[content truncated - ~${Math.max(0, Math.round(estimateTokens$1(text) - headTokens - tailTokens))} tokens omitted]\n`;
+	return head + notice + tail;
 }
-/** Truncate oversized text parts in a ContentPart array. */
+/** Truncate oversized text parts in a ContentPart array.
+*  Tail-biased: keeps 25% head + 75% tail. */
 function truncateContentParts(parts) {
 	let totalTokens = 0;
 	for (const p of parts) if (p.type === "text") totalTokens += estimateTokens$1(p.text);
@@ -81114,39 +81804,83 @@ function truncateContentParts(parts) {
 		type: "text",
 		text: TOOL_TRUNCATION_NOTICE.trim()
 	}];
-	const result = [];
-	let used = 0;
-	for (const p of parts) {
+	const headBudget = Math.floor(budget * .25);
+	const tailBudget = budget - headBudget;
+	const headParts = [];
+	let headUsed = 0;
+	let headEnd = 0;
+	for (let i = 0; i < parts.length; i++) {
+		const p = parts[i];
 		if (p.type !== "text") {
-			result.push(p);
+			headParts.push(p);
+			headEnd = i + 1;
 			continue;
 		}
 		const partTokens = estimateTokens$1(p.text);
-		if (used + partTokens <= budget) {
-			result.push(p);
-			used += partTokens;
+		if (headUsed + partTokens <= headBudget) {
+			headParts.push(p);
+			headUsed += partTokens;
+			headEnd = i + 1;
 		} else {
-			const remaining = budget - used;
-			let kept = "";
-			let t = 0;
-			for (const ch of p.text) {
-				const chTokens = ch.codePointAt(0) <= 127 ? 1 / 4 : 1;
-				if (t + chTokens > remaining) break;
-				kept += ch;
-				t += chTokens;
-			}
-			if (kept.length > 0) result.push({
-				type: "text",
-				text: kept
-			});
+			const remaining = headBudget - headUsed;
+			if (remaining > 0) {
+				let kept = "";
+				let t = 0;
+				for (const ch of p.text) {
+					const chTokens = ch.codePointAt(0) <= 127 ? 1 / 4 : 1;
+					if (t + chTokens > remaining) break;
+					kept += ch;
+					t += chTokens;
+				}
+				if (kept.length > 0) headParts.push({
+					type: "text",
+					text: kept
+				});
+			}
 			break;
 		}
 	}
-	result.push({
-		type: "text",
-		text: TOOL_TRUNCATION_NOTICE
-	});
-	return result;
+	const tailParts = [];
+	let tailUsed = 0;
+	for (let i = parts.length - 1; i >= headEnd; i--) {
+		const p = parts[i];
+		if (p.type !== "text") {
+			tailParts.unshift(p);
+			continue;
+		}
+		const partTokens = estimateTokens$1(p.text);
+		if (tailUsed + partTokens <= tailBudget) {
+			tailParts.unshift(p);
+			tailUsed += partTokens;
+		} else {
+			const remaining = tailBudget - tailUsed;
+			if (remaining > 0) {
+				const chars = [...p.text];
+				let kept = "";
+				let t = 0;
+				for (let j = chars.length - 1; j >= 0; j--) {
+					const chTokens = chars[j].codePointAt(0) <= 127 ? 1 / 4 : 1;
+					if (t + chTokens > remaining) break;
+					kept = chars[j] + kept;
+					t += chTokens;
+				}
+				if (kept.length > 0) tailParts.unshift({
+					type: "text",
+					text: kept
+				});
+			}
+			break;
+		}
+	}
+	const omitted = Math.max(0, Math.round(totalTokens - headUsed - tailUsed));
+	return [
+		...headParts,
+		{
+			type: "text",
+			text: `[content truncated - ~${omitted} tokens omitted]`
+		},
+		...tailParts
+	];
 }
 function isEmptyOutputText(output) {
 	return output.length === 0 || output.trim() === TOOL_OUTPUT_EMPTY_TEXT;
@@ -81616,6 +82350,8 @@ function buildGoalReminder(goal) {
 	lines.push("Goal mode is iterative. Keep the self-audit brief each turn. Do not explore unrelated interpretations once the goal can be decided. If the objective is simple, already answered, impossible, unsafe, or contradictory, do not run another goal turn. Explain briefly if useful, then call UpdateGoal with `complete` or `blocked` in the same turn. Otherwise, self-audit against the objective and any completion criteria above, then do one coherent slice of work toward the objective. Use multiple turns when the task naturally has multiple phases. Call UpdateGoal with `complete` only when all required work is done, any stated validation has passed, and there is no useful next action. Do not mark complete after only producing a plan, summary, first pass, or partial result. If an external condition or required user input prevents progress, or the objective cannot be completed as stated, call UpdateGoal with `blocked`. Otherwise keep working — after your turn ends you will be prompted to continue. Call UpdateGoal as soon as the goal is genuinely done or cannot proceed; don't keep going once there is nothing left to do.");
 	lines.push("");
 	lines.push("When you call UpdateGoal with `complete`, an independent reviewer will verify that the completion criteria are met. In your final response before calling UpdateGoal, provide a structured summary: what was done, which files changed, the verification command and result, and any remaining work or blockers. Do not rely on the UpdateGoal argument alone; the reviewer and the user must see this summary in your natural-language reply.");
+	lines.push("");
+	lines.push("Important: before calling UpdateGoal with `complete`, always call WriteGoalNote first to summarize the key findings, constraints, or partial results from this turn. The reviewer will see these notes together with your final output, so include anything that helps them evaluate cross-turn context. Keep the note concise and actionable.");
 	return lines.join("\n");
 }
 function maxBudgetFraction(goal) {
@@ -97329,6 +98065,13 @@ function buildGraderPrompt(objective, criteria, output) {
 		"## Agent Output",
 		output || "(no output captured)",
 		"",
+		"The Agent Output section contains the following optional parts, in order:",
+		"1. The agent's natural-language summary of what was done this turn.",
+		"2. \"## Cross-turn working notes\" — short notes the agent recorded using the WriteGoalNote tool across continuation turns. These notes capture key findings, constraints, decisions, and partial results. Treat them as supplementary context when evaluating whether the acceptance criteria are met; they are not the deliverable itself.",
+		"3. \"## Changes this turn\" — a git diff stat (or a note if git is unavailable) showing which files were modified. Use it to verify that the claimed work has an actual code footprint.",
+		"",
+		"If the Agent Output does not contain a \"## Cross-turn working notes\" section, add a non-blocking issue: \"No cross-turn working notes were provided. Use WriteGoalNote to record key findings, constraints, and partial results across turns.\" This issue alone must not cause a FAIL.",
+		"",
 		"Evaluate each dimension independently against the acceptance criteria, then decide overall PASS/FAIL.",
 		"When FAIL, list every specific issue with an actionable fix direction so the agent knows exactly what to address next.",
 		"Respond with JSON:",
@@ -98019,6 +98762,11 @@ const GOAL_CONTINUATION_ORIGIN = {
 	kind: "system_trigger",
 	name: "goal_continuation"
 };
+const GOAL_BUDGET_STEER_PROMPT = "Budget nearly exhausted. Wrap up immediately: verify your work, run tests, and call UpdateGoal with status \"complete\" or \"blocked\". Do not start any new work.";
+const GOAL_BUDGET_STEER_ORIGIN = {
+	kind: "system_trigger",
+	name: "goal_budget_steer"
+};
 var TurnFlow = class {
 	agent;
 	steerBuffer = [];
@@ -98183,6 +98931,14 @@ var TurnFlow = class {
 				}
 			}
 			await this.agent.goal.incrementTurn();
+			const budgetSnapshot = this.agent.goal.getGoal().goal;
+			if (budgetSnapshot !== null && budgetSnapshot.status === "active" && (budgetSnapshot.budget.overBudget || isBudgetNearExhaustion(budgetSnapshot.budget, .2))) {
+				turnInput = [{
+					type: "text",
+					text: GOAL_BUDGET_STEER_PROMPT
+				}];
+				turnOrigin = GOAL_BUDGET_STEER_ORIGIN;
+			}
 			const end = await this.runOneTurn(turnId, turnInput, turnOrigin, signal, false);
 			if (end.event.reason === "cancelled") {
 				await this.agent.goal.pauseOnInterrupt({ reason: "Paused after interruption" });
@@ -98374,7 +99130,7 @@ var TurnFlow = class {
 					turnId: String(turnId),
 					signal,
 					llm: this.agent.llm,
-					buildMessages: () => this.agent.context.messages,
+					buildMessages: () => this.agent.context.messagesForLLM(),
 					dispatchEvent: this.buildDispatchEvent(turnId),
 					tools: this.agent.tools.loopTools,
 					log: this.agent.log,
@@ -99509,6 +100265,9 @@ var Agent = class {
 				if (status === "paused") return this.goal.pauseGoal({}, "user");
 				return this.goal.resumeGoal({}, "user");
 			},
+			updateGoalObjective: async (payload) => {
+				return this.goal.updateObjective({ objective: payload.objective }, "user");
+			},
 			cancelGoal: async () => {
 				return this.goal.cancelGoal("user");
 			},
@@ -119565,6 +120324,9 @@ var SessionAPIImpl = class {
 	updateGoalStatus({ agentId, ...payload }) {
 		return this.getAgent(agentId).updateGoalStatus(payload);
 	}
+	updateGoalObjective({ agentId, ...payload }) {
+		return this.getAgent(agentId).updateGoalObjective(payload);
+	}
 	cancelGoal({ agentId, ...payload }) {
 		return this.getAgent(agentId).cancelGoal(payload);
 	}
@@ -121307,6 +122069,9 @@ var ScreamCore = class {
 	updateGoalStatus({ sessionId, ...payload }) {
 		return this.sessionApi(sessionId).updateGoalStatus(payload);
 	}
+	updateGoalObjective({ sessionId, ...payload }) {
+		return this.sessionApi(sessionId).updateGoalObjective(payload);
+	}
 	cancelGoal({ sessionId, ...payload }) {
 		return this.sessionApi(sessionId).cancelGoal(payload);
 	}
@@ -121760,6 +122525,13 @@ var SDKRpcClient = class {
 			status: input.status
 		});
 	}
+	async updateGoalObjective(input) {
+		return (await this.getRpc()).updateGoalObjective({
+			sessionId: input.sessionId,
+			agentId: this.interactiveAgentId,
+			objective: input.objective
+		});
+	}
 	async cancelGoal(input) {
 		return (await this.getRpc()).cancelGoal({
 			sessionId: input.sessionId,
@@ -122520,6 +123292,13 @@ var Session = class {
 			status
 		});
 	}
+	async updateGoalObjective(objective) {
+		this.ensureOpen();
+		return this.rpc.updateGoalObjective({
+			sessionId: this.id,
+			objective
+		});
+	}
 	async cancelGoal() {
 		this.ensureOpen();
 		return this.rpc.cancelGoal({ sessionId: this.id });
@@ -122979,7 +123758,7 @@ function optionalBuildString(value) {
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 const SCREAM_BUILD_INFO = {
-	version: optionalBuildString("0.10.7"),
+	version: optionalBuildString("0.10.9"),
 	channel: optionalBuildString(""),
 	commit: optionalBuildString(""),
 	buildTarget: optionalBuildString("darwin-arm64")
@@ -126197,9 +126976,15 @@ function formatGoalDuration(ms) {
 	const seconds = totalSeconds % 60;
 	return seconds > 0 ? `${minutes}m${seconds}s` : `${minutes}m`;
 }
-/** Build the footer goal badge: `GOAL 3m · 7 turns`. */
-function formatGoalBadge(wallClockMs, turnsUsed) {
-	return `GOAL ${formatGoalDuration(wallClockMs)} · ${turnsUsed} turns`;
+/** Build the footer goal badge: `GOAL 3m · 7 turns`.
+*
+* The TUI only receives `goal.updated` events on state changes, so we keep a
+* local base timestamp and add the elapsed time since the last snapshot to
+* produce a live wall-clock reading between sparse events.
+*/
+function formatGoalBadge(goal) {
+	const elapsedSinceSnapshot = Date.now() - goal.wallClockBaseAt;
+	return `GOAL ${formatGoalDuration(goal.wallClockMs + Math.max(0, elapsedSinceSnapshot))} · ${goal.turnsUsed} turns`;
 }
 const CONTEXT_WARNING_PERCENT_THRESHOLD = 60;
 const CONTEXT_ERROR_PERCENT_THRESHOLD = 90;
@@ -126270,6 +127055,30 @@ function formatFooterGitBadge(status, colors) {
 	if (status.pullRequest === null) return base;
 	return `${base} ${chalk.hex(colors.primary)(formatPullRequestBadge(status.pullRequest, { linkPullRequest: true }))}`;
 }
+/**
+* Middle-truncate a (possibly ANSI-colored) string to `maxWidth` visible
+* columns, keeping a head and a tail fragment joined by `ellipsis`. The
+* remaining budget is split roughly in half so both the start and the end of
+* the original content stay visible - e.g. `GOAL 3m · 7 turns` becomes
+* `GOAL… turns` (head `GOAL`, tail `turns`). ANSI styling is preserved via
+* sliceByColumn, which carries the active SGR state into the tail; a reset is
+* emitted around the ellipsis so a colour opened in the head never bleeds
+* across it. Exported for unit testing.
+*/
+function truncateMiddle(line, maxWidth, ellipsis) {
+	if (maxWidth <= 0) return "";
+	const textWidth = visibleWidth(line);
+	if (textWidth <= maxWidth) return line;
+	const ellipsisWidth = visibleWidth(ellipsis);
+	if (ellipsisWidth >= maxWidth) return truncateToWidth(line, maxWidth, ellipsis);
+	const keepWidth = maxWidth - ellipsisWidth;
+	const headWidth = Math.max(0, Math.ceil(keepWidth / 2));
+	const tailWidth = keepWidth - headWidth;
+	const head = headWidth > 0 ? sliceByColumn(line, 0, headWidth) : "";
+	const tail = tailWidth > 0 ? sliceByColumn(line, textWidth - tailWidth, tailWidth) : "";
+	const RESET = "\x1B[0m";
+	return head + RESET + ellipsis + RESET + tail;
+}
 var FooterComponent = class {
 	state;
 	colors;
@@ -126295,15 +127104,17 @@ var FooterComponent = class {
 		this.onGitStatusChange = onGitStatusChange;
 		this.gitCacheWorkDir = state.workDir;
 		this.gitCache = createGitStatusCache(state.workDir, { onChange: this.onGitStatusChange });
+		this.#restartStatusTimer(state.streamingPhase, state.goalActive);
 	}
 	setState(state) {
 		const previousPhase = this.state?.streamingPhase;
+		const previousGoalActive = this.state?.goalActive;
 		if (state.workDir !== this.gitCacheWorkDir) {
 			this.gitCacheWorkDir = state.workDir;
 			this.gitCache = createGitStatusCache(state.workDir, { onChange: this.onGitStatusChange });
 		}
 		this.state = state;
-		if (state.streamingPhase !== previousPhase) this.#restartStatusTimer(state.streamingPhase);
+		if (state.streamingPhase !== previousPhase || state.goalActive !== previousGoalActive) this.#restartStatusTimer(state.streamingPhase, state.goalActive);
 	}
 	setColors(colors) {
 		this.colors = colors;
@@ -126331,9 +127142,9 @@ var FooterComponent = class {
 	dispose() {
 		this.#stopStatusTimer();
 	}
-	#restartStatusTimer(phase) {
+	#restartStatusTimer(phase, goalActive) {
 		this.#stopStatusTimer();
-		if (phase === "idle") return;
+		if (phase === "idle" && !goalActive) return;
 		const intervalMs = 1e3 / 60;
 		this.statusTimer = setInterval(() => {
 			this.ui.requestRender();
@@ -126354,8 +127165,7 @@ var FooterComponent = class {
 		}
 		if (state.wolfpackMode) left.push(chalk.hex(colors.wolfpackMode).bold(t("badge.wolfpack")));
 		if (state.goalActive && state.goal) {
-			const g = state.goal;
-			const goalLabel = formatGoalBadge(g.wallClockMs, g.turnsUsed);
+			const goalLabel = formatGoalBadge(state.goal);
 			left.push(chalk.hex(colors.primary).bold(goalLabel));
 		}
 		const model = shortenModel(modelDisplayName(state));
@@ -126377,13 +127187,21 @@ var FooterComponent = class {
 		}
 		const rightWidth = visibleWidth(rightText);
 		const gap = 3;
+		const ellipsis = chalk.hex(colors.textDim)("…");
 		let line1;
 		if (leftWidth + gap + rightWidth <= width) {
 			const pad = width - leftWidth - rightWidth;
 			line1 = leftLine + " ".repeat(pad) + rightText;
-		} else if (leftWidth <= width) line1 = leftLine;
-		else line1 = truncateToWidth(leftLine, width, "…");
-		return [truncateToWidth(line1, width)];
+		} else {
+			const targetLeft = width - gap - rightWidth;
+			if (targetLeft > 0) {
+				const shrunkLeft = truncateMiddle(leftLine, targetLeft, ellipsis);
+				const pad = width - visibleWidth(shrunkLeft) - rightWidth;
+				line1 = shrunkLeft + " ".repeat(pad) + rightText;
+			} else if (leftWidth <= width) line1 = leftLine + " ".repeat(width - leftWidth);
+			else line1 = truncateMiddle(leftLine, width, ellipsis);
+		}
+		return [truncateToWidth(line1, width, "…")];
 	}
 };
 //#endregion
@@ -126731,10 +127549,63 @@ function createThemeStyles(colors) {
 //#endregion
 //#region src/tui/theme/pi-tui-theme.ts
 const HEADING_HASH_PREFIX = /^((?:\u001B\[[0-9;]*m)*)#{1,6}[ \t]+/;
+/**
+* Map cli-highlight syntax tokens onto the ColorPalette so code blocks follow
+* the active theme instead of cli-highlight's built-in colors. cli-highlight
+* takes one formatter function per token; tokens not listed here fall back to
+* its DEFAULT_THEME.
+*/
+function createCodeHighlightTheme(colors) {
+	const keyword = chalk.hex(colors.primary);
+	const str = chalk.hex(colors.success);
+	const comment = chalk.hex(colors.textDim);
+	const num = chalk.hex(colors.warning);
+	const fn = chalk.hex(colors.primary);
+	const cls = chalk.hex(colors.accent);
+	const text = chalk.hex(colors.text);
+	return {
+		keyword,
+		built_in: fn,
+		type: cls,
+		literal: num,
+		number: num,
+		regexp: str,
+		string: str,
+		subst: str,
+		symbol: num,
+		class: cls,
+		function: fn,
+		title: fn,
+		params: text,
+		comment,
+		doctag: comment,
+		meta: chalk.hex(colors.textMuted),
+		"meta-keyword": keyword,
+		"meta-string": str,
+		section: keyword,
+		tag: cls,
+		name: fn,
+		"builtin-name": fn,
+		attr: num,
+		attribute: num,
+		variable: text,
+		bullet: num,
+		code: str,
+		emphasis: (s) => chalk.italic(s),
+		strong: (s) => chalk.bold(s),
+		formula: text,
+		link: chalk.hex(colors.mdLink),
+		quote: chalk.hex(colors.mdQuote),
+		addition: chalk.hex(colors.diffAdded),
+		deletion: chalk.hex(colors.diffRemoved),
+		default: text
+	};
+}
 function createMarkdownTheme(colors) {
 	const stripHash = (text) => text.replace(HEADING_HASH_PREFIX, "$1");
 	const muted = chalk.hex(colors.textMuted);
 	const border = chalk.hex(colors.border);
+	const codeTheme = createCodeHighlightTheme(colors);
 	return {
 		heading: (text) => chalk.bold.hex(colors.text)(stripHash(text)),
 		link: (text) => chalk.hex(colors.mdLink)(text),
@@ -126756,7 +127627,8 @@ function createMarkdownTheme(colors) {
 			try {
 				return highlight(code, {
 					language,
-					ignoreIllegals: true
+					ignoreIllegals: true,
+					theme: codeTheme
 				}).split("\n");
 			} catch {
 				return code.split("\n");
@@ -128185,6 +129057,10 @@ function buildEmptyGoalLines(colors) {
 		value(t("goalpanel.no_goal")),
 		"",
 		`${muted("/goal")} ${value(t("goalpanel.goal_placeholder"))}   ${muted(t("goalpanel.create_goal"))}`,
+		`${muted("/goal setup")}      ${muted(t("goalpanel.setup_goal"))}`,
+		`${muted("/goal update")} ${value("<new objective>")}   ${muted(t("goalpanel.update_goal"))}`,
+		`${muted("/goal status")}      ${muted(t("goalpanel.status_goal"))}`,
+		`${muted("/goal replace")} ${value("<new objective>")}   ${muted(t("goalpanel.replace_goal"))}`,
 		`${muted("/goal pause")}       ${muted(t("goalpanel.pause_goal"))}`,
 		`${muted("/goal resume")}      ${muted(t("goalpanel.resume_goal"))}`,
 		`${muted("/goaloff")}          ${muted(t("goalpanel.cancel_goal"))}`
@@ -128247,6 +129123,19 @@ function parseGoalCommand(rawArgs) {
 	const tokens = args.split(/\s+/);
 	const first = tokens[0];
 	if (first !== void 0 && CONTROL_SUBCOMMANDS.has(first) && tokens.length === 1) return { kind: first };
+	if (first === "setup") return { kind: "setup" };
+	if (first === "update") {
+		const objective = tokens.slice(1).join(" ").trim();
+		if (objective.length === 0) return {
+			kind: "error",
+			severity: "hint",
+			message: t("goal.need_desc")
+		};
+		return {
+			kind: "update",
+			objective
+		};
+	}
 	let index = 0;
 	let replace = false;
 	if (tokens[index] === "replace") {
@@ -128276,6 +129165,9 @@ async function handleGoalCommand(host, args) {
 		case "status":
 			await showGoalStatus(host);
 			return;
+		case "setup":
+			await guidedGoalSetup(host);
+			return;
 		case "pause":
 			await pauseGoal(host);
 			return;
@@ -128285,6 +129177,9 @@ async function handleGoalCommand(host, args) {
 		case "off":
 			await handleGoalOffCommand(host);
 			return;
+		case "update":
+			await updateGoalObjective(host, parsed);
+			return;
 		case "create":
 			await createGoal(host, parsed);
 			return;
@@ -128302,8 +129197,51 @@ async function createGoal(host, parsed) {
 	}
 	await showGoalConfigWizard(host, session, parsed.objective, parsed.replace);
 }
+const GOAL_REFINER_SYSTEM_PROMPT = "You are a goal refiner. Given a brief task description, produce a single clear, actionable objective sentence (max 200 chars). Do not add explanations, quotes, or prefixes.";
+/**
+* Guided goal creation: collect a brief task description, refine it via the
+* LLM into a single objective sentence, let the user confirm/edit, then enter
+* the standard configuration wizard. Falls back to the raw description if the
+* LLM call fails.
+*/
+async function guidedGoalSetup(host) {
+	const session = host.session;
+	if (session === void 0) {
+		host.showError(t("error.no_session"));
+		return;
+	}
+	if (detectGoalConflict(host.state.appState, "enable_goal") === "goal_active") {
+		host.showNotice(t("goal.storm_breaker"), t("goal.conflict_loop"));
+		return;
+	}
+	const { TextInputDialogComponent } = await import("./text-input-dialog-B1ak519Y.mjs");
+	const initialDesc = await promptText(host, TextInputDialogComponent, {
+		title: t("goal.setup_title_initial"),
+		subtitle: t("goal.setup_desc_hint"),
+		placeholder: t("goal.setup_desc_placeholder"),
+		allowEmpty: false
+	});
+	if (initialDesc === void 0) return;
+	host.showStatus(t("goal.setup_refining"));
+	let objective;
+	try {
+		objective = (await session.generateText(GOAL_REFINER_SYSTEM_PROMPT, initialDesc)).trim();
+		if (objective.length === 0) objective = initialDesc;
+	} catch {
+		objective = initialDesc;
+	}
+	const confirmed = await promptText(host, TextInputDialogComponent, {
+		title: t("goal.setup_title_confirm"),
+		subtitle: t("goal.setup_confirm_hint"),
+		placeholder: objective,
+		initialValue: objective,
+		allowEmpty: true
+	});
+	if (confirmed === void 0) return;
+	await showGoalConfigWizard(host, session, confirmed.trim() || objective, false);
+}
 async function showGoalConfigWizard(host, session, objective, replace) {
-	const { TextInputDialogComponent } = await import("./text-input-dialog-DqBy9bEe.mjs");
+	const { TextInputDialogComponent } = await import("./text-input-dialog-B1ak519Y.mjs");
 	const turnInput = await promptNumber(host, TextInputDialogComponent, {
 		title: t("goal.wizard_title", { objective }),
 		subtitle: t("goal.budget_turns_hint"),
@@ -128373,6 +129311,27 @@ function promptNumber(host, TextInputDialogComponent, opts) {
 		host.mountEditorReplacement(dialog);
 	});
 }
+/** Prompt user for free-form text. Returns undefined on cancel. */
+function promptText(host, TextInputDialogComponent, opts) {
+	return new Promise((resolve) => {
+		const dialog = new TextInputDialogComponent((result) => {
+			host.restoreEditor();
+			if (result.kind !== "ok") {
+				resolve(void 0);
+				return;
+			}
+			resolve(result.value.trim());
+		}, {
+			title: opts.title,
+			subtitle: opts.subtitle,
+			placeholder: opts.placeholder,
+			initialValue: opts.initialValue,
+			allowEmpty: opts.allowEmpty,
+			colors: host.state.theme.colors
+		});
+		host.mountEditorReplacement(dialog);
+	});
+}
 async function pauseGoal(host) {
 	const session = host.session;
 	if (session === void 0) {
@@ -128413,6 +129372,24 @@ async function resumeGoal(host) {
 		host.showError(t("goal.resume_failed", { msg: message }));
 	}
 }
+async function updateGoalObjective(host, parsed) {
+	const session = host.session;
+	if (session === void 0) {
+		host.showError(t("error.no_session"));
+		return;
+	}
+	try {
+		if ((await session.getGoal()).goal === null) {
+			host.showStatus(t("goal.no_active"));
+			return;
+		}
+		await session.updateGoalObjective(parsed.objective);
+		host.showStatus(t("goal.updated", { objective: parsed.objective }));
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		host.showError(t("goal.update_failed", { msg: message }));
+	}
+}
 async function handleGoalOffCommand(host) {
 	const session = host.session;
 	if (session === void 0) {
@@ -129442,6 +130419,12 @@ function easeSpeedRatio(ratio) {
 }
 //#endregion
 //#region src/tui/components/messages/thinking.ts
+/** gpt-5 reasoning summaries contain empty HTML comment padding sentinels
+* like `<!-- -->`. Strip them to keep the thinking display clean. */
+const EMPTY_COMMENT_RE = /<!--\s*-->/g;
+function filterThinkingNoise(text) {
+	return text.replace(EMPTY_COMMENT_RE, "");
+}
 var ThinkingComponent = class {
 	text;
 	color;
@@ -129480,7 +130463,7 @@ var ThinkingComponent = class {
 		this.textComponent.setText(this.styled(trimmed));
 	}
 	styled(text) {
-		return chalk.hex(this.color).italic(text);
+		return chalk.hex(this.color).italic(filterThinkingNoise(text));
 	}
 	finalize() {
 		if (this.mode === "finalized") return;
@@ -129657,6 +130640,68 @@ function makeDiffStyles(colors) {
 		meta: (s) => chalk.hex(colors.diffMeta)(s)
 	};
 }
+const ANSI_RE = /\u001B\[[0-9;]*m/;
+const ANSI_RESET_RE = /\u001B\[(?:0|39)m/g;
+/**
+* Extract the leading ANSI SGR prefix a chalk-style color function applies,
+* e.g. `\x1b[38;2;121;235;0m` for a truecolor hex. Returns `''` when the
+* function emits no color (chalk level 0 / non-color environment).
+*/
+function extractAnsiPrefix(fn) {
+	const sentinel = "\0";
+	const styled = fn(sentinel);
+	const idx = styled.indexOf(sentinel);
+	return idx >= 0 ? styled.slice(0, idx) : "";
+}
+/** Visualize leading whitespace: tabs as `->`, leading spaces as `·`. */
+function visualizeIndent(line) {
+	let i = 0;
+	let visual = "";
+	while (i < line.length) {
+		const ch = line[i];
+		if (ch === "	") {
+			visual += "->";
+			i++;
+			continue;
+		}
+		if (ch === " ") {
+			visual += "·";
+			i++;
+			continue;
+		}
+		break;
+	}
+	return {
+		text: visual + line.slice(i),
+		indentEnd: visual.length
+	};
+}
+/**
+* Render a diff line's code with leading-whitespace visualization (tabs as
+* `->`, spaces as `·`, dimmed) and optional syntax highlighting. Highlighting
+* runs on the raw code first; indent visualization then runs on the
+* highlighted string - leading whitespace carries no token color, so it is
+* still plain and can be replaced and dimmed without disturbing the tokens.
+*
+* When highlighting is on and produced token colors, the diff line color is
+* layered as the base foreground: syntax tokens override it, but every ANSI
+* reset re-injects the diff color so non-token spans (punctuation, operators,
+* whitespace) stay green/red instead of falling back to the terminal default.
+* When highlighting is off (streaming) or produced no token colors, the code
+* part is colored with the diff line color instead.
+*/
+function renderDiffCode(code, colorFn, highlight, lang) {
+	const { text, indentEnd } = visualizeIndent(highlight ? highlightLines(code, lang)[0] ?? code : code);
+	const indent = text.slice(0, indentEnd);
+	const rest = text.slice(indentEnd);
+	const dimIndent = indent.length > 0 ? chalk.dim(indent) : indent;
+	if (highlight && ANSI_RE.test(rest)) {
+		const prefix = extractAnsiPrefix(colorFn);
+		if (prefix.length > 0) return dimIndent + prefix + rest.replace(ANSI_RESET_RE, (m) => m + prefix) + "\x1B[39m";
+		return dimIndent + rest;
+	}
+	return dimIndent + colorFn(rest);
+}
 /**
 * Compute word-level diff between two single lines and highlight the changed
 * words with `chalk.inverse()`. Only the first removed/added part has its
@@ -129763,6 +130808,8 @@ function computeDiffLines(oldText, newText, oldStart = 1, newStart = 1, isIncomp
 }
 function renderDiffLines(oldText, newText, path, colors, isIncomplete = false, oldStart, newStart, maxLines) {
 	const s = makeDiffStyles(colors);
+	const lang = langFromPath(path);
+	const doHighlight = !isIncomplete && lang !== void 0;
 	const changedLines = computeDiffLines(oldText, newText, oldStart ?? 1, newStart ?? 1, isIncomplete).filter((l) => l.kind !== "context");
 	const added = changedLines.filter((l) => l.kind === "add").length;
 	const removed = changedLines.filter((l) => l.kind === "delete").length;
@@ -129787,7 +130834,7 @@ function renderDiffLines(oldText, newText, path, colors, isIncomplete = false, o
 		const line = shown[i];
 		const marker = line.kind === "add" ? "+" : "-";
 		const color = line.kind === "add" ? s.add : s.del;
-		output.push(s.gutter(String(line.lineNum).padStart(4) + " ") + color(marker + " " + line.code));
+		output.push(s.gutter(String(line.lineNum).padStart(4) + " ") + color(`${marker} `) + renderDiffCode(line.code, color, doHighlight, lang));
 		i += 1;
 	}
 	const hidden = changedLines.length - shown.length;
@@ -129838,11 +130885,11 @@ function buildClusters(diffLines, contextLines) {
 		removedCount: removed
 	};
 }
-function formatDiffRow(line, s) {
+function formatDiffRow(line, s, doHighlight, lang) {
 	const gutter = s.gutter(String(line.lineNum).padStart(4) + " ");
-	if (line.kind === "add") return gutter + s.add("+ " + line.code);
-	if (line.kind === "delete") return gutter + s.del("- " + line.code);
-	return gutter + "  " + line.code;
+	if (line.kind === "add") return gutter + s.add("+ ") + renderDiffCode(line.code, s.add, doHighlight, lang);
+	if (line.kind === "delete") return gutter + s.del("- ") + renderDiffCode(line.code, s.del, doHighlight, lang);
+	return gutter + "  " + renderDiffCode(line.code, (x) => x, doHighlight, lang);
 }
 /**
 * Render a diff with surrounding context, eliding unchanged middle
@@ -129855,6 +130902,8 @@ function formatDiffRow(line, s) {
 */
 function renderDiffLinesClustered(oldText, newText, path, colors, opts = {}) {
 	const s = makeDiffStyles(colors);
+	const lang = langFromPath(path);
+	const doHighlight = !(opts.isIncomplete ?? false) && lang !== void 0;
 	const contextLines = opts.contextLines ?? 3;
 	const maxLines = opts.maxLines;
 	const diffLines = computeDiffLines(oldText, newText, 1, 1, opts.isIncomplete ?? false);
@@ -129911,7 +130960,7 @@ function renderDiffLinesClustered(oldText, newText, path, colors, opts = {}) {
 				i += 2;
 				continue;
 			}
-			output.push(formatDiffRow(line, s));
+			output.push(formatDiffRow(line, s, doHighlight, lang));
 			body++;
 			if (line.kind !== "context") shownChanges++;
 			prevEnd = i;
@@ -130077,34 +131126,43 @@ function truncateTailBytes(text, maxBytes) {
 }
 /**
 * Component that renders tool output with wrap-aware line truncation.
-* Uses pi-tui's Text component to compute actual visual wrapped lines,
-* then caps at PREVIEW_LINES. This handles long single-line output (e.g.
-* JSON blobs) that would otherwise wrap to dozens of visual rows.
+* Uses pi-tui's Text component to compute actual visual wrapped lines, then
+* caps at `maxLines`. When collapsed the TAIL is shown (newest output, where
+* command errors land) with an expand hint at the top; when expanded the full
+* output is shown with a collapse hint at the top. Handles long single-line
+* output (e.g. JSON blobs) that would otherwise wrap to dozens of visual rows.
 */
 var TruncatedOutputComponent = class {
 	textComponent;
 	expanded;
 	maxLines;
 	hintFormatter;
+	collapseHintFormatter;
 	constructor(output, options) {
 		this.expanded = options.expanded;
 		this.maxLines = options.maxLines ?? PREVIEW_LINES;
 		this.hintFormatter = options.hintFormatter;
+		this.collapseHintFormatter = options.collapseHintFormatter;
 		const tint = options.isError ? chalk.hex(options.colors.error) : chalk.dim;
 		const cleaned = trimTrailingEmptyLines(output.split("\n")).join("\n");
-		const truncated = options.maxBytes === void 0 ? cleaned : truncateTailBytes(cleaned, options.maxBytes);
-		this.textComponent = new Text(tint(truncated), 2, 0);
+		const stripped = options.isError ? cleaned.replaceAll(/\u001B\[[0-9;]*m/g, "") : cleaned;
+		const tinted = (options.maxBytes === void 0 ? stripped : truncateTailBytes(stripped, options.maxBytes)).split("\n").map((line) => tint(line)).join("\n");
+		this.textComponent = new Text(tinted, 2, 0);
 	}
 	invalidate() {
 		this.textComponent.invalidate();
 	}
 	render(width) {
 		const contentLines = this.textComponent.render(width);
-		if (this.expanded || contentLines.length <= this.maxLines) return contentLines;
-		const shown = contentLines.slice(0, this.maxLines);
+		if (contentLines.length <= this.maxLines) return contentLines;
+		if (this.expanded) {
+			const collapseHint = this.collapseHintFormatter ? this.collapseHintFormatter() : t("shell.collapse_hint");
+			return [chalk.dim(collapseHint), ...contentLines];
+		}
 		const remaining = contentLines.length - this.maxLines;
-		const hint = this.hintFormatter ? this.hintFormatter(remaining) : `... (${String(remaining)} more lines, ctrl+o to expand)`;
-		return [...shown, chalk.dim(hint)];
+		const tail = contentLines.slice(-this.maxLines);
+		const expandHint = this.hintFormatter ? this.hintFormatter(remaining) : t("shell.more_lines", { count: String(remaining) });
+		return [chalk.dim(expandHint), ...tail];
 	}
 };
 const renderTruncated = (_toolCall, result, ctx) => {
@@ -130121,7 +131179,7 @@ var ShellExecutionComponent = class extends Container {
 	constructor(options) {
 		super();
 		if (options.showCommand === true) this.addCommandPreview(options.command ?? "", options.commandPreviewLines);
-		if (options.result !== void 0) this.addResultPreview(options.result, options.colors, options.expanded ?? false, options.resultPreviewLines ?? PREVIEW_LINES);
+		if (options.result !== void 0) this.addResultPreview(options.result, options.colors, options.expanded ?? false, options.resultPreviewLines ?? 15);
 	}
 	addCommandPreview(command, previewLines) {
 		if (command.length === 0) return;
@@ -130140,7 +131198,8 @@ var ShellExecutionComponent = class extends Container {
 			colors,
 			maxLines: previewLines,
 			maxBytes: MAX_SHELL_OUTPUT_BYTES,
-			hintFormatter: (remaining) => t("shell.more_lines", { count: String(remaining) })
+			hintFormatter: (remaining) => t("shell.more_lines", { count: String(remaining) }),
+			collapseHintFormatter: () => t("shell.collapse_hint")
 		}));
 	}
 };
@@ -138363,6 +139422,8 @@ var SessionEventHandler = class {
 		this.host.showNotice(title, detail);
 	}
 	handleStepRetrying(event) {
+		this.host.streamingUI.resetLiveText();
+		this.host.streamingUI.resetToolUi();
 		this.host.setAppState({ reconnectAttempt: event.nextAttempt });
 	}
 	maybeShowDebugTiming(event) {
@@ -138652,7 +139713,8 @@ var SessionEventHandler = class {
 			goal: {
 				objective: snapshot.objective,
 				turnsUsed: snapshot.turnsUsed ?? 0,
-				wallClockMs: snapshot.wallClockMs ?? 0
+				wallClockMs: snapshot.wallClockMs ?? 0,
+				wallClockBaseAt: Date.now()
 			},
 			goalActive: snapshot.status === "active"
 		});
@@ -144729,7 +145791,8 @@ var SessionManager = class {
 			goal: goal ? {
 				objective: goal.objective,
 				turnsUsed: goal.turnsUsed ?? 0,
-				wallClockMs: goal.wallClockMs ?? 0
+				wallClockMs: goal.wallClockMs ?? 0,
+				wallClockBaseAt: Date.now()
 			} : null,
 			goalActive: goal?.status === "active",
 			goalContinuationCount: 0
@@ -146975,6 +148038,7 @@ var ScreamTUI = class {
 	deferUserMessages = false;
 	aborted = false;
 	isShuttingDown = false;
+	tightModeHandler = null;
 	reverseRpcDisposers = [];
 	startupNotice;
 	updatePrefetched;
@@ -147071,6 +148135,11 @@ var ScreamTUI = class {
 		this.inputController.setupAutocomplete();
 	}
 	async start() {
+		this.tightModeHandler = () => {
+			setTightMode((process.stdout.columns ?? 80) < 60);
+		};
+		this.tightModeHandler();
+		process.stdout.on("resize", this.tightModeHandler);
 		this.lifecycleController.installSignalHandlers();
 		try {
 			const shouldReplayHistory = await this.initMainTui();
@@ -147148,6 +148217,11 @@ var ScreamTUI = class {
 	async stop(exitCode) {
 		if (this.isShuttingDown) return;
 		this.isShuttingDown = true;
+		if (this.tightModeHandler !== null) {
+			process.stdout.off("resize", this.tightModeHandler);
+			this.tightModeHandler = null;
+		}
+		setTightMode(false);
 		this.lifecycleController.stopCcConnectPolling();
 		this.lifecycleController.uninstallSignalHandlers();
 		this.aborted = true;