scream-code 0.3.7 → 0.3.8

package/dist/main.mjs

@@ -87211,10 +87211,25 @@ var Session$1 = class {
 		const main = this.agents.get("main");
 		const profile = DEFAULT_AGENT_PROFILES["agent"];
 		if (main !== void 0 && profile !== void 0) await this.bootstrapAgentProfile(main, profile);
+		if (main !== void 0 && this.metadata.custom?.["recap"]) main.context.appendSystemReminder(this.metadata.custom["recap"], {
+			kind: "injection",
+			variant: "recap"
+		});
 		await this.triggerSessionStart("resume");
 		return { warning: resumeWarning };
 	}
 	async close() {
+		const main = this.agents.get("main");
+		if (main !== void 0) {
+			const recap = main.sessionMemory.getSessionSummary();
+			if (recap.length > 0) {
+				this.metadata.custom = {
+					...this.metadata.custom,
+					recap
+				};
+				this.writeMetadata();
+			}
+		}
 		try {
 			await Promise.allSettled(Array.from(this.agents.values(), async (agent) => agent.cron?.stop()));
 			await this.stopBackgroundTasksOnExit();
@@ -103346,7 +103361,13 @@ function slugifyWorkDirName(name) {
 const WORKDIR_KEY_PREFIX = "wd_";
 const HASH_LENGTH = 12;
 function normalizeWorkDir(workDir) {
-	return resolve$1(workDir);
+	const resolved = resolve$1(workDir);
+	let dir = resolved;
+	while (dir !== dirname$2(dir)) {
+		if (existsSync(join$1(dir, ".git")) || existsSync(join$1(dir, "package.json"))) return dir;
+		dir = dirname$2(dir);
+	}
+	return resolved;
 }
 function encodeWorkDirKey(workDir) {
 	const normalized = normalizeWorkDir(workDir);
@@ -115063,11 +115084,11 @@ function checkCcConnect$1() {
 }
 function detectScreamPath$1() {
 	try {
-		const which = execSync(process.platform === "win32" ? "where scream" : "which scream 2>/dev/null", {
+		const first = execSync(process.platform === "win32" ? "where scream" : "which scream 2>/dev/null", {
 			encoding: "utf-8",
 			timeout: 3e3
-		}).trim();
-		if (which) return `${which} stream-json`;
+		}).trim().split(/[\r\n]+/)[0]?.trim() ?? "";
+		if (first) return `${first} stream-json`;
 	} catch {}
 	return "scream stream-json";
 }
@@ -115075,18 +115096,40 @@ function readConfiguredType() {
 	if (!existsSync(CONFIG_PATH)) return void 0;
 	try {
 		const content = readFileSync(CONFIG_PATH, "utf-8");
+		let inPlatforms = false;
 		for (const line of content.split("\n")) {
-			const m = line.match(/^type\s*=\s*"(\S+)"/);
-			if (m) return m[1];
+			const trimmed = line.trim();
+			if (trimmed === "[[projects.platforms]]") {
+				inPlatforms = true;
+				continue;
+			}
+			if (trimmed.startsWith("[[") && trimmed !== "[[projects.platforms]]") {
+				inPlatforms = false;
+				continue;
+			}
+			if (inPlatforms) {
+				const m = line.match(/^type\s*=\s*"(\S+)"/);
+				if (m) return m[1];
+			}
 		}
 		return;
 	} catch {
 		return;
 	}
 }
+function escapeSingleQuotes(str) {
+	return str.replace(/'/g, "\\'");
+}
 function generateConfig$1(platform) {
 	const dir = dirname$1(CONFIG_PATH);
 	if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+	const platformBlock = `\n[[projects.platforms]]\ntype = "${platform.type}"\n`;
+	if (existsSync(CONFIG_PATH)) {
+		const existing = readFileSync(CONFIG_PATH, "utf-8");
+		if (existing.includes(`type = "${platform.type}"`)) return;
+		writeFileSync(CONFIG_PATH, existing + platformBlock, "utf-8");
+		return;
+	}
 	writeFileSync(CONFIG_PATH, [
 		"# 全局：允许/禁止图片和文件回传到聊天（on = 开启，off = 关闭）",
 		"attachment_send = \"on\"",
@@ -115098,8 +115141,8 @@ function generateConfig$1(platform) {
 		"type = \"claudecode\"",
 		"",
 		"[projects.agent.options]",
-		`cli_path = '${detectScreamPath$1()}'`,
-		`work_dir = '${process.cwd()}'`,
+		`cli_path = '${escapeSingleQuotes(detectScreamPath$1())}'`,
+		`work_dir = '${escapeSingleQuotes(process.cwd())}'`,
 		"mode = \"default\"",
 		"",
 		"[[projects.platforms]]",
@@ -121098,7 +121141,7 @@ const TOOLBAR_TIPS = [
 		priority: 3
 	},
 	{
-		text: "让 Scream 安排任务，例如 \"八点提醒我上号打三角洲\"",
+		text: "让 Scream 安排任务，例如 \"2个小时后提醒我去拿快递\"",
 		solo: true,
 		priority: 3
 	}
@@ -125908,11 +125951,11 @@ function detectScreamPath() {
 		if (arg1.includes("scream-code") || arg1.includes("scream")) return `node ${arg1} stream-json`;
 	}
 	try {
-		const which = execSync("which scream 2>/dev/null", {
+		const first = execSync("which scream 2>/dev/null", {
 			encoding: "utf-8",
 			timeout: 3e3
-		}).trim();
-		if (which) return `${which} stream-json`;
+		}).trim().split(/[\r\n]+/)[0]?.trim() ?? "";
+		if (first) return `${first} stream-json`;
 	} catch {}
 	return "scream stream-json";
 }
@@ -126199,6 +126242,18 @@ var ClaudeStreamJsonWriter = class {
 			content: `Resume this session: scream -r ${sessionId}`
 		});
 	}
+	/** Emit a `control_request` event for cc-connect permission flow. */
+	emitControlRequest(requestId, toolCallId, toolName, input) {
+		this.writeJson({
+			type: "control_request",
+			request_id: requestId,
+			tool_use: {
+				id: toolCallId,
+				name: toolName,
+				input
+			}
+		});
+	}
 	updateUsage(input, output) {
 		if (input > 0) this.tokenUsage.input += input;
 		if (output > 0) this.tokenUsage.output += output;
@@ -126248,6 +126303,39 @@ function extractUserText(msg) {
 	if (typeof content === "string") return content;
 	return content.filter((b) => b.type === "text").map((b) => b.text ?? "").join("\n");
 }
+function mapCcConnectMode(mode) {
+	switch (mode) {
+		case "default": return {
+			permission: "manual",
+			planMode: false
+		};
+		case "acceptEdits": return {
+			permission: "manual",
+			planMode: false
+		};
+		case "plan": return {
+			permission: "manual",
+			planMode: true
+		};
+		case "auto": return {
+			permission: "auto",
+			planMode: false
+		};
+		case "yolo":
+		case "bypassPermissions": return {
+			permission: "yolo",
+			planMode: false
+		};
+		case "dontAsk": return {
+			permission: "manual",
+			planMode: false
+		};
+		default: return {
+			permission: "auto",
+			planMode: false
+		};
+	}
+}
 async function runStreamJson(opts) {
 	const workDir = opts.workDir ?? process.cwd();
 	const telemetryBootstrap = createCliTelemetryBootstrap();
@@ -126264,6 +126352,9 @@ async function runStreamJson(opts) {
 	});
 	let session;
 	let currentSessionId;
+	let sessionKey = "cc-connect-main";
+	const pendingApprovals = /* @__PURE__ */ new Map();
+	const subagentNames = /* @__PURE__ */ new Map();
 	const agentsMdPath = join(workDir, ".scream-code", "AGENTS.md");
 	let originalAgentsMd;
 	let injectedAgentsMd = false;
@@ -126272,7 +126363,12 @@ async function runStreamJson(opts) {
 			originalAgentsMd = await readFile(agentsMdPath, "utf-8");
 		} catch {}
 		await mkdir(join(workDir, ".scream-code"), { recursive: true });
-		await writeFile$1(agentsMdPath, originalAgentsMd ? `${opts.appendSystemPrompt}\n\n${originalAgentsMd}` : opts.appendSystemPrompt, "utf-8");
+		const ccPrompt = `【重要】你可以通过以下命令向用户发送图片或文件：
+  cc-connect send --image /absolute/path/to/image.png
+  cc-connect send --file /absolute/path/to/file.pdf
+当用户要求你发送文件、截图、生成的图片时，使用 Bash 工具执行上述命令即可。
+\n${opts.appendSystemPrompt}`;
+		await writeFile$1(agentsMdPath, originalAgentsMd ? `${ccPrompt}\n\n${originalAgentsMd}` : ccPrompt, "utf-8");
 		injectedAgentsMd = true;
 		log.info("stream-json: injected cc-connect system prompt into AGENTS.md");
 	}
@@ -126281,10 +126377,16 @@ async function runStreamJson(opts) {
 		const config = await harness.getConfig();
 		for await (const msg of readStdinMessages()) {
 			if (msg.type === "control_response") {
-				log.debug("stream-json: control_response received (auto-approved mode)", {
-					requestId: msg.response.request_id,
-					behavior: msg.response.response.behavior
-				});
+				const pending = pendingApprovals.get(msg.response.request_id);
+				if (pending) {
+					pendingApprovals.delete(msg.response.request_id);
+					const behavior = msg.response.response.behavior;
+					pending.resolve({
+						decision: behavior === "allow" ? "approved" : "rejected",
+						scope: behavior === "allow" ? "session" : void 0,
+						feedback: msg.response.response.message
+					});
+				} else log.warn("stream-json: control_response for unknown request_id", { requestId: msg.response.request_id });
 				continue;
 			}
 			const userText = extractUserText(msg);
@@ -126292,7 +126394,8 @@ async function runStreamJson(opts) {
 				log.warn("stream-json: empty user message, skipping");
 				continue;
 			}
-			const sessionKey = "cc-connect-main";
+			sessionKey = opts.resume ?? "cc-connect-main";
+			const { permission: mappedPermission, planMode: mappedPlanMode } = mapCcConnectMode(opts.permissionMode);
 			if (!session) {
 				const existing = await harness.listSessions({
 					sessionId: sessionKey,
@@ -126317,7 +126420,8 @@ async function runStreamJson(opts) {
 						id: sessionKey,
 						workDir,
 						model,
-						permission: "auto"
+						permission: mappedPermission,
+						planMode: mappedPlanMode
 					});
 					log.info("stream-json: recreated session", { sessionId: session.id });
 				}
@@ -126327,7 +126431,8 @@ async function runStreamJson(opts) {
 						id: sessionKey,
 						workDir,
 						model,
-						permission: "auto"
+						permission: mappedPermission,
+						planMode: mappedPlanMode
 					});
 					log.info("stream-json: created session", { sessionId: session.id });
 				}
@@ -126335,7 +126440,34 @@ async function runStreamJson(opts) {
 				writer.setSessionId(session.id);
 				writer.setModel(opts.model ?? config.defaultModel ?? "");
 				writer.emitSystem(sessionKey);
-				session.setApprovalHandler(() => ({ decision: "approved" }));
+				function sendControlRequest(request) {
+					return new Promise((resolve) => {
+						const reqId = `req_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+						pendingApprovals.set(reqId, { resolve });
+						writer.emitControlRequest(reqId, request.toolCallId, request.toolName, request.display);
+					});
+				}
+				switch (opts.permissionMode) {
+					case "yolo":
+					case "bypassPermissions":
+						session.setApprovalHandler(() => ({ decision: "approved" }));
+						break;
+					case "dontAsk":
+						session.setApprovalHandler(() => ({
+							decision: "rejected",
+							feedback: "dontAsk 模式下工具调用被自动拒绝"
+						}));
+						break;
+					case "acceptEdits":
+						session.setApprovalHandler((request) => {
+							if (["Edit", "Write"].includes(request.toolName)) return { decision: "approved" };
+							return sendControlRequest(request);
+						});
+						break;
+					default:
+						session.setApprovalHandler((request) => sendControlRequest(request));
+						break;
+				}
 				session.setQuestionHandler(() => null);
 			}
 			let activeTurnId;
@@ -126361,6 +126493,23 @@ async function runStreamJson(opts) {
 						finish(/* @__PURE__ */ new Error(`${event.code}: ${event.message}`));
 						return;
 					}
+					if (event.type === "subagent.spawned") {
+						subagentNames.set(event.subagentId, event.subagentName);
+						writer.writeAssistantDelta(`\n[子任务: ${event.subagentName}]\n`);
+						return;
+					}
+					if (event.type === "subagent.completed") {
+						const name = subagentNames.get(event.subagentId) ?? event.subagentId;
+						writer.writeAssistantDelta(`\n[子任务完成: ${name}]\n`);
+						subagentNames.delete(event.subagentId);
+						return;
+					}
+					if (event.type === "subagent.failed") {
+						const name = subagentNames.get(event.subagentId) ?? event.subagentId;
+						writer.writeAssistantDelta(`\n[子任务失败: ${name} - ${event.error}]\n`);
+						subagentNames.delete(event.subagentId);
+						return;
+					}
 					if (event.type === "turn.started" && activeTurnId === void 0) {
 						if (event.agentId !== "main") return;
 						activeTurnId = event.turnId;
@@ -126405,7 +126554,12 @@ async function runStreamJson(opts) {
 		writer.emitResult("error", error instanceof Error ? error.message : String(error));
 		process.exitCode = 1;
 	} finally {
-		if (currentSessionId) writer.emitResumeHint(currentSessionId);
+		for (const [, pending] of pendingApprovals) pending.resolve({
+			decision: "rejected",
+			feedback: "会话已结束"
+		});
+		pendingApprovals.clear();
+		if (currentSessionId) writer.emitResumeHint(sessionKey);
 		try {
 			if (session) await session.close();
 			await harness.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scream-code",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "The Starting Point for Next-Gen Agents",
   "license": "MIT",
   "author": "ScreamCli",
@@ -43,22 +43,8 @@
     "access": "public",
     "provenance": true
   },
-  "scripts": {
-    "build": "tsdown",
-    "dev": "node scripts/dev.mjs",
-    "dev:cli-only": "tsx --import ../../build/register-raw-text-loader.mjs ./src/main.ts",
-    "dev:prod": "node dist/main.mjs",
-    "clean": "rm -rf dist",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "pnpm -w run build:packages && vitest run",
-    "e2e": "pnpm -w run build:packages && SCREAM_E2E=1 vitest run test/e2e",
-    "e2e:real": "pnpm -w run build:packages && SCREAM_E2E_REAL=1 vitest run test/e2e/real-llm-smoke.e2e.test.ts",
-    "preinstall": "node -e \"console.log('\\n📦 正在安装 scream-code，请稍候...\\n')\"",
-    "postinstall": "node scripts/postinstall.mjs",
-    "smoke": "node dist/main.mjs --version"
-  },
   "dependencies": {
-    "@earendil-works/pi-tui": "^0.74.0",
+    "@earendil-works/pi-tui": "^0.78.1",
     "@mariozechner/clipboard": "^0.3.2",
     "chalk": "^5.4.1",
     "cli-highlight": "^2.1.11",
@@ -69,16 +55,30 @@
   },
   "devDependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@scream-cli/agent-core": "workspace:^",
-    "@scream-cli/config": "workspace:^",
-    "@scream-cli/migration-legacy": "workspace:^",
-    "@scream-cli/scream-code-sdk": "workspace:^",
-    "@scream-cli/scream-telemetry": "workspace:^",
-    "@scream-code/memory": "workspace:*",
     "@types/semver": "^7.7.0",
-    "tsx": "^4.21.0"
+    "tsx": "^4.21.0",
+    "@scream-cli/agent-core": "^0.5.0",
+    "@scream-cli/config": "^0.1.0",
+    "@scream-cli/migration-legacy": "^0.1.5",
+    "@scream-cli/scream-telemetry": "^0.1.1",
+    "@scream-cli/scream-code-sdk": "^0.4.0",
+    "@scream-code/memory": "0.1.0"
   },
   "engines": {
     "node": ">=22.19.0"
+  },
+  "scripts": {
+    "build": "tsdown",
+    "dev": "node scripts/dev.mjs",
+    "dev:cli-only": "tsx --import ../../build/register-raw-text-loader.mjs ./src/main.ts",
+    "dev:prod": "node dist/main.mjs",
+    "clean": "rm -rf dist",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "pnpm -w run build:packages && vitest run",
+    "e2e": "pnpm -w run build:packages && SCREAM_E2E=1 vitest run test/e2e",
+    "e2e:real": "pnpm -w run build:packages && SCREAM_E2E_REAL=1 vitest run test/e2e/real-llm-smoke.e2e.test.ts",
+    "preinstall": "node -e \"console.log('\\n📦 正在安装 scream-code，请稍候...\\n')\"",
+    "postinstall": "node scripts/postinstall.mjs",
+    "smoke": "node dist/main.mjs --version"
   }
-}
+}