@google/gemini-cli 0.32.0-preview.0 → 0.33.0-preview.0

package/dist/src/ui/components/Tips.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import type React from 'react';

package/dist/src/ui/components/Tips.js

@@ -4,6 +4,6 @@ import { theme } from '../semantic-colors.js';
 import {} from '@google/gemini-cli-core';
 export const Tips = ({ config }) => {
     const geminiMdFileCount = config.getGeminiMdFileCount();
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.text.primary, children: "Tips for getting started:" }), _jsx(Text, { color: theme.text.primary, children: "1. Ask questions, edit files, or run commands." }), _jsx(Text, { color: theme.text.primary, children: "2. Be specific for the best results." }), geminiMdFileCount === 0 && (_jsxs(Text, { color: theme.text.primary, children: ["3. Create", ' ', _jsx(Text, { bold: true, color: theme.text.accent, children: "GEMINI.md" }), ' ', "files to customize your interactions with Gemini."] })), _jsxs(Text, { color: theme.text.primary, children: [geminiMdFileCount === 0 ? '4.' : '3.', ' ', _jsx(Text, { bold: true, color: theme.text.accent, children: "/help" }), ' ', "for more information."] })] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.text.primary, children: "Tips for getting started:" }), geminiMdFileCount === 0 && (_jsxs(Text, { color: theme.text.primary, children: ["1. Create ", _jsx(Text, { bold: true, children: "GEMINI.md" }), " files to customize your interactions"] })), _jsxs(Text, { color: theme.text.primary, children: [geminiMdFileCount === 0 ? '2.' : '1.', ' ', _jsx(Text, { color: theme.text.secondary, children: "/help" }), " for more information"] }), _jsxs(Text, { color: theme.text.primary, children: [geminiMdFileCount === 0 ? '3.' : '2.', " Ask coding questions, edit code or run commands"] }), _jsxs(Text, { color: theme.text.primary, children: [geminiMdFileCount === 0 ? '4.' : '3.', " Be specific for the best results"] })] }));
 };
 //# sourceMappingURL=Tips.js.map

