Merge pull request DeusData#1704 from DeusData/fix/stdin-gate-tests-post-1181

fix: unbreak main — stdin-gate DeusData#1359 guards + Windows search_code UTF-8 pipe

Author: DeusData

src/cli/cli.c

@@ -12561,6 +12561,8 @@ static void cli_add_typed(yyjson_mut_doc *out, yyjson_mut_val *obj, const char *
     yyjson_mut_obj_add(obj, yyjson_mut_strcpy(out, key), vv);
 }
 
+static bool cli_stdin_allowed_for_schema(const char *schema_str);
+
 bool cbm_cli_args_from_stdin_allowed(const char *tool_name, bool stdin_is_tty) {
     /* An interactive run has nothing piped to read: consulting the terminal
      * would just sit waiting for the user to type JSON. Unchanged by #1359 —
@@ -12589,6 +12591,17 @@ bool cbm_cli_args_from_stdin_allowed(const char *tool_name, bool stdin_is_tty) {
         return false;
     }
 
+    return cli_stdin_allowed_for_schema(schema_str);
+}
+
+/* Schema→decision core of the stdin gate, split out so the zero-argument
+ * branch stays TESTED even when no shipped tool is zero-argument anymore:
+ * #1181 gave list_projects pagination parameters, retiring the last
+ * empty-properties schema, and the #1359 regression tests had leaned on it
+ * as their live example. The product contract is unchanged — a schema that
+ * declares no properties means stdin has nothing to carry and the read is
+ * pure deadlock; the tests now exercise this path directly. */
+static bool cli_stdin_allowed_for_schema(const char *schema_str) {
     yyjson_doc *schema_doc = yyjson_read(schema_str, strlen(schema_str), 0);
     if (!schema_doc) {
         /* The schemas are compile-time constants, so a parse failure means a
@@ -12604,6 +12617,12 @@ bool cbm_cli_args_from_stdin_allowed(const char *tool_name, bool stdin_is_tty) {
     return accepts_arguments;
 }
 
+#ifdef CBM_CLI_ENABLE_TEST_API
+bool cbm_cli_stdin_allowed_for_schema_for_test(const char *schema_str) {
+    return cli_stdin_allowed_for_schema(schema_str);
+}
+#endif
+
 char *cbm_cli_build_args_json(const char *tool_name, int argc, char **argv, char **err_out) {
     if (err_out) {
         *err_out = NULL;

src/mcp/mcp.c

@@ -8848,6 +8848,16 @@ bool cbm_search_code_file_pattern_can_prefilter(const char *file_pattern) {
 /* Build the grep/search command string based on scoped vs recursive mode.
  * On Windows, uses PowerShell Select-String with tab-delimited output.
  * On POSIX, uses grep with colon-delimited output. */
+/* Windows PowerShell 5.1 encodes stdout for a native-process pipe in the
+ * console OEM codepage, so any character the inherited CP cannot carry
+ * (Cyrillic under CP437/850, etc.) degrades to '?' before it ever reaches
+ * collect_grep_matches — and WHETHER it degrades depends on the console the
+ * server happened to inherit. Pin the pipe to UTF-8 inside every generated
+ * command so raw search content is codepage-independent. (The read side is
+ * already safe: Select-String decodes BOM-less UTF-8 via .NET StreamReader
+ * defaults.) */
+#define CBM_PS_UTF8_PRELUDE "[Console]::OutputEncoding=[System.Text.Encoding]::UTF8; "
+
 void cbm_search_code_build_grep_cmd(char *cmd, size_t cmd_sz, bool use_regex, bool scoped,
                                     const char *file_pattern, const char *tmpfile,
                                     const char *filelist, const char *root_path) {
@@ -8858,7 +8868,8 @@ void cbm_search_code_build_grep_cmd(char *cmd, size_t cmd_sz, bool use_regex, bo
             if (cbm_search_code_file_pattern_can_prefilter(file_pattern)) {
                 snprintf(
                     cmd, cmd_sz,
-                    "powershell -Command \"$pat = Get-Content -Encoding UTF8 -LiteralPath '%s'; "
+                    "powershell -Command \"" CBM_PS_UTF8_PRELUDE
+                    "$pat = Get-Content -Encoding UTF8 -LiteralPath '%s'; "
                     "Get-Content -Encoding UTF8 -LiteralPath '%s'"
                     " | Where-Object { $_ -like '%s' }"
                     " | ForEach-Object { Select-String -LiteralPath $_ -Pattern $pat%s "
@@ -8869,7 +8880,8 @@ void cbm_search_code_build_grep_cmd(char *cmd, size_t cmd_sz, bool use_regex, bo
             } else {
                 snprintf(
                     cmd, cmd_sz,
-                    "powershell -Command \"$pat = Get-Content -Encoding UTF8 -LiteralPath '%s'; "
+                    "powershell -Command \"" CBM_PS_UTF8_PRELUDE
+                    "$pat = Get-Content -Encoding UTF8 -LiteralPath '%s'; "
                     "Get-Content -Encoding UTF8 -LiteralPath '%s' | ForEach-Object { Select-String "
                     "-LiteralPath $_ -Pattern $pat%s "
                     "-ErrorAction SilentlyContinue }"
@@ -8880,7 +8892,8 @@ void cbm_search_code_build_grep_cmd(char *cmd, size_t cmd_sz, bool use_regex, bo
         } else {
             snprintf(
                 cmd, cmd_sz,
-                "powershell -Command \"$pat = Get-Content -Encoding UTF8 -LiteralPath '%s'; "
+                "powershell -Command \"" CBM_PS_UTF8_PRELUDE
+                "$pat = Get-Content -Encoding UTF8 -LiteralPath '%s'; "
                 "Get-Content -Encoding UTF8 -LiteralPath '%s' | ForEach-Object { Select-String "
                 "-LiteralPath $_ -Pattern $pat%s "
                 "-ErrorAction SilentlyContinue }"
@@ -8891,7 +8904,8 @@ void cbm_search_code_build_grep_cmd(char *cmd, size_t cmd_sz, bool use_regex, bo
         if (file_pattern) {
             snprintf(
                 cmd, cmd_sz,
-                "powershell -Command \"Get-ChildItem -Recurse -Path '%s\\*' -Include '%s' -File "
+                "powershell -Command \"" CBM_PS_UTF8_PRELUDE
+                "Get-ChildItem -Recurse -Path '%s\\*' -Include '%s' -File "
                 "-ErrorAction SilentlyContinue"
                 " | Select-String -Pattern (Get-Content -Encoding UTF8 -LiteralPath '%s')%s "
                 "-ErrorAction SilentlyContinue"
@@ -8900,7 +8914,8 @@ void cbm_search_code_build_grep_cmd(char *cmd, size_t cmd_sz, bool use_regex, bo
         } else {
             snprintf(
                 cmd, cmd_sz,
-                "powershell -Command \"Get-ChildItem -Recurse -Path '%s\\*' -File -ErrorAction "
+                "powershell -Command \"" CBM_PS_UTF8_PRELUDE
+                "Get-ChildItem -Recurse -Path '%s\\*' -File -ErrorAction "
                 "SilentlyContinue"
                 " | Select-String -Pattern (Get-Content -Encoding UTF8 -LiteralPath '%s')%s "
                 "-ErrorAction SilentlyContinue"

tests/test_cli.c

@@ -54,6 +54,7 @@ int cbm_cli_activation_abort_cleanup_probe_for_test(void);
 bool cbm_cli_activation_test_ops_installed(void);
 int cbm_cli_build_yaml_stdio_mcp_block_for_test(const char *binary_path, bool goose_schema,
                                                 char *block, size_t block_size);
+bool cbm_cli_stdin_allowed_for_schema_for_test(const char *schema_str);
 
 TEST(cli_progress_visibility_policy) {
     ASSERT_TRUE(cbm_cli_progress_enabled(true, false));
@@ -12453,22 +12454,22 @@ TEST(cli_print_tool_help_issue680) {
  * properties, so stdin could never have carried anything it accepts: the read
  * was pure deadlock. Gate the read on the tool actually declaring arguments. */
 TEST(cli_zero_argument_tool_never_reads_stdin_issue1359) {
-    /* The reported hang: zero-argument tool + non-terminal stdin. */
-    ASSERT_FALSE(cbm_cli_args_from_stdin_allowed("list_projects", false));
-
-    /* The documented `echo '<json>' | cli <tool>` channel must survive. */
-    ASSERT_TRUE(cbm_cli_args_from_stdin_allowed("index_status", false));
-    ASSERT_TRUE(cbm_cli_args_from_stdin_allowed("search_graph", false));
-    ASSERT_TRUE(cbm_cli_args_from_stdin_allowed("index_repository", false));
-
-    /* Interactive runs never read the terminal for arguments — unchanged. */
-    ASSERT_FALSE(cbm_cli_args_from_stdin_allowed("index_status", true));
+    /* #1359's deadlock class: a tool whose schema declares no properties must
+     * never read stdin (nothing it could carry; the read is pure deadlock).
+     * Since #1181 no SHIPPED tool is zero-argument anymore — list_projects,
+     * the original example, now declares pagination properties — so the
+     * zero-argument branch is exercised directly through the schema seam,
+     * and list_projects asserts its NEW truth. */
+    ASSERT_FALSE(
+        cbm_cli_stdin_allowed_for_schema_for_test("{\"type\":\"object\",\"properties\":{}}"));
+    ASSERT_FALSE(cbm_cli_stdin_allowed_for_schema_for_test("{\"type\":\"object\"}"));
+    ASSERT_TRUE(cbm_cli_stdin_allowed_for_schema_for_test(
+        "{\"type\":\"object\",\"properties\":{\"p\":{\"type\":\"string\"}}}"));
+
+    /* list_projects now takes piped arguments (offset/limit/include_details);
+     * the TTY guard still refuses regardless of schema. */
+    ASSERT_TRUE(cbm_cli_args_from_stdin_allowed("list_projects", false));
     ASSERT_FALSE(cbm_cli_args_from_stdin_allowed("list_projects", true));
-
-    /* An unknown tool is rejected by name; blocking for input first can only
-     * delay that verdict, never change it. */
-    ASSERT_FALSE(cbm_cli_args_from_stdin_allowed("nope_not_a_tool", false));
-    ASSERT_FALSE(cbm_cli_args_from_stdin_allowed(NULL, false));
     PASS();
 }
 
@@ -12496,8 +12497,12 @@ TEST(cli_stdin_args_gate_tracks_tool_schema_issue1359) {
         ASSERT_EQ(cbm_cli_args_from_stdin_allowed(name, false), declares_properties);
         ASSERT_FALSE(cbm_cli_args_from_stdin_allowed(name, true));
     }
-    /* list_projects at minimum; without one the sweep above proves nothing. */
-    ASSERT_GTE(zero_argument_tools, 1);
+    /* Since #1181 every shipped tool declares properties, so the sweep's
+     * zero-argument branch can be empty here — that branch is pinned directly
+     * against the schema seam in the test above, which survives the registry
+     * having no zero-argument example. The sweep still proves schema↔gate
+     * parity for every tool that exists. */
+    (void)zero_argument_tools;
     PASS();
 }
 

tests/test_mcp.c

@@ -2120,7 +2120,7 @@ TEST(tool_search_graph_includes_node_properties) {
     ASSERT_NOT_NULL(strstr(inner, "func HandleRequest")); /* its value */
     ASSERT_NOT_NULL(strstr(inner, "\"base_classes\""));
     ASSERT_NOT_NULL(strstr(inner, "[\"HandlerBase\",\"Audited\"]"));
-    ASSERT_NULL(strstr(inner, "is_exported"));            /* blob never spills */
+    ASSERT_NULL(strstr(inner, "is_exported")); /* blob never spills */
     free(inner);
     free(resp);
 
@@ -2680,15 +2680,13 @@ TEST(tool_check_index_coverage_accepts_truncated_ignored_catalog_for_fresh_path_
         ((int64_t)source_stat.st_mtimespec.tv_sec * (int64_t)CBM_NSEC_PER_SEC) +
         (int64_t)source_stat.st_mtimespec.tv_nsec;
 #elif defined(_WIN32)
-    int64_t source_mtime_ns =
-        (int64_t)source_stat.st_mtime * (int64_t)CBM_NSEC_PER_SEC;
+    int64_t source_mtime_ns = (int64_t)source_stat.st_mtime * (int64_t)CBM_NSEC_PER_SEC;
 #else
-    int64_t source_mtime_ns =
-        ((int64_t)source_stat.st_mtim.tv_sec * (int64_t)CBM_NSEC_PER_SEC) +
-        (int64_t)source_stat.st_mtim.tv_nsec;
+    int64_t source_mtime_ns = ((int64_t)source_stat.st_mtim.tv_sec * (int64_t)CBM_NSEC_PER_SEC) +
+                              (int64_t)source_stat.st_mtim.tv_nsec;
 #endif
-    ASSERT_EQ(cbm_store_upsert_file_hash(store, "test-project", "main.go", "",
-                                         source_mtime_ns, source_stat.st_size),
+    ASSERT_EQ(cbm_store_upsert_file_hash(store, "test-project", "main.go", "", source_mtime_ns,
+                                         source_stat.st_size),
               CBM_STORE_OK);
     cbm_project_t project = {0};
     ASSERT_EQ(cbm_store_get_project(store, "test-project", &project), CBM_STORE_OK);
@@ -2702,8 +2700,7 @@ TEST(tool_check_index_coverage_accepts_truncated_ignored_catalog_for_fresh_path_
         .coverage_version = 1,
         .hash_records_complete = true,
     };
-    ASSERT_EQ(cbm_store_coverage_replace_ex(store, "test-project", NULL, 0, &meta),
-              CBM_STORE_OK);
+    ASSERT_EQ(cbm_store_coverage_replace_ex(store, "test-project", NULL, 0, &meta), CBM_STORE_OK);
     cbm_project_free_fields(&project);
 
     char *response = cbm_mcp_handle_tool(
@@ -4351,12 +4348,12 @@ TEST(search_code_full_preserves_utf8_source) {
                           .end_line = 2};
     ASSERT_GT(cbm_store_upsert_node(st, &section), 0);
 
-    char *resp = cbm_mcp_server_handle(
-        srv, "{\"jsonrpc\":\"2.0\",\"id\":97,\"method\":\"tools/call\","
-             "\"params\":{\"name\":\"search_code\",\"arguments\":{"
-             "\"project\":\"utf8-search\",\"pattern\":\"accounting-design\","
-             "\"file_pattern\":\"*.md\",\"path_filter\":\"^design/\","
-             "\"mode\":\"full\",\"format\":\"json\",\"limit\":5}}}");
+    char *resp =
+        cbm_mcp_server_handle(srv, "{\"jsonrpc\":\"2.0\",\"id\":97,\"method\":\"tools/call\","
+                                   "\"params\":{\"name\":\"search_code\",\"arguments\":{"
+                                   "\"project\":\"utf8-search\",\"pattern\":\"accounting-design\","
+                                   "\"file_pattern\":\"*.md\",\"path_filter\":\"^design/\","
+                                   "\"mode\":\"full\",\"format\":\"json\",\"limit\":5}}}");
     ASSERT_NOT_NULL(resp);
     char *inner = extract_text_content(resp);
     ASSERT_NOT_NULL(inner);
@@ -4408,11 +4405,11 @@ TEST(search_code_raw_match_preserves_utf8_content) {
                        .end_line = 1};
     ASSERT_GT(cbm_store_upsert_node(st, &node), 0);
 
-    char *resp = cbm_mcp_server_handle(
-        srv, "{\"jsonrpc\":\"2.0\",\"id\":98,\"method\":\"tools/call\","
-             "\"params\":{\"name\":\"search_code\",\"arguments\":{"
-             "\"project\":\"test-project\",\"pattern\":\"raw-\","
-             "\"file_pattern\":\"*.md\",\"format\":\"json\",\"limit\":5}}}");
+    char *resp =
+        cbm_mcp_server_handle(srv, "{\"jsonrpc\":\"2.0\",\"id\":98,\"method\":\"tools/call\","
+                                   "\"params\":{\"name\":\"search_code\",\"arguments\":{"
+                                   "\"project\":\"test-project\",\"pattern\":\"raw-\","
+                                   "\"file_pattern\":\"*.md\",\"format\":\"json\",\"limit\":5}}}");
     ASSERT_NOT_NULL(resp);
     char *inner = extract_text_content(resp);
     ASSERT_NOT_NULL(inner);
@@ -4459,11 +4456,11 @@ TEST(search_code_context_preserves_utf8_context) {
                        .end_line = 3};
     ASSERT_GT(cbm_store_upsert_node(st, &node), 0);
 
-    char *resp = cbm_mcp_server_handle(
-        srv, "{\"jsonrpc\":\"2.0\",\"id\":99,\"method\":\"tools/call\","
-             "\"params\":{\"name\":\"search_code\",\"arguments\":{"
-             "\"project\":\"test-project\",\"pattern\":\"context-needle\","
-             "\"format\":\"json\",\"context\":1,\"limit\":5}}}");
+    char *resp =
+        cbm_mcp_server_handle(srv, "{\"jsonrpc\":\"2.0\",\"id\":99,\"method\":\"tools/call\","
+                                   "\"params\":{\"name\":\"search_code\",\"arguments\":{"
+                                   "\"project\":\"test-project\",\"pattern\":\"context-needle\","
+                                   "\"format\":\"json\",\"context\":1,\"limit\":5}}}");
     ASSERT_NOT_NULL(resp);
     char *inner = extract_text_content(resp);
     ASSERT_NOT_NULL(inner);
@@ -4507,8 +4504,8 @@ TEST(search_code_invalid_utf8_still_returns_valid_json) {
     char invalid_path[512];
     snprintf(invalid_path, sizeof(invalid_path), "%s/project/invalid.md", tmp);
     static const unsigned char invalid_source[] = {
-        'i', 'n', 'v', 'a', 'l', 'i', 'd', '-', 'n', 'e', 'e', 'd', 'l', 'e', '\n',
-        'c', 'o', 'n', 't', 'e', 'x', 't', ' ', 0xFF, '\n',
+        'i', 'n',  'v', 'a', 'l', 'i', 'd', '-', 'n', 'e', 'e',  'd',  'l',
+        'e', '\n', 'c', 'o', 'n', 't', 'e', 'x', 't', ' ', 0xFF, '\n',
     };
     FILE *fp = cbm_fopen(invalid_path, "wb");
     ASSERT_NOT_NULL(fp);
@@ -4526,11 +4523,11 @@ TEST(search_code_invalid_utf8_still_returns_valid_json) {
                        .end_line = 2};
     ASSERT_GT(cbm_store_upsert_node(st, &node), 0);
 
-    char *resp = cbm_mcp_server_handle(
-        srv, "{\"jsonrpc\":\"2.0\",\"id\":100,\"method\":\"tools/call\","
-             "\"params\":{\"name\":\"search_code\",\"arguments\":{"
-             "\"project\":\"test-project\",\"pattern\":\"invalid-needle\","
-             "\"mode\":\"full\",\"format\":\"json\",\"limit\":5}}}");
+    char *resp =
+        cbm_mcp_server_handle(srv, "{\"jsonrpc\":\"2.0\",\"id\":100,\"method\":\"tools/call\","
+                                   "\"params\":{\"name\":\"search_code\",\"arguments\":{"
+                                   "\"project\":\"test-project\",\"pattern\":\"invalid-needle\","
+                                   "\"mode\":\"full\",\"format\":\"json\",\"limit\":5}}}");
     ASSERT_NOT_NULL(resp);
     char *inner = extract_text_content(resp);
     ASSERT_NOT_NULL(inner);
@@ -4921,6 +4918,35 @@ TEST(search_code_windows_prefilter_precedes_content_scan) {
 #endif
 }
 
+/* Windows raw scans must pin the PowerShell pipe to UTF-8: PS 5.1 otherwise
+ * emits stdout in the console OEM codepage and non-ASCII content degrades to
+ * '?' depending on the inherited console CP (seen as test_mcp raw-Русский
+ * mojibake on CI). Every builder variant must carry the prelude. */
+TEST(search_code_windows_scan_pins_utf8_output) {
+#ifdef _WIN32
+    static const char prelude[] =
+        "powershell -Command \"[Console]::OutputEncoding=[System.Text.Encoding]::UTF8; ";
+    char command[CBM_SZ_4K];
+    struct {
+        bool scoped;
+        const char *file_pattern;
+    } cases[] = {{true, "*.go"},     /* scoped + prefilterable pattern */
+                 {true, "*x*z*.go"}, /* scoped + non-prefilterable pattern */
+                 {true, NULL},       /* scoped, no pattern */
+                 {false, "*.go"},    /* unscoped + pattern */
+                 {false, NULL}};     /* unscoped, no pattern */
+    for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) {
+        cbm_search_code_build_grep_cmd(command, sizeof(command), false, cases[i].scoped,
+                                       cases[i].file_pattern, "C:/tmp/pattern", "C:/tmp/filelist",
+                                       "C:/tmp/root");
+        ASSERT_TRUE(strncmp(command, prelude, sizeof(prelude) - 1) == 0);
+    }
+    PASS();
+#else
+    SKIP_PLATFORM("PowerShell scan encoding applies on Windows");
+#endif
+}
+
 /* issue #283: search_code with regex=true and a syntactically invalid pattern
  * must return an explicit error, not an empty result indistinguishable from a
  * legitimate no-match. */
@@ -8769,10 +8795,10 @@ TEST(tool_resolve_store_by_internal_name_issue704) {
     ASSERT_NULL(strstr(list, "ghost704"));     /* 0-byte ghost filtered (RED before) */
     free(list);
 
-    char *page = cbm_mcp_server_handle(
-        srv, "{\"jsonrpc\":\"2.0\",\"id\":11,\"method\":\"tools/call\","
-             "\"params\":{\"name\":\"list_projects\","
-             "\"arguments\":{\"offset\":0,\"limit\":1}}}");
+    char *page =
+        cbm_mcp_server_handle(srv, "{\"jsonrpc\":\"2.0\",\"id\":11,\"method\":\"tools/call\","
+                                   "\"params\":{\"name\":\"list_projects\","
+                                   "\"arguments\":{\"offset\":0,\"limit\":1}}}");
     ASSERT_NOT_NULL(page);
     ASSERT_NOT_NULL(strstr(page, "\\\"total\\\":3"));
     ASSERT_NOT_NULL(strstr(page, "\\\"limit\\\":1"));
@@ -11223,6 +11249,7 @@ SUITE(mcp) {
     RUN_TEST(search_code_path_filter_matches_nothing);
     RUN_TEST(search_code_file_pattern_prefilter_boundaries);
     RUN_TEST(search_code_windows_prefilter_precedes_content_scan);
+    RUN_TEST(search_code_windows_scan_pins_utf8_output);
     RUN_TEST(search_code_invalid_regex_errors_issue283);
     RUN_TEST(search_code_literal_pipe_warns_issue282);
     RUN_TEST(search_code_reports_phase_timings_only_in_debug_mode);