merge: resolve conflict in agent.integration.test.ts

2026-07-14 12:00:18 -07:00 · 2026-02-26 09:20:40 -05:00
parent 968b5395fe 8380f0a3b1
commit 498a4eac65
431 changed files with 23096 additions and 4835 deletions
@@ -162,5 +162,5 @@ describe('GeminiCliAgent Integration', () => {
        // Just consume the stream
      }
    }).rejects.toThrow('Dynamic instruction failure');
-  });
+  }, 30000);
 });