scream-code 0.13.9 → 0.14.0

package/dist/{app-vcurmmh6.mjs → app-BXslKpYT.mjs}

@@ -4,7 +4,7 @@ import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
 const __dirname = __cjsShimDirname(__filename);
 import "./suppress-sqlite-warning-C2VB0doZ.mjs";
-import { $t as isTodoItemShape, A as renderDiffLinesClustered, An as CLI_COMMAND_NAME, At as ENABLE_TERMINAL_FOCUS_REPORTING, B as BackgroundAgentStatusComponent, Bn as MemoryMemoStore, Bt as TERMINAL_THEME_LIGHT, Cn as loadTuiConfig, Ct as createThemeStyles, D as toggleEmptySessionHint, Dn as getInputHistoryFile, Dt as parseOsc11BackgroundTheme, E as isTurnElapsedEnabled, En as getDataDir, Et as detectTerminalTheme, F as estimateTokens, Fn as fetchCatalog, Ft as OSC11_RESPONSE_PREFIX_NO_ESC, G as getBreathingFrame, Gn as isOrphanedToolCallError, H as AgentGroupComponent, Hn as log, Ht as isStreaming, I as getSharedSpeedTracker, In as saveCatalogCache, It as QUERY_TERMINAL_THEME, J as refineGoal, Jt as printableChar, K as resetBreathingClock, Kn as ErrorCodes, L as SkillActivationComponent, Ln as ScreamHarness, Lt as TERMINAL_FOCUS_IN, M as langFromPath, Mn as CLI_USER_AGENT_PRODUCT, Mt as OSC11_QUERY, N as CachedContainer, Nn as PRODUCT_NAME, Nt as OSC11_RESPONSE, O as ToolCallComponent, On as getLogDir, Ot as DISABLE_TERMINAL_FOCUS_REPORTING, P as ThinkingComponent, Pn as DEFAULT_CATALOG_URL, Pt as OSC11_RESPONSE_PREFIX, Qt as formatErrorMessage, R as ReadGroupComponent, Rt as TERMINAL_FOCUS_OUT, S as getDaemonInstructions, Sn as TuiLikePreferencesSchema, St as createMarkdownTheme, T as isEmptySessionHintDismissed, Tn as detectShellEnvironment, Tt as getColorPalette, U as WelcomeComponent, Un as resolveGlobalLogPath, Ut as FooterComponent, V as AssistantMessageComponent, Vn as flushDiagnosticLogs, Vt as isBusy, W as BREATHE_CYCLE_MS, Wn as isScreamError, Xt as appendStreamingArgsPreview, Yt as STATUS_BULLET, Zt as argsRecord, _ as refreshUpdateCache, _n as isExperimentalFlagEnabled, _t as clearInfoPanelState, an as EMPTY_SESSION_HINT_URL, b as readJsonlFile, bn as PULSE_WAVE_FRAMES, bt as resolveThemeSync, c as hasDispose, cn as SESSION_TIPS, ct as handlePlanCommand, d as formatMemoryMemoForInjection, dn as getCtrlDHint, en as parseStreamingArgs, et as toTerminalHyperlink, fn as getLlmNotSetMessage, g as selectUpdateTarget, gn as sortSlashCommands, gt as supportsBalance, hn as BUILTIN_SLASH_COMMANDS, ht as refreshProviderBalance, i as buildRoleAdditionalText, in as CHARS_PER_TOKEN, j as highlightLines, jn as CLI_UI_MODE, jt as ENABLE_TERMINAL_THEME_REPORTING, k as renderDiffLines, kn as detectInstallSource, kt as DISABLE_TERMINAL_THEME_REPORTING, l as isPlanExpandable, ln as TIP_ROTATION_INTERVAL_MS, mn as buildSkillSlashCommands, n as clearEvalPanelState, nn as stringValue, nt as getModelCycleLevel, on as EXIT_CONFIRM_WINDOW_MS, ot as handleFusionPlanCommand, pn as getNoActiveSessionMessage, q as clearGoalState, qn as SCREAM_ERROR_INFO, r as openUrl, rn as truncateErrorMessage, s as disposeChildren, sn as MAIN_AGENT_ID, t as dispatchInput, tn as serializeToolResultOutput, tt as changeThinkingLevel, u as MoonLoader, un as getCtrlCHint, v as readUpdateCache, vn as setExperimentalFlags, w as UserMessageComponent, wn as saveTuiConfig, wt as contrastTextHex, xn as TuiConfigParseError, xt as createEditorTheme, y as appendJsonlLine, yn as PIXEL_PULSE_FRAMES, z as parseReadGroupOutput, zn as resolveScreamHome, zt as TERMINAL_THEME_DARK } from "./dispatch-DIJJXO0L.mjs";
+import { $t as isTodoItemShape, A as renderDiffLinesClustered, An as CLI_COMMAND_NAME, At as ENABLE_TERMINAL_FOCUS_REPORTING, B as BackgroundAgentStatusComponent, Bn as MemoryMemoStore, Bt as TERMINAL_THEME_LIGHT, Cn as loadTuiConfig, Ct as createThemeStyles, D as toggleEmptySessionHint, Dn as getInputHistoryFile, Dt as parseOsc11BackgroundTheme, E as isTurnElapsedEnabled, En as getDataDir, Et as detectTerminalTheme, F as estimateTokens, Fn as fetchCatalog, Ft as OSC11_RESPONSE_PREFIX_NO_ESC, G as getBreathingFrame, Gn as isOrphanedToolCallError, H as AgentGroupComponent, Hn as log, Ht as isStreaming, I as getSharedSpeedTracker, In as saveCatalogCache, It as QUERY_TERMINAL_THEME, J as refineGoal, Jt as printableChar, K as resetBreathingClock, Kn as ErrorCodes, L as SkillActivationComponent, Ln as ScreamHarness, Lt as TERMINAL_FOCUS_IN, M as langFromPath, Mn as CLI_USER_AGENT_PRODUCT, Mt as OSC11_QUERY, N as CachedContainer, Nn as PRODUCT_NAME, Nt as OSC11_RESPONSE, O as ToolCallComponent, On as getLogDir, Ot as DISABLE_TERMINAL_FOCUS_REPORTING, P as ThinkingComponent, Pn as DEFAULT_CATALOG_URL, Pt as OSC11_RESPONSE_PREFIX, Qt as formatErrorMessage, R as ReadGroupComponent, Rt as TERMINAL_FOCUS_OUT, S as getDaemonInstructions, Sn as TuiLikePreferencesSchema, St as createMarkdownTheme, T as isEmptySessionHintDismissed, Tn as detectShellEnvironment, Tt as getColorPalette, U as WelcomeComponent, Un as resolveGlobalLogPath, Ut as FooterComponent, V as AssistantMessageComponent, Vn as flushDiagnosticLogs, Vt as isBusy, W as BREATHE_CYCLE_MS, Wn as isScreamError, Xt as appendStreamingArgsPreview, Yt as STATUS_BULLET, Zt as argsRecord, _ as refreshUpdateCache, _n as isExperimentalFlagEnabled, _t as clearInfoPanelState, an as EMPTY_SESSION_HINT_URL, b as readJsonlFile, bn as PULSE_WAVE_FRAMES, bt as resolveThemeSync, c as hasDispose, cn as SESSION_TIPS, ct as handlePlanCommand, d as formatMemoryMemoForInjection, dn as getCtrlDHint, en as parseStreamingArgs, et as toTerminalHyperlink, fn as getLlmNotSetMessage, g as selectUpdateTarget, gn as sortSlashCommands, gt as supportsBalance, hn as BUILTIN_SLASH_COMMANDS, ht as refreshProviderBalance, i as buildRoleAdditionalText, in as CHARS_PER_TOKEN, j as highlightLines, jn as CLI_UI_MODE, jt as ENABLE_TERMINAL_THEME_REPORTING, k as renderDiffLines, kn as detectInstallSource, kt as DISABLE_TERMINAL_THEME_REPORTING, l as isPlanExpandable, ln as TIP_ROTATION_INTERVAL_MS, mn as buildSkillSlashCommands, n as clearEvalPanelState, nn as stringValue, nt as getModelCycleLevel, on as EXIT_CONFIRM_WINDOW_MS, ot as handleFusionPlanCommand, pn as getNoActiveSessionMessage, q as clearGoalState, qn as SCREAM_ERROR_INFO, r as openUrl, rn as truncateErrorMessage, s as disposeChildren, sn as MAIN_AGENT_ID, t as dispatchInput, tn as serializeToolResultOutput, tt as changeThinkingLevel, u as MoonLoader, un as getCtrlCHint, v as readUpdateCache, vn as setExperimentalFlags, w as UserMessageComponent, wn as saveTuiConfig, wt as contrastTextHex, xn as TuiConfigParseError, xt as createEditorTheme, y as appendJsonlLine, yn as PIXEL_PULSE_FRAMES, z as parseReadGroupOutput, zn as resolveScreamHome, zt as TERMINAL_THEME_DARK } from "./dispatch-202xtik3.mjs";
 import { a as setLocale, o as t } from "./text-input-dialog-BzVVVncg.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
