scream-code 0.4.1 → 0.4.3

package/dist/main.mjs

@@ -85268,6 +85268,11 @@ async function runToolCallBatch(step, response) {
 	try {
 		for (let index = 0; index < calls.length; index += 1) {
 			const call = calls[index];
+			if (step.signal.aborted) {
+				await dispatchToolCall(step, call, call.args);
+				pendingResults.push(Promise.resolve(makeErrorToolResult(call, call.args, abortedToolOutput(call.toolName, step.signal))));
+				continue;
+			}
 			const prepared = await prepareToolCall(step, call);
 			pendingResults.push(scheduler.add(prepared.task));
 			if (prepared.stopBatchAfterThis === true) {
@@ -113594,10 +113599,27 @@ async function locateWindowsGitBash(deps) {
 			checked.push(inferred);
 			if (await deps.isFile(inferred)) return inferred;
 		}
+		const fellback = inferBashByWalkingUp(gitExe);
+		if (fellback !== void 0) {
+			checked.push(fellback);
+			if (await deps.isFile(fellback)) return fellback;
+		}
 	}
-	const candidates = ["C:\\Program Files\\Git\\bin\\bash.exe", "C:\\Program Files (x86)\\Git\\bin\\bash.exe"];
+	const bashExe = await deps.findExecutable("bash.exe");
+	if (bashExe !== void 0) {
+		checked.push(bashExe);
+		return bashExe;
+	}
+	const candidates = [
+		"C:\\Program Files\\Git\\bin\\bash.exe",
+		"C:\\Program Files (x86)\\Git\\bin\\bash.exe",
+		"C:\\msys64\\usr\\bin\\bash.exe",
+		"C:\\cygwin64\\bin\\bash.exe"
+	];
 	const localAppData = deps.env["LOCALAPPDATA"]?.trim();
 	if (localAppData !== void 0 && localAppData.length > 0) candidates.push(`${localAppData}\\Programs\\Git\\bin\\bash.exe`);
+	const userProfile = deps.env["USERPROFILE"]?.trim();
+	if (userProfile !== void 0 && userProfile.length > 0) candidates.push(`${userProfile}\\scoop\\apps\\git\\current\\bin\\bash.exe`);
 	for (const candidate of candidates) {
 		checked.push(candidate);
 		if (await deps.isFile(candidate)) return candidate;
@@ -113615,6 +113637,16 @@ function inferGitBashFromGitExe(gitExe) {
 		}
 	}
 }
+function inferBashByWalkingUp(gitExe) {
+	const sep = gitExe.includes("\\") ? "\\" : "/";
+	const parts = gitExe.split(sep);
+	for (let i = parts.length - 1; i >= 1 && parts.length - i <= 6; i -= 1) {
+		const root = parts.slice(0, i).join(sep) || sep;
+		const candidate = `${root}${sep}bin${sep}bash.exe`;
+		const gitDir = parts.slice(0, -1).join(sep);
+		if (`${root}${sep}bin` !== gitDir) return candidate;
+	}
+}
 /**
 * Production convenience — derive the deps bag from Node's ambient surface.
 *
@@ -114245,6 +114277,10 @@ var ScreamCore = class {
 		});
 		this.sdk = rpcClient(this);
 	}
+	/** Resolve the shell environment so missing Git Bash is surfaced early. */
+	async preflight() {
+		await this.jian;
+	}
 	async createSession(input) {
 		const options = input;
 		const workDir = requiredWorkDir("createSession", options.workDir);
@@ -114949,6 +114985,9 @@ var SDKRpcClient = class {
 	get configPath() {
 		return this.core.configPath;
 	}
+	async preflight() {
+		await this.core.preflight();
+	}
 	async createSession(input) {
 		const rpc = await this.getRpc();
 		const { planMode, ...coreInput } = input;
@@ -115887,6 +115926,10 @@ var ScreamHarness = class {
 	async getExperimentalFlags() {
 		return this.rpc.getExperimentalFlags();
 	}
+	/** Validate host environment before starting the UI. */
+	async preflight() {
+		await this.rpc.preflight();
+	}
 	async ensureConfigFile() {
 		await ensureConfigFile(this.configPath);
 	}
@@ -131527,6 +131570,15 @@ function createTUIState(options) {
 	const theme = createScreamTUIThemeBundle(initialAppState.theme, options.resolvedTheme);
 	const terminal = new ProcessTerminal();
 	const ui = new TUI(terminal);
+	const uiAny = ui;
+	const originalDoRender = uiAny["doRender"].bind(ui);
+	uiAny["doRender"] = () => {
+		try {
+			originalDoRender();
+		} catch (error) {
+			console.error("[scream-code] render error:", error);
+		}
+	};
 	const transcriptContainer = new GutterContainer(1, 1);
 	const activityContainer = new GutterContainer(1, 1);
 	const todoPanelContainer = new GutterContainer(1, 1);
@@ -135376,112 +135428,114 @@ var ScreamTUI = class {
 };
 //#endregion
 //#region src/tui/components/chrome/loading.ts
-const { stdout } = process$1;
-const BRIGHT = "\x1B[38;2;255;255;255m";
-const RESET = "\x1B[0m";
-const THEME_GREEN = {
-	dark: "\x1B[38;2;78;200;126m",
-	light: "\x1B[38;2;14;122;56m"
+const { stdout, stdin } = process$1;
+const LOGO = [
+	"███████╗ ██████╗██████╗ ███████╗ █████╗ ███╗   ███╗  ██████╗ ██████╗ ██████╗ ███████╗",
+	"██╔════╝██╔════╝██╔══██╗██╔════╝██╔══██╗████╗ ████║ ██╔════╝██╔═══██╗██╔══██╗██╔════╝",
+	"███████╗██║     ██████╔╝█████╗  ███████║██╔████╔██║ ██║     ██║   ██║██║  ██║█████╗  ",
+	"╚════██║██║     ██╔══██╗██╔══╝  ██╔══██║██║╚██╔╝██║ ██║     ██║   ██║██║  ██║██╔══╝  ",
+	"███████║╚██████╗██║  ██║███████╗██║  ██║██║ ╚═╝ ██║ ╚██████╗╚██████╔╝██████╔╝███████╗",
+	"╚══════╝ ╚═════╝╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝  ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝"
+];
+const SHADOW_CHARS = new Set([
+	"╚",
+	"═",
+	"╝",
+	"║",
+	"╔",
+	"╗",
+	"╠",
+	"╣",
+	"╦",
+	"╩",
+	"╬"
+]);
+const SHEEN_STEP = 2;
+const SHEEN_INTERVAL_MS = 150;
+const THEME_ACCENT = {
+	dark: [
+		78,
+		200,
+		126
+	],
+	light: [
+		14,
+		122,
+		56
+	]
 };
-const FRAMES = [
-	{
-		duration: 80,
-		content: [
-			"┌┐",
-			"││",
-			"││",
-			"└┘"
-		]
-	},
-	{
-		duration: 80,
-		content: [
-			"┌──────┐",
-			"│      │",
-			"│      │",
-			"└──────┘"
-		]
-	},
-	{
-		duration: 80,
-		content: [
-			"┌──────────────────┐",
-			"│                  │",
-			"│                  │",
-			"└──────────────────┘"
-		]
-	},
-	{
-		duration: 80,
-		content: [
-			"┌──────────────────────────────┐",
-			"│                              │",
-			"│    welcome to scream code    │",
-			"│                              │",
-			"└──────────────────────────────┘"
-		]
-	},
-	{
-		duration: 100,
-		content: [
-			"┌─────────────────────────────────────────────────────────────────┐",
-			"│                                                                 │",
-			"│                     welcome to scream code                      │",
-			"│                                                                 │",
-			"│      ███████╗  ██████╗██████╗ ███████╗ █████╗ ███╗   ███╗       │",
-			"│      ██╔════╝ ██╔════╝██╔══██╗██╔════╝██╔══██╗████╗ ████║       │",
-			"│      ███████╗ ██║     ██████╔╝█████╗  ███████║██╔████╔██║       │",
-			"│      ╚════██║ ██║     ██╔══██╗██╔══╝  ██╔══██║██║╚██╔╝██║       │",
-			"│      ███████║ ╚██████╗██║  ██║███████╗██║  ██║██║ ╚═╝ ██║       │",
-			"│      ╚══════╝  ╚═════╝╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝       │",
-			"│                                                                 │",
-			"└─────────────────────────────────────────────────────────────────┘"
-		]
-	},
-	{
-		duration: 120,
-		content: [
-			"┌─────────────────────────────────────────────────────────────────┐",
-			"│                                                                 │",
-			"│                     welcome to scream code                      │",
-			"│                                                                 │",
-			"│      ███████╗  ██████╗██████╗ ███████╗ █████╗ ███╗   ███╗       │",
-			"│      ██╔════╝ ██╔════╝██╔══██╗██╔════╝██╔══██╗████╗ ████║       │",
-			"│      ███████╗ ██║     ██████╔╝█████╗  ███████║██╔████╔██║       │",
-			"│      ╚════██║ ██║     ██╔══██╗██╔══╝  ██╔══██║██║╚██╔╝██║       │",
-			"│      ███████║ ╚██████╗██║  ██║███████╗██║  ██║██║ ╚═╝ ██║       │",
-			"│      ╚══════╝  ╚═════╝╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝       │",
-			"│                                                                 │",
-			"│                       你的中文智能Ai助手                        │",
-			"└─────────────────────────────────────────────────────────────────┘"
-		]
-	},
-	{
-		duration: 9999,
-		content: [
-			"┌─────────────────────────────────────────────────────────────────┐",
-			"│                                                                 │",
-			"│                     welcome to scream code                      │",
-			"│                                                                 │",
-			"│      ███████╗  ██████╗██████╗ ███████╗ █████╗ ███╗   ███╗       │",
-			"│      ██╔════╝ ██╔════╝██╔══██╗██╔════╝██╔══██╗████╗ ████║       │",
-			"│      ███████╗ ██║     ██████╔╝█████╗  ███████║██╔████╔██║       │",
-			"│      ╚════██║ ██║     ██╔══██╗██╔══╝  ██╔══██║██║╚██╔╝██║       │",
-			"│      ███████║ ╚██████╗██║  ██║███████╗██║  ██║██║ ╚═╝ ██║       │",
-			"│      ╚══════╝  ╚═════╝╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝       │",
-			"│                                                                 │",
-			"│                       你的中文智能Ai助手                        │",
-			"└─────────────────────────────────────────────────────────────────┘"
-		]
-	}
+const BLOCK_RGB = [
+	255,
+	255,
+	255
+];
+const LOGO_RGB = [
+	136,
+	136,
+	136
 ];
-function color(line, green) {
-	const s = line.replace(/[│ ]/g, "");
-	const tb = (line.startsWith("┌") || line.startsWith("└")) && (line.endsWith("┐") || line.endsWith("┘")) && s.replace(/[─┌┐└┘]/g, "") === "";
-	const es = line.startsWith("│") && line.endsWith("│") && s === "";
-	if (tb || es) return green;
-	if (line.includes("welcome") || line.includes("scream") || line.includes("你的中文")) return green;
-	return BRIGHT;
+const DIM_RGB = [
+	85,
+	85,
+	85
+];
+function fg(r, g, b) {
+	return `\x1b[38;2;${r};${g};${b}m`;
+}
+const RESET = "\x1B[0m";
+const BOLD = "\x1B[1m";
+const DIM = "\x1B[2m";
+function renderSheen(char, charIndex, sheenPos, isReversing, accent) {
+	if (char === " ") return " ";
+	if (char === "█") return `${fg(...BLOCK_RGB)}█${RESET}`;
+	if (!SHADOW_CHARS.has(char)) return `${fg(...LOGO_RGB)}${char}${RESET}`;
+	let color;
+	if (isReversing) color = charIndex <= sheenPos ? LOGO_RGB : accent;
+	else color = charIndex <= sheenPos ? accent : LOGO_RGB;
+	return `${fg(...color)}${char}${RESET}`;
+}
+const LOADING_TEXT = "Ai正在加载中...";
+function buildShimmerPalette(n, accent) {
+	const size = Math.max(8, Math.min(20, Math.ceil(n * 1.5)));
+	const palette = [];
+	for (let i = 0; i < size; i++) {
+		const t = i / (size - 1);
+		palette.push([
+			Math.round(accent[0] - t * accent[0] * .35),
+			Math.round(accent[1] - t * accent[1] * .6),
+			Math.round(accent[2] - t * accent[2] * .33)
+		]);
+	}
+	return palette;
+}
+function renderShimmer(pulse, accent) {
+	const chars = LOADING_TEXT.split("");
+	const n = chars.length;
+	const palette = buildShimmerPalette(n, accent);
+	let out = "";
+	for (let i = 0; i < n; i++) {
+		const phase = (pulse - i + n) % n;
+		const color = palette[phase];
+		const ratio = n <= 1 ? 0 : phase / (n - 1);
+		out += `${ratio < .23 ? BOLD : ratio < .69 ? "" : DIM}${fg(...color)}${chars[i]}${RESET}`;
+	}
+	return out;
+}
+function getTerminalSize() {
+	return {
+		cols: stdout.columns || 80,
+		rows: stdout.rows || 24
+	};
+}
+function visualWidth(s) {
+	let w = 0;
+	for (const ch of s.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "")) w += /[一-鿿　-〿＀-￯]/.test(ch) ? 2 : 1;
+	return w;
+}
+function centerPad(text, width) {
+	const plainW = visualWidth(text);
+	const pad = Math.max(0, Math.floor((width - plainW) / 2));
+	return " ".repeat(pad) + text;
 }
 let ansiSupported = null;
 function supportsAnsi() {
@@ -135523,63 +135577,77 @@ function supportsAnsi() {
 	ansiSupported = false;
 	return false;
 }
-function plainFrame(frameIndex, green) {
-	const f = FRAMES[Math.min(frameIndex, FRAMES.length - 1)];
-	let out = "";
-	for (const l of f.content) out += color(l, green) + (l || " ") + "\x1B[0m\n";
-	return out;
-}
-const LOADING_STAGES = [
-	"正在整理记忆区域....",
-	"正在加载用户喜好....",
-	"正在确认模型配置....",
-	"正在加载scream code...."
-];
-const STAGE_DELAYS_MS = [
-	450,
-	350,
-	650,
-	350
-];
 function runLoadingAnimation(theme = "dark") {
-	const green = THEME_GREEN[theme];
 	if (!supportsAnsi()) {
-		stdout.write(plainFrame(FRAMES.length - 1, green));
-		for (const stage of LOADING_STAGES) stdout.write(green + stage + "\x1B[0m\n");
+		for (const line of LOGO) stdout.write(`${fg(...LOGO_RGB)}${line}${RESET}\n`);
 		return Promise.resolve();
 	}
 	return new Promise((resolve) => {
-		const last = FRAMES.length - 1;
-		let frame = 0;
-		function draw(i) {
-			stdout.write("\x1B[H" + plainFrame(i, green));
-		}
-		function showStages(stages, index) {
-			if (index >= stages.length) {
-				setTimeout(() => {
-					stdout.write("\x1B[2J\x1B[H\x1B[?25h");
-					resolve();
-				}, 400);
-				return;
-			}
-			stdout.write("\n" + green + stages[index] + RESET);
-			const delay = STAGE_DELAYS_MS[index] ?? 350;
-			setTimeout(() => showStages(stages, index + 1), delay);
+		stdout.write("\x1B[?1049h");
+		stdout.write("\x1B[2J");
+		stdout.write("\x1B[?25l");
+		const accent = THEME_ACCENT[theme];
+		let sheenPos = 0;
+		let isReversing = false;
+		let shimmerPulse = 0;
+		let phase = "loading";
+		function render() {
+			const { cols, rows } = getTerminalSize();
+			const lines = [];
+			const contentHeight = LOGO.length + 4;
+			const topPad = Math.max(0, Math.floor((rows - contentHeight) / 2));
+			for (let i = 0; i < topPad; i++) lines.push("");
+			for (const line of LOGO) {
+				let colored = "";
+				for (let ci = 0; ci < line.length; ci++) colored += renderSheen(line[ci], ci, sheenPos, isReversing, accent);
+				lines.push(centerPad(colored, cols));
+			}
+			if (phase === "loading") lines.push(centerPad(renderShimmer(shimmerPulse, accent), cols));
+			else lines.push(centerPad(`${BOLD}${fg(...accent)}点击按下 ENTER 唤醒核心${RESET}`, cols));
+			lines.push("");
+			lines.push("");
+			lines.push(centerPad(`${fg(...DIM_RGB)}按住 Ctrl+C 即可退出 Scream Code${RESET}`, cols));
+			while (lines.length < rows) lines.push("");
+			stdout.write("\x1B[H");
+			stdout.write(lines.join("\n"));
 		}
 		function tick() {
-			if (frame >= last) {
-				setTimeout(() => {
-					showStages(LOADING_STAGES, 0);
-				}, 600);
-				return;
+			sheenPos += SHEEN_STEP;
+			if (sheenPos >= 90) {
+				isReversing = !isReversing;
+				sheenPos = 0;
 			}
-			draw(frame);
-			frame++;
-			setTimeout(tick, FRAMES[frame - 1].duration);
+			shimmerPulse = (shimmerPulse + 1) % 10;
+			render();
 		}
-		stdout.write("\x1B[?25l\x1B[2J\x1B[H");
-		draw(0);
-		setTimeout(tick, FRAMES[0].duration);
+		function cleanup() {
+			clearInterval(timer);
+			stdin.removeAllListeners("data");
+			stdin.setRawMode(false);
+			stdout.write("\x1B[?25h");
+			stdout.write("\x1B[?1049l");
+		}
+		function interrupt() {
+			cleanup();
+			process$1.exit(0);
+		}
+		process$1.on("SIGINT", interrupt);
+		process$1.on("SIGTERM", interrupt);
+		stdin.setRawMode(true);
+		stdin.on("data", (data) => {
+			const key = data.toString();
+			if (key === "") interrupt();
+			if ((key === "\r" || key === "\n") && phase === "ready") {
+				cleanup();
+				resolve();
+			}
+		});
+		render();
+		const timer = setInterval(tick, SHEEN_INTERVAL_MS);
+		setTimeout(() => {
+			phase = "ready";
+			render();
+		}, 400);
 	});
 }
 //#endregion
@@ -135619,6 +135687,7 @@ async function runShell(opts, version) {
 	await harness.ensureConfigFile();
 	const config = await harness.getConfig();
 	const configMs = Date.now() - configStartedAt;
+	await harness.preflight();
 	await runLoadingAnimation(resolvedTheme);
 	const tui = new ScreamTUI(harness, {
 		cliOptions: opts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scream-code",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "The Starting Point for Next-Gen Agents",
   "license": "MIT",
   "author": "ScreamCli",
@@ -40,7 +40,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "provenance": true
+    "provenance": false
   },
   "scripts": {
     "build": "tsdown",