fix(patch): cherry-pick 467a305 to release/v0.9.0-preview.0-pr-10661 to patch version v0.9.0-preview.0 and create version 0.9.0-preview.1 (#10817)

Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>

integration-tests/context-compress-interactive.test.ts

@@ -18,93 +18,87 @@ describe('Interactive Mode', () => {
     await rig.cleanup();
   });
 
-  it.skipIf(process.platform === 'win32')(
-    'should trigger chat compression with /compress command',
-    async () => {
-      await rig.setup('interactive-compress-test');
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10770
+  it.skip('should trigger chat compression with /compress command', async () => {
+    await rig.setup('interactive-compress-test');
 
-      const { ptyProcess } = rig.runInteractive();
+    const { ptyProcess } = rig.runInteractive();
 
-      let fullOutput = '';
-      ptyProcess.onData((data) => (fullOutput += data));
+    let fullOutput = '';
+    ptyProcess.onData((data) => (fullOutput += data));
 
-      const authDialogAppeared = await rig.waitForText(
-        'How would you like to authenticate',
-        5000,
-      );
+    const authDialogAppeared = await rig.waitForText(
+      'How would you like to authenticate',
+      5000,
+    );
 
-      // select the second option if auth dialog come's up
-      if (authDialogAppeared) {
-        ptyProcess.write('2');
-      }
+    // select the second option if auth dialog come's up
+    if (authDialogAppeared) {
+      ptyProcess.write('2');
+    }
 
-      // Wait for the app to be ready
-      const isReady = await rig.waitForText('Type your message', 15000);
-      expect(
-        isReady,
-        'CLI did not start up in interactive mode correctly',
-      ).toBe(true);
+    // Wait for the app to be ready
+    const isReady = await rig.waitForText('Type your message', 15000);
+    expect(isReady, 'CLI did not start up in interactive mode correctly').toBe(
+      true,
+    );
 
-      const longPrompt =
-        'Dont do anything except returning a 1000 token long paragragh with the <name of the scientist who discovered theory of relativity> at the end to indicate end of response. This is a moderately long sentence.';
+    const longPrompt =
+      'Dont do anything except returning a 1000 token long paragragh with the <name of the scientist who discovered theory of relativity> at the end to indicate end of response. This is a moderately long sentence.';
 
-      await type(ptyProcess, longPrompt);
-      await type(ptyProcess, '\r');
+    await type(ptyProcess, longPrompt);
+    await type(ptyProcess, '\r');
 
-      await rig.waitForText('einstein', 25000);
+    await rig.waitForText('einstein', 25000);
 
-      await type(ptyProcess, '/compress');
-      // A small delay to allow React to re-render the command list.
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      await type(ptyProcess, '\r');
+    await type(ptyProcess, '/compress');
+    // A small delay to allow React to re-render the command list.
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    await type(ptyProcess, '\r');
 
-      const foundEvent = await rig.waitForTelemetryEvent(
-        'chat_compression',
-        90000,
-      );
-      expect(foundEvent, 'chat_compression telemetry event was not found').toBe(
-        true,
-      );
-    },
-  );
+    const foundEvent = await rig.waitForTelemetryEvent(
+      'chat_compression',
+      90000,
+    );
+    expect(foundEvent, 'chat_compression telemetry event was not found').toBe(
+      true,
+    );
+  });
 
-  it.skipIf(process.platform === 'win32')(
-    'should handle compression failure on token inflation',
-    async () => {
-      await rig.setup('interactive-compress-test');
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10769
+  it.skip('should handle compression failure on token inflation', async () => {
+    await rig.setup('interactive-compress-test');
 
-      const { ptyProcess } = rig.runInteractive();
+    const { ptyProcess } = rig.runInteractive();
 
-      let fullOutput = '';
-      ptyProcess.onData((data) => (fullOutput += data));
+    let fullOutput = '';
+    ptyProcess.onData((data) => (fullOutput += data));
 
-      const authDialogAppeared = await rig.waitForText(
-        'How would you like to authenticate',
-        5000,
-      );
+    const authDialogAppeared = await rig.waitForText(
+      'How would you like to authenticate',
+      5000,
+    );
 
-      // select the second option if auth dialog come's up
-      if (authDialogAppeared) {
-        ptyProcess.write('2');
-      }
+    // select the second option if auth dialog come's up
+    if (authDialogAppeared) {
+      ptyProcess.write('2');
+    }
 
-      // Wait for the app to be ready
-      const isReady = await rig.waitForText('Type your message', 25000);
-      expect(
-        isReady,
-        'CLI did not start up in interactive mode correctly',
-      ).toBe(true);
+    // Wait for the app to be ready
+    const isReady = await rig.waitForText('Type your message', 25000);
+    expect(isReady, 'CLI did not start up in interactive mode correctly').toBe(
+      true,
+    );
 
-      await type(ptyProcess, '/compress');
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      await type(ptyProcess, '\r');
+    await type(ptyProcess, '/compress');
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    await type(ptyProcess, '\r');
 
-      const compressionFailed = await rig.waitForText(
-        'compression was not beneficial',
-        25000,
-      );
+    const compressionFailed = await rig.waitForText(
+      'compression was not beneficial',
+      25000,
+    );
 
-      expect(compressionFailed).toBe(true);
-    },
-  );
+    expect(compressionFailed).toBe(true);
+  });
 });

integration-tests/mcp_server_cyclic_schema.test.ts

@@ -192,7 +192,8 @@ describe('mcp server with cyclic tool schema is detected', () => {
     }
   });
 
-  it('mcp tool list should include tool with cyclic tool schema', async () => {
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10735
+  it.skip('mcp tool list should include tool with cyclic tool schema', async () => {
     const tool_list_output = await rig.run('/mcp list');
     expect(tool_list_output).toContain('tool_with_cyclic_schema');
   });

integration-tests/run_shell_command.test.ts

@@ -197,7 +197,8 @@ describe('run_shell_command', () => {
     ).toBeTruthy();
   });
 
-  it('should combine multiple --allowed-tools flags', async () => {
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10737
+  it.skip('should combine multiple --allowed-tools flags', async () => {
     const rig = new TestRig();
     await rig.setup('should combine multiple --allowed-tools flags');
 
@@ -226,7 +227,8 @@ describe('run_shell_command', () => {
     ).toBeTruthy();
   });
 
-  it('should allow all with "ShellTool" and other specifics', async () => {
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10768
+  it.skip('should allow all with "ShellTool" and other specifics', async () => {
     const rig = new TestRig();
     await rig.setup('should allow all with "ShellTool" and other specifics');
 

integration-tests/simple-mcp-server.test.ts

@@ -210,7 +210,8 @@ describe('simple-mcp-server', () => {
     }
   });
 
-  it('should add two numbers', async () => {
+  //TODO -https://github.com/google-gemini/gemini-cli/issues/10738
+  it.skip('should add two numbers', async () => {
     // Test directory is already set up in before hook
     // Just run the command - MCP server config is in settings.json
     const output = await rig.run('add 5 and 10');