fix(patch): cherry-pick d6f88f8 to release/v0.39.0-preview.1-pr-25670 to patch version v0.39.0-preview.1 and create version 0.39.0-preview.2

[gemini-cli-robot]

This PR automatically cherry-picks commit d6f88f8 to patch version v0.39.0-preview.1 in the preview release to create version 0.39.0-preview.2.

[gemini-code-assist]

Summary of Changes

Hello, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request cherry-picks a specific commit to update the preview release version. It improves how agent activity is tracked and displayed by including message logs and refining the reassembly logic. Additionally, it cleans up internal configuration methods by shifting agent registry initialization to a more standard reload flow.

Highlights

• Agent Activity Tracking: Updated A2AResultReassembler to include message logs in activity items and filter out user-role messages.
• Configuration Refactoring: Refactored agent registry reloading logic by removing the private onAgentsRefreshed method and updating tests to use the public reload method.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-code-assist]

Code Review

This pull request updates the A2AResultReassembler to correctly handle message logs and activity items, including skipping user messages and improving the logic for displaying status indicators. It also refactors agent reloading in tests to use the public reload() method instead of a private internal call. Feedback was provided to ensure the 'Working...' indicator remains visible while the agent is active, to avoid duplicating authentication messages in the activity list, and to prevent empty messages from being added to the log.

[gemini-code-assist]

The current implementation of toActivityItems should be updated to ensure consistency with the previous implementation and improve the user experience:

1. UX Consistency: The pending (Working...) indicator is currently only shown if items.length === 0. To maintain consistency with the reference behavior, a running item should always be present to indicate the agent is still active.
2. Redundancy: The AUTH_REQUIRED_MSG is duplicated in the output, appearing as both a running and completed item.
3. Empty Content: Trimming msg without checking for emptiness can lead to activity items with empty content.

Refactoring the logic will ensure the component aligns with the expected behavior while addressing these issues.

  toActivityItems(): SubagentActivityItem[] {
    const isAuthRequired = this.messageLog.includes(AUTH_REQUIRED_MSG);
    const items: SubagentActivityItem[] = [];

    if (isAuthRequired) {
      items.push({
        id: 'auth-required',
        type: 'thought',
        content: AUTH_REQUIRED_MSG,
        status: 'running',
      });
    }

    this.messageLog.forEach((msg, index) => {
      const trimmed = msg.trim();
      // Skip empty messages and the synthetic auth message (handled above as 'running')
      if (!trimmed || trimmed === AUTH_REQUIRED_MSG) return;
      items.push({
        id: 'msg-' + index,
        type: 'thought',
        content: trimmed,
        status: 'completed',
      });
    });

    // Always show a running indicator if not waiting for auth, 
    // to indicate the agent is still active.
    if (!isAuthRequired) {
      items.push({
        id: 'pending',
        type: 'thought',
        content: 'Working...',
        status: 'running',
      });
    }

    return items;
  }

References

1. When a change's primary purpose is to align a component with a reference implementation (e.g., a 'main agent'), prioritize consistency with the reference, even if it means not addressing potential issues in the aligned code.

[gemini-code-assist]

This test should be updated to reflect the corrected logic in toActivityItems. It should verify that a pending item is included at the end of the list to indicate ongoing activity.

      const items = reassembler.toActivityItems();
      expect(items).toHaveLength(3);
      expect(items[0]).toEqual({
        id: 'msg-0',
        type: 'thought',
        content: 'Message 1',
        status: 'completed',
      });
      expect(items[1]).toEqual({
        id: 'msg-1',
        type: 'thought',
        content: 'Message 2',
        status: 'completed',
      });
      expect(items[2]).toEqual({
        id: 'pending',
        type: 'thought',
        content: 'Working...',
        status: 'running',
      });

[github-actions]

Size Change: +307 B (0%)

Total Size: 34.1 MB