package/dist/src/ui/components/Tips.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tips.js","sourceRoot":"","sources":["../../../../src/ui/components/Tips.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAe,MAAM,yBAAyB,CAAC;AAMtD,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,iBAAiB,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IACxD,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,0CAAkC,EACjE,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,+DAExB,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,qDAExB,EACN,iBAAiB,KAAK,CAAC,IAAI,CAC1B,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,0BACnB,GAAG,EACb,KAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,0BAE5B,EAAC,GAAG,yDAEN,CACR,EACD,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,aAC5B,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,EAC3C,KAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,sBAE5B,EAAC,GAAG,6BAEN,IACH,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"Tips.js","sourceRoot":"","sources":["../../../../src/ui/components/Tips.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAe,MAAM,yBAAyB,CAAC;AAMtD,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,iBAAiB,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAExD,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aACtC,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,0CAAkC,EAChE,iBAAiB,KAAK,CAAC,IAAI,CAC1B,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,2BACnB,KAAC,IAAI,IAAC,IAAI,gCAAiB,6CAEhC,CACR,EACD,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,aAC5B,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,EAC3C,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,sBAAc,6BAC1C,EACP,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,aAC5B,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,wDAEjC,EACP,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,aAC5B,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,yCACjC,IACH,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/components/Tips.test.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 export {};

package/dist/src/ui/components/Tips.test.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { render } from '../../test-utils/render.js';
@@ -9,16 +9,15 @@ import { Tips } from './Tips.js';
 import { describe, it, expect, vi } from 'vitest';
 describe('Tips', () => {
     it.each([
-        [0, '3. Create GEMINI.md files'],
-        [5, '3. /help for more information'],
-    ])('renders correct tips when file count is %i', async (count, expectedText) => {
+        { fileCount: 0, description: 'renders all tips including GEMINI.md tip' },
+        { fileCount: 5, description: 'renders fewer tips when GEMINI.md exists' },
+    ])('$description', async ({ fileCount }) => {
         const config = {
-            getGeminiMdFileCount: vi.fn().mockReturnValue(count),
+            getGeminiMdFileCount: vi.fn().mockReturnValue(fileCount),
         };
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(Tips, { config: config }));
         await waitUntilReady();
-        const output = lastFrame();
-        expect(output).toContain(expectedText);
+        expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
 });

package/dist/src/ui/components/Tips.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tips.test.js","sourceRoot":"","sources":["../../../../src/ui/components/Tips.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAGlD,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,IAAI,CAAC;QACN,CAAC,CAAC,EAAE,2BAA2B,CAAC;QAChC,CAAC,CAAC,EAAE,+BAA+B,CAAC;KACrC,CAAC,CACA,4CAA4C,EAC5C,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;QAC5B,MAAM,MAAM,GAAG;YACb,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;SAChC,CAAC;QAEvB,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,IAAI,IAAC,MAAM,EAAE,MAAM,GAAI,CACzB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACvC,OAAO,EAAE,CAAC;IACZ,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"Tips.test.js","sourceRoot":"","sources":["../../../../src/ui/components/Tips.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAGlD,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,IAAI,CAAC;QACN,EAAE,SAAS,EAAE,CAAC,EAAE,WAAW,EAAE,0CAA0C,EAAE;QACzE,EAAE,SAAS,EAAE,CAAC,EAAE,WAAW,EAAE,0CAA0C,EAAE;KAC1E,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG;YACb,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;SACpC,CAAC;QAEvB,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,IAAI,IAAC,MAAM,EAAE,MAAM,GAAI,CACzB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/ui/components/UserIdentity.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import type React from 'react';

package/dist/src/ui/components/UserIdentity.js

@@ -1,23 +1,21 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useMemo } from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useMemo, useEffect, useState } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import { UserAccountManager, AuthType, } from '@google/gemini-cli-core';
 export const UserIdentity = ({ config }) => {
     const authType = config.getContentGeneratorConfig()?.authType;
-    const { email, tierName } = useMemo(() => {
-        if (!authType) {
-            return { email: undefined, tierName: undefined };
+    const [email, setEmail] = useState();
+    useEffect(() => {
+        if (authType) {
+            const userAccountManager = new UserAccountManager();
+            setEmail(userAccountManager.getCachedGoogleAccount() ?? undefined);
         }
-        const userAccountManager = new UserAccountManager();
-        return {
-            email: userAccountManager.getCachedGoogleAccount(),
-            tierName: config.getUserTierName(),
-        };
-    }, [config, authType]);
+    }, [authType]);
+    const tierName = useMemo(() => (authType ? config.getUserTierName() : undefined), [config, authType]);
     if (!authType) {
         return null;
     }
-    return (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.text.primary, children: authType === AuthType.LOGIN_WITH_GOOGLE ? (_jsxs(Text, { children: [_jsxs(Text, { bold: true, children: ["Logged in with Google", email ? ':' : ''] }), email ? ` ${email}` : ''] })) : (`Authenticated with ${authType}`) }), _jsx(Text, { color: theme.text.secondary, children: " /auth" })] }), tierName && (_jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, children: "Plan:" }), " ", tierName] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.text.primary, wrap: "truncate-end", children: authType === AuthType.LOGIN_WITH_GOOGLE ? (_jsx(Text, { children: email ?? 'Logged in with Google' })) : (`Authenticated with ${authType}`) }), _jsx(Text, { color: theme.text.secondary, children: " /auth" })] }), tierName && (_jsxs(Box, { children: [_jsx(Text, { color: theme.text.primary, wrap: "truncate-end", children: tierName }), _jsx(Text, { color: theme.text.secondary, children: " /upgrade" })] }))] }));
 };
 //# sourceMappingURL=UserIdentity.js.map

