Labeling refactor/followups

.github/workflows/commit-message-based-labels.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: ./github-actions/pull-request-labeling
+      - uses: ./github-actions/labeling/pull-request
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
           labels: '{}'

.prettierignore

@@ -6,7 +6,7 @@
 github-actions/bazel/configure-remote/configure-remote.js
 github-actions/branch-manager/main.js
 github-actions/browserstack/set-browserstack-env.js
-github-actions/pull-request-labeling/main.js
+github-actions/labeling/pull-request/main.js
 github-actions/feature-request/main.js
 github-actions/google-internal-tests/main.js
 github-actions/org-file-sync/main.js
@@ -15,7 +15,7 @@ github-actions/previews/pack-and-upload-artifact/inject-artifact-metadata.js
 github-actions/previews/upload-artifacts-to-firebase/extract-artifact-metadata.js
 github-actions/previews/upload-artifacts-to-firebase/fetch-workflow-artifact.js
 github-actions/saucelabs/set-saucelabs-env.js
-github-actions/issue-labeling/main.js
+github-actions/labeling/issue/main.js
 github-actions/slash-commands/main.js
 github-actions/unified-status-check/main.js
 

MODULE.bazel

@@ -104,11 +104,12 @@ npm.npm_translate_lock(
         "@devinfra//github-actions/browserstack:package.json",
         "@devinfra//github-actions/feature-request:package.json",
         "@devinfra//github-actions/google-internal-tests:package.json",
+        "@devinfra//github-actions/labeling/issue:package.json",
+        "@devinfra//github-actions/labeling/pull-request:package.json",
         "@devinfra//github-actions/org-file-sync:package.json",
         "@devinfra//github-actions/post-approval-changes:package.json",
         "@devinfra//github-actions/previews/pack-and-upload-artifact:package.json",
         "@devinfra//github-actions/previews/upload-artifacts-to-firebase:package.json",
-        "@devinfra//github-actions/pull-request-labeling:package.json",
         "@devinfra//github-actions/saucelabs:package.json",
         "@devinfra//github-actions/unified-status-check:package.json",
         "@devinfra//ng-dev:package.json",

github-actions/labeling/BUILD.bazel

@@ -0,0 +1,5 @@
+load("@devinfra_npm//:defs.bzl", "npm_link_all_packages")
+
+package(default_visibility = ["//github-actions/labeling:__subpackages__"])
+
+npm_link_all_packages()

github-actions/issue-labeling/BUILD.bazel → github-actions/labeling/issue/BUILD.bazel

@@ -1,9 +1,6 @@
-load("@devinfra_npm//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults.bzl", "esbuild_checked_in", "jasmine_test", "ts_project")
 
-package(default_visibility = ["//github-actions/issue-labeling:__subpackages__"])
-
-npm_link_all_packages()
+package(default_visibility = ["//github-actions/labeling/issue:__subpackages__"])
 
 ts_project(
     name = "lib",
@@ -13,13 +10,14 @@ ts_project(
     ),
     tsconfig = "//github-actions:tsconfig",
     deps = [
-        ":node_modules/@actions/core",
-        ":node_modules/@actions/github",
-        ":node_modules/@google/genai",
-        ":node_modules/@octokit/openapi-types",
-        ":node_modules/@octokit/rest",
-        ":node_modules/@types/node",
         "//github-actions:utils",
+        "//github-actions/labeling:node_modules/@actions/core",
+        "//github-actions/labeling:node_modules/@actions/github",
+        "//github-actions/labeling:node_modules/@google/genai",
+        "//github-actions/labeling:node_modules/@octokit/openapi-types",
+        "//github-actions/labeling:node_modules/@octokit/rest",
+        "//github-actions/labeling:node_modules/@types/node",
+        "//github-actions/labeling/shared",
         "//ng-dev/pr/common/labels",
     ],
 )
@@ -31,14 +29,14 @@ ts_project(
     tsconfig = "//github-actions:tsconfig_test",
     deps = [
         ":lib",
-        ":node_modules/@actions/core",
-        ":node_modules/@actions/github",
-        ":node_modules/@google/genai",
-        ":node_modules/@octokit/openapi-types",
-        ":node_modules/@octokit/rest",
-        ":node_modules/@types/jasmine",
-        ":node_modules/@types/node",
         "//github-actions:utils",
+        "//github-actions/labeling:node_modules/@actions/core",
+        "//github-actions/labeling:node_modules/@actions/github",
+        "//github-actions/labeling:node_modules/@google/genai",
+        "//github-actions/labeling:node_modules/@octokit/openapi-types",
+        "//github-actions/labeling:node_modules/@octokit/rest",
+        "//github-actions/labeling:node_modules/@types/jasmine",
+        "//github-actions/labeling:node_modules/@types/node",
     ],
 )
 

github-actions/labeling/issue/lib/issue-labeling.spec.ts

@@ -0,0 +1,112 @@
+import {Octokit} from '@octokit/rest';
+import * as core from '@actions/core';
+import {IssueLabeling as _IssueLabeling} from './issue-labeling.js';
+
+class IssueLabeling extends _IssueLabeling {
+  setGit(git: any) {
+    this.git = git;
+  }
+}
+
+describe('IssueLabeling', () => {
+  let mockGit: jasmine.SpyObj<Octokit>;
+  let mockAI: any;
+  let issueLabeling: IssueLabeling;
+  let getIssue: jasmine.Spy;
+
+  beforeEach(() => {
+    mockGit = jasmine.createSpyObj('Octokit', ['paginate', 'issues', 'pulls']);
+    mockGit.issues = jasmine.createSpyObj('issues', ['addLabels', 'get']);
+
+    // Mock paginate to return the result of the promise if it's a list, or just execute the callback
+    (mockGit.paginate as jasmine.Spy).and.callFake((fn: any, args: any) => {
+      if (fn === mockGit.issues.listLabelsOnIssue) {
+        return Promise.resolve([{name: 'area: core'}, {name: 'area: router'}, {name: 'bug'}]);
+      }
+      return Promise.resolve([]);
+    });
+
+    (mockGit.issues.addLabels as unknown as jasmine.Spy).and.returnValue(Promise.resolve({}));
+    getIssue = mockGit.issues.get as unknown as jasmine.Spy;
+    getIssue.and.resolveTo({
+      data: {
+        title: 'Tough Issue',
+        body: 'Complex Body',
+        labels: [],
+      },
+    });
+
+    mockAI = {
+      models: jasmine.createSpyObj('models', ['generateContent']),
+    };
+
+    spyOn(IssueLabeling.prototype, 'getGenerativeAI').and.returnValue(mockAI);
+    issueLabeling = new IssueLabeling();
+    issueLabeling.setGit(mockGit as unknown as Octokit);
+  });
+
+  it('should initialize labels correctly', async () => {
+    await issueLabeling.initialize();
+    expect(issueLabeling.repoAreaLabels.has('area: core')).toBe(true);
+    expect(issueLabeling.repoAreaLabels.has('area: router')).toBe(true);
+    expect(issueLabeling.repoAreaLabels.has('bug')).toBe(false);
+  });
+
+  it('should apply a label when Gemini is confident', async () => {
+    mockAI.models.generateContent.and.returnValue(
+      Promise.resolve({
+        text: 'area: core',
+      }),
+    );
+
+    await issueLabeling.initialize();
+    await issueLabeling.run();
+
+    expect(mockGit.issues.addLabels).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        labels: ['area: core'],
+      }),
+    );
+  });
+
+  it('should NOT apply a label when Gemini returns "ambiguous"', async () => {
+    mockAI.models.generateContent.and.returnValue(
+      Promise.resolve({
+        text: 'ambiguous',
+      }),
+    );
+
+    await issueLabeling.initialize();
+    await issueLabeling.run();
+
+    expect(mockGit.issues.addLabels).not.toHaveBeenCalled();
+  });
+
+  it('should NOT apply a label when Gemini returns an invalid label', async () => {
+    mockAI.models.generateContent.and.returnValue(
+      Promise.resolve({
+        text: 'area: invalid',
+      }),
+    );
+
+    await issueLabeling.initialize();
+    await issueLabeling.run();
+
+    expect(mockGit.issues.addLabels).not.toHaveBeenCalled();
+  });
+
+  it('should skip labeling when issue already has an area label', async () => {
+    getIssue.and.resolveTo({
+      data: {
+        title: 'Tough Issue',
+        body: 'Complex Body',
+        labels: [{name: 'area: core'}],
+      },
+    });
+    await issueLabeling.initialize();
+
+    await issueLabeling.run();
+
+    expect(mockGit.issues.addLabels).not.toHaveBeenCalled();
+  });
+});