@google/gemini-cli-core 0.65.0-preview.0 → 0.66.0-nightly.20261016.gdebf42324
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docs/changelogs/index.md +22 -0
- package/dist/docs/changelogs/latest.md +64 -54
- package/dist/docs/changelogs/preview.md +91 -55
- package/dist/docs/reference/configuration.md +8 -3
- package/dist/google-gemini-cli-core-0.66.0-nightly.20261013.g204db94ae.tgz +0 -0
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/scheduler/scheduler.js +25 -2
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/scheduler/scheduler.test.js +35 -1
- package/dist/src/scheduler/scheduler.test.js.map +1 -1
- package/dist/src/scheduler/scheduler_parallel.test.js +79 -0
- package/dist/src/scheduler/scheduler_parallel.test.js.map +1 -1
- package/dist/src/scheduler/types.d.ts +7 -0
- package/dist/src/skills/skillLoader.js +32 -12
- package/dist/src/skills/skillLoader.js.map +1 -1
- package/dist/src/skills/skillLoader.test.js +124 -0
- package/dist/src/skills/skillLoader.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +6 -0
- package/dist/src/utils/editor.js +47 -4
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +113 -1
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/gitUtils.js +36 -0
- package/dist/src/utils/gitUtils.js.map +1 -1
- package/dist/src/utils/gitUtils.test.js +48 -0
- package/dist/src/utils/gitUtils.test.js.map +1 -1
- package/dist/src/utils/stdio.d.ts +14 -1
- package/dist/src/utils/stdio.js +62 -4
- package/dist/src/utils/stdio.js.map +1 -1
- package/dist/src/utils/stdio.test.js +47 -0
- package/dist/src/utils/stdio.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -18,6 +18,28 @@ on GitHub.
|
|
|
18
18
|
| [Preview](preview.md) | Experimental features ready for early feedback. |
|
|
19
19
|
| [Stable](latest.md) | Stable, recommended for general use. |
|
|
20
20
|
|
|
21
|
+
## Announcements: v0.64.0 - 2026-10-13
|
|
22
|
+
|
|
23
|
+
- **Atomic Operations & State Persistence:** Serialized file tool operations
|
|
24
|
+
with atomic writes and introduced atomic CLI state persistence with automatic
|
|
25
|
+
recovery from backup on corruption
|
|
26
|
+
([#29499](https://github.com/google-gemini/gemini-cli/pull/29499) by
|
|
27
|
+
@elberthc-byte,
|
|
28
|
+
[#29558](https://github.com/google-gemini/gemini-cli/pull/29558) by
|
|
29
|
+
@urielefrenvirtusa).
|
|
30
|
+
- **Chat Recording Optimization:** Implemented append-only delta patching and
|
|
31
|
+
bounded history windowing in ChatRecordingService to optimize memory and disk
|
|
32
|
+
efficiency during long-running sessions
|
|
33
|
+
([#29568](https://github.com/google-gemini/gemini-cli/pull/29568) by
|
|
34
|
+
@jvargassanchez-dot).
|
|
35
|
+
- **CLI Interaction & Input Robustness:** Resolved `@file:line` references,
|
|
36
|
+
prevented CPU hangs on `@` in code blocks, and ensured Ctrl+C emergency aborts
|
|
37
|
+
reliably reach cancellation handlers
|
|
38
|
+
([#29581](https://github.com/google-gemini/gemini-cli/pull/29581) by
|
|
39
|
+
@jesussamuel-byte,
|
|
40
|
+
[#29586](https://github.com/google-gemini/gemini-cli/pull/29586) by
|
|
41
|
+
@urielefrenvirtusa).
|
|
42
|
+
|
|
21
43
|
## Announcements: v0.63.0 - 2026-10-06
|
|
22
44
|
|
|
23
45
|
- **Autonomous Plan Execution:** Enabled autonomous plan execution in
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
# Latest stable release: v0.
|
|
1
|
+
# Latest stable release: v0.64.0
|
|
2
2
|
|
|
3
|
-
Released: October
|
|
3
|
+
Released: October 13, 2026
|
|
4
4
|
|
|
5
5
|
For most users, our latest stable release is the recommended release. Install
|
|
6
6
|
the latest stable version with:
|
|
@@ -11,62 +11,72 @@ npm install -g @google/gemini-cli
|
|
|
11
11
|
|
|
12
12
|
## Highlights
|
|
13
13
|
|
|
14
|
-
- **
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
- **
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
- **
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
- **
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
14
|
+
- **Atomic File Operations & State Recovery:** Serialized file tool operations
|
|
15
|
+
with atomic writes and introduced atomic CLI state persistence with automatic
|
|
16
|
+
recovery from backup on corruption.
|
|
17
|
+
- **Chat Recording Optimization:** Implemented append-only delta patching and
|
|
18
|
+
bounded history windowing in ChatRecordingService to optimize memory and disk
|
|
19
|
+
efficiency during long-running sessions.
|
|
20
|
+
- **CLI Input & Reference Resolution:** Added support for resolving `@file:line`
|
|
21
|
+
references, resolved CPU hangs and quote swallowing on `@` symbols within code
|
|
22
|
+
blocks, and prevented ghost text wrap hangs.
|
|
23
|
+
- **Terminal UI & Interaction Stability:** Ensured Ctrl+C emergency aborts
|
|
24
|
+
reliably reach active cancellation handlers, made selection list confirmation
|
|
25
|
+
with Enter and Spacebar dependable, preserved scroll positions, and fixed
|
|
26
|
+
Windows ConPTY IME cursor forwarding.
|
|
27
27
|
|
|
28
28
|
## What's Changed
|
|
29
29
|
|
|
30
|
-
-
|
|
31
|
-
|
|
32
|
-
[#
|
|
33
|
-
-
|
|
34
|
-
|
|
35
|
-
-
|
|
36
|
-
|
|
37
|
-
-
|
|
38
|
-
|
|
39
|
-
[#
|
|
40
|
-
-
|
|
41
|
-
[#29487](https://github.com/google-gemini/gemini-cli/pull/29487)
|
|
42
|
-
- fix(core): bound tool output size and optimize memory lifecycle in
|
|
43
|
-
long-running agent loops by @diegogodinezr in
|
|
44
|
-
[#29451](https://github.com/google-gemini/gemini-cli/pull/29451)
|
|
45
|
-
- fix(core): remove invalid diff.external override by @urielefrenvirtusa in
|
|
46
|
-
[#29467](https://github.com/google-gemini/gemini-cli/pull/29467)
|
|
47
|
-
- chore(release): bump version to 0.63.0-nightly.20260923.gf50ba8608 by
|
|
30
|
+
- refactor(a2a-server): implement V1 to V2 settings migration logic by
|
|
31
|
+
@jvargassanchez-dot in
|
|
32
|
+
[#29450](https://github.com/google-gemini/gemini-cli/pull/29450)
|
|
33
|
+
- fix(acp): bridge PromptResponse.usage and emit usage_update notifications
|
|
34
|
+
(#29389) by @elberthc-byte in
|
|
35
|
+
[#29549](https://github.com/google-gemini/gemini-cli/pull/29549)
|
|
36
|
+
- Changelog for v0.63.0-preview.0 by @gemini-cli-robot in
|
|
37
|
+
[#29565](https://github.com/google-gemini/gemini-cli/pull/29565)
|
|
38
|
+
- fix(cli): propagate resolved folder trust state in headless mode (#29031) by
|
|
39
|
+
@amelidev in [#29528](https://github.com/google-gemini/gemini-cli/pull/29528)
|
|
40
|
+
- chore(release): bump version to 0.64.0-nightly.20260929.gd75234cae by
|
|
48
41
|
@gemini-cli-robot in
|
|
49
|
-
[#
|
|
50
|
-
-
|
|
51
|
-
|
|
52
|
-
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
-
|
|
59
|
-
|
|
60
|
-
[#29506](https://github.com/google-gemini/gemini-cli/pull/29506)
|
|
61
|
-
- fix(auth): prevent infinite auth loop from file contention, headless keyring,
|
|
62
|
-
and supervisor state drops (#28341) by @villahernandez-coder in
|
|
63
|
-
[#29448](https://github.com/google-gemini/gemini-cli/pull/29448)
|
|
64
|
-
- fix(core): enable autonomous plan execution in non-interactive mode by
|
|
42
|
+
[#29567](https://github.com/google-gemini/gemini-cli/pull/29567)
|
|
43
|
+
- fix(cli): prevent CPU hang and quote swallowing on @ within code (#29434) by
|
|
44
|
+
@elberthc-byte in
|
|
45
|
+
[#29557](https://github.com/google-gemini/gemini-cli/pull/29557)
|
|
46
|
+
- fix(core): serialize file tool operations and make writes atomic (#29078) by
|
|
47
|
+
@elberthc-byte in
|
|
48
|
+
[#29499](https://github.com/google-gemini/gemini-cli/pull/29499)
|
|
49
|
+
- fix(core): implement append-only delta patching and bounded history windowing
|
|
50
|
+
in ChatRecordingService by @jvargassanchez-dot in
|
|
51
|
+
[#29568](https://github.com/google-gemini/gemini-cli/pull/29568)
|
|
52
|
+
- fix(cli): persist state atomically and recover from backup on corruption by
|
|
65
53
|
@urielefrenvirtusa in
|
|
66
|
-
[#
|
|
67
|
-
- fix(
|
|
68
|
-
by @
|
|
69
|
-
[#
|
|
54
|
+
[#29558](https://github.com/google-gemini/gemini-cli/pull/29558)
|
|
55
|
+
- fix(cli): ensure Ctrl+C emergency abort reaches cancellation handler during
|
|
56
|
+
active operations by @urielefrenvirtusa in
|
|
57
|
+
[#29586](https://github.com/google-gemini/gemini-cli/pull/29586)
|
|
58
|
+
- fix(cli): resolve @file:line references and prevent ghost text wrap hang by
|
|
59
|
+
@jesussamuel-byte in
|
|
60
|
+
[#29581](https://github.com/google-gemini/gemini-cli/pull/29581)
|
|
61
|
+
- fix(ui): ensure Windows ConPTY forwards IME cursor position by
|
|
62
|
+
@jesussamuel-byte in
|
|
63
|
+
[#29560](https://github.com/google-gemini/gemini-cli/pull/29560)
|
|
64
|
+
- fix(cli): retry directory removal on Windows locking errors during extension
|
|
65
|
+
updates by @jesussamuel-byte in
|
|
66
|
+
[#29540](https://github.com/google-gemini/gemini-cli/pull/29540)
|
|
67
|
+
- fix(acp): resolve session by exact id and handle listener cleanup on session
|
|
68
|
+
failure by @diegogodinezr in
|
|
69
|
+
[#29580](https://github.com/google-gemini/gemini-cli/pull/29580)
|
|
70
|
+
- fix(cli): preserve scroll position and partition pending height budget by
|
|
71
|
+
@luisfelipe-alt in
|
|
72
|
+
[#29520](https://github.com/google-gemini/gemini-cli/pull/29520)
|
|
73
|
+
- fix(cli): ensure Enter and Spacebar reliably confirm selection list options by
|
|
74
|
+
@ugorla-dev in
|
|
75
|
+
[#29502](https://github.com/google-gemini/gemini-cli/pull/29502)
|
|
76
|
+
- fix(patch): cherry-pick 2ce1a69 to release/v0.64.0-preview.0-pr-29672 to patch
|
|
77
|
+
version v0.64.0-preview.0 and create version 0.64.0-preview.1 by
|
|
78
|
+
@gemini-cli-robot in
|
|
79
|
+
[#29696](https://github.com/google-gemini/gemini-cli/pull/29696)
|
|
70
80
|
|
|
71
81
|
**Full Changelog**:
|
|
72
|
-
https://github.com/google-gemini/gemini-cli/compare/v0.
|
|
82
|
+
https://github.com/google-gemini/gemini-cli/compare/v0.63.0...v0.64.0
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
# Preview release: v0.
|
|
1
|
+
# Preview release: v0.65.0-preview.0
|
|
2
2
|
|
|
3
|
-
Released: October
|
|
3
|
+
Released: October 13, 2026
|
|
4
4
|
|
|
5
5
|
Our preview release includes the latest, new, and experimental features. This
|
|
6
6
|
release may not be as stable as our [latest weekly release](latest.md).
|
|
@@ -13,67 +13,103 @@ npm install -g @google/gemini-cli@preview
|
|
|
13
13
|
|
|
14
14
|
## Highlights
|
|
15
15
|
|
|
16
|
-
- **
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
- **
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
16
|
+
- **Custom Telemetry Headers**: Added support for configuring custom OTLP
|
|
17
|
+
headers in telemetry settings, enabling authentication and header
|
|
18
|
+
customization for OpenTelemetry collectors.
|
|
19
|
+
- **File System Performance & Traversal**: Optimized ignore pattern filtering
|
|
20
|
+
with subtree pruning to accelerate directory scanning, deferred recursive file
|
|
21
|
+
reads for `@<directory>` references, and improved empty file handling across
|
|
22
|
+
multi-byte encodings.
|
|
23
|
+
- **Session Resilience & State Integrity**: Prevented session poisoning during
|
|
24
|
+
rapid Ctrl+C interruptions, preserved resumed session history on quick exits,
|
|
25
|
+
and eliminated duplicate tool response turns upon resuming sessions.
|
|
26
|
+
- **Authentication & Workspace Security**: Enforced read-only workspace settings
|
|
27
|
+
in untrusted directories, aligned OAuth callback parameter validation with RFC
|
|
28
|
+
9207 metadata, and resolved infinite authentication retry loops.
|
|
29
|
+
- **Terminal UI & Interactive Stability**: Resolved interactive mode hangs on
|
|
30
|
+
Enter keypresses, prevented unnecessary terminal clears and scroll resets when
|
|
31
|
+
expanding output with Ctrl+O, and restored debounced static UI refreshes on
|
|
32
|
+
terminal width changes.
|
|
28
33
|
|
|
29
34
|
## What's Changed
|
|
30
35
|
|
|
31
|
-
-
|
|
36
|
+
- fix(cli): enforce read-only workspace settings in untrusted folders by
|
|
32
37
|
@jvargassanchez-dot in
|
|
33
|
-
[#
|
|
34
|
-
- fix(
|
|
35
|
-
|
|
36
|
-
[#
|
|
37
|
-
-
|
|
38
|
-
|
|
39
|
-
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
[#29583](https://github.com/google-gemini/gemini-cli/pull/29583)
|
|
39
|
+
- fix(core): avoid duplicate tool response turns when resuming sessions by
|
|
40
|
+
@diegogodinezr in
|
|
41
|
+
[#29618](https://github.com/google-gemini/gemini-cli/pull/29618)
|
|
42
|
+
- fix(core): prevent deletion of resumed session history on quick exit (#29198)
|
|
43
|
+
by @villahernandez-coder in
|
|
44
|
+
[#29584](https://github.com/google-gemini/gemini-cli/pull/29584)
|
|
45
|
+
- Changelog for v0.64.0-preview.0 by @gemini-cli-robot in
|
|
46
|
+
[#29656](https://github.com/google-gemini/gemini-cli/pull/29656)
|
|
47
|
+
- Changelog for v0.63.0 by @gemini-cli-robot in
|
|
48
|
+
[#29659](https://github.com/google-gemini/gemini-cli/pull/29659)
|
|
49
|
+
- fix(core): align OAuth callback iss parameter validation with RFC 9207
|
|
50
|
+
metadata by @luisfelipe-alt in
|
|
51
|
+
[#29616](https://github.com/google-gemini/gemini-cli/pull/29616)
|
|
52
|
+
- fix(cli): prevent unnecessary terminal clears and scroll resets when expanding
|
|
53
|
+
with Ctrl+O by @jesussamuel-byte in
|
|
54
|
+
[#29640](https://github.com/google-gemini/gemini-cli/pull/29640)
|
|
55
|
+
- chore(release): bump version to 0.65.0-nightly.20261006.gfb972b2f8 by
|
|
42
56
|
@gemini-cli-robot in
|
|
43
|
-
[#
|
|
44
|
-
- fix(
|
|
45
|
-
@
|
|
46
|
-
[#
|
|
47
|
-
- fix(core):
|
|
57
|
+
[#29657](https://github.com/google-gemini/gemini-cli/pull/29657)
|
|
58
|
+
- fix(ci): add missing loop in unassign-inactive-assignees workflow by
|
|
59
|
+
@ugorla-dev in
|
|
60
|
+
[#29609](https://github.com/google-gemini/gemini-cli/pull/29609)
|
|
61
|
+
- fix(core): enforce terminal user turn invariant and normalize request contents
|
|
62
|
+
by @luisfelipe-alt in
|
|
63
|
+
[#29612](https://github.com/google-gemini/gemini-cli/pull/29612)
|
|
64
|
+
- `feat(telemetry): support custom OTLP headers in telemetry configuration` by
|
|
65
|
+
@jesussamuel-byte in
|
|
66
|
+
[#29641](https://github.com/google-gemini/gemini-cli/pull/29641)
|
|
67
|
+
- fix(auth): prevent infinite verification and OAuth retry loops by
|
|
68
|
+
@villahernandez-coder in
|
|
69
|
+
[#29655](https://github.com/google-gemini/gemini-cli/pull/29655)
|
|
70
|
+
- fix(cli): handle JSON parse and response stream errors in fetchJson by
|
|
71
|
+
@jesussamuel-byte in
|
|
72
|
+
[#29658](https://github.com/google-gemini/gemini-cli/pull/29658)
|
|
73
|
+
- fix(core): preserve line terminators in truncateString by @diegogodinezr in
|
|
74
|
+
[#29673](https://github.com/google-gemini/gemini-cli/pull/29673)
|
|
75
|
+
- fix(vscode-ide-companion): make IdeServer.stop() resolve while MCP sessions
|
|
76
|
+
are open by @elberthc-byte in
|
|
77
|
+
[#29674](https://github.com/google-gemini/gemini-cli/pull/29674)
|
|
78
|
+
- fix(core): retain ask_user question text in the tool result display by
|
|
48
79
|
@elberthc-byte in
|
|
49
|
-
[#
|
|
50
|
-
- fix(core):
|
|
51
|
-
|
|
52
|
-
[#
|
|
53
|
-
- fix(cli):
|
|
80
|
+
[#29677](https://github.com/google-gemini/gemini-cli/pull/29677)
|
|
81
|
+
- fix(core): eliminate false positives on untrusted command flags and compound
|
|
82
|
+
loops by @DavidAPierce in
|
|
83
|
+
[#29672](https://github.com/google-gemini/gemini-cli/pull/29672)
|
|
84
|
+
- fix(cli): clear cached credentials when re-selecting Google login by
|
|
54
85
|
@urielefrenvirtusa in
|
|
55
|
-
[#
|
|
56
|
-
- fix(cli):
|
|
57
|
-
|
|
58
|
-
[#
|
|
59
|
-
-
|
|
86
|
+
[#29643](https://github.com/google-gemini/gemini-cli/pull/29643)
|
|
87
|
+
- fix(cli): resolve hang on Enter keypress in interactive mode (#23297) by
|
|
88
|
+
@elberthc-byte in
|
|
89
|
+
[#29476](https://github.com/google-gemini/gemini-cli/pull/29476)
|
|
90
|
+
- perf(core): optimize ignore filtering and enable subtree pruning (#29077) by
|
|
91
|
+
@amelidev in [#29582](https://github.com/google-gemini/gemini-cli/pull/29582)
|
|
92
|
+
- fix(a2a-server): isolate tool rejection to active call in sequential batches
|
|
93
|
+
by @jvargassanchez-dot in
|
|
94
|
+
[#29683](https://github.com/google-gemini/gemini-cli/pull/29683)
|
|
95
|
+
- fix(cli): skip eager recursive file reading for @<directory> references by
|
|
96
|
+
@jvargassanchez-dot in
|
|
97
|
+
[#29617](https://github.com/google-gemini/gemini-cli/pull/29617)
|
|
98
|
+
- fix(cli): keep loading other extensions when one fails the allowlist check by
|
|
60
99
|
@jesussamuel-byte in
|
|
61
|
-
[#
|
|
62
|
-
- fix(
|
|
100
|
+
[#29720](https://github.com/google-gemini/gemini-cli/pull/29720)
|
|
101
|
+
- fix(cli): correct reverse search highlight index for expanding unicode
|
|
102
|
+
characters by @diegogodinezr in
|
|
103
|
+
[#29699](https://github.com/google-gemini/gemini-cli/pull/29699)
|
|
104
|
+
- fix(core): treat whitespace-only UTF-16 and UTF-32 files as empty by
|
|
63
105
|
@jesussamuel-byte in
|
|
64
|
-
[#
|
|
65
|
-
- fix(cli):
|
|
66
|
-
|
|
67
|
-
[#
|
|
68
|
-
- fix(
|
|
69
|
-
|
|
70
|
-
[#
|
|
71
|
-
- fix(cli): preserve scroll position and partition pending height budget by
|
|
72
|
-
@luisfelipe-alt in
|
|
73
|
-
[#29520](https://github.com/google-gemini/gemini-cli/pull/29520)
|
|
74
|
-
- fix(cli): ensure Enter and Spacebar reliably confirm selection list options by
|
|
75
|
-
@ugorla-dev in
|
|
76
|
-
[#29502](https://github.com/google-gemini/gemini-cli/pull/29502)
|
|
106
|
+
[#29722](https://github.com/google-gemini/gemini-cli/pull/29722)
|
|
107
|
+
- fix(cli): restore debounced static UI refresh on terminal width changes by
|
|
108
|
+
@jvargassanchez-dot in
|
|
109
|
+
[#29644](https://github.com/google-gemini/gemini-cli/pull/29644)
|
|
110
|
+
- fix(cli): prevent session poisoning on rapid Ctrl-C interruption by
|
|
111
|
+
@villahernandez-coder in
|
|
112
|
+
[#29728](https://github.com/google-gemini/gemini-cli/pull/29728)
|
|
77
113
|
|
|
78
114
|
**Full Changelog**:
|
|
79
|
-
https://github.com/google-gemini/gemini-cli/compare/v0.
|
|
115
|
+
https://github.com/google-gemini/gemini-cli/compare/v0.64.0-preview.1...v0.65.0-preview.0
|
|
@@ -66,9 +66,14 @@ variables using `$VAR_NAME`, `${VAR_NAME}`, or `${VAR_NAME:-DEFAULT_VALUE}`
|
|
|
66
66
|
syntax. These variables will be automatically resolved when the settings are
|
|
67
67
|
loaded. For example, if you have an environment variable `MY_API_TOKEN`, you
|
|
68
68
|
could use it in `settings.json` like this: `"apiKey": "$MY_API_TOKEN"`. If you
|
|
69
|
-
want to provide a fallback value, use `${MY_API_TOKEN:-default-token}`.
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
want to provide a fallback value, use `${MY_API_TOKEN:-default-token}`. You can
|
|
70
|
+
reference variables from your shell environment as well as variables loaded from
|
|
71
|
+
[`.env` files](#environment-variables-and-env-files). The settings that control
|
|
72
|
+
how `.env` files are loaded, such as `security.folderTrust.enabled`,
|
|
73
|
+
`advanced.ignoreLocalEnv`, `advanced.excludedEnvVars`, and `tools.sandbox`, are
|
|
74
|
+
evaluated before any `.env` file is loaded, so they can only reference variables
|
|
75
|
+
from your shell environment. Additionally, each extension can have its own
|
|
76
|
+
`.env` file in its directory, which will be loaded automatically.
|
|
72
77
|
|
|
73
78
|
**Note for Enterprise Users:** For guidance on deploying and managing Gemini CLI
|
|
74
79
|
in a corporate environment, see the
|
|
@@ -3,5 +3,5 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
export declare const GIT_COMMIT_INFO = "
|
|
7
|
-
export declare const CLI_VERSION = "0.
|
|
6
|
+
export declare const GIT_COMMIT_INFO = "debf42324";
|
|
7
|
+
export declare const CLI_VERSION = "0.66.0-nightly.20261016.gdebf42324";
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
// This file is auto-generated by the build script (scripts/generate-git-commit-info.js)
|
|
7
7
|
// Do not edit this file manually.
|
|
8
|
-
export const GIT_COMMIT_INFO = '
|
|
9
|
-
export const CLI_VERSION = '0.
|
|
8
|
+
export const GIT_COMMIT_INFO = 'debf42324';
|
|
9
|
+
export const CLI_VERSION = '0.66.0-nightly.20261016.gdebf42324';
|
|
10
10
|
//# sourceMappingURL=git-commit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,oCAAoC,CAAC"}
|
|
@@ -13,7 +13,7 @@ import { CoreToolCallStatus, } from './types.js';
|
|
|
13
13
|
import { ToolErrorType } from '../tools/tool-error.js';
|
|
14
14
|
import { UPDATE_TOPIC_TOOL_NAME } from '../tools/tool-names.js';
|
|
15
15
|
import { PolicyDecision } from '../policy/types.js';
|
|
16
|
-
import { ToolConfirmationOutcome, } from '../tools/tools.js';
|
|
16
|
+
import { Kind, ToolConfirmationOutcome, } from '../tools/tools.js';
|
|
17
17
|
import { getToolSuggestion, isParallelizable } from '../utils/tool-utils.js';
|
|
18
18
|
import { runInDevTraceSpan } from '../telemetry/trace.js';
|
|
19
19
|
import { logToolCall } from '../telemetry/loggers.js';
|
|
@@ -46,6 +46,26 @@ const createErrorResponse = (request, error, errorType) => ({
|
|
|
46
46
|
errorType,
|
|
47
47
|
contentLength: error.message.length,
|
|
48
48
|
});
|
|
49
|
+
/**
|
|
50
|
+
* Assigns a group ID to every run of two or more adjacent requests for which
|
|
51
|
+
* `isGroupable` returns true. All requests in a run get the call ID of the
|
|
52
|
+
* first request in it. Requests that are not part of a run get `undefined`.
|
|
53
|
+
*/
|
|
54
|
+
function getToolCallGroupIds(requests, isGroupable) {
|
|
55
|
+
const groupable = requests.map(isGroupable);
|
|
56
|
+
const groupIds = requests.map(() => undefined);
|
|
57
|
+
let runStart = 0;
|
|
58
|
+
for (let i = 0; i <= requests.length; i++) {
|
|
59
|
+
if (i < requests.length && groupable[i])
|
|
60
|
+
continue;
|
|
61
|
+
// The run of groupable requests in [runStart, i) has ended.
|
|
62
|
+
if (i - runStart >= 2) {
|
|
63
|
+
groupIds.fill(requests[runStart].callId, runStart, i);
|
|
64
|
+
}
|
|
65
|
+
runStart = i + 1;
|
|
66
|
+
}
|
|
67
|
+
return groupIds;
|
|
68
|
+
}
|
|
49
69
|
/**
|
|
50
70
|
* Event-Driven Orchestrator for Tool Execution.
|
|
51
71
|
* Coordinates execution via state updates and event listening.
|
|
@@ -216,11 +236,13 @@ export class Scheduler {
|
|
|
216
236
|
});
|
|
217
237
|
try {
|
|
218
238
|
const toolRegistry = this.context.toolRegistry;
|
|
219
|
-
const
|
|
239
|
+
const groupIds = getToolCallGroupIds(sortedRequests, (request) => toolRegistry.getTool(request.name)?.kind === Kind.Agent);
|
|
240
|
+
const newCalls = sortedRequests.map((request, index) => {
|
|
220
241
|
const enrichedRequest = {
|
|
221
242
|
...request,
|
|
222
243
|
schedulerId: this.schedulerId,
|
|
223
244
|
parentCallId: this.parentCallId,
|
|
245
|
+
groupId: groupIds[index],
|
|
224
246
|
};
|
|
225
247
|
const tool = toolRegistry.getTool(request.name);
|
|
226
248
|
if (!tool) {
|
|
@@ -536,6 +558,7 @@ export class Scheduler {
|
|
|
536
558
|
isClientInitiated: result.request.isClientInitiated,
|
|
537
559
|
prompt_id: result.request.prompt_id,
|
|
538
560
|
schedulerId: this.schedulerId,
|
|
561
|
+
groupId: result.request.groupId,
|
|
539
562
|
};
|
|
540
563
|
if (!newTool) {
|
|
541
564
|
// Enqueue an errored tool call
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../src/scheduler/scheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EASL,kBAAkB,GAEnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAqB,MAAM,oBAAoB,CAAC;AACvE,OAAO,EACL,uBAAuB,GAExB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EACL,cAAc,GAGf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EACL,UAAU,EACV,SAAS,GAEV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAwB/D,SAAS,qBAAqB,CAC5B,UAAmB;IAEnB,OAAO,CACL,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,IAAI;QACnB,2BAA2B,IAAI,UAAU;QACzC,OAAQ,UAAsD;aAC3D,yBAAyB,KAAK,UAAU,CAC5C,CAAC;AACJ,CAAC;AAED,MAAM,mBAAmB,GAAG,CAC1B,OAA4B,EAC5B,KAAY,EACZ,SAAoC,EACd,EAAE,CAAC,CAAC;IAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;IACtB,KAAK;IACL,aAAa,EAAE;QACb;YACE,gBAAgB,EAAE;gBAChB,EAAE,EAAE,OAAO,CAAC,MAAM;gBAClB,IAAI,EAAE,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,IAAI;gBACjD,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;aACnC;SACF;KACF;IACD,aAAa,EAAE,KAAK,CAAC,OAAO;IAC5B,SAAS;IACT,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM;CACpC,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,OAAO,SAAS;IACH,iBAAiB,GAAG,IAAI,eAAe,EAAE,CAAC;IAE1C,KAAK,CAAwB;IAC7B,QAAQ,CAAe;IACvB,QAAQ,CAA0B;IAClC,MAAM,CAAS;IACf,OAAO,CAAmB;IAC1B,UAAU,CAAa;IACvB,kBAAkB,CAA+B;IACjD,WAAW,CAAS;IACpB,QAAQ,CAAU;IAClB,YAAY,CAAU;IACtB,wBAAwB,CAA8B;IACtD,uBAAuB,CAAU;IAE1C,YAAY,GAAG,KAAK,CAAC;IACrB,YAAY,GAAG,KAAK,CAAC;IACZ,YAAY,GAAyB,EAAE,CAAC;IAEzD,YAAY,OAAyB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAChE,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACrD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC;QACjE,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,IAAI,CAAC;QACvE,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAqB,CACpC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,WAAW,EAChB,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAC5D,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAE9C,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE9C,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO;QACL,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAEgB,iBAAiB,GAAG,CAAC,OAA2B,EAAE,EAAE;QACnE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,kBAAkB,CAAC,SAAS,EAAE,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GACd,OAAO,CAAC,KAAK,KAAK,SAAS;YAC3B,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC9B,OAAO,CAAC,KAAK,GAAG,CAAC;YACf,CAAC,CAAC,OAAO,CAAC,KAAK;YACf,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,SAAS,EAAE;YAC5D,eAAe,EAAE,OAAO,CAAC,OAAO;YAChC,eAAe,EAAE,UAAU;gBACzB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC;gBACtD,CAAC,CAAC,SAAS;YACb,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa,EAAE,UAAU;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC;IAEe,6BAA6B,GAAG,KAAK,EACpD,OAAgC,EAChC,EAAE;QACF,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YAC5B,IAAI,EAAE,cAAc,CAAC,0BAA0B;YAC/C,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,SAAS,EAAE,KAAK;YAChB,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC;IAEM,uBAAuB,CAAC,UAAsB;QACpD,kEAAkE;QAClE,2DAA2D;QAC3D,UAAU,CAAC,SAAS,CAClB,cAAc,CAAC,yBAAyB,EACxC,IAAI,CAAC,6BAA6B,EAClC,EAAE,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAC1C,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAQ,CACZ,OAAoD,EACpD,MAAmB;QAEnB,OAAO,iBAAiB,CACtB;YACE,SAAS,EAAE,kBAAkB,CAAC,iBAAiB;YAC/C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,EAAE;YAC/D,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,EAAE;YAC9D,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE;SAC9C,EACD,KAAK,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAE9D,YAAY,CAAC,KAAK,GAAG,QAAQ,CAAC;YAE9B,IAAI,gBAAgB,GAAwB,EAAE,CAAC;YAE/C,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAC7C,gBAAgB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC9D,CAAC;YAED,YAAY,CAAC,MAAM,GAAG,gBAAgB,CAAC;YACvC,OAAO,gBAAgB,CAAC;QAC1B,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,eAAe,CACrB,QAA+B,EAC/B,MAAmB;QAEnB,OAAO,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1D,MAAM,YAAY,GAAG,GAAG,EAAE;gBACxB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,QAAQ,CACrC,CAAC;gBACF,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;oBACf,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACnC,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC,CAAC;YAEF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;gBACzC,OAAO;YACT,CAAC;YAED,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAE/D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;gBACrB,QAAQ;gBACR,MAAM;gBACN,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;oBACnB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAClD,OAAO,CAAC,OAAO,CAAC,CAAC;gBACnB,CAAC;gBACD,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;oBACd,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAClD,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,IAAI,IAAI,CAAC,YAAY;YAAE,OAAO;QAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,gCAAgC;QAChC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,sBAAsB;QACtB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QAC9C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,UAAU,CAAC,OAAO,CAAC,MAAM,EACzB,kBAAkB,CAAC,SAAS,EAC5B,6BAA6B,CAC9B,CAAC;gBACF,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QAED,cAAc;QACd,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,6BAA6B,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;IACnC,CAAC;IAEO,UAAU,CAAC,MAAc;QAC/B,OAAO,CACL,MAAM,KAAK,kBAAkB,CAAC,OAAO;YACrC,MAAM,KAAK,kBAAkB,CAAC,KAAK;YACnC,MAAM,KAAK,kBAAkB,CAAC,SAAS,CACxC,CAAC;IACJ,CAAC;IAED,0CAA0C;IAElC,KAAK,CAAC,WAAW,CACvB,QAA+B,EAC/B,MAAmB;QAEnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAE1D,iFAAiF;QACjF,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB;gBAAE,OAAO,CAAC,CAAC,CAAC;YACjD,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB;gBAAE,OAAO,CAAC,CAAC;YAChD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;YAC/C,MAAM,QAAQ,GAAe,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC1D,MAAM,eAAe,GAAwB;oBAC3C,GAAG,OAAO;oBACV,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;iBAChC,CAAC;gBACF,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEhD,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,OAAO;wBACL,GAAG,IAAI,CAAC,kCAAkC,CACxC,eAAe,EACf,YAAY,CAAC,eAAe,EAAE,CAC/B;wBACD,YAAY,EAAE,mBAAmB;qBAClC,CAAC;gBACJ,CAAC;gBAED,OAAO,IAAI,CAAC,0BAA0B,CACpC,eAAe,EACf,IAAI,EACJ,mBAAmB,CACpB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC7B,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QACnC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YACxB,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACpC,CAAC;IACH,CAAC;IAEO,kCAAkC,CACxC,OAA4B,EAC5B,SAAmB;QAEnB,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9D,OAAO;YACL,MAAM,EAAE,kBAAkB,CAAC,KAAK;YAChC,OAAO;YACP,QAAQ,EAAE,mBAAmB,CAC3B,OAAO,EACP,IAAI,KAAK,CAAC,SAAS,OAAO,CAAC,IAAI,eAAe,UAAU,EAAE,CAAC,EAC3D,aAAa,CAAC,mBAAmB,CAClC;YACD,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC;IAEO,0BAA0B,CAChC,OAA4B,EAC5B,IAAwB,EACxB,YAA0B;QAE1B,OAAO,sBAAsB,CAC3B;YACE,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,EACD,GAAG,EAAE;YACH,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAC;wBACpC,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,UAAU;wBACV,WAAW,EAAE,IAAI,CAAC,WAAW;qBAC9B,CAAC,CAAC;oBACH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;wBACjC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;oBACjD,CAAC;gBACH,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,kBAAkB,CAAC,UAAU;oBACrC,OAAO;oBACP,IAAI;oBACJ,UAAU;oBACV,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;oBACrB,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,YAAY;iBACb,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO;oBACL,MAAM,EAAE,kBAAkB,CAAC,KAAK;oBAChC,OAAO;oBACP,IAAI;oBACJ,QAAQ,EAAE,mBAAmB,CAC3B,OAAO,EACP,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAC7C,aAAa,CAAC,mBAAmB,CAClC;oBACD,UAAU,EAAE,CAAC;oBACb,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,YAAY;iBACb,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAED,mCAAmC;IAE3B,KAAK,CAAC,aAAa,CAAC,MAAmB;QAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACzD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC3D,IAAI,CAAC,cAAc;gBAAE,MAAM;QAC7B,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,gBAAgB,CAAC,MAAmB;QAChD,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,0CAA0C;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;YAC9C,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBACjC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC/C,CAAC;YACH,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CACnE,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC,IAAI;gBAAE,OAAO,KAAK,CAAC;YAExB,IAAI,IAAI,CAAC,MAAM,KAAK,kBAAkB,CAAC,KAAK,EAAE,CAAC;gBAC7C,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,kBAAkB,CAAC,KAAK,EACxB,IAAI,CAAC,QAAQ,CACd,CAAC;gBACF,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kFAAkF;YAClF,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;oBAClC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;oBACtC,IAAI,MAAM,IAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;oBACvB,CAAC;yBAAM,CAAC;wBACN,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,wEAAwE;QACxE,yCAAyC;QAEzC,4DAA4D;QAC5D,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QAC5C,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CACxC,CAAC,CAAC,EAA2B,EAAE,CAC7B,CAAC,CAAC,MAAM,KAAK,kBAAkB,CAAC,UAAU,CAC7C,CAAC;QACF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CACnE,CAAC;QACJ,CAAC;QAED,6BAA6B;QAC7B,kEAAkE;QAClE,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QACxC,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CACvC,CAAC,CAAC,EAA0B,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,kBAAkB,CAAC,SAAS,CACzE,CAAC;QAEF,mFAAmF;QACnF,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAChC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,KAAK,kBAAkB,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CACzE,CAAC;QAEF,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,QAAQ,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CACpD,CAAC;YACF,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;QAED,6BAA6B;QAC7B,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC7C,YAAY,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC;QAED,4FAA4F;QAC5F,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CACrD,CAAC;QACF,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CACjE,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,MAAM,CACrD,CAAC;QAEF,IAAI,YAAY,IAAI,gBAAgB,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,oGAAoG;QACpG,uFAAuF;QACvF,MAAM,oBAAoB,GAAG,WAAW,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,KAAK,kBAAkB,CAAC,gBAAgB;YAChD,CAAC,CAAC,MAAM,KAAK,kBAAkB,CAAC,SAAS,CAC5C,CAAC;QAEF,IAAI,oBAAoB,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChD,8FAA8F;YAC9F,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,6FAA6F;QAC7F,yBAAyB;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,MAA0B,EAC1B,MAAmB;QAEnB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACtE,qEAAqE;YACrE,mEAAmE;YACnE,IAAI,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAChD,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,CAAC,OAAO,CAAC,MAAM,EACrB,kBAAkB,CAAC,SAAS,EAC5B,qBAAqB,CACtB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,CAAC,OAAO,CAAC,MAAM,EACrB,kBAAkB,CAAC,KAAK,EACxB,mBAAmB,CACjB,MAAM,CAAC,OAAO,EACd,GAAG,EACH,aAAa,CAAC,mBAAmB,CAClC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,6CAA6C;IAErC,KAAK,CAAC,gBAAgB,CAC5B,QAA4B,EAC5B,MAAmB;QAEnB,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;QAEvC,6BAA6B;QAC7B,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAC7C,IAAI,CAAC,MAAM,EACX,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,UAAU,CACpB,CAAC;QAEF,IAAI,UAAU,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,KAAK,EACxB,mBAAmB,CACjB,QAAQ,CAAC,OAAO,EAChB,UAAU,CAAC,KAAK,EAChB,UAAU,CAAC,SAAS,CACrB,CACF,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,GACpE,UAAU,CAAC;QAEb,IAAI,YAAY,IAAI,aAAa,EAAE,CAAC;YAClC,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,YAAY,CAAC;YACrC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;YAC5C,QAAQ,CAAC,UAAU,GAAG,aAAa,CAAC;QACtC,CAAC;QAED,uBAAuB;QACvB,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAC1D,QAAQ,EACR,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,QAAQ,GAAG,cAAc,CAAC;QAC9B,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;YAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;QACrC,CAAC;QAED,MAAM,YAAY,GAChB,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC1C,QAAQ,CAAC,UAAU,CAAC,yBAAyB,EAAE,CAAC;QAElD,IAAI,QAAQ,KAAK,cAAc,CAAC,KAAK,IAAI,YAAY,EAAE,CAAC;YACtD,QAAQ;gBACN,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,IAAI,CAAC;oBACrC,CAAC,CAAC,cAAc,CAAC,QAAQ;oBACzB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC;QAC5B,CAAC;QAED,IAAI,QAAQ,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;YACrC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,oBAAoB,CACtD,IAAI,CAAC,MAAM,EACX,IAAI,CACL,CAAC;YAEF,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,KAAK,EACxB,mBAAmB,CACjB,QAAQ,CAAC,OAAO,EAChB,IAAI,KAAK,CAAC,YAAY,CAAC,EACvB,SAAS,CACV,CACF,CAAC;YACF,OAAO;QACT,CAAC;QAED,yBAAyB;QACzB,IAAI,OAAO,GAAG,uBAAuB,CAAC,WAAW,CAAC;QAClD,IAAI,WAAwD,CAAC;QAE7D,IAAI,QAAQ,KAAK,cAAc,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,cAAc,GAClB,YAAY,KAAK,KAAK;gBACtB,CAAC,cAAc,KAAK,cAAc,CAAC,KAAK,IAAI,YAAY,CAAC;gBACvD,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,SAAS,CAAC;YAEhB,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE;gBACzD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;gBACvD,aAAa,EAAE,iBAAiB;gBAChC,cAAc;aACf,CAAC,CAAC;YACH,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YACzB,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACnC,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEvC,wBAAwB;QACxB,IAAI,QAAQ,KAAK,cAAc,CAAC,QAAQ,IAAI,OAAO,EAAE,CAAC;YACpD,MAAM,YAAY,CAChB,QAAQ,CAAC,IAAI,EACb,OAAO,EACP,WAAW,EACX,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,QAAQ,CAAC,UAAU,CACpB,CAAC;QACJ,CAAC;QAED,4EAA4E;QAC5E,IAAI,OAAO,KAAK,uBAAuB,CAAC,MAAM,EAAE,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,SAAS,EAC5B,wBAAwB,CACzB,CAAC;YACF,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBACjC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC;YACzD,CAAC;YACD,OAAO,CAAC,iBAAiB;QAC3B,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAChE,CAAC;IAED,6BAA6B;IAE7B;;OAEG;IACK,KAAK,CAAC,QAAQ,CACpB,QAA2B,EAC3B,MAAmB;QAEnB,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;QACvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,SAAS,EAC5B,qBAAqB,CACtB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAE9D,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAsB,CAAC;QAEvE,MAAM,MAAM,GAAG,MAAM,sBAAsB,CACzC;YACE,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;YACjC,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,EACD,GAAG,EAAE,CACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YACpB,IAAI,EAAE,UAAU;YAChB,MAAM;YACN,mBAAmB,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAC/B,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,kBAAkB,CAAC,SAAS,EAAE;gBACxD,UAAU,EAAE,GAAG;aAChB,CAAC;YACJ,gBAAgB,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC5B,IACE,OAAO,CAAC,MAAM,KAAK,kBAAkB,CAAC,SAAS;oBAC/C,OAAO,CAAC,GAAG,EACX,CAAC;oBACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,SAAS,EAAE;wBAC5D,GAAG,EAAE,OAAO,CAAC,GAAG;qBACjB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC,CACL,CAAC;QAEF,IACE,CAAC,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO;YAC3C,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,KAAK,CAAC;YAC7C,MAAM,CAAC,mBAAmB,EAC1B,CAAC;YACD,0DAA0D;YAC1D,MAAM,gBAAgB,GAAyC;gBAC7D,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,UAAU,EAAE,UAAU,CAAC,SAAS;oBAC9B,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC,SAAS;oBACnC,CAAC,CAAC,SAAS;gBACb,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC;YACF,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAE9D,MAAM,WAAW,GAAG,MAAM,CAAC,mBAAmB,CAAC;YAC/C,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC7C,MAAM,mBAAmB,GACvB,MAAM,CAAC,OAAO,CAAC,mBAAmB,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YAE5D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAEpE,MAAM,UAAU,GAAwB;gBACtC,MAAM,EAAE,cAAc;gBACtB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,mBAAmB;gBACnB,mBAAmB,EACjB,MAAM,CAAC,OAAO,CAAC,mBAAmB,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI;gBAC3D,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB;gBACnD,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;gBACnC,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC;YAEF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,+BAA+B;gBAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,kCAAkC,CACvD,UAAU,EACV,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,eAAe,EAAE,CAC5C,CAAC;gBACF,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACN,uDAAuD;gBACvD,MAAM,cAAc,GAAG,IAAI,CAAC,0BAA0B,CACpD,UAAU,EACV,OAAO,EACP,UAAU,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CACzD,CAAC;gBACF,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YACnE,CAAC;YAED,0EAA0E;YAC1E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,iBAAiB,GAAG,EAAE,CAAC;QAE3B,IACE,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,KAAK;YAC1C,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK,4BAA4B,EAC1D,CAAC;YACD,cAAc,GAAG,IAAI,CAAC;YACtB,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC;QAC3D,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,uEAAuE;gBACvE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAG/C,CAAC;gBAEF,MAAM,mBAAmB,GAAoC;oBAC3D,IAAI,EAAE,mBAAmB;oBACzB,KAAK,EAAE,2BAA2B;oBAClC,OAAO,EAAE,MAAM,CACb,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,WAAW,CAAC,WAAW,CAC9D;oBACD,WAAW,EAAE,WAAW,CAAC,WAAW;oBACpC,qBAAqB,EAAE,WAAW,CAAC,qBAAqB;iBACzD,CAAC;gBAEF,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;gBAE1C,gGAAgG;gBAChG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC;oBAC/C,WAAW,CAAC,qBAAqB,CAAC;gBACpC,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEvE,4EAA4E;gBAC5E,0EAA0E;gBAC1E,iDAAiD;gBACjD,IAAI,CAAC,KAAK,CAAC,UAAU,CACnB,MAAM,EACN,UAAU,CAAC,OAAO,CAAC,IAAI,EACvB,UAAU,CAAC,UAAU,CACtB,CAAC;gBAEF,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,gBAAgB,EAAE;oBACnE,mBAAmB;oBACnB,aAAa;iBACd,CAAC,CAAC;gBAEH,MAAM,cAAc,GAAG;oBACrB,GAAG,UAAU;oBACb,MAAM,EAAE,kBAAkB,CAAC,UAAU;iBAChB,CAAC;gBAExB,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE;oBACnE,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;oBAC3C,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;iBACxD,CAAC,CAAC;gBAEH,IAAI,UAAU,CAAC,OAAO,KAAK,uBAAuB,CAAC,MAAM,EAAE,CAAC;oBAK1D,MAAM,aAAa,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAgB,CAAC;oBAC3D,aAAa,CAAC,UAAU;wBACtB,6FAA6F;4BAC7F,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;oBAEtC,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,KAAK,EACxB,aAAa,CACd,CAAC;oBACF,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC;oBAC/C,WAAW,CAAC,qBAAqB,CAAC;gBAEpC,+DAA+D;gBAC/D,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,SAAS,EAAE;oBAC5D,UAAU,EAAE,SAAS;iBACtB,CAAC,CAAC;gBAEH,kFAAkF;gBAClF,OAAO,MAAM,IAAI,CAAC,QAAQ,CACxB;oBACE,GAAG,UAAU;oBACb,MAAM,EAAE,kBAAkB,CAAC,SAAS;iBAChB,EACtB,MAAM,CACP,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,6DAA6D;YAC/D,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACjD,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,OAAO,EAC1B,MAAM,CAAC,QAAQ,CAChB,CAAC;QACJ,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,SAAS,EAAE,CAAC;YAC1D,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,SAAS,EAC5B,MAAM,CAAC,QAAQ,CAChB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,YAAY,CACrB,MAAM,EACN,kBAAkB,CAAC,KAAK,EACxB,MAAM,CAAC,QAAQ,CAChB,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,0BAA0B;QAChC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAG,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC;iBACtC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;iBAClB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../src/scheduler/scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ vi.mock('./tool-executor.js');
|
|
|
44
44
|
vi.mock('./tool-modifier.js');
|
|
45
45
|
import { Scheduler } from './scheduler.js';
|
|
46
46
|
import { PolicyDecision, ApprovalMode } from '../policy/types.js';
|
|
47
|
-
import { ToolConfirmationOutcome, } from '../tools/tools.js';
|
|
47
|
+
import { ToolConfirmationOutcome, Kind, } from '../tools/tools.js';
|
|
48
48
|
import { UPDATE_TOPIC_TOOL_NAME } from '../tools/tool-names.js';
|
|
49
49
|
import { CoreToolCallStatus, ROOT_SCHEDULER_ID, } from './types.js';
|
|
50
50
|
import { ToolErrorType } from '../tools/tool-error.js';
|
|
@@ -1022,6 +1022,40 @@ describe('Scheduler (Orchestrator)', () => {
|
|
|
1022
1022
|
}),
|
|
1023
1023
|
}));
|
|
1024
1024
|
});
|
|
1025
|
+
it('should keep the group of the call it replaces', async () => {
|
|
1026
|
+
const agentTool = {
|
|
1027
|
+
name: 'agent-tool',
|
|
1028
|
+
kind: Kind.Agent,
|
|
1029
|
+
build: vi.fn().mockReturnValue({}),
|
|
1030
|
+
};
|
|
1031
|
+
const mockToolB = {
|
|
1032
|
+
name: 'tool-b',
|
|
1033
|
+
build: vi.fn().mockReturnValue({}),
|
|
1034
|
+
};
|
|
1035
|
+
vi.mocked(mockToolRegistry.getTool).mockImplementation((name) => name === 'tool-b' ? mockToolB : agentTool);
|
|
1036
|
+
mockExecutor.execute.mockImplementation(async ({ call }) => {
|
|
1037
|
+
const { callId, name } = call.request;
|
|
1038
|
+
return {
|
|
1039
|
+
status: 'success',
|
|
1040
|
+
response: { callId, responseParts: [] },
|
|
1041
|
+
request: call.request,
|
|
1042
|
+
// Only the first agent call asks for a tail call.
|
|
1043
|
+
...(callId === 'call-1' && name === 'agent-tool'
|
|
1044
|
+
? { tailToolCallRequest: { name: 'tool-b', args: {} } }
|
|
1045
|
+
: {}),
|
|
1046
|
+
};
|
|
1047
|
+
});
|
|
1048
|
+
const agentReq1 = { ...req1, name: 'agent-tool' };
|
|
1049
|
+
const agentReq2 = { ...req2, name: 'agent-tool', args: {} };
|
|
1050
|
+
await scheduler.schedule([agentReq1, agentReq2], signal);
|
|
1051
|
+
expect(mockStateManager.replaceActiveCallWithTailCall).toHaveBeenCalledWith('call-1', expect.objectContaining({
|
|
1052
|
+
request: expect.objectContaining({
|
|
1053
|
+
callId: 'call-1',
|
|
1054
|
+
name: 'tool-b',
|
|
1055
|
+
groupId: 'call-1',
|
|
1056
|
+
}),
|
|
1057
|
+
}));
|
|
1058
|
+
});
|
|
1025
1059
|
});
|
|
1026
1060
|
});
|
|
1027
1061
|
describe('Tool Call Context Propagation', () => {
|