From 186f51b7ee14b044ca9c788786b164f684f9c6e5 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 30 Jun 2026 19:36:38 +0100
Subject: [PATCH] Do not report errors using client before one is set.

---
 cmd-invoke.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/cmd-invoke.c b/cmd-invoke.c
index c7872706c..7d456f968 100644
--- a/cmd-invoke.c
+++ b/cmd-invoke.c
@@ -316,6 +316,24 @@ cmd_invoke_if(struct cmdq_item *item, struct cmd_invoke_state *is,
 	return (0);
 }
 
+/* Report an error from an invoke item. */
+static void
+cmd_invoke_error(struct cmdq_item *item, struct cmd_invoke_state *is,
+    struct cmd_parse_node *node, const char *cause)
+{
+	u_int	line = cmd_parse_node_line(node);
+
+	if (cmdq_get_client(item) != NULL) {
+		cmdq_error(item, "%s", cause);
+		return;
+	}
+
+	if (is->file != NULL)
+		cfg_add_cause("%s:%u: %s", is->file, line, cause);
+	else
+		cfg_add_cause("%s", cause);
+}
+
 /* Build one command from a parsed command node. */
 static struct cmd *
 cmd_invoke_build_command(struct cmdq_item *item, struct cmd_invoke_state *is,
@@ -352,7 +370,7 @@ cmd_invoke_build_command(struct cmdq_item *item, struct cmd_invoke_state *is,
 	cmd = cmd_parse(values, count, is->file, cmd_parse_node_line(node),
 	    is->parse_flags, &cause);
 	if (cmd == NULL) {
-		cmdq_error(item, "%s", cause);
+		cmd_invoke_error(item, is, node, cause);
 		free(cause);
 		goto fail;
 	}