Filename	Size	Change
./bundle/chunk-7SSAFHDD.js	0 B	-3.55 MB (removed)	🏆
./bundle/chunk-SIDUWCNQ.js	0 B	-3.8 kB (removed)	🏆
./bundle/chunk-UUS365PS.js	0 B	-14.9 MB (removed)	🏆
./bundle/core-TIOVV6E2.js	0 B	-46.6 kB (removed)	🏆
./bundle/devtoolsService-C3MQOADG.js	0 B	-28.4 kB (removed)	🏆
./bundle/gemini-I22QH6CV.js	0 B	-553 kB (removed)	🏆
./bundle/interactiveCli-QH764MTP.js	0 B	-1.29 MB (removed)	🏆
./bundle/oauth2-provider-ROIYAMI5.js	0 B	-9.16 kB (removed)	🏆
./bundle/chunk-65PXYF3R.js	14.9 MB	+14.9 MB (new file)	🆕
./bundle/chunk-CIDQPEQO.js	3.8 kB	+3.8 kB (new file)	🆕
./bundle/chunk-TRGJIYMO.js	3.55 MB	+3.55 MB (new file)	🆕
./bundle/core-XM2TULGL.js	46.6 kB	+46.6 kB (new file)	🆕
./bundle/devtoolsService-QUJAQNOC.js	28.4 kB	+28.4 kB (new file)	🆕
./bundle/gemini-G56CAVSY.js	553 kB	+553 kB (new file)	🆕
./bundle/interactiveCli-YLFRDOZY.js	1.29 MB	+1.29 MB (new file)	🆕
./bundle/oauth2-provider-IAW2ZSX3.js	9.16 kB	+9.16 kB (new file)	🆕

ℹ️ View Unchanged

Filename	Size	Change
./bundle/bundled/third_party/index.js	8 MB	0 B
./bundle/chunk-34MYV7JD.js	2.45 kB	0 B
./bundle/chunk-5AUYMPVF.js	858 B	0 B
./bundle/chunk-5PS3AYFU.js	1.18 kB	0 B
./bundle/chunk-664ZODQF.js	124 kB	0 B
./bundle/chunk-DAHVX5MI.js	206 kB	0 B
./bundle/chunk-IUUIT4SU.js	56.5 kB	0 B
./bundle/chunk-QM5IP3NK.js	1.97 MB	0 B
./bundle/chunk-RJTRUG2J.js	39.8 kB	0 B
./bundle/cleanup-WIGGBF63.js	0 B	-932 B (removed)	🏆
./bundle/devtools-36NN55EP.js	696 kB	0 B
./bundle/dist-T73EYRDX.js	356 B	0 B
./bundle/events-XB7DADIJ.js	418 B	0 B
./bundle/gemini.js	4.97 kB	0 B
./bundle/getMachineId-bsd-TXG52NKR.js	1.55 kB	0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js	1.55 kB	0 B
./bundle/getMachineId-linux-SHIFKOOX.js	1.34 kB	0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js	1.06 kB	0 B
./bundle/getMachineId-win-6KLLGOI4.js	1.72 kB	0 B
./bundle/memoryDiscovery-MYQ3ZWKM.js	980 B	0 B
./bundle/multipart-parser-KPBZEGQU.js	11.7 kB	0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js	222 kB	0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js	229 kB	0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js	13.4 kB	0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js	132 B	0 B
./bundle/sandbox-macos-permissive-open.sb	890 B	0 B
./bundle/sandbox-macos-permissive-proxied.sb	1.31 kB	0 B
./bundle/sandbox-macos-restrictive-open.sb	3.36 kB	0 B
./bundle/sandbox-macos-restrictive-proxied.sb	3.56 kB	0 B
./bundle/sandbox-macos-strict-open.sb	4.82 kB	0 B
./bundle/sandbox-macos-strict-proxied.sb	5.02 kB	0 B
./bundle/src-QVCVGIUX.js	47 kB	0 B
./bundle/tree-sitter-7U6MW5PS.js	274 kB	0 B
./bundle/tree-sitter-bash-34ZGLXVX.js	1.84 MB	0 B
./bundle/cleanup-YDI44GSI.js	932 B	+932 B (new file)	🆕

_{compressed-size-action}