Fix extensions logging race condition and slash command logging (#12732)

packages/cli/src/services/FileCommandLoader.test.ts

@@ -842,6 +842,52 @@ describe('FileCommandLoader', () => {
         assert.fail('Incorrect action type');
       }
     });
+
+    it('correctly loads extensionId for extension commands', async () => {
+      const extensionId = 'my-test-ext-id-123';
+      const extensionDir = path.join(
+        process.cwd(),
+        GEMINI_DIR,
+        'extensions',
+        'my-test-ext',
+      );
+
+      mock({
+        [extensionDir]: {
+          'gemini-extension.json': JSON.stringify({
+            name: 'my-test-ext',
+            id: extensionId,
+            version: '1.0.0',
+          }),
+          commands: {
+            'my-cmd.toml': 'prompt = "My test command"',
+          },
+        },
+      });
+
+      const mockConfig = {
+        getProjectRoot: vi.fn(() => process.cwd()),
+        getExtensions: vi.fn(() => [
+          {
+            name: 'my-test-ext',
+            id: extensionId,
+            version: '1.0.0',
+            isActive: true,
+            path: extensionDir,
+          },
+        ]),
+        getFolderTrust: vi.fn(() => false),
+        isTrustedFolder: vi.fn(() => false),
+      } as unknown as Config;
+      const loader = new FileCommandLoader(mockConfig);
+      const commands = await loader.loadCommands(signal);
+
+      expect(commands).toHaveLength(1);
+      const command = commands[0];
+      expect(command.name).toBe('my-cmd');
+      expect(command.extensionName).toBe('my-test-ext');
+      expect(command.extensionId).toBe(extensionId);
+    });
   });
 
   describe('Argument Handling Integration (via ShellProcessor)', () => {

packages/cli/src/services/FileCommandLoader.ts

@@ -37,6 +37,7 @@ import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
 interface CommandDirectory {
   path: string;
   extensionName?: string;
+  extensionId?: string;
 }
 
 /**
@@ -110,6 +111,7 @@ export class FileCommandLoader implements ICommandLoader {
             path.join(dirInfo.path, file),
             dirInfo.path,
             dirInfo.extensionName,
+            dirInfo.extensionId,
           ),
         );
 
@@ -158,6 +160,7 @@ export class FileCommandLoader implements ICommandLoader {
       const extensionCommandDirs = activeExtensions.map((ext) => ({
         path: path.join(ext.path, 'commands'),
         extensionName: ext.name,
+        extensionId: ext.id,
       }));
 
       dirs.push(...extensionCommandDirs);
@@ -177,6 +180,7 @@ export class FileCommandLoader implements ICommandLoader {
     filePath: string,
     baseDir: string,
     extensionName?: string,
+    extensionId?: string,
   ): Promise<SlashCommand | null> {
     let fileContent: string;
     try {
@@ -265,6 +269,7 @@ export class FileCommandLoader implements ICommandLoader {
       description,
       kind: CommandKind.FILE,
       extensionName,
+      extensionId,
       action: async (
         context: CommandContext,
         _args: string,