From df49cdf774cb1395bd5203e94be9e5bd3fffc6fd Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Wed, 16 Sep 2026 12:45:38 -0700
Subject: [PATCH 1/7] fix: colorize doctor diagnostics and fix issue generation

Colorize diagnostic status words (pass/fail/warn), colorize actionable
suggestions with warning icon, and fix generateIssueMarkdown to preserve
Summary and Steps To Reproduce sections.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/commands/doctor.ts | 97 ++++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 46 deletions(-)

diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts
index cd7cc1b7..adaed912 100644
--- a/src/commands/doctor.ts
+++ b/src/commands/doctor.ts
@@ -17,7 +17,7 @@
 import { EOL } from 'node:os';
 import { resolve as pathResolve, join } from 'node:path';
 import { spawn } from 'node:child_process';
-import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
+import { Flags, loglevel, SfCommand, StandardColors } from '@salesforce/sf-plugins-core';
 import { Lifecycle, Messages, SfError } from '@salesforce/core';
 import open from 'open';
 import got from 'got';
@@ -73,7 +73,14 @@ export default class Doctor extends SfCommand<SfDoctorDiagnosis> {
     this.outputDir = pathResolve(flags['output-dir'] ?? process.cwd());
 
     lifecycle.on<DiagnosticStatus>('Doctor:diagnostic', async (data) => {
-      this.log(`${data.status} - ${data.testName}`);
+      const colorMap = {
+        pass: StandardColors.success,
+        fail: StandardColors.error,
+        warn: StandardColors.warning,
+        unknown: StandardColors.warning,
+      } as const;
+      const colorFn = colorMap[data.status];
+      this.log(`${colorFn(data.status)} - ${data.testName}`);
       return Promise.resolve(this.doctor.addDiagnosticStatus(data));
     });
 
@@ -122,7 +129,14 @@ export default class Doctor extends SfCommand<SfDoctorDiagnosis> {
 
     this.log();
     this.styledHeader('Suggestions');
-    diagnosis.suggestions.forEach((s) => this.log(`  * ${s}`));
+    const pinnedCount = 2;
+    const pinned = diagnosis.suggestions.slice(0, pinnedCount);
+    const actionable = diagnosis.suggestions.slice(pinnedCount);
+    if (actionable.length) {
+      actionable.forEach((s) => this.log(`  ${StandardColors.warning('⚠')} ${s}`));
+      this.log();
+    }
+    pinned.forEach((s) => this.log(`  * ${s}`));
 
     if (flags['create-issue']) {
       const raw = 'https://raw.githubusercontent.com/forcedotcom/cli/main/.github/ISSUE_TEMPLATE/bug_report.md';
@@ -162,51 +176,42 @@ export default class Doctor extends SfCommand<SfDoctorDiagnosis> {
   }
 
   private generateIssueMarkdown(body: string, diagnosis: SfDoctorDiagnosis): string {
-    const info = `
-\`\`\`
-CLI:
-${diagnosis.cliConfig.userAgent}
+    const diagnosticIcon = (status: string): string => {
+      if (status === 'pass') return ':white_check_mark:';
+      if (status === 'warn') return ':warning:';
+      return ':x:';
+    };
 
-Plugin Version:
-${diagnosis.versionDetail.pluginVersions.join(EOL)}
-\`\`\`
-${
-  diagnosis.sfdxEnvVars.length
-    ? `
-\`\`\`
-SFDX ENV. VARS.
-${diagnosis.sfdxEnvVars.join(EOL)}
-\`\`\`
-`
-    : ''
-}
-${
-  diagnosis.sfEnvVars.length
-    ? `
-\`\`\`
-SF ENV. VARS.
-${diagnosis.sfEnvVars.join(EOL)}
-\`\`\`
-`
-    : ''
-}
-\`\`\`
-Windows: ${diagnosis.cliConfig.windows}
-Shell: ${diagnosis.cliConfig.shell}
-Channel: ${diagnosis.cliConfig.channel}
-\`\`\`
----
-### Diagnostics
-${this.doctor
-  .getDiagnosis()
-  .diagnosticResults.map(
-    (res) => `${res.status === 'pass' ? ':white_check_mark:' : ':x:'} ${res.status} - ${res.testName}`
-  )
-  .join(EOL)}
-`;
+    const systemInfo = [
+      '```',
+      'CLI:',
+      diagnosis.cliConfig.userAgent,
+      '',
+      'Plugin Version:',
+      ...diagnosis.versionDetail.pluginVersions,
+      '```',
+      ...(diagnosis.sfdxEnvVars.length ? ['', '```', 'SFDX ENV. VARS.', ...diagnosis.sfdxEnvVars, '```'] : []),
+      ...(diagnosis.sfEnvVars.length ? ['', '```', 'SF ENV. VARS.', ...diagnosis.sfEnvVars, '```'] : []),
+      '',
+      '```',
+      `Windows: ${diagnosis.cliConfig.windows}`,
+      `Shell: ${diagnosis.cliConfig.shell}`,
+      `Channel: ${diagnosis.cliConfig.channel}`,
+      '```',
+      '---',
+      '### Diagnostics',
+      ...this.doctor
+        .getDiagnosis()
+        .diagnosticResults.map((res) => `${diagnosticIcon(res.status)} ${res.status} - ${res.testName}`),
+    ].join(EOL);
+
+    // Remove the frontmatter and Note block, but preserve Summary, Steps To Reproduce,
+    // and all other sections. Replace the System Information placeholder with actual data.
     return body
-      .replace(/---(?:.*\n)*>\s.*\n/gm, '')
-      .replace(/<!-- Which shell(?:.*\n)*.*/gm, info)
+      .replace(/---\nname:[\s\S]*?---\n/, '')
+      .replace(/> \*\*Note\*\*[\s\S]*?> {3}- If you require immediate assistance.*\n/m, '')
+      .replace(/> \[!TIP\]\n>.*\n/m, '')
+      .replace(/<!-- Which shell[\s\S]*PASTE_VERSION_OUTPUT_HERE\n```/m, systemInfo)
       .trim();
   }
 

From 65a3357ce1576402b0fc64d7ad5f87ae9dc455c5 Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Wed, 16 Sep 2026 12:46:14 -0700
Subject: [PATCH 2/7] ci: add Slack notification for test failures

Post to #cli-team-alerts when the tests workflow fails on a branch push.
Shows repo, author, PR link, and run URL. Filters out bot-triggered runs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../notify-slack-on-test-failure.yml          | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 .github/workflows/notify-slack-on-test-failure.yml

diff --git a/.github/workflows/notify-slack-on-test-failure.yml b/.github/workflows/notify-slack-on-test-failure.yml
new file mode 100644
index 00000000..c2768139
--- /dev/null
+++ b/.github/workflows/notify-slack-on-test-failure.yml
@@ -0,0 +1,50 @@
+name: Notify Slack on Test Failure
+
+on:
+  workflow_run:
+    workflows: [tests]
+    types: [completed]
+
+jobs:
+  notify-failure:
+    runs-on: ubuntu-latest
+    if: >-
+      github.event.workflow_run.conclusion == 'failure' &&
+      github.event.workflow_run.actor.login != 'svc-cli-bot' &&
+      github.event.workflow_run.actor.login != 'dependabot[bot]'
+    steps:
+      - name: Get PR number
+        id: pr
+        run: |
+          PR=$(gh api "repos/${{ github.repository }}/pulls?head=${{ github.repository_owner }}:${{ github.event.workflow_run.head_branch }}&state=open" --jq '.[0].number')
+          TITLE=$(gh api "repos/${{ github.repository }}/pulls?head=${{ github.repository_owner }}:${{ github.event.workflow_run.head_branch }}&state=open" --jq '.[0].title')
+          echo "number=$PR" >> "$GITHUB_OUTPUT"
+          echo "title=$TITLE" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Announce Test Failure
+        uses: slackapi/slack-github-action@v1.26.0
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.CLI_ALERTS_SLACK_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+        with:
+          payload: |
+            {
+              "text": "Tests failed in ${{ github.event.workflow_run.repository.name }}",
+              "blocks": [
+                {
+                  "type": "header",
+                  "text": {
+                    "type": "plain_text",
+                    "text": ":x: Tests failed in ${{ github.event.workflow_run.repository.name }}"
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*Repo:* <${{ github.event.workflow_run.repository.html_url }}|${{ github.event.workflow_run.repository.name }}>\n*Author:* ${{ github.event.workflow_run.actor.login }}\n*PR:* <${{ github.event.workflow_run.repository.html_url }}/pull/${{ steps.pr.outputs.number }}|#${{ steps.pr.outputs.number }} ${{ steps.pr.outputs.title }}>\n*Run:* ${{ github.event.workflow_run.html_url }}"
+                  }
+                }
+              ]
+            }

From 6f3fd73933dbe5764ca2320a9bd3fcb1c571caa2 Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Wed, 16 Sep 2026 12:52:24 -0700
Subject: [PATCH 3/7] test: break test to veify ci

---
 test/commands/doctor.test.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/commands/doctor.test.ts b/test/commands/doctor.test.ts
index 7bedd63f..32ba37e3 100644
--- a/test/commands/doctor.test.ts
+++ b/test/commands/doctor.test.ts
@@ -32,6 +32,12 @@ import { prompts } from '../../src/shared/prompts.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-info', 'doctor');
 
+describe('TEMPORARY - test slack notification', () => {
+  it('should fail on purpose', () => {
+    expect(true).to.equal(false);
+  });
+});
+
 let oclifConfig: Config;
 
 const getVersionDetailStub = (overrides?: Partial<Interfaces.VersionDetails>): Interfaces.VersionDetails => {

From 1abf1c1e9846e14a0021f401d6a0f8be23d11bb6 Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Wed, 16 Sep 2026 13:18:12 -0700
Subject: [PATCH 4/7] test: update notify ci failure

---
 .../notify-slack-on-test-failure.yml          | 50 -------------------
 .github/workflows/test.yml                    | 46 +++++++++++++++++
 2 files changed, 46 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/notify-slack-on-test-failure.yml

diff --git a/.github/workflows/notify-slack-on-test-failure.yml b/.github/workflows/notify-slack-on-test-failure.yml
deleted file mode 100644
index c2768139..00000000
--- a/.github/workflows/notify-slack-on-test-failure.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Notify Slack on Test Failure
-
-on:
-  workflow_run:
-    workflows: [tests]
-    types: [completed]
-
-jobs:
-  notify-failure:
-    runs-on: ubuntu-latest
-    if: >-
-      github.event.workflow_run.conclusion == 'failure' &&
-      github.event.workflow_run.actor.login != 'svc-cli-bot' &&
-      github.event.workflow_run.actor.login != 'dependabot[bot]'
-    steps:
-      - name: Get PR number
-        id: pr
-        run: |
-          PR=$(gh api "repos/${{ github.repository }}/pulls?head=${{ github.repository_owner }}:${{ github.event.workflow_run.head_branch }}&state=open" --jq '.[0].number')
-          TITLE=$(gh api "repos/${{ github.repository }}/pulls?head=${{ github.repository_owner }}:${{ github.event.workflow_run.head_branch }}&state=open" --jq '.[0].title')
-          echo "number=$PR" >> "$GITHUB_OUTPUT"
-          echo "title=$TITLE" >> "$GITHUB_OUTPUT"
-        env:
-          GH_TOKEN: ${{ github.token }}
-      - name: Announce Test Failure
-        uses: slackapi/slack-github-action@v1.26.0
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.CLI_ALERTS_SLACK_WEBHOOK }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-        with:
-          payload: |
-            {
-              "text": "Tests failed in ${{ github.event.workflow_run.repository.name }}",
-              "blocks": [
-                {
-                  "type": "header",
-                  "text": {
-                    "type": "plain_text",
-                    "text": ":x: Tests failed in ${{ github.event.workflow_run.repository.name }}"
-                  }
-                },
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "*Repo:* <${{ github.event.workflow_run.repository.html_url }}|${{ github.event.workflow_run.repository.name }}>\n*Author:* ${{ github.event.workflow_run.actor.login }}\n*PR:* <${{ github.event.workflow_run.repository.html_url }}/pull/${{ steps.pr.outputs.number }}|#${{ steps.pr.outputs.number }} ${{ steps.pr.outputs.title }}>\n*Run:* ${{ github.event.workflow_run.html_url }}"
-                  }
-                }
-              ]
-            }
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04639c09..4617aeec 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,3 +24,49 @@ jobs:
       fail-fast: false
     with:
       os: ${{ matrix.os }}
+  notify-failure:
+    needs: [linux-unit-tests, windows-unit-tests, nuts]
+    if: >-
+      failure() &&
+      github.actor != 'svc-cli-bot' &&
+      github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get PR info
+        id: pr
+        run: |
+          PR_JSON=$(gh api "repos/${REPO}/pulls?head=${OWNER}:${BRANCH}&state=open" --jq '.[0] | {number, title}')
+          echo "number=$(echo "$PR_JSON" | jq -r '.number')" >> "$GITHUB_OUTPUT"
+          echo "title=$(echo "$PR_JSON" | jq -r '.title')" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+          OWNER: ${{ github.repository_owner }}
+          BRANCH: ${{ github.ref_name }}
+      - name: Notify Slack
+        if: steps.pr.outputs.number != 'null'
+        uses: slackapi/slack-github-action@v1.26.0
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.CLI_ALERTS_SLACK_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+        with:
+          payload: |
+            {
+              "text": "Tests failed in ${{ github.event.repository.name }}",
+              "blocks": [
+                {
+                  "type": "header",
+                  "text": {
+                    "type": "plain_text",
+                    "text": ":x: Tests failed in ${{ github.event.repository.name }}"
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*Repo:* <${{ github.event.repository.html_url }}|${{ github.event.repository.name }}>\n*Author:* ${{ github.actor }}\n*PR:* <${{ github.event.repository.html_url }}/pull/${{ steps.pr.outputs.number }}|#${{ steps.pr.outputs.number }} ${{ steps.pr.outputs.title }}>\n*Run:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                  }
+                }
+              ]
+            }

From 1eb07365234d183d13c5614b54af1d6849a30457 Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Wed, 16 Sep 2026 13:51:08 -0700
Subject: [PATCH 5/7] test: add slack mention

---
 .github/workflows/test.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4617aeec..f8a55dd7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,6 +43,18 @@ jobs:
           REPO: ${{ github.repository }}
           OWNER: ${{ github.repository_owner }}
           BRANCH: ${{ github.ref_name }}
+      - name: Get Slack user ID
+        id: slack-user
+        run: |
+          SLACK_ID=$(echo "$USER_MAP" | jq -r --arg user "$GITHUB_ACTOR" '.[$user] // empty')
+          if [ -n "$SLACK_ID" ]; then
+            echo "mention=<@${SLACK_ID}>" >> "$GITHUB_OUTPUT"
+          else
+            echo "mention=${GITHUB_ACTOR}" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          USER_MAP: ${{ secrets.SLACK_USER_MAP }}
+          GITHUB_ACTOR: ${{ github.actor }}
       - name: Notify Slack
         if: steps.pr.outputs.number != 'null'
         uses: slackapi/slack-github-action@v1.26.0
@@ -65,7 +77,7 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "*Repo:* <${{ github.event.repository.html_url }}|${{ github.event.repository.name }}>\n*Author:* ${{ github.actor }}\n*PR:* <${{ github.event.repository.html_url }}/pull/${{ steps.pr.outputs.number }}|#${{ steps.pr.outputs.number }} ${{ steps.pr.outputs.title }}>\n*Run:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                    "text": "*Repo:* <${{ github.event.repository.html_url }}|${{ github.event.repository.name }}>\n*Author:* ${{ steps.slack-user.outputs.mention }}\n*PR:* <${{ github.event.repository.html_url }}/pull/${{ steps.pr.outputs.number }}|#${{ steps.pr.outputs.number }} ${{ steps.pr.outputs.title }}>\n*Job url:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
                   }
                 }
               ]

From 1a9af35815c752d4e19ce6d97ce2c207ffee8563 Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Wed, 16 Sep 2026 14:05:23 -0700
Subject: [PATCH 6/7] test: update display and title

---
 .github/workflows/test.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f8a55dd7..d2b2f6e9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,6 +32,18 @@ jobs:
       github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
+      - name: Get failed jobs
+        id: failed
+        run: |
+          FAILED=""
+          if [ "$LINUX" = "failure" ]; then FAILED="linux-unit-tests"; fi
+          if [ "$WINDOWS" = "failure" ]; then FAILED="${FAILED:+$FAILED, }windows-unit-tests"; fi
+          if [ "$NUTS" = "failure" ]; then FAILED="${FAILED:+$FAILED, }nuts"; fi
+          echo "jobs=$FAILED" >> "$GITHUB_OUTPUT"
+        env:
+          LINUX: ${{ needs.linux-unit-tests.result }}
+          WINDOWS: ${{ needs.windows-unit-tests.result }}
+          NUTS: ${{ needs.nuts.result }}
       - name: Get PR info
         id: pr
         run: |
@@ -64,20 +76,20 @@ jobs:
         with:
           payload: |
             {
-              "text": "Tests failed in ${{ github.event.repository.name }}",
+              "text": "tests/${{ steps.failed.outputs.jobs }} failed in ${{ github.event.repository.name }}",
               "blocks": [
                 {
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": ":x: Tests failed in ${{ github.event.repository.name }}"
+                    "text": ":bh-alert: tests/${{ steps.failed.outputs.jobs }} failed in ${{ github.event.repository.name }} :bh-alert:"
                   }
                 },
                 {
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "*Repo:* <${{ github.event.repository.html_url }}|${{ github.event.repository.name }}>\n*Author:* ${{ steps.slack-user.outputs.mention }}\n*PR:* <${{ github.event.repository.html_url }}/pull/${{ steps.pr.outputs.number }}|#${{ steps.pr.outputs.number }} ${{ steps.pr.outputs.title }}>\n*Job url:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                    "text": "*PR:* <${{ github.event.repository.html_url }}/pull/${{ steps.pr.outputs.number }}|#${{ steps.pr.outputs.number }} ${{ steps.pr.outputs.title }}>\n*Author:* ${{ steps.slack-user.outputs.mention }}\n*Job url:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
                   }
                 }
               ]

From c40b25684ffb9cbeec062dd17c843a9a7aabf88d Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Wed, 16 Sep 2026 14:17:20 -0700
Subject: [PATCH 7/7] fix: update the title

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d2b2f6e9..5678091a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,13 +76,13 @@ jobs:
         with:
           payload: |
             {
-              "text": "tests/${{ steps.failed.outputs.jobs }} failed in ${{ github.event.repository.name }}",
+              "text": "Workflow \"tests/${{ steps.failed.outputs.jobs }}\" failed in ${{ github.event.repository.name }}",
               "blocks": [
                 {
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": ":bh-alert: tests/${{ steps.failed.outputs.jobs }} failed in ${{ github.event.repository.name }} :bh-alert:"
+                    "text": ":x: Workflow \"tests/${{ steps.failed.outputs.jobs }}\" failed in ${{ github.event.repository.name }} :x:"
                   }
                 },
                 {