Honor JSON errors for workspace commands #1709 #1710

Author: Widthdom

src/CodeIndex/Cli/ProgramRunner.cs

@@ -254,7 +254,12 @@ internal static int Run(
                     "validate-config" => CdidxConfigFile.RunValidate(subArgs, jsonOptions),
                     "config" => subArgs.Length > 0 && subArgs[0] == "show"
                         ? CdidxConfigFile.RunShow(subArgs[1..], jsonOptions)
-                        : ShowError(args, "Unknown config command: use `cdidx config show`."),
+                        : CommandErrorWriter.WriteJsonOrHuman(
+                            ContainsJsonOutputFlag(subArgs),
+                            jsonOptions,
+                            "Unknown config command: use `cdidx config show`.",
+                            CommandExitCodes.UsageError,
+                            "use `cdidx config show`."),
                     "workspace" => WorkspaceCommandRunner.Run(subArgs, jsonOptions),
                     "db" => DbCommandRunner.RunIntegrityCheck(subArgs, jsonOptions),
                     "report" => ReportCommandRunner.Run(subArgs, jsonOptions, appVersion),

src/CodeIndex/Cli/WorkspaceCommandRunner.cs

@@ -17,7 +17,7 @@ internal static int Run(string[] args, JsonSerializerOptions jsonOptions)
             "status" => List(json, jsonOptions),
             "current" => Current(json, jsonOptions),
             "use" => Use(args[1..], json, jsonOptions),
-            _ => CommandErrorWriter.Write("Unknown workspace command.", CommandExitCodes.UsageError, "use `cdidx workspace list`, `cdidx workspace use <name>`, or `cdidx workspace current`.")
+            _ => CommandErrorWriter.WriteJsonOrHuman(json, jsonOptions, "Unknown workspace command.", CommandExitCodes.UsageError, "use `cdidx workspace list`, `cdidx workspace use <name>`, or `cdidx workspace current`.")
         };
     }
 
@@ -61,7 +61,7 @@ private static int Current(bool json, JsonSerializerOptions jsonOptions)
     private static int Use(string[] args, bool json, JsonSerializerOptions jsonOptions)
     {
         if (args.Length != 1)
-            return CommandErrorWriter.Write("workspace use requires a name.", CommandExitCodes.UsageError, "run `cdidx workspace use <name>` from a manifest member or pass `default`.");
+            return CommandErrorWriter.WriteJsonOrHuman(json, jsonOptions, "workspace use requires a name.", CommandExitCodes.UsageError, "run `cdidx workspace use <name>` from a manifest member or pass `default`.");
 
         var name = args[0];
         var manifest = WorkspaceManifestLoader.Find(Environment.CurrentDirectory);
@@ -70,7 +70,7 @@ private static int Use(string[] args, bool json, JsonSerializerOptions jsonOptio
             ? null
             : manifest?.Members.FirstOrDefault(m => string.Equals(Path.GetFileName(m.Path), name, StringComparison.OrdinalIgnoreCase));
         if (manifest != null && member == null && !useDefault)
-            return CommandErrorWriter.Write("workspace member was not found.", CommandExitCodes.UsageError, "run `cdidx workspace list` and pass one of the listed member directory names.");
+            return CommandErrorWriter.WriteJsonOrHuman(json, jsonOptions, "workspace member was not found.", CommandExitCodes.UsageError, "run `cdidx workspace list` and pass one of the listed member directory names.");
 
         var root = member?.Path ?? Environment.CurrentDirectory;
         var dbPath = member?.DbPath ?? DbPathResolver.ResolveForIndex(root, explicitDbPath: null);

tests/CodeIndex.Tests/WorkspaceCommandRunnerTests.cs

@@ -44,6 +44,40 @@ public void WorkspaceList_ReadsManifestMembers()
         }
     }
 
+    [Fact]
+    public void WorkspaceErrors_HonorJsonFlag()
+    {
+        var (exitCode, stdout, stderr) = ConsoleCapture.Capture(() => WorkspaceCommandRunner.Run(["nope", "--json"], _jsonOptions));
+
+        Assert.Equal(CommandExitCodes.UsageError, exitCode);
+        Assert.Contains("\"status\":\"error\"", stdout);
+        Assert.Contains("Unknown workspace command", stdout);
+        Assert.DoesNotContain("Unknown workspace command", stderr);
+    }
+
+    [Fact]
+    public void ConfigErrors_HonorJsonFlag()
+    {
+        var configHome = TestProjectHelper.CreateTempProject("cdidx_config_error_config");
+        try
+        {
+            using var env = EnvironmentVariableScope.Capture(ActiveWorkspace.EnvironmentVariable, "XDG_CONFIG_HOME");
+            Environment.SetEnvironmentVariable(ActiveWorkspace.EnvironmentVariable, null);
+            Environment.SetEnvironmentVariable("XDG_CONFIG_HOME", configHome);
+
+            var (exitCode, stdout, stderr) = ConsoleCapture.Capture(() => ProgramRunner.Run(["config", "nope", "--json"], _jsonOptions));
+
+            Assert.Equal(CommandExitCodes.UsageError, exitCode);
+            Assert.Contains("\"status\":\"error\"", stdout);
+            Assert.Contains("Unknown config command", stdout);
+            Assert.DoesNotContain("Unknown config command", stderr);
+        }
+        finally
+        {
+            TestProjectHelper.DeleteDirectory(configHome);
+        }
+    }
+
     [Fact]
     public void ConfigShow_PrintsPrecedence()
     {