package/dist/src/ui/components/UserIdentity.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserIdentity.js","sourceRoot":"","sources":["../../../../src/ui/components/UserIdentity.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAEL,kBAAkB,EAClB,QAAQ,GACT,MAAM,yBAAyB,CAAC;AAMjC,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IACtE,MAAM,QAAQ,GAAG,MAAM,CAAC,yBAAyB,EAAE,EAAE,QAAQ,CAAC;IAE9D,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;QACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;QACnD,CAAC;QACD,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACpD,OAAO;YACL,KAAK,EAAE,kBAAkB,CAAC,sBAAsB,EAAE;YAClD,QAAQ,EAAE,MAAM,CAAC,eAAe,EAAE;SACnC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,SAAS,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,aACvC,MAAC,GAAG,eACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,YAC5B,QAAQ,KAAK,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CACzC,MAAC,IAAI,eACH,MAAC,IAAI,IAAC,IAAI,4CAAuB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAQ,EACxD,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IACpB,CACR,CAAC,CAAC,CAAC,CACF,sBAAsB,QAAQ,EAAE,CACjC,GACI,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,uBAAe,IAC5C,EACL,QAAQ,IAAI,CACX,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,aAC7B,KAAC,IAAI,IAAC,IAAI,4BAAa,OAAE,QAAQ,IAC5B,CACR,IACG,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"UserIdentity.js","sourceRoot":"","sources":["../../../../src/ui/components/UserIdentity.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAEL,kBAAkB,EAClB,QAAQ,GACT,MAAM,yBAAyB,CAAC;AAMjC,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IACtE,MAAM,QAAQ,GAAG,MAAM,CAAC,yBAAyB,EAAE,EAAE,QAAQ,CAAC;IAC9D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAsB,CAAC;IAEzD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;YACpD,QAAQ,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,IAAI,SAAS,CAAC,CAAC;QACrE,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,MAAM,QAAQ,GAAG,OAAO,CACtB,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EACvD,CAAC,MAAM,EAAE,QAAQ,CAAC,CACnB,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aAEzB,MAAC,GAAG,eACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAC,cAAc,YACjD,QAAQ,KAAK,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CACzC,KAAC,IAAI,cAAE,KAAK,IAAI,uBAAuB,GAAQ,CAChD,CAAC,CAAC,CAAC,CACF,sBAAsB,QAAQ,EAAE,CACjC,GACI,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,uBAAe,IAC5C,EAGL,QAAQ,IAAI,CACX,MAAC,GAAG,eACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAC,cAAc,YACjD,QAAQ,GACJ,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,0BAAkB,IAC/C,CACP,IACG,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/components/UserIdentity.test.js

@@ -32,11 +32,12 @@ describe('<UserIdentity />', () => {
         const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(UserIdentity, { config: mockConfig }));
         await waitUntilReady();
         const output = lastFrame();
-        expect(output).toContain('Logged in with Google: test@example.com');
+        expect(output).toContain('test@example.com');
         expect(output).toContain('/auth');
+        expect(output).not.toContain('/upgrade');
         unmount();
     });
