topchester-ai 0.23.0 → 0.24.0

package/dist/cli.mjs

@@ -5273,6 +5273,7 @@ const hookHandlerSchema = z.object({
 	type: z.literal("command").optional(),
 	command: z.string().min(1),
 	timeoutMs: hookTimeoutMsSchema.optional(),
+	statusMessage: z.string().min(1).optional(),
 	matcher: hookMatcherSchema
 }).strict();
 const canonicalHooksConfigSchema = z.object({
@@ -7567,6 +7568,14 @@ function toolCallMessage(call, label, resultSummary) {
 		resultSummary
 	};
 }
+function hookStatusMessage(label, eventName, statusMessage) {
+	return {
+		kind: "hook_status",
+		label,
+		...eventName === void 0 ? {} : { eventName },
+		...statusMessage === void 0 ? {} : { statusMessage }
+	};
+}
 function subagentMessage(message) {
 	return {
 		kind: "subagent",
@@ -7583,6 +7592,7 @@ const DEFAULT_MODAL_VISIBLE_ACTION_LIMIT = 16;
 function renderChatMessage(message, options = {}) {
 	if (message.kind === "modal") return renderChatModal(message, options.selectedActionIndex, options.maxModalHeight);
 	if (message.kind === "tool_call") return renderToolCallMessage(message);
+	if (message.kind === "hook_status") return renderHookStatusMessage(message);
 	if (message.kind === "subagent") return renderSubagentMessage(message);
 	if (message.kind === "thinking") return message.text.split("\n").map((line) => ui.muted(line));
 	if (message.text.length === 0) return [""];
@@ -7617,6 +7627,9 @@ function renderToolCallMessage(message) {
 	const visibleLabel = message.resultSummary && !message.label.includes(message.resultSummary) ? `${message.label} ${message.resultSummary}` : message.label;
 	return [`   ${ui.muted(expandTabs(visibleLabel))}`];
 }
+function renderHookStatusMessage(message) {
+	return [`   ${ui.muted(expandTabs(message.label))}`];
+}
 function renderSubagentMessage(message) {
 	const label = message.title ?? shortSessionId(message.sessionId);
 	switch (message.status) {
@@ -7774,6 +7787,12 @@ const toolCallPayloadSchema = z.object({
 	label: z.string(),
 	call: z.record(z.string(), jsonValueSchema)
 });
+const hookStatusPayloadSchema = z.object({
+	kind: z.literal("hook_status"),
+	eventName: z.string(),
+	statusMessage: z.string(),
+	label: z.string()
+});
 const taskPlanItemPayloadSchema = z.object({
 	text: z.string(),
 	status: z.enum([
@@ -7840,6 +7859,7 @@ const subagentFailedPayloadSchema = subagentLifecycleBasePayloadSchema.extend({
 const sessionEventPayloadSchema = z.discriminatedUnion("kind", [
 	messagePayloadSchema,
 	toolCallPayloadSchema,
+	hookStatusPayloadSchema,
 	taskPlanPayloadSchema,
 	instructionContextPayloadSchema,
 	statusPayloadSchema,
@@ -8012,6 +8032,9 @@ function rehydrateSession(events) {
 		case "tool_call":
 			messages.push(toolCallMessage(event.call, event.label));
 			break;
+		case "hook_status":
+			messages.push(hookStatusMessage(event.label, event.eventName, event.statusMessage));
+			break;
 		case "task_plan":
 			taskPlan = {
 				items: event.items,
@@ -8638,6 +8661,14 @@ const agentEvent = {
 			label
 		};
 	},
+	hookStatus(eventName, statusMessage) {
+		return {
+			type: "hook_status",
+			eventName,
+			statusMessage,
+			label: `🪝 hook>${formatHookEventName(eventName)}: ${statusMessage}`
+		};
+	},
 	taskPlan(plan) {
 		return {
 			type: "task_plan",
@@ -8698,6 +8729,9 @@ function choiceAction(label, value) {
 		value
 	};
 }
+function formatHookEventName(eventName) {
+	return eventName.replace(/([a-z])([A-Z])/gu, "$1-$2").toLowerCase();
+}
 //#endregion
 //#region src/tui/keys.ts
 function isUpKey(data) {
@@ -9066,6 +9100,7 @@ var ChatLayout = class {
 				case "system":
 				case "thinking":
 				case "tool_call":
+				case "hook_status":
 				case "subagent":
 				case "modal": return [];
 			}
@@ -9638,6 +9673,11 @@ async function runTopchesterHooks(context, event, payload, options = {}) {
 	};
 	for (const handler of handlers) {
 		result.handlerCount += 1;
+		const statusMessage = handler.statusMessage?.trim();
+		if (statusMessage) options.onHookStart?.({
+			event,
+			statusMessage
+		});
 		const handlerResult = await runCommandHandler(context, event, payload, handler, options);
 		result.contexts.push(...handlerResult.contexts);
 		result.messages.push(...handlerResult.messages);
@@ -10210,6 +10250,12 @@ function runtimeEventToSessionPayload(event) {
 			label: event.label,
 			call: event.call
 		};
+		case "hook_status": return {
+			kind: "hook_status",
+			eventName: event.eventName,
+			statusMessage: event.statusMessage,
+			label: event.label
+		};
 		case "task_plan": return {
 			kind: "task_plan",
 			items: event.plan.items,
@@ -10851,15 +10897,27 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 		const sessionKey = session?.sessionId ?? `workspace:${this.context.workspaceRoot}`;
 		if (this.startedHookSessionKeys.has(sessionKey)) return [];
 		this.startedHookSessionKeys.add(sessionKey);
+		const startedEvents = [];
 		const result = await this.runHookEvent("SessionStart", this.createBaseHookPayload("SessionStart", session, {
 			isResumed: Boolean(options.isResumed),
 			taskStartAlias: "TaskStart"
-		}), { abortSignal: options.abortSignal });
-		return this.hookResultToEvents(result);
+		}), {
+			abortSignal: options.abortSignal,
+			onHookStart: (status) => {
+				startedEvents.push(agentEvent.hookStatus(status.event, status.statusMessage));
+			}
+		});
+		return [...startedEvents, ...this.hookResultToEvents(result)];
 	}
 	async runPreCompactHooks(session, options = {}) {
-		const result = await this.runHookEvent("PreCompact", this.createBaseHookPayload("PreCompact", session, { reason: options.reason ?? "Compaction is about to start." }), { abortSignal: options.abortSignal });
-		return this.hookResultToEvents(result);
+		const startedEvents = [];
+		const result = await this.runHookEvent("PreCompact", this.createBaseHookPayload("PreCompact", session, { reason: options.reason ?? "Compaction is about to start." }), {
+			abortSignal: options.abortSignal,
+			onHookStart: (status) => {
+				startedEvents.push(agentEvent.hookStatus(status.event, status.statusMessage));
+			}
+		});
+		return [...startedEvents, ...this.hookResultToEvents(result)];
 	}
 	/**
 	* Streams one user chat turn through the agent loop. It builds the model
@@ -10875,11 +10933,13 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 	async *submitMessageStream(conversation, message, abortSignal, options = {}) {
 		const session = options.session ?? this.options.session;
 		for (const event of await this.runSessionStartHooks(session, { abortSignal })) yield event;
-		const userPromptHook = await this.runHookEvent("UserPromptSubmit", this.createBaseHookPayload("UserPromptSubmit", session, {
+		const userPromptHookRun = this.startHookEvent("UserPromptSubmit", this.createBaseHookPayload("UserPromptSubmit", session, {
 			prompt: { text: message },
 			prompt_text: message,
 			user_prompt: message
 		}), { abortSignal });
+		for await (const event of userPromptHookRun.statusEvents) yield event;
+		const userPromptHook = await userPromptHookRun.result;
 		for (const event of this.hookResultToEvents(userPromptHook)) yield event;
 		if (userPromptHook.blocked || userPromptHook.stopped) {
 			const interruption = userPromptHook.blocked ?? userPromptHook.stopped;
@@ -11008,7 +11068,7 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 				}
 				const finalMessage = finalText.trim() || "I got an empty response from the model.";
 				yield agentEvent.assistantMessage(finalMessage, formatAgentMessageMeta(result.modelId, totalDurationMs, tokenUsageTotals));
-				for (const event of await this.runStopHookEvents(session, finalMessage, "completed", abortSignal)) yield event;
+				for await (const event of this.streamStopHookEvents(session, finalMessage, "completed", abortSignal)) yield event;
 				yield agentEvent.status("ready");
 				return;
 			}
@@ -11032,7 +11092,9 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 					for (let batchIndex = 0; batchIndex < batch.length; batchIndex += 1) {
 						const call = batch[batchIndex];
 						const resultIndex = index + batchIndex;
-						const preHook = await this.runPreToolUseHook(call, modelToolCalls[resultIndex]?.id, session, abortSignal);
+						const preHookRun = this.startPreToolUseHook(call, modelToolCalls[resultIndex]?.id, session, abortSignal);
+						for await (const event of preHookRun.statusEvents) yield event;
+						const preHook = await preHookRun.result;
 						for (const event of this.hookResultToEvents(preHook)) yield event;
 						if (preHook.stopped) {
 							if (preHook.messages.length === 0) yield agentEvent.systemMessage(preHook.stopped.message);
@@ -11078,7 +11140,9 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 					const toolResult = taskResults[index];
 					for (const event of createInstructionContextEventsFromToolResult(toolResult, persistedProjectInstructionKeys)) yield event;
 					yield agentEvent.toolCall(call, formatToolCallMessage(call, toolResult));
-					const postHook = await this.runPostToolUseHook(call, modelToolCalls[index]?.id, toolResult, session, abortSignal);
+					const postHookRun = this.startPostToolUseHook(call, modelToolCalls[index]?.id, toolResult, session, abortSignal);
+					for await (const event of postHookRun.statusEvents) yield event;
+					const postHook = await postHookRun.result;
 					for (const event of this.hookResultToEvents(postHook)) yield event;
 					postHookContexts.push(...postHook.contexts);
 					if (postHook.stopped) {
@@ -11098,7 +11162,9 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 				const postHookContexts = [];
 				for (let index = 0; index < parallelCalls.length; index += 1) {
 					const call = parallelCalls[index];
-					const preHook = await this.runPreToolUseHook(call, modelToolCalls[index]?.id, session, abortSignal);
+					const preHookRun = this.startPreToolUseHook(call, modelToolCalls[index]?.id, session, abortSignal);
+					for await (const event of preHookRun.statusEvents) yield event;
+					const preHook = await preHookRun.result;
 					for (const event of this.hookResultToEvents(preHook)) yield event;
 					if (preHook.stopped) {
 						if (preHook.messages.length === 0) yield agentEvent.systemMessage(preHook.stopped.message);
@@ -11136,7 +11202,9 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 					const toolResult = parallelResults[index];
 					for (const event of createInstructionContextEventsFromToolResult(toolResult, persistedProjectInstructionKeys)) yield event;
 					yield agentEvent.toolCall(call, formatToolCallMessage(call, toolResult));
-					const postHook = await this.runPostToolUseHook(call, modelToolCalls[index]?.id, toolResult, session, abortSignal);
+					const postHookRun = this.startPostToolUseHook(call, modelToolCalls[index]?.id, toolResult, session, abortSignal);
+					for await (const event of postHookRun.statusEvents) yield event;
+					const postHook = await postHookRun.result;
 					for (const event of this.hookResultToEvents(postHook)) yield event;
 					postHookContexts.push(...postHook.contexts);
 					if (postHook.stopped) {
@@ -11154,11 +11222,13 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			if (suppressiblePlanTodoAnswer !== void 0) {
 				const finalMessage = suppressiblePlanTodoAnswer || "I got an empty response from the model.";
 				yield agentEvent.assistantMessage(finalMessage, formatAgentMessageMeta(result.modelId, totalDurationMs, tokenUsageTotals));
-				for (const event of await this.runStopHookEvents(session, finalMessage, "completed", abortSignal)) yield event;
+				for await (const event of this.streamStopHookEvents(session, finalMessage, "completed", abortSignal)) yield event;
 				yield agentEvent.status("ready");
 				return;
 			}
-			const preHook = await this.runPreToolUseHook(executableToolCall, toolCall.id, session, abortSignal);
+			const preHookRun = this.startPreToolUseHook(executableToolCall, toolCall.id, session, abortSignal);
+			for await (const event of preHookRun.statusEvents) yield event;
+			const preHook = await preHookRun.result;
 			for (const event of this.hookResultToEvents(preHook)) yield event;
 			let toolResult;
 			if (preHook.stopped) {
@@ -11196,7 +11266,9 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			for (const event of createInstructionContextEventsFromToolResult(toolResult, persistedProjectInstructionKeys)) yield event;
 			yield agentEvent.toolCall(executableToolCall, formatToolCallMessage(executableToolCall, toolResult));
 			if (!isToolErrorResult(toolResult) && toolResult.tool === "plan_todo") yield agentEvent.taskPlan(toolResult.plan);
-			const postHook = await this.runPostToolUseHook(executableToolCall, toolCall.id, toolResult, session, abortSignal);
+			const postHookRun = this.startPostToolUseHook(executableToolCall, toolCall.id, toolResult, session, abortSignal);
+			for await (const event of postHookRun.statusEvents) yield event;
+			const postHook = await postHookRun.result;
 			for (const event of this.hookResultToEvents(postHook)) yield event;
 			if (postHook.stopped) {
 				if (postHook.messages.length === 0) yield agentEvent.systemMessage(postHook.stopped.message);
@@ -11208,7 +11280,7 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 		}
 		const finalMessage = "I stopped because the tool loop ended unexpectedly.";
 		yield agentEvent.assistantMessage(finalMessage, formatAgentMessageMeta(lastModelId, totalDurationMs, tokenUsageTotals));
-		for (const event of await this.runStopHookEvents(session, finalMessage, "failed", abortSignal)) yield event;
+		for await (const event of this.streamStopHookEvents(session, finalMessage, "failed", abortSignal)) yield event;
 		yield agentEvent.status("ready");
 	}
 	/**
@@ -11223,29 +11295,45 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 		}
 		return events;
 	}
-	async runPreToolUseHook(call, toolCallId, session, abortSignal) {
-		return this.runHookEvent("PreToolUse", this.createToolHookPayload("PreToolUse", call, toolCallId, session), {
+	startPreToolUseHook(call, toolCallId, session, abortSignal) {
+		return this.startHookEvent("PreToolUse", this.createToolHookPayload("PreToolUse", call, toolCallId, session), {
 			toolName: call.tool,
 			abortSignal
 		});
 	}
-	async runPostToolUseHook(call, toolCallId, result, session, abortSignal) {
-		return this.runHookEvent("PostToolUse", this.createToolHookPayload("PostToolUse", call, toolCallId, session, { result }), {
+	startPostToolUseHook(call, toolCallId, result, session, abortSignal) {
+		return this.startHookEvent("PostToolUse", this.createToolHookPayload("PostToolUse", call, toolCallId, session, { result }), {
 			toolName: call.tool,
 			abortSignal
 		});
 	}
-	async runStopHookEvents(session, finalMessage, status, abortSignal) {
-		const result = await this.runHookEvent("Stop", this.createBaseHookPayload("Stop", session, {
+	async *streamStopHookEvents(session, finalMessage, status, abortSignal) {
+		const hookRun = this.startHookEvent("Stop", this.createBaseHookPayload("Stop", session, {
 			taskCompleteAlias: "TaskComplete",
 			finalMessage,
 			status
 		}), { abortSignal });
-		return this.hookResultToEvents(result);
+		for await (const event of hookRun.statusEvents) yield event;
+		const result = await hookRun.result;
+		for (const event of this.hookResultToEvents(result)) yield event;
 	}
 	async runHookEvent(event, payload, options = {}) {
 		return runTopchesterHooks(this.context, event, payload, options);
 	}
+	startHookEvent(event, payload, options = {}) {
+		const queue = createRuntimeEventQueue();
+		return {
+			statusEvents: queue,
+			result: this.runHookEvent(event, payload, {
+				...options,
+				onHookStart: (status) => {
+					queue.push(agentEvent.hookStatus(status.event, status.statusMessage));
+				}
+			}).finally(() => {
+				queue.close();
+			})
+		};
+	}
 	createBaseHookPayload(event, session, extra = {}) {
 		return {
 			hook_event_name: event,
@@ -11253,6 +11341,7 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			cwd: this.context.workspaceRoot,
 			workspaceRoot: this.context.workspaceRoot,
 			source: "topchester",
+			...this.createHookModelPayload("agent.primary"),
 			...session ? {
 				session_id: session.sessionId,
 				sessionId: session.sessionId,
@@ -11266,6 +11355,33 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			...extra
 		};
 	}
+	createHookModelPayload(purpose) {
+		const resolveModel = this.context.modelGateway.resolveModel;
+		if (typeof resolveModel !== "function") return {};
+		try {
+			const resolved = resolveModel.call(this.context.modelGateway, purpose);
+			const modelRef = `${resolved.providerId}/${resolved.modelId}`;
+			return {
+				model_purpose: resolved.purpose,
+				model_provider: resolved.providerId,
+				model_id: resolved.modelId,
+				model_ref: modelRef,
+				model: {
+					purpose: resolved.purpose,
+					providerId: resolved.providerId,
+					modelId: resolved.modelId,
+					ref: modelRef
+				}
+			};
+		} catch (error) {
+			this.context.logger.debug({
+				event: "hook_model_resolution_skipped",
+				purpose,
+				error: error instanceof Error ? error.message : String(error)
+			}, "hook model metadata unavailable");
+			return {};
+		}
+	}
 	createToolHookPayload(event, call, toolCallId, session, extra = {}) {
 		return this.createBaseHookPayload(event, session, {
 			tool_name: call.tool,
@@ -11494,6 +11610,7 @@ function renderRuntimeEvent(event) {
 	switch (event.type) {
 		case "message": return [event.role === "assistant" ? agentMessage(event.text, event.meta) : systemMessage(event.text)];
 		case "tool_call": return [toolCallMessage(event.call, event.label)];
+		case "hook_status": return [hookStatusMessage(event.label, event.eventName, event.statusMessage)];
 		case "knowledge_status": return [systemMessage([`KB status: ${formatKnowledgePathStatus(event.status)}${formatKbPathSource(event.status)}`, event.guidance].filter(Boolean).join("\n"))];
 		case "choice": return [modalMessage({
 			tone: event.tone,
@@ -11533,6 +11650,11 @@ function formatForwardedSubagentEvent(sessionId, event) {
 		sessionId,
 		text: event.label
 	})];
+	if (event.type === "hook_status") return [subagentMessage({
+		status: "event",
+		sessionId,
+		text: event.label
+	})];
 	return [];
 }
 function formatKbPathSource(status) {
@@ -11731,6 +11853,12 @@ function chatMessageToSessionPayload(message) {
 	};
 	if (message.kind === "thinking") return;
 	if (message.kind === "subagent") return;
+	if (message.kind === "hook_status") return message.eventName && message.statusMessage ? {
+		kind: "hook_status",
+		eventName: message.eventName,
+		statusMessage: message.statusMessage,
+		label: message.label
+	} : void 0;
 	if (message.kind === "modal") return {
 		kind: "choice",
 		tone: message.tone,
@@ -12802,6 +12930,7 @@ async function loadConversation(workspaceRoot, resume) {
 			case "system":
 			case "thinking":
 			case "tool_call":
+			case "hook_status":
 			case "subagent":
 			case "modal": return [];
 		}
@@ -12834,6 +12963,10 @@ function printPlainEvent(event) {
 		console.log(event.label);
 		return;
 	}
+	if (event.type === "hook_status") {
+		console.log(event.label);
+		return;
+	}
 	if (event.type === "knowledge_status" && event.guidance) {
 		console.log(event.guidance);
 		return;