@ia-ccun/code-agent-cli 0.0.54-beta.1 → 0.0.54-beta.3

package/config/agent/extensions/error-monitor.ts

@@ -22,7 +22,9 @@ function formatBeijingTime(date: Date = new Date()): string {
 
 // 格式化为文件名日期字符串 (北京时间)
 function getLogFileName(date: Date = new Date()): string {
-	const beijingDate = new Date(date.toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }));
+	const beijingDate = new Date(
+		date.toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }),
+	);
 	const year = beijingDate.getFullYear();
 	const month = String(beijingDate.getMonth() + 1).padStart(2, "0");
 	const day = String(beijingDate.getDate()).padStart(2, "0");
@@ -34,7 +36,9 @@ function cleanOldLogs(): void {
 	if (!fs.existsSync(ERROR_LOG_DIR)) return;
 
 	const files = fs.readdirSync(ERROR_LOG_DIR);
-	const now = new Date(new Date().toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }));
+	const now = new Date(
+		new Date().toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }),
+	);
 
 	for (const file of files) {
 		if (!file.startsWith("aicode-error-") || !file.endsWith(".log")) continue;
@@ -43,8 +47,14 @@ function cleanOldLogs(): void {
 		const match = file.match(/aicode-error-(\d{4})-(\d{2})-(\d{2})\.log/);
 		if (!match) continue;
 
-		const fileDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-		const diffDays = Math.floor((now.getTime() - fileDate.getTime()) / (1000 * 60 * 60 * 24));
+		const fileDate = new Date(
+			parseInt(match[1]),
+			parseInt(match[2]) - 1,
+			parseInt(match[3]),
+		);
+		const diffDays = Math.floor(
+			(now.getTime() - fileDate.getTime()) / (1000 * 60 * 60 * 24),
+		);
 
 		if (diffDays > KEEP_DAYS) {
 			fs.unlinkSync(path.join(ERROR_LOG_DIR, file));
@@ -63,7 +73,10 @@ function ensureLogDir(): void {
  * @author: xujianjiang
  * Append error message to log file
  */
-function appendToErrorLog(message: string, context?: Record<string, unknown>): void {
+function appendToErrorLog(
+	message: string,
+	context?: Record<string, unknown>,
+): void {
 	ensureLogDir();
 	cleanOldLogs(); // 每次写日志时清理过期文件
 	const timestamp = formatBeijingTime();
@@ -80,47 +93,38 @@ export default function (pi: ExtensionAPI) {
 	// Counter for error tracking
 	let toolErrorCount = 0;
 	let bashErrorCount = 0;
-	const startTime = Date.now();
-
 	// Monitor tool execution end for errors
 	pi.on("tool_execution_end", (event) => {
 		const { toolCallId, toolName, result, isError } = event;
 
 		if (isError) {
 			toolErrorCount++;
-			const errorMsg = typeof result === "string" ? result : JSON.stringify(result);
+			const errorMsg =
+				typeof result === "string" ? result : JSON.stringify(result);
 
 			// Append to error log file
-			appendToErrorLog(
-				`Tool Execution Failed: ${toolName}`,
-				{
-					toolCallId,
-					toolName,
-					errorMessage: errorMsg?.substring(0, 500),
-				}
-			);
+			appendToErrorLog(`Tool Execution Failed: ${toolName}`, {
+				toolCallId,
+				toolName,
+				errorMessage: errorMsg?.substring(0, 500),
+			});
 		}
 	});
 
 	// Monitor user bash events for command failures
+	// pi 1.1.0: UserBashEvent 不再含 result 字段, 只在执行前发; 实际退出码在 tool_execution_end 监听
 	pi.on("user_bash", (event) => {
-		const { command, result } = event;
-
-		if (result?.exitCode !== 0) {
-			bashErrorCount++;
-
-			// Append to error log file
-			appendToErrorLog(
-				`Bash Command Failed: ${command} - exit code ${result?.exitCode}`,
-				{
-					command,
-					exitCode: result?.exitCode,
-					stderr: result?.stderr?.substring(0, 500),
-					stdout: result?.stdout?.substring(0, 500),
-				}
-			);
-		}
+		const { command, excludeFromContext, cwd } = event;
+		// 记录用户执行的命令（不判断成功/失败，失败已在 tool_execution_end 记录）
+		bashErrorCount++;
+		appendToErrorLog(
+			`Bash Command Executed: ${command}${excludeFromContext ? " (excluded from context)" : ""}`,
+			{
+				command,
+				cwd,
+				excludeFromContext,
+			},
+		);
 	});
-
 	// Session shutdown - silent (errors already logged to file)
 }

package/config/agent/extensions/goal.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, ExtensionToolContext } from "@earendil-works/pi-coding-agent";
 import { Box, Spacer, Text } from "@earendil-works/pi-tui";
 
 const CUSTOM_TYPE = "aicode-goal";
@@ -161,8 +161,8 @@ function syncGoalTools(pi: ExtensionAPI) {
 	for (const name of GOAL_TOOL_NAMES) (want ? active.add(name) : active.delete(name));
 	pi.setActiveTools(Array.from(active));
 }
-
-function persist(pi: ExtensionAPI, ctx: ExtensionContext, next: GoalState | null) {
+// pi 1.1.0: ExtensionToolContext (used in CustomTool.execute) extends ExtensionContext
+function persist(pi: ExtensionAPI, ctx: ExtensionContext | ExtensionToolContext, next: GoalState | null) {
 	goal = next;
 	pi.appendEntry(CUSTOM_TYPE, { goal: next, statusBarEnabled });
 	updateStatusBar(ctx);
@@ -299,11 +299,13 @@ export default function piGoal(pi: ExtensionAPI) {
 			additionalProperties: false,
 		} as any,
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-			if (params.status !== "complete") {
-				return { content: [{ type: "text", text: "update_goal 仅接受 status=complete。" }], isError: true };
+			// pi 1.1.0: AgentToolResult.details is required (T = JsonValue | undefined)
+			// pi 1.1.0: params 在 execute 里是 unknown, 需要 narrow
+			if ((params as { status?: string }).status !== "complete") {
+				return { content: [{ type: "text", text: "update_goal 仅接受 status=complete。" }], details: undefined, isError: true };
 			}
 			if (!goal) {
-				return { content: [{ type: "text", text: "未设置目标。" }], isError: true };
+				return { content: [{ type: "text", text: "未设置目标。" }], details: undefined, isError: true };
 			}
 			const now = Date.now();
 			const next: GoalState = { ...goal, status: "complete", updatedAt: now };

package/config/agent/extensions/msg-debug.ts

@@ -1,19 +1,30 @@
 /**
  * @author: xujianjiang
  * Msg Debug Extension - Log LLM request/response messages to file
- * 
+ *
  * This extension logs all requests and responses sent to/from the LLM provider
  * for debugging purposes. Logs are saved to ~/.aicode-cli/logs/
- * 
+ *
  * Features:
  * - Logs before_provider_request: messages, parameters, raw payload
- * - Logs after_provider_response: usage stats, response content, stop reason
- * - Logs errors with context
- * - Console output removed (logs to file only)
+ * - Logs after_provider_response: HTTP status, response headers
  * - Session-based log files (one file per session)
+ *
+ * NOTE: pi 1.1.0 event payloads changed:
+ *   - BeforeProviderRequestEvent now only has `payload: unknown` (no provider/model).
+ *     Provider/model are read from `ctx.model` instead.
+ *   - AfterProviderResponseEvent now only has `status: number, headers: Record<string,string>`.
+ *     Response/usage/cached fields are gone (use `provider_stream_event` or message events).
+ *   - The "error" event no longer exists.
  */
 
-import { appendFileSync, existsSync, mkdirSync, readdirSync, unlinkSync } from "node:fs";
+import {
+	appendFileSync,
+	existsSync,
+	mkdirSync,
+	readdirSync,
+	unlinkSync,
+} from "node:fs";
 import { join } from "node:path";
 import os from "node:os";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
@@ -25,7 +36,9 @@ function formatBeijingTime(date: Date = new Date()): string {
 
 // 格式化为文件名日期字符串 (北京时间)
 function formatDateStr(date: Date = new Date()): string {
-	const beijingDate = new Date(date.toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }));
+	const beijingDate = new Date(
+		date.toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }),
+	);
 	const year = beijingDate.getFullYear();
 	const month = String(beijingDate.getMonth() + 1).padStart(2, "0");
 	const day = String(beijingDate.getDate()).padStart(2, "0");
@@ -46,19 +59,43 @@ function ensureLogDir(): void {
 // 清理过期日志文件
 function cleanOldLogs(): void {
 	if (!existsSync(LOG_DIR)) return;
-	const now = new Date(new Date().toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }));
+	const now = new Date(
+		new Date().toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }),
+	);
 	for (const file of readdirSync(LOG_DIR)) {
 		if (!file.startsWith("llm-requests-") || !file.endsWith(".log")) continue;
 		const match = file.match(/llm-requests-(\d{4})-(\d{2})-(\d{2})\.log/);
 		if (!match) continue;
-		const fileDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-		const diffDays = Math.floor((now.getTime() - fileDate.getTime()) / (1000 * 60 * 60 * 24));
+		const fileDate = new Date(
+			parseInt(match[1]),
+			parseInt(match[2]) - 1,
+			parseInt(match[3]),
+		);
+		const diffDays = Math.floor(
+			(now.getTime() - fileDate.getTime()) / (1000 * 60 * 60 * 24),
+		);
 		if (diffDays > KEEP_DAYS) {
 			unlinkSync(join(LOG_DIR, file));
 		}
 	}
 }
 
+// 1.1.0 BeforeProviderRequestEvent.payload is `unknown`; narrow to a useful shape.
+type ProviderPayload = {
+	messages?: Array<{ role?: string; content?: unknown }>;
+	max_tokens?: number;
+	temperature?: number;
+	top_p?: number;
+	top_k?: number;
+	stop_sequences?: string[];
+	thinking?: unknown;
+	budget_tokens?: number;
+};
+
+function isProviderPayload(value: unknown): value is ProviderPayload {
+	return typeof value === "object" && value !== null;
+}
+
 export default function (pi: ExtensionAPI) {
 	ensureLogDir();
 	cleanOldLogs();
@@ -69,156 +106,110 @@ export default function (pi: ExtensionAPI) {
 	// Filter to only log user and assistant messages
 	const ALLOWED_ROLES = ["user", "assistant"];
 
-	function formatMessage(message: any): string {
+	function formatMessage(message: { role?: string; content?: unknown }): string {
 		if (!message) return "undefined";
-		
 		const role = message.role || "unknown";
 		let content = "";
-		
 		if (typeof message.content === "string") {
 			content = message.content;
 		} else if (Array.isArray(message.content)) {
-			content = message.content.map((item: any) => {
-				if (item.type === "text") {
-					return item.text || "";
-				} else if (item.type === "image") {
-					return `[image: ${item.source?.type || "unknown"}]`;
-				} else if (item.type === "tool_use") {
-					return `[tool_use: ${item.name || "unknown"}]`;
-				} else if (item.type === "tool_result") {
-					return `[tool_result: ${item.tool_use_id || ""}]`;
-				}
-				return JSON.stringify(item);
-			}).join("\n");
+			content = message.content
+				.map((item: any) => {
+					if (item.type === "text") return item.text || "";
+					if (item.type === "image")
+						return `[image: ${item.source?.type || "unknown"}]`;
+					if (item.type === "tool_use")
+						return `[tool_use: ${item.name || "unknown"}]`;
+					if (item.type === "tool_result")
+						return `[tool_result: ${item.tool_use_id || ""}]`;
+					return JSON.stringify(item);
+				})
+				.join("\n");
 		}
-		
 		return `[${role}]: ${content}`;
 	}
 
-	// Filter messages to only include user and assistant
-	function filterMessages(messages: any[]): any[] {
+	function filterMessages(
+		messages: unknown,
+	): Array<{ role?: string; content?: unknown }> {
 		if (!Array.isArray(messages)) return [];
-		return messages.filter((msg) => ALLOWED_ROLES.includes(msg.role));
+		return (messages as Array<{ role?: string }>).filter((msg) =>
+			ALLOWED_ROLES.includes(msg.role ?? ""),
+		);
 	}
 
 	// Log before request is sent
-	pi.on("before_provider_request", (event) => {
+	pi.on("before_provider_request", (event, ctx) => {
 		const timestamp = formatBeijingTime();
-		const { provider, model, payload } = event;
-		
-		// Filter messages to only user and assistant
+		const payload = isProviderPayload(event.payload) ? event.payload : {};
+		// Provider/model are no longer on the event payload in 1.1.0; read from ctx.
+		const modelId = (ctx.model as { id?: string } | undefined)?.id;
+		const provider = modelId?.split("/")[0] ?? "unknown";
+		const model = modelId ?? "unknown";
+
 		const filteredMessages = filterMessages(payload.messages);
-		const originalCount = payload.messages?.length || 0;
-		
+		const originalCount = Array.isArray(payload.messages)
+			? payload.messages.length
+			: 0;
+
 		const logEntry = `
 ================================================================================
 [${timestamp}] BEFORE PROVIDER REQUEST
 ================================================================================
-Provider: ${provider || "unknown"}
-Model: ${model || "unknown"}
+Provider: ${provider}
+Model: ${model}
 Messages: ${filteredMessages.length} (filtered from ${originalCount}, showing user/assistant only)
 
 --- Messages ---
-${filteredMessages.map((msg: any, i: number) => 
-	`[${i}] ${formatMessage(msg)}`
-).join("\n\n") || "No messages"}
+${
+	filteredMessages
+		.map((msg, i: number) => `[${i}] ${formatMessage(msg)}`)
+		.join("\n\n") || "No messages"
+}
 
 --- Request Parameters ---
-${JSON.stringify({
-	maxTokens: payload.max_tokens,
-	temperature: payload.temperature,
-	topP: payload.top_p,
-	topK: payload.top_k,
-	stopSequences: payload.stop_sequences,
-	thinking: payload.thinking ? "enabled" : "disabled",
-	budgetTokens: payload.budget_tokens
-}, null, 2)}
+${JSON.stringify(
+	{
+		maxTokens: payload.max_tokens,
+		temperature: payload.temperature,
+		topP: payload.top_p,
+		topK: payload.top_k,
+		stopSequences: payload.stop_sequences,
+		thinking: payload.thinking ? "enabled" : "disabled",
+		budgetTokens: payload.budget_tokens,
+	},
+	null,
+	2,
+)}
 
 --- Raw Payload (filtered) ---
 ${JSON.stringify({ ...payload, messages: filteredMessages }, null, 2)}
 
 ================================================================================
 `;
-		
+
 		// Save to file
 		appendFileSync(logFile, logEntry, "utf8");
 	});
 
-	// Log after response is received
+	// Log after response is received (HTTP-level, not assistant message)
 	pi.on("after_provider_response", (event) => {
 		const timestamp = formatBeijingTime();
-		const { response, usage, cached } = event;
-		
-		// Check if response is defined
-		if (!response) {
-			const logEntry = `
-================================================================================
-[${timestamp}] AFTER PROVIDER RESPONSE
-================================================================================
-Cached: ${cached ? "YES" : "NO"}
-Error: Response is undefined
+		const { status, headers } = event;
 
-================================================================================
-`;
-			appendFileSync(logFile, logEntry, "utf8");
-			return;
-		}
-		
 		const logEntry = `
 ================================================================================
 [${timestamp}] AFTER PROVIDER RESPONSE
 ================================================================================
-Cached: ${cached ? "YES" : "NO"}
-
---- Usage Stats ---
-${JSON.stringify(usage, null, 2)}
+Status: ${status}
 
---- Response Content ---
-${response.content?.map((c: any, i: number) => {
-	if (c.type === "text") {
-		return `[${i}] text: ${c.text}`;
-	} else if (c.type === "tool_use") {
-		return `[${i}] tool_use: ${c.name}(${JSON.stringify(c.input)})`;
-	}
-	return `[${i}] ${c.type}: ${JSON.stringify(c)}`;
-}).join("\n") || "No content"}
-
---- Stop Reason ---
-${response.stopReason || "unknown"}
-
---- Raw Response ---
-${JSON.stringify(response, null, 2)}
+--- Response Headers ---
+${JSON.stringify(headers, null, 2)}
 
 ================================================================================
-
 `;
-		
-		// Save to file
-		appendFileSync(logFile, logEntry, "utf8");
-	});
 
-	// Log request errors
-	pi.on("error", (event) => {
-		const timestamp = formatBeijingTime();
-		const { error, context } = event;
-		
-		const logEntry = `
-################################################################################
-[${timestamp}] ERROR
-################################################################################
-Error: ${error.message || String(error)}
-Stack: ${error.stack || "No stack trace"}
-
-Context:
-${JSON.stringify(context, null, 2)}
-
-################################################################################
-
-`;
-		
 		// Save to file
 		appendFileSync(logFile, logEntry, "utf8");
 	});
-
-	// Extension enabled silently (logs to file only, no console output)
 }