-    it('should render login message without colon if email is missing', async () => {
+    it('should render login message if email is missing', async () => {
         // Modify the mock for this specific test
         vi.mocked(UserAccountManager).mockImplementationOnce(() => ({
             getCachedGoogleAccount: () => undefined,
@@ -51,11 +52,11 @@ describe('<UserIdentity />', () => {
         await waitUntilReady();
         const output = lastFrame();
         expect(output).toContain('Logged in with Google');
-        expect(output).not.toContain('Logged in with Google:');
         expect(output).toContain('/auth');
+        expect(output).not.toContain('/upgrade');
         unmount();
     });
-    it('should render plan name on a separate line if provided', async () => {
+    it('should render plan name and upgrade indicator', async () => {
         const mockConfig = makeFakeConfig();
         vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
             authType: AuthType.LOGIN_WITH_GOOGLE,
@@ -65,13 +66,10 @@ describe('<UserIdentity />', () => {
         const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(UserIdentity, { config: mockConfig }));
         await waitUntilReady();
         const output = lastFrame();
-        expect(output).toContain('Logged in with Google: test@example.com');
+        expect(output).toContain('test@example.com');
         expect(output).toContain('/auth');
-        expect(output).toContain('Plan: Premium Plan');
-        // Check for two lines (or more if wrapped, but here it should be separate)
-        const lines = output?.split('\n').filter((line) => line.trim().length > 0);
-        expect(lines?.some((line) => line.includes('Logged in with Google'))).toBe(true);
-        expect(lines?.some((line) => line.includes('Plan: Premium Plan'))).toBe(true);
+        expect(output).toContain('Premium Plan');
+        expect(output).toContain('/upgrade');
         unmount();
     });
     it('should not render if authType is missing', async () => {
@@ -94,6 +92,21 @@ describe('<UserIdentity />', () => {
         const output = lastFrame();
         expect(output).toContain(`Authenticated with ${AuthType.USE_GEMINI}`);
         expect(output).toContain('/auth');
+        expect(output).not.toContain('/upgrade');
+        unmount();
+    });
+    it('should render specific tier name when provided', async () => {
+        const mockConfig = makeFakeConfig();
+        vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
+            authType: AuthType.LOGIN_WITH_GOOGLE,
+            model: 'gemini-pro',
+        });
+        vi.spyOn(mockConfig, 'getUserTierName').mockReturnValue('Enterprise Tier');
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(UserIdentity, { config: mockConfig }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('Enterprise Tier');
+        expect(output).toContain('/upgrade');
         unmount();
     });
 });

package/dist/src/ui/components/UserIdentity.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserIdentity.test.js","sourceRoot":"","sources":["../../../../src/ui/components/UserIdentity.test.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserIdentity.test.js","sourceRoot":"","sources":["../../../../src/ui/components/UserIdentity.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EACL,cAAc,EACd,QAAQ,EACR,kBAAkB,GAEnB,MAAM,yBAAyB,CAAC;AAEjC,oDAAoD;AACpD,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,QAAQ,GACZ,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,QAAQ;QACX,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YACpD,sBAAsB,EAAE,GAAG,EAAE,CAAC,kBAAkB;SACjD,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;QACpC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC,eAAe,CAAC;YAChE,QAAQ,EAAE,QAAQ,CAAC,iBAAiB;YACpC,KAAK,EAAE,YAAY;SACiB,CAAC,CAAC;QACxC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAEnE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,YAAY,IAAC,MAAM,EAAE,UAAU,GAAI,CACrC,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACzC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,yCAAyC;QACzC,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,sBAAsB,CAClD,GAAG,EAAE,CACH,CAAC;YACC,sBAAsB,EAAE,GAAG,EAAE,CAAC,SAAS;SACxC,CAAkC,CACtC,CAAC;QAEF,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;QACpC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC,eAAe,CAAC;YAChE,QAAQ,EAAE,QAAQ,CAAC,iBAAiB;YACpC,KAAK,EAAE,YAAY;SACiB,CAAC,CAAC;QACxC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAEnE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,YAAY,IAAC,MAAM,EAAE,UAAU,GAAI,CACrC,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACzC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;QACpC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC,eAAe,CAAC;YAChE,QAAQ,EAAE,QAAQ,CAAC,iBAAiB;YACpC,KAAK,EAAE,YAAY;SACiB,CAAC,CAAC;QACxC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAExE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,YAAY,IAAC,MAAM,EAAE,UAAU,GAAI,CACrC,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAErC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;QACpC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC,eAAe,CAC/D,EAAuC,CACxC,CAAC;QAEF,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,YAAY,IAAC,MAAM,EAAE,UAAU,GAAI,CACrC,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;QACpC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC,eAAe,CAAC;YAChE,QAAQ,EAAE,QAAQ,CAAC,UAAU;YAC7B,KAAK,EAAE,YAAY;SACiB,CAAC,CAAC;QACxC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAEnE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,YAAY,IAAC,MAAM,EAAE,UAAU,GAAI,CACrC,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,sBAAsB,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACzC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;QACpC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC,eAAe,CAAC;YAChE,QAAQ,EAAE,QAAQ,CAAC,iBAAiB;YACpC,KAAK,EAAE,YAAY;SACiB,CAAC,CAAC;QACxC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;QAE3E,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,YAAY,IAAC,MAAM,EAAE,UAAU,GAAI,CACrC,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACrC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/ui/components/messages/InfoMessage.d.ts

@@ -6,6 +6,7 @@
 import type React from 'react';
 interface InfoMessageProps {
     text: string;
+    secondaryText?: string;
     icon?: string;
     color?: string;
     marginBottom?: number;

package/dist/src/ui/components/messages/InfoMessage.js

@@ -2,10 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Text, Box } from 'ink';
 import { theme } from '../../semantic-colors.js';
 import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
-export const InfoMessage = ({ text, icon, color, marginBottom, }) => {
+export const InfoMessage = ({ text, secondaryText, icon, color, marginBottom, }) => {
     color ??= theme.status.warning;
     const prefix = icon ?? 'ℹ ';
     const prefixWidth = prefix.length;
-    return (_jsxs(Box, { flexDirection: "row", marginTop: 1, marginBottom: marginBottom ?? 0, children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: color, children: prefix }) }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: text.split('\n').map((line, index) => (_jsx(Text, { wrap: "wrap", children: _jsx(RenderInline, { text: line, defaultColor: color }) }, index))) })] }));
+    return (_jsxs(Box, { flexDirection: "row", marginTop: 1, marginBottom: marginBottom ?? 0, children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: color, children: prefix }) }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: text.split('\n').map((line, index) => (_jsxs(Text, { wrap: "wrap", children: [_jsx(RenderInline, { text: line, defaultColor: color }), index === text.split('\n').length - 1 && secondaryText && (_jsxs(Text, { color: theme.text.secondary, children: [" ", secondaryText] }))] }, index))) })] }));
 };
 //# sourceMappingURL=InfoMessage.js.map