@@ -30,7 +30,7 @@ function optionalBuildString(value) {
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 const SCREAM_BUILD_INFO = {
-	version: optionalBuildString("0.13.9"),
+	version: optionalBuildString("0.14.0"),
 	channel: optionalBuildString(""),
 	commit: optionalBuildString(""),
 	buildTarget: optionalBuildString("darwin-arm64")
@@ -2909,9 +2909,9 @@ var SessionEventHandler = class {
 			const { name, purpose } = event.candidate;
 			if (name.length === 0) return;
 			if (this.promptedSkillCandidates.has(name)) return;
-			this.promptedSkillCandidates.add(name);
 			const session = this.host.session;
 			if (session === void 0) return;
+			this.promptedSkillCandidates.add(name);
 			if (this.host.streamingUI.hasActiveTurn()) {
 				this.pendingSkillCandidates.push({
 					name,
@@ -12192,7 +12192,7 @@ var ScreamTUI = class {
 		const card = new OnboardingCardComponent({
 			colors: this.state.theme.colors,
 			onConfigure: () => {
-				import("./dispatch-SbA6zFMd.mjs").then(({ handleConnectCommand }) => handleConnectCommand(this, "")).finally(() => {
+				import("./dispatch-D71h_08g.mjs").then(({ handleConnectCommand }) => handleConnectCommand(this, "")).finally(() => {
 					this.restoreEditor();
 				});
 			},
@@ -13237,26 +13237,21 @@ function mapCcConnectMode(mode) {
 		};
 	}
 }
-async function runStreamJson(opts) {
-	const homeDir = resolveScreamHome();
-	const workDir = opts.workDir ?? process.cwd();
-	const harness = new ScreamHarness({
-		homeDir,
-		identity: createScreamCodeHostIdentity("dev"),
-		uiMode: "print",
-		skillDirs: opts.skillsDirs
-	});
-	let streamTuiConfig;
-	try {
-		streamTuiConfig = await loadTuiConfig();
-		setLocale(streamTuiConfig.language);
-	} catch (error) {
-		if (!(error instanceof TuiConfigParseError)) throw error;
-		streamTuiConfig = error.fallback;
-		setLocale(streamTuiConfig.language);
-	}
-	const streamSubagentModels = streamTuiConfig.subagentModels;
-	harness.setSubagentModelBindings(() => streamSubagentModels);
+/**
+* Install the stdout EPIPE guard and return the line writer handed to
+* {@link ClaudeStreamJsonWriter}.
+*
+* cc-connect closes our stdout when it kills/restarts the agent (idle
+* timeout, /restart, config change). Writing after that raises EPIPE as an
+* unhandled error and crashes the process. The pipe is gone — results can
+* no longer be delivered — so exit quietly instead of burning tokens as a
+* zombie waiting for a signal that may never come.
+*
+* Both the `error` event on stdout and a throw from `stdout.write` are
+* covered: EPIPE → process.exit(0); any other error is surfaced (rethrown or
+* logged) so real I/O failures are not masked.
+*/
+function installStdoutEpipeGuard() {
 	const handleStdoutClosed = () => {
 		log.debug("stream-json: stdout closed (EPIPE), exiting");
 		process.exit(0);
@@ -13268,7 +13263,7 @@ async function runStreamJson(opts) {
 		}
 		log.error("stream-json: stdout error", { error: String(error) });
 	});
-	const writer = new ClaudeStreamJsonWriter((line) => {
+	return (line) => {
 		try {
 			process.stdout.write(`${line}\n`);
 		} catch (error) {
@@ -13278,7 +13273,29 @@ async function runStreamJson(opts) {
 			}
 			throw error;
 		}
+	};
+}
+async function runStreamJson(opts) {
+	const homeDir = resolveScreamHome();
+	const workDir = opts.workDir ?? process.cwd();
+	const harness = new ScreamHarness({
+		homeDir,
+		identity: createScreamCodeHostIdentity("dev"),
+		uiMode: "print",
+		skillDirs: opts.skillsDirs
 	});
+	let streamTuiConfig;
+	try {
+		streamTuiConfig = await loadTuiConfig();
+		setLocale(streamTuiConfig.language);
+	} catch (error) {
+		if (!(error instanceof TuiConfigParseError)) throw error;
+		streamTuiConfig = error.fallback;
+		setLocale(streamTuiConfig.language);
+	}
+	const streamSubagentModels = streamTuiConfig.subagentModels;
+	harness.setSubagentModelBindings(() => streamSubagentModels);
+	const writer = new ClaudeStreamJsonWriter(installStdoutEpipeGuard());
 	let session;
 	let currentSessionId;
 	let sessionKey = "cc-connect-main";

package/dist/{dispatch-DIJJXO0L.mjs → dispatch-202xtik3.mjs}

@@ -64654,7 +64654,23 @@ function renderPrompt(template, vars) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/skill-tool.md
-var skill_tool_default = "Invoke a registered skill from the current skill listing. BLOCKING REQUIREMENT: when a skill from the listing matches the user's request, you MUST call this tool (not free-form text). Do NOT call the same skill repeatedly inside one turn — recursive depth is capped at {{ MAX_SKILL_QUERY_DEPTH }}.";
+var skill_tool_default = "Invoke a registered skill from the current skill listing. BLOCKING REQUIREMENT: when a skill from the listing matches the user's request, you MUST call this tool (not free-form text). Do NOT call the same skill repeatedly inside one turn — recursive depth is capped at {{ MAX_SKILL_QUERY_DEPTH }}.\n\n## Currently model-invocable skills\n{{ AVAILABLE_SKILLS }}\nThis list is a construction-time snapshot; for the live catalog inspect the skill registry.";
+/** Max skills to list inline in the tool description; rest are summarized. */
+const MAX_INLINE_SKILLS = 15;
+/** Max description length per skill line. */
+const MAX_SKILL_DESC_CHARS = 100;
+function buildSkillToolDescription(agent) {
+	const skills = agent.skills?.registry.listInvocableSkills() ?? [];
+	const lines = skills.slice(0, MAX_INLINE_SKILLS).map((s) => {
+		const desc = s.description.trim().replaceAll(/\n/g, " ").slice(0, MAX_SKILL_DESC_CHARS);
+		return `- ${s.name}: ${desc}`;
+	});
+	if (skills.length > MAX_INLINE_SKILLS) lines.push(`…${String(skills.length - MAX_INLINE_SKILLS)} more (see skill registry)`);
+	return renderPrompt(skill_tool_default, {
+		MAX_SKILL_QUERY_DEPTH: 3,
+		AVAILABLE_SKILLS: lines.length > 0 ? lines.join("\n") : "(none currently registered)"
+	});
+}
 var NestedSkillTooDeepError = class extends Error {
 	skillName;
 	depth;
@@ -64674,11 +64690,12 @@ var SkillTool = class SkillTool {
 	agent;
 	options;
 	name = "Skill";
-	description = renderPrompt(skill_tool_default, { MAX_SKILL_QUERY_DEPTH: 3 });
+	description;
 	parameters = toInputJsonSchema(SkillToolInputSchema);
 	constructor(agent, options = {}) {
 		this.agent = agent;
 		this.options = options;
+		this.description = buildSkillToolDescription(agent);
 	}
 	resolveExecution(args) {
 		return {
@@ -76706,10 +76723,10 @@ function stripContextMetadata(message) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/agent/compaction/compaction-instruction.md
-var compaction_instruction_default = "\n--- This message is a direct task, not part of the above conversation ---\n\nYou are now given a task to compact this conversation context according to specific priorities and output requirements.\n\nOutput text only. DO NOT CALL ANY TOOLS. Calling tools will be rejected and fails the task. You already have all the information you need in the conversation history. You have only one chance.\n\nThe goal of compaction is to keep essential code patterns, technical details, and architectural decisions for continuing development without losing context after the above messages are cleared work.\n\n{{ customInstruction }}\n\n<!-- Memory Memo Extraction (PRIORITY — do not skip) -->\n\n## 任务经验提取\n\nAFTER completing the compaction summary below, scan the messages being compacted for **task loops**. A task loop is \"completed\" when:\n- The user made a clear request or asked a specific question\n- You provided a solution or answer\n- The outcome is clear (success, partial success, or failure)\n\n**You MUST output at least one memory-memo block** (or the `{\"none\": true}` marker) at the very end of your response — omitting the section entirely is not allowed. Record completed task loops as full experience records; record **in-progress work** as a lower-priority record whose \"outcome\" is \"进行中\" (so the ongoing task survives compaction and can be resumed later).\n\nFor each task loop found, output a structured experience record **at the very end of your response**:\n\n```memory-memo\n{\n  \"userNeed\": \"<the user's need or goal, one sentence>\",\n  \"approach\": \"<what was done — the approach taken, 2-4 sentences>\",\n  \"outcome\": \"<final result, e.g. '完成', '部分完成', '失败: reason', or '进行中' for in-progress work>\",\n  \"whatFailed\": \"<dead ends tried — things that didn't work, or 'none'>\",\n  \"whatWorked\": \"<key actions that ultimately worked, or 'none'>\",\n  \"tags\": [\"<tag1>\", \"<tag2>\", \"<tag3>\"],\n  \"note\": \"<optional: a soft, AI-readable note/suggestion that makes the record easier for future turns to understand — e.g. '这类任务先查接口可用性再写代码'. Omit if none>\"\n}\n```\n\nGuidelines:\n- Record important failed attempts in \"whatFailed\" to help avoid repeating mistakes.\n- Record key successful actions in \"whatWorked\" to help reuse effective approaches.\n- Include 3-5 semantic \"tags\" summarizing the task domain, tech stack, or action type (e.g. [\"react\", \"auth\", \"部署\"]).\n- \"note\" is optional: a one-sentence advisory note that helps future AI understand/reuse the record faster. It is a soft suggestion, not a user-enforced rule.\n- For in-progress work: record it with \"outcome\": \"进行中\" and describe where the task stands and what remains — this is what lets the agent resume seamlessly after compaction.\n- Merge closely related sub-tasks into a single record.\n- Use the exact field names and JSON format shown above (no extra fields beyond \"note\").\n\nIf no task loops (completed or in-progress) are found in the compacted messages, output:\n```memory-memo\n{\"none\": true}\n```\n\n<!-- Compression Priorities (in order) -->\n\n1. **Current Task State**: What is being worked on RIGHT NOW\n2. **Errors & Solutions**: All encountered errors and their resolutions\n3. **Code Evolution**: Final working versions only (remove intermediate attempts)\n4. **System Context**: Project structure, dependencies, environment setup\n5. **Design Decisions**: Architectural choices and their rationale\n6. **Next Steps**: The ordered, actionable plan going forward\n7. **TODO Items**: Unfinished tasks and known issues\n\n<!-- Required Output Structure -->\n\n## Current Focus\n\n[What we're working on now]\n\n## Environment\n\n- [Key setup/config points]\n- ...\n\n## Completed Tasks\n\n- [Task]: [Brief outcome]\n- ...\n\n## Active Issues\n\n- [Issue]: [Status/Next steps]\n- ...\n\n## Key Decisions\n\n- [Decision]: [rationale] — preserve architectural choices and why they were made\n- ...\n\n## Next Steps\n\n1. [The very next actionable step]\n2. [Then this]\n3. ...\n\n## Code State\n\n### [Critical file name]\n\n[Brief description of the file's purpose and current state]\n\n```\n[The latest version of critical code snippets in this file, <20 lines]\n```\n\n### [Critical file name]\n\n- [Useful classes/methods/functions]: [Brief description/usage]\n- ...\n\n<!-- Omit non-critical code, intermediate attempts, and resolved errors -->\n\n## Important Context\n\n- [Any crucial information not covered above]\n- ...\n\n## All User Messages\n\n- [Detailed non tool use user message]\n- ...\n\n## Skill candidates\n\nScan the compressed messages for reusable processes (project-specific build\nsteps, recurring debugging patterns, or tool workflows). If any is genuinely\nworth capturing as a reusable skill, output at the very end, at most one:\n\n[[skill-candidate: <name>|<one-line purpose>|<evidence>]]\n\n- The evidence must be concrete and verifiable: exact file paths, commands, or\n  step sequences from the conversation (e.g. \"run `pnpm vitest run -t compaction`\n  in packages/agent-core to reproduce the compaction snapshots\"). Vague evidence\n  like \"used a script\" is not acceptable.\n- Only emit a candidate when the process is genuinely reusable beyond this one\n  task; do not emit for one-off actions.\n\nOmit if none.\n";
+var compaction_instruction_default = "\n--- This message is a direct task, not part of the above conversation ---\n\nYou are now given a task to compact this conversation context according to specific priorities and output requirements.\n\nOutput text only. DO NOT CALL ANY TOOLS. Calling tools will be rejected and fails the task. You already have all the information you need in the conversation history. You have only one chance.\n\nThe goal of compaction is to keep essential code patterns, technical details, and architectural decisions for continuing development without losing context after the above messages are cleared work.\n\n{{ customInstruction }}\n\n<!-- Memory Memo Extraction (PRIORITY — do not skip) -->\n\n## 任务经验提取\n\nAFTER completing the compaction summary below, scan the messages being compacted for **task loops**. A task loop is \"completed\" when:\n- The user made a clear request or asked a specific question\n- You provided a solution or answer\n- The outcome is clear (success, partial success, or failure)\n\n**You MUST output at least one memory-memo block** (or the `{\"none\": true}` marker) after the summary — omitting the section entirely is not allowed. Record completed task loops as full experience records; record **in-progress work** as a lower-priority record whose \"outcome\" is \"进行中\" (so the ongoing task survives compaction and can be resumed later).\n\nFor each task loop found, output a structured experience record after the summary (the skill-candidate marker line described below comes after all memory-memo blocks):\n\n```memory-memo\n{\n  \"userNeed\": \"<the user's need or goal, one sentence>\",\n  \"approach\": \"<what was done — the approach taken, 2-4 sentences>\",\n  \"outcome\": \"<final result, e.g. '完成', '部分完成', '失败: reason', or '进行中' for in-progress work>\",\n  \"whatFailed\": \"<dead ends tried — things that didn't work, or 'none'>\",\n  \"whatWorked\": \"<key actions that ultimately worked, or 'none'>\",\n  \"tags\": [\"<tag1>\", \"<tag2>\", \"<tag3>\"],\n  \"note\": \"<optional: a soft, AI-readable note/suggestion that makes the record easier for future turns to understand — e.g. '这类任务先查接口可用性再写代码'. Omit if none>\"\n}\n```\n\nGuidelines:\n- Record important failed attempts in \"whatFailed\" to help avoid repeating mistakes.\n- Record key successful actions in \"whatWorked\" to help reuse effective approaches.\n- Include 3-5 semantic \"tags\" summarizing the task domain, tech stack, or action type (e.g. [\"react\", \"auth\", \"部署\"]).\n- \"note\" is optional: a one-sentence advisory note that helps future AI understand/reuse the record faster. It is a soft suggestion, not a user-enforced rule.\n- For in-progress work: record it with \"outcome\": \"进行中\" and describe where the task stands and what remains — this is what lets the agent resume seamlessly after compaction.\n- Merge closely related sub-tasks into a single record.\n- Use the exact field names and JSON format shown above (no extra fields beyond \"note\").\n\nIf no task loops (completed or in-progress) are found in the compacted messages, output:\n```memory-memo\n{\"none\": true}\n```\n\n<!-- Compression Priorities (in order) -->\n\n1. **Current Task State**: What is being worked on RIGHT NOW\n2. **Errors & Solutions**: All encountered errors and their resolutions\n3. **Code Evolution**: Final working versions only (remove intermediate attempts)\n4. **System Context**: Project structure, dependencies, environment setup\n5. **Design Decisions**: Architectural choices and their rationale\n6. **Next Steps**: The ordered, actionable plan going forward\n7. **TODO Items**: Unfinished tasks and known issues\n\n<!-- Required Output Structure -->\n\n## Current Focus\n\n[What we're working on now]\n\n## Environment\n\n- [Key setup/config points]\n- ...\n\n## Completed Tasks\n\n- [Task]: [Brief outcome]\n- ...\n\n## Active Issues\n\n- [Issue]: [Status/Next steps]\n- ...\n\n## Key Decisions\n\n- [Decision]: [rationale] — preserve architectural choices and why they were made\n- ...\n\n## Next Steps\n\n1. [The very next actionable step]\n2. [Then this]\n3. ...\n\n## Code State\n\n### [Critical file name]\n\n[Brief description of the file's purpose and current state]\n\n```\n[The latest version of critical code snippets in this file, <20 lines]\n```\n\n### [Critical file name]\n\n- [Useful classes/methods/functions]: [Brief description/usage]\n- ...\n\n<!-- Omit non-critical code, intermediate attempts, and resolved errors -->\n\n## Important Context\n\n- [Any crucial information not covered above]\n- ...\n\n## All User Messages\n\n- [Detailed non tool use user message]\n- ...\n\n## Skill candidates\n\nScan the compressed messages for reusable processes (project-specific build\nsteps, recurring debugging patterns, or tool workflows). Then output exactly\none marker as the very LAST line of your response — after all memory-memo\nblocks:\n\n- If a process is genuinely worth capturing as a reusable skill (reusable\n  beyond this one task — do not emit for one-off actions; the evidence must\n  be concrete and verifiable: exact file paths, commands, or step sequences\n  from the conversation, e.g. \"run `pnpm vitest run -t compaction` in\n  packages/agent-core to reproduce the compaction snapshots\". Vague evidence\n  like \"used a script\" is not acceptable):\n\n[[skill-candidate: <name>|<one-line purpose>|<evidence>]]\n\n- If none exists, output instead:\n\n[[skill-candidate: none]]\n\nThis marker line is MANDATORY — never omit it, and output at most one\ncandidate marker.\n";
 //#endregion
 //#region ../../packages/agent-core/src/agent/compaction/compaction-update-instruction.md
-var compaction_update_instruction_default = "\n--- This message is a direct task, not part of the above conversation ---\n\nYou are now given a task to UPDATE an existing compaction summary with new messages that came in after the last compaction.\n\nA previous compaction summary already exists at the top of the conversation (the first assistant message). You must NOT discard it. Instead, merge the new information into the existing structure, keeping all previously captured state intact unless explicitly contradicted or resolved by the new messages.\n\nOutput text only. DO NOT CALL ANY TOOLS. Calling tools will be rejected and fails the task. You have only one chance.\n\n{{ customInstruction }}\n\n<!-- Previous Summary Reference -->\n\nThe first assistant message above is the PREVIOUS summary. Treat it as the source of truth for everything that happened before the new messages. Do not restate it verbatim — produce an updated, merged summary.\n\n<!-- Memory Memo Extraction (PRIORITY — do not skip) -->\n\n## 任务经验提取\n\nAFTER completing the updated summary below, scan ONLY the new messages being compacted (not those already covered by the previous summary) for **task loops**. A task loop is \"completed\" when:\n- The user made a clear request or asked a specific question\n- You provided a solution or answer\n- The outcome is clear (success, partial success, or failure)\n\n**You MUST output at least one memory-memo block** (or the `{\"none\": true}` marker) at the very end of your response — omitting the section entirely is not allowed. Record completed task loops as full experience records; record **in-progress work** as a lower-priority record whose \"outcome\" is \"进行中\" (so the ongoing task survives compaction and can be resumed later).\n\nFor each task loop found, output a structured experience record **at the very end of your response**:\n\n```memory-memo\n{\n  \"userNeed\": \"<the user's need or goal, one sentence>\",\n  \"approach\": \"<what was done — the approach taken, 2-4 sentences>\",\n  \"outcome\": \"<final result, e.g. '完成', '部分完成', '失败: reason', or '进行中' for in-progress work>\",\n  \"whatFailed\": \"<dead ends tried — things that didn't work, or 'none'>\",\n  \"whatWorked\": \"<key actions that ultimately worked, or 'none'>\",\n  \"tags\": [\"<tag1>\", \"<tag2>\", \"<tag3>\"],\n  \"note\": \"<optional: a soft, AI-readable note/suggestion that makes the record easier for future turns to understand — e.g. '这类任务先查接口可用性再写代码'. Omit if none>\"\n}\n```\n\nGuidelines:\n- Record important failed attempts in \"whatFailed\" to help avoid repeating mistakes.\n- Record key successful actions in \"whatWorked\" to help reuse effective approaches.\n- Include 3-5 semantic \"tags\" summarizing the task domain, tech stack, or action type.\n- For in-progress work: record it with \"outcome\": \"进行中\" and describe where the task stands and what remains — this is what lets the agent resume seamlessly after compaction.\n- Merge closely related sub-tasks into a single record.\n- Use the exact field names and JSON format shown above.\n\nIf no task loops (completed or in-progress) are found in the new compacted messages, output:\n```memory-memo\n{\"none\": true}\n```\n\n<!-- Update Rules -->\n\n1. Preserve the section structure of the previous summary (Current Focus, Environment, Completed Tasks, Active Issues, Key Decisions, Next Steps, Code State, Important Context, All User Messages).\n2. Move newly-completed tasks from \"Current Focus\" / \"Active Issues\" into \"Completed Tasks\".\n3. Update \"Current Focus\" to reflect what is being worked on RIGHT NOW.\n4. Append new user messages to \"All User Messages\" — do not repeat those already captured.\n5. Refresh \"Code State\" code snippets only if newer versions exist in the new messages.\n6. Drop resolved issues from \"Active Issues\"; add newly-discovered ones.\n7. Merge new decisions into \"Key Decisions\" (keep prior decisions unless explicitly overturned); merge new steps into \"Next Steps\" (reorder if priorities changed).\n8. Do not invent new information. If the new messages say nothing about a section, carry the previous content forward unchanged.\n\n<!-- Required Output Structure -->\n\n## Current Focus\n\n[What we're working on now]\n\n## Environment\n\n- [Key setup/config points]\n- ...\n\n## Completed Tasks\n\n- [Task]: [Brief outcome]\n- ...\n\n## Active Issues\n\n- [Issue]: [Status/Next steps]\n- ...\n\n## Key Decisions\n\n- [Decision]: [rationale] — preserve architectural choices and why they were made\n- ...\n\n## Next Steps\n\n1. [The very next actionable step]\n2. [Then this]\n3. ...\n\n## Code State\n\n### [Critical file name]\n\n[Brief description of the file's purpose and current state]\n\n```\n[The latest version of critical code snippets in this file, <20 lines]\n```\n\n## Important Context\n\n- [Any crucial information not covered above]\n- ...\n\n## All User Messages\n\n- [Detailed non tool use user message]\n- ...\n";
+var compaction_update_instruction_default = "\n--- This message is a direct task, not part of the above conversation ---\n\nYou are now given a task to UPDATE an existing compaction summary with new messages that came in after the last compaction.\n\nA previous compaction summary already exists at the top of the conversation (the first assistant message). You must NOT discard it. Instead, merge the new information into the existing structure, keeping all previously captured state intact unless explicitly contradicted or resolved by the new messages.\n\nOutput text only. DO NOT CALL ANY TOOLS. Calling tools will be rejected and fails the task. You have only one chance.\n\n{{ customInstruction }}\n\n<!-- Previous Summary Reference -->\n\nThe first assistant message above is the PREVIOUS summary. Treat it as the source of truth for everything that happened before the new messages. Do not restate it verbatim — produce an updated, merged summary.\n\n<!-- Memory Memo Extraction (PRIORITY — do not skip) -->\n\n## 任务经验提取\n\nAFTER completing the updated summary below, scan ONLY the new messages being compacted (not those already covered by the previous summary) for **task loops**. A task loop is \"completed\" when:\n- The user made a clear request or asked a specific question\n- You provided a solution or answer\n- The outcome is clear (success, partial success, or failure)\n\n**You MUST output at least one memory-memo block** (or the `{\"none\": true}` marker) after the updated summary — omitting the section entirely is not allowed. Record completed task loops as full experience records; record **in-progress work** as a lower-priority record whose \"outcome\" is \"进行中\" (so the ongoing task survives compaction and can be resumed later).\n\nFor each task loop found, output a structured experience record after the updated summary (the skill-candidate marker line described below comes after all memory-memo blocks):\n\n```memory-memo\n{\n  \"userNeed\": \"<the user's need or goal, one sentence>\",\n  \"approach\": \"<what was done — the approach taken, 2-4 sentences>\",\n  \"outcome\": \"<final result, e.g. '完成', '部分完成', '失败: reason', or '进行中' for in-progress work>\",\n  \"whatFailed\": \"<dead ends tried — things that didn't work, or 'none'>\",\n  \"whatWorked\": \"<key actions that ultimately worked, or 'none'>\",\n  \"tags\": [\"<tag1>\", \"<tag2>\", \"<tag3>\"],\n  \"note\": \"<optional: a soft, AI-readable note/suggestion that makes the record easier for future turns to understand — e.g. '这类任务先查接口可用性再写代码'. Omit if none>\"\n}\n```\n\nGuidelines:\n- Record important failed attempts in \"whatFailed\" to help avoid repeating mistakes.\n- Record key successful actions in \"whatWorked\" to help reuse effective approaches.\n- Include 3-5 semantic \"tags\" summarizing the task domain, tech stack, or action type.\n- For in-progress work: record it with \"outcome\": \"进行中\" and describe where the task stands and what remains — this is what lets the agent resume seamlessly after compaction.\n- Merge closely related sub-tasks into a single record.\n- Use the exact field names and JSON format shown above.\n\nIf no task loops (completed or in-progress) are found in the new compacted messages, output:\n```memory-memo\n{\"none\": true}\n```\n\n<!-- Skill Candidate Detection (after memory-memo) -->\n\n## Skill candidates\n\nAFTER the memory-memo block(s), scan ONLY the new messages being compacted\n(not the content already covered by the previous summary — candidates from\nolder messages were already considered) for reusable processes\n(project-specific build steps, recurring debugging patterns, or tool\nworkflows). Then output exactly one marker as the very LAST line of your\nresponse — after all memory-memo blocks:\n\n- If a process is genuinely worth capturing as a reusable skill (reusable\n  beyond this one task — do not emit for one-off actions; the evidence must\n  be concrete and verifiable: exact file paths, commands, or step sequences\n  from the new messages):\n\n[[skill-candidate: <name>|<one-line purpose>|<evidence>]]\n\n- If none exists, output instead:\n\n[[skill-candidate: none]]\n\nThis marker line is MANDATORY — never omit it, and output at most one\ncandidate marker.\n\n<!-- Update Rules -->\n\n1. Preserve the section structure of the previous summary (Current Focus, Environment, Completed Tasks, Active Issues, Key Decisions, Next Steps, Code State, Important Context, All User Messages).\n2. Move newly-completed tasks from \"Current Focus\" / \"Active Issues\" into \"Completed Tasks\".\n3. Update \"Current Focus\" to reflect what is being worked on RIGHT NOW.\n4. Append new user messages to \"All User Messages\" — do not repeat those already captured.\n5. Refresh \"Code State\" code snippets only if newer versions exist in the new messages.\n6. Drop resolved issues from \"Active Issues\"; add newly-discovered ones.\n7. Merge new decisions into \"Key Decisions\" (keep prior decisions unless explicitly overturned); merge new steps into \"Next Steps\" (reorder if priorities changed).\n8. Do not invent new information. If the new messages say nothing about a section, carry the previous content forward unchanged.\n\n<!-- Required Output Structure -->\n\n## Current Focus\n\n[What we're working on now]\n\n## Environment\n\n- [Key setup/config points]\n- ...\n\n## Completed Tasks\n\n- [Task]: [Brief outcome]\n- ...\n\n## Active Issues\n\n- [Issue]: [Status/Next steps]\n- ...\n\n## Key Decisions\n\n- [Decision]: [rationale] — preserve architectural choices and why they were made\n- ...\n\n## Next Steps\n\n1. [The very next actionable step]\n2. [Then this]\n3. ...\n\n## Code State\n\n### [Critical file name]\n\n[Brief description of the file's purpose and current state]\n\n```\n[The latest version of critical code snippets in this file, <20 lines]\n```\n\n## Important Context\n\n- [Any crucial information not covered above]\n- ...\n\n## All User Messages\n\n- [Detailed non tool use user message]\n- ...\n";
 //#endregion
 //#region ../../packages/agent-core/src/agent/compaction/render-messages.ts
 const TOOL_RESULT_MAX_CHARS = 2e3;
@@ -77157,7 +77174,7 @@ var FullCompaction = class {
 			blockedByTurn: false
 		};
 		this.compacting = active;
-		active.promise = this.compactionWorker(abortController.signal, data, compactedCount);
+		active.promise = this.compactionWorker(abortController.signal, data, compactedCount, active);
 	}
 	cancel() {
 		this.markCanceled();
@@ -77186,6 +77203,13 @@ var FullCompaction = class {
 		this.lowWaterMark = 0;
 		this.reactiveAttempted = false;
 	}
+	/** The low-water mark is measured against the model's context window, so a
+	*  model switch (different max_context_tokens) invalidates it. Without a
+	*  reset, a stale mark from a large model can mask the overflow threshold
+	*  of a smaller model and suppress compaction until the provider overflows. */
+	resetLowWaterMark() {
+		this.lowWaterMark = 0;
+	}
 	async handleOverflowError(signal, error) {
 		if (this.reactiveAttempted) throw error;
 		if (!this.beginAutoCompaction(false) && !this.compacting) {
@@ -77197,6 +77221,12 @@ var FullCompaction = class {
 			throw error;
 		}
 		this.reactiveAttempted = true;
+		if (this.compacting) try {
+			await this.block(signal);
+		} catch (blockError) {
+			if (signal.aborted || isAbortError$1(blockError)) throw blockError;
+			throw error;
+		}
 	}
 	async beforeStep(signal) {
 		this.agent.microCompaction.detect();
@@ -77246,13 +77276,14 @@ var FullCompaction = class {
 	async block(signal) {
 		const active = this.compacting;
 		if (!active) return;
+		signal.throwIfAborted();
 		active.blockedByTurn = true;
 		const timeoutId = setTimeout(() => {
 			if (this.compacting === active) {
 				this.compactionTimedOut = true;
-				this.markCanceled("压缩超时（60秒），已取消。请使用 /compact 手动重试。");
+				this.markCanceled("压缩超时（120秒），已取消。请使用 /compact 手动重试。");
 			}
-		}, 6e4);
+		}, 12e4);
 		const onAbort = () => {
 			clearTimeout(timeoutId);
 			if (this.compacting === active) this.cancel();
@@ -77269,7 +77300,7 @@ var FullCompaction = class {
 			signal.removeEventListener("abort", onAbort);
 		}
 	}
-	async compactionWorker(signal, data, compactedCount) {
+	async compactionWorker(signal, data, compactedCount, owner) {
 		const originalHistory = [...this.agent.context.history];
 		const systemPromptTokens = estimateTokens$1(this.agent.getRuntimeSystemPrompt());
 		const toolTokens = estimateTokensForTools(this.agent.tools.loopTools);
@@ -77309,24 +77340,27 @@ var FullCompaction = class {
 				} catch (error) {
 					if (error instanceof APIContextOverflowError || error instanceof TruncatedError) {
 						const reduced = this.strategy.reduceCompactOnOverflow(messagesToCompact);
-						if (reduced < compactedCount) compactedCount = reduced;
-						else {
-							this.agent.log.warn("compaction overflow at minimum split, falling back to re-summarize", {
-								compactedCount,
-								tokensBefore: estimateTokensForMessages(messagesToCompact)
-							});
-							const result = await summarizeWithFallback(messagesToCompact, summarizeOnce);
-							summary = result.summary;
-							usage = result.usage;
-							break;
+						if (reduced < compactedCount) {
+							compactedCount = reduced;
+							continue;
 						}
-					} else if (!isRetryableGenerateError(error)) throw error;
+						this.agent.log.warn("compaction overflow at minimum split, falling back to re-summarize", {
+							compactedCount,
+							tokensBefore: estimateTokensForMessages(messagesToCompact)
+						});
+						const result = await summarizeWithFallback(messagesToCompact, summarizeOnce);
+						summary = result.summary;
+						usage = result.usage;
+						break;
+					}
+					if (!isRetryableGenerateError(error)) throw error;
 					if (retryCount + 1 >= 5) throw error;
-					await sleepForRetry(delays[retryCount], signal);
+					await sleepForRetry(computeDelayMs(error, delays, retryCount + 1), signal);
 					retryCount += 1;
 				}
 			}
 			if (usage !== null) this.agent.usage.record(model, usage);
+			if (this.compacting !== owner) return void 0;
 			const newHistory = this.agent.context.history;
 			for (let i = 0; i < originalHistory.length; i++) if (newHistory[i] !== originalHistory[i]) {
 				this.markCanceled("上下文已被更改（如 /revoke），压缩已取消");
@@ -77341,6 +77375,7 @@ var FullCompaction = class {
 			} else this.lastCompactionFiles = void 0;
 			for (const msg of messagesToCompactForOps) extractFileOpsFromMessage(msg, fileOps);
 			const toolCallHistory = formatToolCallHistory(messagesToCompactForOps);
+			const skillCandidateSummary = summary;
 			const processedSummary = this.postProcessSummary(summary, fileOps, toolCallHistory, compactedCount);
 			const tokensAfter = systemPromptTokens + toolTokens + estimateTokens$1(processedSummary) + estimateTokensForMessages(recent);
 			const fileLists = computeFileLists(fileOps);
@@ -77366,20 +77401,23 @@ var FullCompaction = class {
 			this.lowWaterMark = Math.floor(this.effectiveTokenCount * 1.1);
 			await this.extractAndStoreMemos(processedSummary, messagesToCompactForOps);
 			this.triggerPostCompactHook(data, result);
-			this.detectSkillCandidates(processedSummary);
+			this.detectSkillCandidates(skillCandidateSummary);
 			this.consecutiveCompactionFailures = 0;
 			this._shouldInjectSessionSummary = true;
 		} catch (error) {
-			const wasTimedOut = this.compactionTimedOut;
-			this.compactionTimedOut = false;
+			const stale = this.compacting !== null && this.compacting !== owner;
+			const wasTimedOut = stale ? false : this.compactionTimedOut;
+			if (!stale) this.compactionTimedOut = false;
 			if (!isAbortError$1(error) || wasTimedOut) {
-				const blockedByTurn = this.compacting?.blockedByTurn === true;
-				this.consecutiveCompactionFailures += 1;
-				if (this.consecutiveCompactionFailures >= MAX_CONSECUTIVE_FAILURES) this.agent.emitEvent({
-					type: "warning",
-					message: `压缩连续失败 ${String(this.consecutiveCompactionFailures)} 次，已自动暂停本回合的自动压缩。使用 /compact 手动重试。`,
-					code: "compaction_circuit_open"
-				});
+				const blockedByTurn = stale || owner.blockedByTurn === true;
+				if (!stale) {
+					this.consecutiveCompactionFailures += 1;
+					if (this.consecutiveCompactionFailures >= MAX_CONSECUTIVE_FAILURES) this.agent.emitEvent({
+						type: "warning",
+						message: `压缩连续失败 ${String(this.consecutiveCompactionFailures)} 次，已自动暂停本回合的自动压缩。使用 /compact 手动重试。`,
+						code: "compaction_circuit_open"
+					});
+				}
 				this.agent.log.error("compaction failed", {
 					code: isScreamError(error) ? error.code : void 0,
 					error,
@@ -77388,7 +77426,7 @@ var FullCompaction = class {
 					compactedCount,
 					tokensBefore
 				});
-				this.markCanceled();
+				if (!stale) this.markCanceled();
 				if (!blockedByTurn) {
 					const details = {
 						model,
@@ -77400,7 +77438,7 @@ var FullCompaction = class {
 						...payload
 					});
 				}
-				if (blockedByTurn) {
+				if (blockedByTurn && !stale) {
 					if (isScreamError(error) && error.code === ErrorCodes.AUTH_LOGIN_REQUIRED) throw error;
 					throw new ScreamError(ErrorCodes.COMPACTION_FAILED, String(error), { cause: error });
 				}
@@ -77491,27 +77529,41 @@ var FullCompaction = class {
 	}
 	/**
 	* Detects [[skill-candidate: <name>|<purpose>|<evidence>]] markers in the
-	* compaction summary and emits a `skill_candidate` event for each one (at
-	* most one per compact). Best-effort and fully isolated: a parse failure or
-	* a missing marker never affects compaction or memory extraction — this
-	* method only reads the summary and emits an event.
+	* compaction summary and emits a `skill_candidate` event (at most one per
+	* compact). Best-effort and fully isolated: a parse failure or a missing
+	* marker never affects compaction or memory extraction — this method only
+	* reads the summary and emits an event.
+	*
+	* Tolerant parsing: the evidence segment may contain `|` characters and
+	* newlines, and the explicit `[[skill-candidate: none]]` marker (emitted
+	* when the model found nothing) is recognized and skipped. When several
+	* markers appear (e.g. an old one carried over into an update summary),
+	* the LAST valid candidate wins — the templates mandate the marker as the
+	* final line of the response, so the trailing one is the model's verdict
+	* for this round.
 	*/
 	detectSkillCandidates(summary) {
 		try {
-			const matches = summary.matchAll(/\[\[skill-candidate:\s*([^|\]]+)\|([^|\]]+)\|([^|\]]+)\]\]/g);
+			const matches = summary.matchAll(/\[\[skill-candidate:\s*([^|\]]+?)(?:\|([^|\]]*)\|([\s\S]*?))?\]\]/g);
+			let chosen;
 			for (const m of matches) {
-				const name = m[1].trim();
+				const name = m[1]?.trim() ?? "";
 				if (name.length === 0) continue;
-				this.agent.emitEvent({
-					type: "skill_candidate",
-					candidate: {
-						name,
-						purpose: m[2].trim(),
-						evidence: m[3].trim()
-					}
-				});
-				break;
+				if (name.toLowerCase() === "none") {
+					chosen = void 0;
+					continue;
+				}
+				if (m[2] === void 0) continue;
+				chosen = {
+					name,
+					purpose: m[2].trim(),
+					evidence: (m[3] ?? "").trim()
+				};
 			}
+			if (chosen !== void 0) this.agent.emitEvent({
+				type: "skill_candidate",
+				candidate: chosen
+			});
 		} catch (error) {
 			this.agent.log.warn("Skill candidate detection failed", { error: String(error) });
 		}
@@ -77529,7 +77581,7 @@ var FullCompaction = class {
 	*/
 	postProcessSummary(summary, fileOps, toolCallHistory, compactedCount) {
 		const todos = this.agent.tools.storeData()["todo"] ?? [];
-		const base = summary.trim().replaceAll(/<files>[\s\S]*?<\/files>\s*/g, "").replace(/^> The conversation before this point was compacted:[\s\S]*?continue from here\.\s*\n+/m, "").trimEnd();
+		const base = summary.trim().replaceAll(/<files>[\s\S]*?<\/files>\s*/g, "").replaceAll(/\[\[skill-candidate:[\s\S]*?\]\]\s*/g, "").replace(/^> The conversation before this point was compacted:[\s\S]*?continue from here\.\s*\n+/m, "").trimEnd();
 		const sections = [];
 		if (compactedCount > 0) sections.push(`> The conversation before this point was compacted: ${String(compactedCount)} earlier message(s) were omitted and are covered by this summary. Treat the summary below as working notes, not verbatim history — the messages after it continue from here.`);
 		if (base.length > 0) sections.push(base);
@@ -78855,7 +78907,10 @@ var ConfigState = class {
 			this._cwd = changed.cwd;
 			this.agent.jian.chdir(changed.cwd);
 		}
-		if (changed.modelAlias) this._modelAlias = changed.modelAlias;
+		if (changed.modelAlias && changed.modelAlias !== this._modelAlias) {
+			this._modelAlias = changed.modelAlias;
+			this.agent.fullCompaction.resetLowWaterMark();
+		}
 		if (changed.profileName) this._profileName = changed.profileName;
 		if (changed.thinkingLevel !== void 0) this._thinkingLevel = resolveThinkingEffort(changed.thinkingLevel, this.agent.screamConfig?.thinking);
 		if (changed.systemPrompt !== void 0) this._systemPrompt = changed.systemPrompt;
@@ -131524,16 +131579,16 @@ const renderTruncated = (_toolCall, result, ctx) => {
 var ShellExecutionComponent = class extends Container {
 	constructor(options) {
 		super();
-		if (options.showCommand === true) this.addCommandPreview(options.command ?? "", options.commandPreviewLines);
+		if (options.showCommand === true) this.addCommandPreview(options.command ?? "", options.commandPreviewLines, options.colors);
 		if (options.result !== void 0) this.addResultPreview(options.result, options.colors, options.expanded ?? false, options.resultPreviewLines ?? 15);
 	}
-	addCommandPreview(command, previewLines) {
+	addCommandPreview(command, previewLines, colors) {
 		if (command.length === 0) return;
-		const allLines = command.split("\n");
+		const allLines = highlightLines(command, "bash", colors);
 		const lines = previewLines === void 0 ? allLines : allLines.slice(0, previewLines);
 		for (const [i, line] of lines.entries()) {
 			const prefix = i === 0 ? "$ " : "  ";
-			this.addChild(new Text(chalk.dim(prefix + line), 2, 0));
+			this.addChild(new Text(`${chalk.dim(prefix)}${line}`, 2, 0));
 		}
 	}
 	addResultPreview(result, colors, expanded, previewLines) {
@@ -131554,8 +131609,8 @@ const shellExecutionResultRenderer = (toolCall, result, ctx) => [new ShellExecut
 	result,
 	colors: ctx.colors,
 	expanded: ctx.expanded,
-	showCommand: ctx.expanded,
-	commandPreviewLines: void 0
+	showCommand: true,
+	commandPreviewLines: ctx.expanded ? void 0 : 3
 })];
 //#endregion
 //#region src/tui/components/media/image-thumbnail.ts
@@ -131834,6 +131889,26 @@ function pickChip(toolName) {
 	return REGISTRY[toolName];
 }
 //#endregion
+//#region src/tui/components/messages/tool-renderers/glance-lines.ts
+/**
+* Renders pre-composed glance lines (ANSI-colored) with hard per-line
+* truncation to the actual render width. Unlike `Text`, long lines never
+* wrap — each logical line always occupies exactly one visual row, so
+* column-aligned samples (Grep matches) never break their alignment on
+* narrow terminals.
+*/
+var GlanceLinesComponent = class {
+	lines;
+	constructor(lines) {
+		this.lines = lines;
+	}
+	invalidate() {}
+	render(width) {
+		const safeWidth = Math.max(width, 1);
+		return this.lines.map((line) => truncateToWidth(`  ${line}`, safeWidth, "…"));
+	}
+};
+//#endregion
 //#region src/tui/components/messages/tool-renderers/summary.ts
 const GLANCE_SAMPLES = 3;
 const MAX_EXTENSION_COUNTS = 4;
@@ -131843,11 +131918,13 @@ function withGlance(glance) {
 		if (result.is_error) return renderTruncated(toolCall, result, ctx);
 		const out = [];
 		if (glance !== null) {
-			const line = glance(toolCall, result, ctx.colors);
-			if (line.length > 0) {
-				const indented = line.split("\n").map((l) => `  ${l}`).join("\n");
-				out.push(new Text(indented, 0, 0));
-			}
+			const glanceOut = glance(toolCall, result, ctx.colors);
+			if (typeof glanceOut === "string") {
+				if (glanceOut.length > 0) {
+					const indented = glanceOut.split("\n").map((l) => `  ${l}`).join("\n");
+					out.push(new Text(indented, 0, 0));
+				}
+			} else out.push(glanceOut);
 		}
 		if (ctx.expanded && result.output.length > 0) out.push(new Text(chalk.dim(result.output), 4, 0));
 		return out;
@@ -131870,29 +131947,35 @@ function readSearchResultsMatches(result) {
 	if (display.kind !== "search_results") return void 0;
 	return display.matches;
 }
-function truncateMatchText(text, max = 80) {
-	if (text.length <= max) return text;
-	return `${text.slice(0, max - 1)}…`;
+function styleFilePath(path) {
+	const idx = path.lastIndexOf("/");
+	if (idx < 0) return path;
+	return `${chalk.dim(path.slice(0, idx + 1))}${path.slice(idx + 1)}`;
 }
 const grepGlance = (_toolCall, result, colors) => {
 	const matches = readSearchResultsMatches(result);
 	if (matches !== void 0 && matches.length > 0) {
-		const fileColor = chalk.hex(colors.roleTool);
-		const lines = matches.slice(0, GLANCE_SAMPLES).map((m) => {
-			return `${m.line > 0 ? `${fileColor(m.file)}${chalk.dim(":")}${chalk.hex(colors.primary)(String(m.line))}` : fileColor(m.file)}${chalk.dim(` ${truncateMatchText(m.text.trim())}`)}`;
+		const samples = matches.slice(0, GLANCE_SAMPLES);
+		const plainLocs = samples.map((m) => m.line > 0 ? `${m.file}:${String(m.line)}` : m.file);
+		const colWidth = Math.max(...plainLocs.map((s) => visibleWidth(s)));
+		const lineNoColor = chalk.hex(colors.roleTool);
+		const lines = samples.map((m, i) => {
+			const loc = m.line > 0 ? `${styleFilePath(m.file)}${chalk.dim(":")}${lineNoColor(String(m.line))}` : styleFilePath(m.file);
+			const pad = " ".repeat(Math.max(0, colWidth - visibleWidth(plainLocs[i] ?? "")));
+			const text = m.text.trim();
+			return text.length > 0 ? `${loc}${pad}  ${chalk.dim(text)}` : `${loc}${pad}`;
 		});
 		const remaining = matches.length - GLANCE_SAMPLES;
 		if (remaining > 0) lines.push(chalk.dim(`+${String(remaining)} more`));
-		return lines.join("\n");
+		return new GlanceLinesComponent(lines);
 	}
 	const lines = nonEmptyLines(result.output);
 	if (lines.length === 0) return "";
 	const samples = lines.slice(0, GLANCE_SAMPLES).map(pathFromGrepLine);
 	const remaining = lines.length - samples.length;
-	const fileColor = chalk.hex(colors.roleTool);
-	const out = samples.map((s) => fileColor(s));
+	const out = samples.map((s) => styleFilePath(s));
 	if (remaining > 0) out.push(chalk.dim(`+${String(remaining)} more`));
-	return out.join("\n");
+	return new GlanceLinesComponent(out);
 };
 function fileBasename(path) {
 	const idx = path.lastIndexOf("/");
@@ -136202,7 +136285,7 @@ function buildRoleAdditionalText(prefs) {
 	if (items.length === 0 && (doNot === void 0 || doNot.length === 0) && !hasToolPriority) return "";
 	lines.push("", ...items);
 	if (doNot !== void 0 && doNot.length > 0) lines.push("", "## Do NOT (explicit prohibitions — NEVER do these)", doNot);
-	if (hasToolPriority) lines.push("", "## Tool priority (set via /like — HIGHEST PRIORITY)", prefs.toolPriority === "skill" ? "For every user request, first analyze the intent, then check all installed skills and try to solve the problem with a matching one. Only when no installed skill fits should you fall back to MCP tools or decide on your own how to solve it." : "For every user request, first analyze the intent, then check all available MCP tools and try to solve the problem with one. Only when no MCP tool fits should you fall back to the Skill tool or decide on your own how to solve it.");
+	if (hasToolPriority) lines.push("", "## Tool priority (set via /like — HIGHEST PRIORITY)", prefs.toolPriority === "skill" ? "For every user request: (1) first analyze the intent, (2) then identify whether any installed skill matches THIS request, (3) if one matches, invoke the Skill tool with it as your FIRST action — before MCP tools or doing it yourself, (4) if none matches, proceed with MCP tools or solve it yourself. Consult the skill list shown in the Skill tool description whenever you are unsure what is installed." : "For every user request: (1) first analyze the intent, (2) then identify whether any available MCP tool matches THIS request, (3) if one matches, use it as your FIRST action — before the Skill tool or doing it yourself, (4) if none matches, proceed with the Skill tool or solve it yourself.");
 	lines.push("", t("like.priority"));
 	return lines.join("\n");
 }

package/dist/{dispatch-SbA6zFMd.mjs → dispatch-D71h_08g.mjs}

@@ -3,5 +3,5 @@ import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
 const __dirname = __cjsShimDirname(__filename);
-import { Kt as handleConnectCommand } from "./dispatch-DIJJXO0L.mjs";
+import { Kt as handleConnectCommand } from "./dispatch-202xtik3.mjs";
 export { handleConnectCommand };

package/dist/main.mjs

@@ -6,7 +6,7 @@ const __dirname = __cjsShimDirname(__filename);
 import "./suppress-sqlite-warning-C2VB0doZ.mjs";
 //#region src/main.ts
 try {
-	(await import("./app-vcurmmh6.mjs")).main();
+	(await import("./app-BXslKpYT.mjs")).main();
 } catch (error) {
 	process.stderr.write(`${error instanceof Error ? error.stack ?? error.message : String(error)}\n`);
 	process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scream-code",
-  "version": "0.13.9",
+  "version": "0.14.0",
   "description": "A terminal-native AI agent for builders",
   "license": "MIT",
   "author": "ScreamCli",