Polish compact help formatting and test assertions

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Author: Copilot

actions/setup/js/mcp_cli_bridge.cjs

@@ -859,6 +859,7 @@ function summarizeHelpText(value, maxLen) {
  */
 function formatCompactNameLines(names, maxLines) {
   if (!Array.isArray(names) || names.length === 0) {
+    // Callers spread the result into help lines, so empty input should contribute no lines.
     return [];
   }
   if (!Number.isFinite(maxLines) || maxLines <= 0) {
@@ -868,6 +869,7 @@ function formatCompactNameLines(names, maxLines) {
   let current = "  ";
   for (const name of names) {
     const token = current.trim() ? `, ${name}` : name;
+    // A single very long name may still exceed the width target; we keep it intact.
     const shouldStartNewLine = current.length + token.length > COMPACT_NAME_LINE_TARGET_WIDTH;
     if (shouldStartNewLine) {
       lines.push(current);
@@ -880,9 +882,10 @@ function formatCompactNameLines(names, maxLines) {
     lines.push(current);
   }
   if (lines.length > maxLines) {
-    // Keep all names visible by collapsing overflow into the last allowed line.
+    // Keep maxLines - 1 full lines and collapse the remaining names into the final allowed line.
     const compactTail = lines
       .slice(maxLines - 1)
+      // Trim per-line indentation before rebuilding a single indented tail line.
       .map(line => line.trim())
       .join(", ");
     return [...lines.slice(0, maxLines - 1), `  ${compactTail}`];

actions/setup/js/mcp_cli_bridge.test.cjs

@@ -221,10 +221,11 @@ describe("mcp_cli_bridge.cjs", () => {
     showHelp("safeoutputs", tools);
 
     const outputLines = stdoutChunks.join("").trimEnd().split("\n");
+    const output = outputLines.join("\n");
     expect(outputLines.length).toBeLessThanOrEqual(20);
-    expect(outputLines.join("\n")).not.toMatch(/\.\.\. \+\d+ more command\(s\)/);
+    expect(output).not.toMatch(/\.\.\. \+\d+ more command\(s\)/);
     for (const tool of tools) {
-      expect(outputLines.join("\n")).toContain(tool.name);
+      expect(output).toContain(tool.name);
     }
   });
 
@@ -237,10 +238,11 @@ describe("mcp_cli_bridge.cjs", () => {
     showHelp("safeoutputs", tools);
 
     const outputLines = stdoutChunks.join("").trimEnd().split("\n");
+    const output = outputLines.join("\n");
     expect(outputLines.length).toBeLessThanOrEqual(20);
-    expect(outputLines.join("\n")).not.toMatch(/\.\.\. \+\d+ more command\(s\)/);
+    expect(output).not.toMatch(/\.\.\. \+\d+ more command\(s\)/);
     for (const tool of tools) {
-      expect(outputLines.join("\n")).toContain(tool.name);
+      expect(output).toContain(tool.name);
     }
   });
 
@@ -262,14 +264,15 @@ describe("mcp_cli_bridge.cjs", () => {
     ]);
 
     const outputLines = stdoutChunks.join("").trimEnd().split("\n");
+    const output = outputLines.join("\n");
     expect(outputLines.length).toBeLessThanOrEqual(30);
-    expect(outputLines.join("\n")).not.toMatch(/\.\.\. \+\d+ more option\(s\)/);
-    expect(outputLines.join("\n")).toContain("Required options are marked with *.");
+    expect(output).not.toMatch(/\.\.\. \+\d+ more option\(s\)/);
+    expect(output).toContain("Required options are marked with *.");
     for (let i = 1; i <= 24; i++) {
-      expect(outputLines.join("\n")).toContain(`--field_${i}`);
+      expect(output).toContain(`--field_${i}`);
     }
-    expect(outputLines.join("\n")).toContain("--field_1*");
-    expect(outputLines.join("\n")).toContain("--field_2*");
+    expect(output).toContain("--field_1*");
+    expect(output).toContain("--field_2*");
   });
 
   it("does not truncate command help when options exactly fit the line budget", () => {
@@ -290,15 +293,16 @@ describe("mcp_cli_bridge.cjs", () => {
     ]);
 
     const outputLines = stdoutChunks.join("").trimEnd().split("\n");
+    const output = outputLines.join("\n");
     expect(outputLines.length).toBeLessThanOrEqual(30);
-    expect(outputLines.join("\n")).not.toMatch(/\.\.\. \+\d+ more option\(s\)/);
-    expect(outputLines.join("\n")).toContain("Required options are marked with *.");
+    expect(output).not.toMatch(/\.\.\. \+\d+ more option\(s\)/);
+    expect(output).toContain("Required options are marked with *.");
     for (let i = 1; i <= 13; i++) {
-      expect(outputLines.join("\n")).toContain(`--field_${i}`);
+      expect(output).toContain(`--field_${i}`);
     }
   });
 
-  it("keeps required-note when required options are in the compact list", () => {
+  it("keeps required note when required options are in the compact list", () => {
     const properties = {};
     for (let i = 1; i <= 24; i++) {
       properties[`field_${i}`] = { type: "string", description: `Field ${i}.` };
@@ -316,10 +320,11 @@ describe("mcp_cli_bridge.cjs", () => {
     ]);
 
     const outputLines = stdoutChunks.join("").trimEnd().split("\n");
-    expect(outputLines.join("\n")).not.toMatch(/\.\.\. \+\d+ more option\(s\)/);
-    expect(outputLines.join("\n")).toContain("Required options are marked with *.");
-    expect(outputLines.join("\n")).toContain("--field_23*");
-    expect(outputLines.join("\n")).toContain("--field_24*");
+    const output = outputLines.join("\n");
+    expect(output).not.toMatch(/\.\.\. \+\d+ more option\(s\)/);
+    expect(output).toContain("Required options are marked with *.");
+    expect(output).toContain("--field_23*");
+    expect(output).toContain("--field_24*");
   });
 
   describe("stdin placeholder removed — '-' is always a literal value", () => {