package/dist/src/ui/components/messages/InfoMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"InfoMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/InfoMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AASrE,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,YAAY,GACb,EAAE,EAAE;IACH,KAAK,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,IAAI,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAElC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,YAAY,IAAI,CAAC,aACpE,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,YACrB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,YAAG,MAAM,GAAQ,GAC/B,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,YACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACrC,KAAC,IAAI,IAAC,IAAI,EAAC,MAAM,YACf,KAAC,YAAY,IAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,GAAI,IAD5B,KAAK,CAErB,CACR,CAAC,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"InfoMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/InfoMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAUrE,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,IAAI,EACJ,aAAa,EACb,IAAI,EACJ,KAAK,EACL,YAAY,GACb,EAAE,EAAE;IACH,KAAK,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,IAAI,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAElC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,YAAY,IAAI,CAAC,aACpE,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,YACrB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,YAAG,MAAM,GAAQ,GAC/B,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,YACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACrC,MAAC,IAAI,IAAC,IAAI,EAAC,MAAM,aACf,KAAC,YAAY,IAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,GAAI,EAChD,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,IAAI,CACzD,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,kBAAI,aAAa,IAAQ,CAC3D,KAJoB,KAAK,CAKrB,CACR,CAAC,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/components/messages/SubagentProgressDisplay.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type React from 'react';
+import type { SubagentProgress } from '@google/gemini-cli-core';
+export interface SubagentProgressDisplayProps {
+    progress: SubagentProgress;
+}
+export declare const SubagentProgressDisplay: React.FC<SubagentProgressDisplayProps>;

package/dist/src/ui/components/messages/SubagentProgressDisplay.js

@@ -0,0 +1,73 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+import { theme } from '../../semantic-colors.js';
+import Spinner from 'ink-spinner';
+import { TOOL_STATUS } from '../../constants.js';
+import { STATUS_INDICATOR_WIDTH } from './ToolShared.js';
+const formatToolArgs = (args) => {
+    if (!args)
+        return '';
+    try {
+        const parsed = JSON.parse(args);
+        if (typeof parsed !== 'object' || parsed === null) {
+            return args;
+        }
+        if ('description' in parsed &&
+            typeof parsed.description === 'string' &&
+            parsed.description) {
+            return parsed.description;
+        }
+        if ('command' in parsed && typeof parsed.command === 'string')
+            return parsed.command;
+        if ('file_path' in parsed && typeof parsed.file_path === 'string')
+            return parsed.file_path;
+        if ('dir_path' in parsed && typeof parsed.dir_path === 'string')
+            return parsed.dir_path;
+        if ('query' in parsed && typeof parsed.query === 'string')
+            return parsed.query;
+        if ('url' in parsed && typeof parsed.url === 'string')
+            return parsed.url;
+        if ('target' in parsed && typeof parsed.target === 'string')
+            return parsed.target;
+        return args;
+    }
+    catch {
+        return args;
+    }
+};
+export const SubagentProgressDisplay = ({ progress }) => {
+    let headerText;
+    let headerColor = theme.text.secondary;
+    if (progress.state === 'cancelled') {
+        headerText = `Subagent ${progress.agentName} was cancelled.`;
+        headerColor = theme.status.warning;
+    }
+    else if (progress.state === 'error') {
+        headerText = `Subagent ${progress.agentName} failed.`;
+        headerColor = theme.status.error;
+    }
+    else if (progress.state === 'completed') {
+        headerText = `Subagent ${progress.agentName} completed.`;
+        headerColor = theme.status.success;
+    }
+    return (_jsxs(Box, { flexDirection: "column", paddingY: 0, children: [headerText && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: headerColor, italic: true, children: headerText }) })), _jsx(Box, { flexDirection: "column", marginLeft: 0, gap: 0, children: progress.recentActivity.map((item) => {
+                    if (item.type === 'thought') {
+                        const isCancellation = item.content === 'Request cancelled.';
+                        const icon = isCancellation ? 'ℹ ' : '💭';
+                        const color = isCancellation
+                            ? theme.status.warning
+                            : theme.text.secondary;
+                        return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { minWidth: STATUS_INDICATOR_WIDTH, children: _jsx(Text, { color: color, children: icon }) }), _jsx(Box, { flexGrow: 1, children: _jsx(Text, { color: color, children: item.content }) })] }, item.id));
+                    }
+                    else if (item.type === 'tool_call') {
+                        const statusSymbol = item.status === 'running' ? (_jsx(Spinner, { type: "dots" })) : item.status === 'completed' ? (_jsx(Text, { color: theme.status.success, children: TOOL_STATUS.SUCCESS })) : item.status === 'cancelled' ? (_jsx(Text, { color: theme.status.warning, bold: true, children: TOOL_STATUS.CANCELED })) : (_jsx(Text, { color: theme.status.error, children: TOOL_STATUS.ERROR }));
+                        const formattedArgs = item.description || formatToolArgs(item.args);
+                        const displayArgs = formattedArgs.length > 60
+                            ? formattedArgs.slice(0, 60) + '...'
+                            : formattedArgs;
+                        return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { minWidth: STATUS_INDICATOR_WIDTH, children: statusSymbol }), _jsxs(Box, { flexDirection: "row", flexGrow: 1, flexWrap: "wrap", children: [_jsx(Text, { bold: true, color: theme.text.primary, strikethrough: item.status === 'cancelled', children: item.displayName || item.content }), displayArgs && (_jsx(Box, { marginLeft: 1, children: _jsx(Text, { color: theme.text.secondary, wrap: "truncate", strikethrough: item.status === 'cancelled', children: displayArgs }) }))] })] }, item.id));
+                    }
+                    return null;
+                }) })] }));
+};
+//# sourceMappingURL=SubagentProgressDisplay.js.map

package/dist/src/ui/components/messages/SubagentProgressDisplay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubagentProgressDisplay.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/SubagentProgressDisplay.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/messages/SubagentProgressDisplay.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js

@@ -0,0 +1,158 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { render, cleanup } from '../../../test-utils/render.js';
+import { SubagentProgressDisplay } from './SubagentProgressDisplay.js';
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { Text } from 'ink';
+vi.mock('ink-spinner', () => ({
+    default: () => _jsx(Text, { children: "\u280B" }),
+}));
+describe('<SubagentProgressDisplay />', () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+        cleanup();
+    });
+    it('renders correctly with description in args', async () => {
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [
+                {
+                    id: '1',
+                    type: 'tool_call',
+                    content: 'run_shell_command',
+                    args: '{"command": "echo hello", "description": "Say hello"}',
+                    status: 'running',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders correctly with displayName and description from item', async () => {
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [
+                {
+                    id: '1',
+                    type: 'tool_call',
+                    content: 'run_shell_command',
+                    displayName: 'RunShellCommand',
+                    description: 'Executing echo hello',
+                    args: '{"command": "echo hello"}',
+                    status: 'running',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders correctly with command fallback', async () => {
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [
+                {
+                    id: '2',
+                    type: 'tool_call',
+                    content: 'run_shell_command',
+                    args: '{"command": "echo hello"}',
+                    status: 'running',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders correctly with file_path', async () => {
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [
+                {
+                    id: '3',
+                    type: 'tool_call',
+                    content: 'write_file',
+                    args: '{"file_path": "/tmp/test.txt", "content": "foo"}',
+                    status: 'completed',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('truncates long args', async () => {
+        const longDesc = 'This is a very long description that should definitely be truncated because it exceeds the limit of sixty characters.';
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [
+                {
+                    id: '4',
+                    type: 'tool_call',
+                    content: 'run_shell_command',
+                    args: JSON.stringify({ description: longDesc }),
+                    status: 'running',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders thought bubbles correctly', async () => {
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [
+                {
+                    id: '5',
+                    type: 'thought',
+                    content: 'Thinking about life',
+                    status: 'running',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders cancelled state correctly', async () => {
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [],
+            state: 'cancelled',
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders "Request cancelled." with the info icon', async () => {
+        const progress = {
+            isSubagentProgress: true,
+            agentName: 'TestAgent',
+            recentActivity: [
+                {
+                    id: '6',
+                    type: 'thought',
+                    content: 'Request cancelled.',
+                    status: 'error',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = render(_jsx(SubagentProgressDisplay, { progress: progress }));
+        await waitUntilReady();
+        expect(lastFrame()).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=SubagentProgressDisplay.test.js.map

package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubagentProgressDisplay.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/SubagentProgressDisplay.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/messages/ToolGroupMessage.js

@@ -31,6 +31,7 @@ export const ToolGroupMessage = ({ item, toolCalls: allToolCalls, availableTermi
             status: t.status,
             approvalMode: t.approvalMode,
             hasResultDisplay: !!t.resultDisplay,
+            parentCallId: t.parentCallId,
         });
     }), [allToolCalls, isLowErrorVerbosity]);
     const config = useConfig();

package/dist/src/ui/components/messages/ToolGroupMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"ToolGroupMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ToolGroupMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/messages/ToolResultDisplay.js

@@ -11,6 +11,7 @@ import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
 import { AnsiOutputText, AnsiLineText } from '../AnsiOutput.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { theme } from '../../semantic-colors.js';
+import { isSubagentProgress, } from '@google/gemini-cli-core';
 import { useUIState } from '../../contexts/UIStateContext.js';
 import { tryParseJSON } from '../../../utils/jsonoutput.js';
 import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
@@ -19,6 +20,7 @@ import { ScrollableList } from '../shared/ScrollableList.js';
 import { SCROLL_TO_ITEM_END } from '../shared/VirtualizedList.js';
 import { ACTIVE_SHELL_MAX_LINES } from '../../constants.js';
 import { calculateToolContentMaxLines } from '../../utils/toolLayoutUtils.js';
+import { SubagentProgressDisplay } from './SubagentProgressDisplay.js';
 // Large threshold to ensure we don't cause performance issues for very large
 // outputs that will get truncated further MaxSizedBox anyway.
 const MAXIMUM_RESULT_DISPLAY_CHARACTERS = 20000;
@@ -101,6 +103,9 @@ export const ToolResultDisplay = ({ resultDisplay, availableTerminalHeight, term
         // Render pretty-printed JSON
         content = (_jsx(Text, { wrap: "wrap", color: theme.text.primary, children: formattedJSON }));
     }
+    else if (isSubagentProgress(truncatedResultDisplay)) {
+        content = _jsx(SubagentProgressDisplay, { progress: truncatedResultDisplay });
+    }
     else if (typeof truncatedResultDisplay === 'string' &&
         renderOutputAsMarkdown) {
         content = (_jsx(MarkdownDisplay, { text: truncatedResultDisplay, terminalWidth: childWidth, renderMarkdown: renderMarkdown, isPending: false }));