@vybestack/llxprt-code 0.1.19-gamma → 0.1.20-nightly.250816.90f427f5
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/README.md +9 -0
- package/dist/package.json +5 -5
- package/dist/src/auth/oauth-manager.d.ts +1 -0
- package/dist/src/auth/oauth-manager.js +24 -13
- package/dist/src/auth/oauth-manager.js.map +1 -1
- package/dist/src/auth/oauth-manager.spec.js +4 -4
- package/dist/src/auth/oauth-manager.spec.js.map +1 -1
- package/dist/src/commands/mcp/list.js +1 -1
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/config/config.d.ts +2 -1
- package/dist/src/config/config.js +183 -25
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/keyBindings.js +4 -0
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +18 -9
- package/dist/src/config/settingsSchema.js +18 -9
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/trustedFolders.d.ts +36 -0
- package/dist/src/config/trustedFolders.js +112 -0
- package/dist/src/config/trustedFolders.js.map +1 -0
- package/dist/src/gemini.js +28 -18
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +1 -1
- package/dist/src/generated/git-commit.js +1 -1
- package/dist/src/nonInteractiveCli.js +3 -4
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/providers/logging/git-stats.js +0 -1
- package/dist/src/providers/logging/git-stats.js.map +1 -1
- package/dist/src/providers/providerConfigUtils.js +1 -1
- package/dist/src/providers/providerConfigUtils.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +2 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/todo-continuation/todoContinuationService.d.ts +0 -1
- package/dist/src/services/todo-continuation/todoContinuationService.js +2 -1
- package/dist/src/services/todo-continuation/todoContinuationService.js.map +1 -1
- package/dist/src/ui/App.js +50 -34
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.d.ts +7 -4
- package/dist/src/ui/IdeIntegrationNudge.js +31 -10
- package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
- package/dist/src/ui/commands/authCommand.js +16 -8
- package/dist/src/ui/commands/authCommand.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.js +2 -4
- package/dist/src/ui/commands/directoryCommand.js.map +1 -1
- package/dist/src/ui/commands/ideCommand.js +11 -8
- package/dist/src/ui/commands/ideCommand.js.map +1 -1
- package/dist/src/ui/commands/keyCommand.js +1 -1
- package/dist/src/ui/commands/keyCommand.js.map +1 -1
- package/dist/src/ui/commands/keyfileCommand.js +1 -1
- package/dist/src/ui/commands/keyfileCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +10 -6
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/setCommand.js +43 -3
- package/dist/src/ui/commands/setCommand.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.js +5 -16
- package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
- package/dist/src/ui/commands/terminalSetupCommand.d.ts +13 -0
- package/dist/src/ui/commands/terminalSetupCommand.js +41 -0
- package/dist/src/ui/commands/terminalSetupCommand.js.map +1 -0
- package/dist/src/ui/commands/types.d.ts +1 -0
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/AuthDialog.js +56 -29
- package/dist/src/ui/components/AuthDialog.js.map +1 -1
- package/dist/src/ui/components/AuthInProgress.js +5 -4
- package/dist/src/ui/components/AuthInProgress.js.map +1 -1
- package/dist/src/ui/components/DebugProfiler.js +5 -4
- package/dist/src/ui/components/DebugProfiler.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js +4 -4
- package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
- package/dist/src/ui/components/EditorSettingsDialog.js +6 -5
- package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
- package/dist/src/ui/components/ErrorBoundary.js +2 -2
- package/dist/src/ui/components/ErrorBoundary.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.js +5 -4
- package/dist/src/ui/components/FolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +7 -1
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/LoggingDialog.js +5 -1
- package/dist/src/ui/components/LoggingDialog.js.map +1 -1
- package/dist/src/ui/components/OAuthCodeDialog.js +12 -14
- package/dist/src/ui/components/OAuthCodeDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +12 -10
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.js +5 -4
- package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.js +6 -5
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/TodoPanel.js +2 -2
- package/dist/src/ui/components/TodoPanel.js.map +1 -1
- package/dist/src/ui/components/messages/InfoMessage.js +1 -1
- package/dist/src/ui/components/messages/InfoMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +8 -7
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.js +11 -9
- package/dist/src/ui/components/shared/RadioButtonSelect.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.d.ts +17 -4
- package/dist/src/ui/components/shared/text-buffer.js +256 -80
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/shared/vim-buffer-actions.js +139 -152
- package/dist/src/ui/components/shared/vim-buffer-actions.js.map +1 -1
- package/dist/src/ui/containers/SessionController.js +23 -23
- package/dist/src/ui/containers/SessionController.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +7 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAuthCommand.js +8 -60
- package/dist/src/ui/hooks/useAuthCommand.js.map +1 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js +5 -5
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useFocus.d.ts +4 -0
- package/dist/src/ui/hooks/useFocus.js +4 -4
- package/dist/src/ui/hooks/useFocus.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.d.ts +3 -2
- package/dist/src/ui/hooks/useFolderTrust.js +24 -9
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +1 -0
- package/dist/src/ui/hooks/useGeminiStream.js +126 -40
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useKeypress.d.ts +9 -1
- package/dist/src/ui/hooks/useKeypress.js +191 -8
- package/dist/src/ui/hooks/useKeypress.js.map +1 -1
- package/dist/src/ui/hooks/useKittyKeyboardProtocol.d.ts +15 -0
- package/dist/src/ui/hooks/useKittyKeyboardProtocol.js +20 -0
- package/dist/src/ui/hooks/useKittyKeyboardProtocol.js.map +1 -0
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js +5 -4
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js.map +1 -1
- package/dist/src/ui/privacy/CloudPaidPrivacyNotice.js +5 -4
- package/dist/src/ui/privacy/CloudPaidPrivacyNotice.js.map +1 -1
- package/dist/src/ui/privacy/GeminiPrivacyNotice.js +5 -4
- package/dist/src/ui/privacy/GeminiPrivacyNotice.js.map +1 -1
- package/dist/src/ui/reducers/sessionReducer.js +1 -0
- package/dist/src/ui/reducers/sessionReducer.js.map +1 -1
- package/dist/src/ui/utils/kittyProtocolDetector.d.ts +13 -0
- package/dist/src/ui/utils/kittyProtocolDetector.js +88 -0
- package/dist/src/ui/utils/kittyProtocolDetector.js.map +1 -0
- package/dist/src/ui/utils/platformConstants.d.ts +38 -0
- package/dist/src/ui/utils/platformConstants.js +39 -0
- package/dist/src/ui/utils/platformConstants.js.map +1 -0
- package/dist/src/ui/utils/renderLoopDetector.js +3 -3
- package/dist/src/ui/utils/renderLoopDetector.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.d.ts +30 -0
- package/dist/src/ui/utils/terminalSetup.js +281 -0
- package/dist/src/ui/utils/terminalSetup.js.map +1 -0
- package/dist/src/utils/checks.d.ts +19 -0
- package/dist/src/utils/checks.js +24 -0
- package/dist/src/utils/checks.js.map +1 -0
- package/dist/src/utils/privacy/ConversationDataRedactor.d.ts +0 -2
- package/dist/src/utils/privacy/ConversationDataRedactor.js +4 -37
- package/dist/src/utils/privacy/ConversationDataRedactor.js.map +1 -1
- package/dist/src/zed-integration/acp.d.ts +63 -0
- package/dist/src/{acp → zed-integration}/acp.js +76 -44
- package/dist/src/zed-integration/acp.js.map +1 -0
- package/dist/src/zed-integration/schema.d.ts +11679 -0
- package/dist/src/zed-integration/schema.js +305 -0
- package/dist/src/zed-integration/schema.js.map +1 -0
- package/dist/src/zed-integration/zedIntegration.d.ts +10 -0
- package/dist/src/{acp/acpPeer.js → zed-integration/zedIntegration.js} +333 -188
- package/dist/src/zed-integration/zedIntegration.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/dist/src/acp/acp.d.ts +0 -208
- package/dist/src/acp/acp.js.map +0 -1
- package/dist/src/acp/acpPeer.d.ts +0 -8
- package/dist/src/acp/acpPeer.js.map +0 -1
- package/dist/src/ui/utils/errorParsing.d.ts +0 -7
- package/dist/src/ui/utils/errorParsing.js +0 -106
- package/dist/src/ui/utils/errorParsing.js.map +0 -1
package/README.md
CHANGED
@@ -326,6 +326,15 @@ Learn more in the [Prompt Configuration Guide](./docs/prompt-configuration.md).
|
|
326
326
|
- `/keyfile` - Load API key from file
|
327
327
|
- `/auth` - Authenticate with Google (for Gemini), Anthropic (for Claude), or Qwen
|
328
328
|
|
329
|
+
### Documentation
|
330
|
+
|
331
|
+
- [**Architecture Overview**](./docs/architecture.md) - How llxprt works
|
332
|
+
- [**IDE Integration**](./docs/ide-integration.md) - VS Code companion
|
333
|
+
- [**Sandboxing & Security**](./docs/sandbox.md) - Safe execution environments
|
334
|
+
- [**Enterprise Deployment**](./docs/deployment.md) - Docker, system-wide config
|
335
|
+
- [**Telemetry & Monitoring**](./docs/telemetry.md) - Usage tracking
|
336
|
+
- [**Tools API Development**](./docs/core/tools-api.md) - Create custom tools
|
337
|
+
|
329
338
|
### Troubleshooting
|
330
339
|
|
331
340
|
See the [troubleshooting guide](docs/troubleshooting.md) if you encounter issues.
|
package/dist/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@vybestack/llxprt-code",
|
3
|
-
"version": "0.1.
|
3
|
+
"version": "0.1.20-nightly.250816.90f427f5",
|
4
4
|
"description": "LLxprt Code",
|
5
5
|
"repository": {
|
6
6
|
"type": "git",
|
@@ -33,23 +33,23 @@
|
|
33
33
|
"dist"
|
34
34
|
],
|
35
35
|
"config": {
|
36
|
-
"sandboxImageUri": "ghcr.io/acoliver/llxprt-code/sandbox:0.1.
|
36
|
+
"sandboxImageUri": "ghcr.io/acoliver/llxprt-code/sandbox:0.1.20-nightly.250816.90f427f5"
|
37
37
|
},
|
38
38
|
"dependencies": {
|
39
39
|
"@anthropic-ai/sdk": "^0.55.1",
|
40
40
|
"@dqbd/tiktoken": "^1.0.21",
|
41
|
-
"@google/genai": "1.
|
41
|
+
"@google/genai": "1.13.0",
|
42
42
|
"@iarna/toml": "^2.2.5",
|
43
43
|
"@modelcontextprotocol/sdk": "^1.15.1",
|
44
44
|
"@types/update-notifier": "^6.0.8",
|
45
|
-
"@vybestack/llxprt-code-core": "0.1.
|
45
|
+
"@vybestack/llxprt-code-core": "0.1.20-nightly.250816.90f427f5",
|
46
46
|
"chalk": "^5.3.0",
|
47
47
|
"command-exists": "^1.2.9",
|
48
48
|
"diff": "^7.0.0",
|
49
49
|
"dotenv": "^17.1.0",
|
50
50
|
"glob": "^10.4.1",
|
51
51
|
"highlight.js": "^11.11.1",
|
52
|
-
"ink": "^6.
|
52
|
+
"ink": "^6.1.1",
|
53
53
|
"ink-big-text": "^2.0.0",
|
54
54
|
"ink-gradient": "^3.0.0",
|
55
55
|
"ink-link": "^4.1.0",
|
@@ -12,10 +12,13 @@ export class OAuthManager {
|
|
12
12
|
providers;
|
13
13
|
tokenStore;
|
14
14
|
settings;
|
15
|
+
// In-memory OAuth enablement state for when settings aren't available
|
16
|
+
inMemoryOAuthState;
|
15
17
|
constructor(tokenStore, settings) {
|
16
18
|
this.providers = new Map();
|
17
19
|
this.tokenStore = tokenStore;
|
18
20
|
this.settings = settings;
|
21
|
+
this.inMemoryOAuthState = new Map();
|
19
22
|
}
|
20
23
|
/**
|
21
24
|
* Register an OAuth provider with the manager
|
@@ -254,16 +257,21 @@ export class OAuthManager {
|
|
254
257
|
if (!provider) {
|
255
258
|
throw new Error(`Unknown provider: ${providerName}`);
|
256
259
|
}
|
257
|
-
if (!this.settings) {
|
258
|
-
throw new Error('Settings are required to toggle OAuth enablement');
|
259
|
-
}
|
260
260
|
const currentlyEnabled = this.isOAuthEnabled(providerName);
|
261
261
|
const newState = !currentlyEnabled;
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
262
|
+
if (this.settings) {
|
263
|
+
// If we have settings, persist the state
|
264
|
+
// Get current OAuth enabled providers or initialize empty object
|
265
|
+
const oauthEnabledProviders = this.settings.merged.oauthEnabledProviders || {};
|
266
|
+
oauthEnabledProviders[providerName] = newState;
|
267
|
+
// Save the updated configuration
|
268
|
+
this.settings.setValue(SettingScope.User, 'oauthEnabledProviders', oauthEnabledProviders);
|
269
|
+
}
|
270
|
+
else {
|
271
|
+
// No settings available, store in memory only
|
272
|
+
// This allows OAuth to work even without a settings file
|
273
|
+
this.inMemoryOAuthState.set(providerName, newState);
|
274
|
+
}
|
267
275
|
return newState;
|
268
276
|
}
|
269
277
|
/**
|
@@ -272,12 +280,15 @@ export class OAuthManager {
|
|
272
280
|
* @returns True if OAuth is enabled, false otherwise
|
273
281
|
*/
|
274
282
|
isOAuthEnabled(providerName) {
|
275
|
-
if (
|
276
|
-
//
|
277
|
-
|
283
|
+
if (this.settings) {
|
284
|
+
// Check settings first if available
|
285
|
+
const oauthEnabledProviders = this.settings.merged.oauthEnabledProviders || {};
|
286
|
+
return oauthEnabledProviders[providerName] ?? false;
|
287
|
+
}
|
288
|
+
else {
|
289
|
+
// Fall back to in-memory state if no settings
|
290
|
+
return this.inMemoryOAuthState.get(providerName) ?? false;
|
278
291
|
}
|
279
|
-
const oauthEnabledProviders = this.settings.merged.oauthEnabledProviders || {};
|
280
|
-
return oauthEnabledProviders[providerName] ?? false;
|
281
292
|
}
|
282
293
|
/**
|
283
294
|
* Check for higher priority authentication methods
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"oauth-manager.js","sourceRoot":"","sources":["../../../src/auth/oauth-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAkB,YAAY,EAAE,MAAM,uBAAuB,CAAC;AA6BrE;;;GAGG;AACH,MAAM,OAAO,YAAY;IACf,SAAS,CAA6B;IACtC,UAAU,CAAa;IACvB,QAAQ,CAAkB;
|
1
|
+
{"version":3,"file":"oauth-manager.js","sourceRoot":"","sources":["../../../src/auth/oauth-manager.ts"],"names":[],"mappings":"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"}
|
@@ -9,14 +9,14 @@ import { OAuthManager } from './oauth-manager.js';
|
|
9
9
|
* Implements real OAuthProvider interface for coordination testing
|
10
10
|
*/
|
11
11
|
class MockOAuthProvider {
|
12
|
-
|
12
|
+
_initialToken;
|
13
13
|
name;
|
14
14
|
token = null;
|
15
15
|
authInitiated = false;
|
16
|
-
constructor(name,
|
17
|
-
this.
|
16
|
+
constructor(name, _initialToken) {
|
17
|
+
this._initialToken = _initialToken;
|
18
18
|
this.name = name;
|
19
|
-
this.token =
|
19
|
+
this.token = this._initialToken || null;
|
20
20
|
}
|
21
21
|
async initiateAuth() {
|
22
22
|
this.authInitiated = true;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"oauth-manager.spec.js","sourceRoot":"","sources":["../../../src/auth/oauth-manager.spec.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"oauth-manager.spec.js","sourceRoot":"","sources":["../../../src/auth/oauth-manager.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAiB,MAAM,oBAAoB,CAAC;AAGjE;;;GAGG;AACH,MAAM,iBAAiB;IAOX;IAND,IAAI,CAAS;IACd,KAAK,GAAsB,IAAI,CAAC;IAChC,aAAa,GAAG,KAAK,CAAC;IAE9B,YACE,IAAY,EACJ,aAA0B;QAA1B,kBAAa,GAAb,aAAa,CAAa;QAElC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,gCAAgC;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,GAAG;gBACX,YAAY,EAAE,UAAU,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE;gBACjD,aAAa,EAAE,WAAW,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE;gBACnD,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,kBAAkB;gBAChD,UAAU,EAAE,QAAQ;gBACpB,KAAK,EAAE,YAAY;aACpB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAC1D,4CAA4C;YAC5C,IAAI,CAAC,KAAK,GAAG;gBACX,GAAG,IAAI,CAAC,KAAK;gBACb,YAAY,EAAE,aAAa,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE;gBACpD,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,kBAAkB;aACjD,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,eAAe;IACf,QAAQ,CAAC,KAAwB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,KAAK,GAAG;YACX,YAAY,EAAE,YAAY,IAAI,CAAC,IAAI,EAAE;YACrC,aAAa,EAAE,WAAW,IAAI,CAAC,IAAI,EAAE;YACrC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,wBAAwB;YACpD,UAAU,EAAE,QAAQ;YACpB,KAAK,EAAE,MAAM;SACd,CAAC;IACJ,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,cAAc;IACV,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IAE/C,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,KAAiB;QACjD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAgB;QAChC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,eAAe;IACf,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF;AAED,QAAQ,CAAC,4DAA4D,EAAE,GAAG,EAAE;IAC1E,IAAI,OAAqB,CAAC;IAC1B,IAAI,UAA0B,CAAC;IAC/B,IAAI,YAA+B,CAAC;IACpC,IAAI,cAAiC,CAAC;IAEtC,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,OAAO,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;QACvC,YAAY,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC7C,cAAc,GAAG,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC;;;;;;;WAOG;QACH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAC9D,MAAM,CAAC,GAAG,EAAE;gBACV,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YAEjB,0DAA0D;YAC1D,MAAM,SAAS,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAClD,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC1D,MAAM,CAAC,GAAG,EAAE;gBACV,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YAEjB,qCAAqC;YACrC,MAAM,SAAS,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAClD,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACtC,MAAM,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH;;;;;;WAMG;QACH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC1D,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzC,MAAM,SAAS,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAClD,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,mBAAmB;QACpE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;QAC3C;;;;;;;WAOG;QACH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;YAC3E,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAEvC,qEAAqE;YACrE,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEjD,OACD,CAAC,kBAAkB,GAAG,UAAU,CAAC;YAElC,MAAM,MAAM,GAAG,MACb,OACD,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC7B,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE1B,gDAAgD;YAChD,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;YAC5E,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAEvC,mCAAmC;YACnC,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAErD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,MAAM,MAAM,GAAG,MACb,OACD,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACzB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE3B,sCAAsC;YACtC,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzC,yCAAyC;YACzC,MAAM,UAAU,GAAG,EAAE;iBAClB,EAAE,EAAE;iBACJ,qBAAqB,CAAC,IAAI,CAAC,CAAC,cAAc;iBAC1C,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB;YAEhD,OACD,CAAC,kBAAkB,GAAG,UAAU,CAAC;YAElC,MAAM,UAAU,GAAG,MACjB,OACD,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC7B,MAAM,YAAY,GAAG,MACnB,OACD,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAE/B,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAyB;YACxD,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,4BAA4B;YAE9D,8CAA8C;YAC9C,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC;;;;;;;WAOG;QACH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;YAC/E,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAEvC,2DAA2D;YAC3D,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEpD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,4DAA4D;YAC5D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAE5B,+CAA+C;YAC/C,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;YAChF,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzC,iCAAiC;YACjC,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAElD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,0BAA0B;YAC1B,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEjD,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEnD,wCAAwC;YACxC,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAEvC,wBAAwB;YACxB,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAElD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,oCAAoC;YACpC,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAEnC,2CAA2C;YAC3C,MAAM,aAAa,GAAG;gBACpB,YAAY,EAAE,gBAAgB;gBAC9B,aAAa,EAAE,eAAe;gBAC9B,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,wBAAwB;gBACpD,UAAU,EAAE,QAAiB;gBAC7B,KAAK,EAAE,MAAM;aACd,CAAC;YACF,MAAM,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YAElD,+CAA+C;YAC/C,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,kDAAkD;YAEnF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAE7C,qDAAqD;YACrD,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH;;;;;;WAMG;QACH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;YACtF,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAEvC,yBAAyB;YACzB,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAEnD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEzB,uCAAuC;YACvC,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wCAAwC,EAAE,GAAG,EAAE;QACtD;;;;;;;WAOG;QACH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzC,mDAAmD;YACnD,MAAM,aAAa,GAAG,EAAE;iBACrB,EAAE,EAAE;iBACJ,kBAAkB,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC;YAEvD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,4CAA4C;YAC5C,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAE/B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;YAE/C,MAAM,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC;YAC/D,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YAEnE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH;;;;;;WAMG;QACH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAEnC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;YACzF,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzC,qCAAqC;YACrC,MAAM,aAAa,GAAG,EAAE;iBACrB,EAAE,EAAE;iBACJ,kBAAkB,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC;YAEvD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,uCAAuC;YACvC,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAE/B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;YAE/C,MAAM,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAEjC,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC;YAC/D,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YAEnE,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B;;;;;;WAMG;QACH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACpE,MAAM,UAAU,GAAG,EAAE;iBAClB,EAAE,EAAE;iBACJ,iBAAiB,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;YAE3D,OACD,CAAC,kBAAkB,GAAG,UAAU,CAAC;YAElC,MAAM,MAAM,CAER,OACD,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAChC,CAAC,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH;;;;;;WAMG;QACH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAChD,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,MAAM,eAAe,GAAG,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACzD,eAAe,CAAC,YAAY,GAAG,KAAK,IAAI,EAAE;gBACxC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC,CAAC;YAEF,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;YAE1C,wBAAwB;YACxB,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEpD,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,CACpB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC;;;;;;WAMG;QACH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,SAAS,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAClD,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH;;;;;;WAMG;QACH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzC,MAAM,SAAS,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAClD,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACtC,0CAA0C;QAC5C,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;YAC7F,8BAA8B;YAC9B,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACzC,MAAM,UAAU,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAEnD,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;YAC9C,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC1C,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,qBAAqB,EAAE,CAAC;YAErD,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACxC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC;;;;;;;WAOG;QACH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;YAChF,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAEvC,sDAAsD;YACtD,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEpD,OACD,CAAC,kBAAkB,GAAG,UAAU,CAAC;YAEhC,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,MACE,OACD,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAE7B,0DAA0D;YAC1D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAE7C,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5B,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH;;;;;;;WAOG;QACH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,mDAAmD;YACnD,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAEvC,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEpD,OACD,CAAC,kBAAkB,GAAG,UAAU,CAAC;YAEhC,OACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,MACE,OACD,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC7B,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB;YAErD,2CAA2C;YAC3C,MAAM,UAAU,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;YAChD,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAClD,UAAU,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAEzC,6CAA6C;YAE3C,UACD,CAAC,cAAc,GAAG,aAAa,CAAC;YAEjC,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEhD,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5B,iEAAiE;YACjE,MAAM,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
@@ -74,7 +74,7 @@ export async function listMcpServers() {
|
|
74
74
|
let statusText = '';
|
75
75
|
switch (status) {
|
76
76
|
case MCPServerStatus.CONNECTED:
|
77
|
-
statusIndicator = COLOR_GREEN + '
|
77
|
+
statusIndicator = COLOR_GREEN + '[OK]' + RESET_COLOR;
|
78
78
|
statusText = 'Connected';
|
79
79
|
break;
|
80
80
|
case MCPServerStatus.CONNECTING:
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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"}
|
@@ -18,6 +18,7 @@ export interface CliArgs {
|
|
18
18
|
showMemoryUsage: boolean | undefined;
|
19
19
|
show_memory_usage: boolean | undefined;
|
20
20
|
yolo: boolean | undefined;
|
21
|
+
approvalMode: string | undefined;
|
21
22
|
telemetry: boolean | undefined;
|
22
23
|
checkpointing: boolean | undefined;
|
23
24
|
telemetryTarget: string | undefined;
|
@@ -43,5 +44,5 @@ export declare function loadHierarchicalLlxprtMemory(currentWorkingDirectory: st
|
|
43
44
|
memoryContent: string;
|
44
45
|
fileCount: number;
|
45
46
|
}>;
|
46
|
-
export declare function loadCliConfig(settings: Settings, extensions: Extension[], sessionId: string, argv: CliArgs): Promise<Config>;
|
47
|
+
export declare function loadCliConfig(settings: Settings, extensions: Extension[], sessionId: string, argv: CliArgs, cwd?: string): Promise<Config>;
|
47
48
|
export declare function loadEnvironment(): void;
|
@@ -10,13 +10,14 @@ import yargs from 'yargs/yargs';
|
|
10
10
|
import { hideBin } from 'yargs/helpers';
|
11
11
|
import process from 'node:process';
|
12
12
|
import { mcpCommand } from '../commands/mcp.js';
|
13
|
-
import { Config, loadServerHierarchicalMemory, setLlxprtMdFilename as setServerGeminiMdFilename, getCurrentLlxprtMdFilename, ApprovalMode,
|
13
|
+
import { Config, loadServerHierarchicalMemory, setLlxprtMdFilename as setServerGeminiMdFilename, getCurrentLlxprtMdFilename, ApprovalMode, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, IdeClient, ProfileManager, ShellTool, EditTool, WriteFileTool, getSettingsService, } from '@vybestack/llxprt-code-core';
|
14
14
|
import { annotateActiveExtensions } from './extension.js';
|
15
15
|
import { getCliVersion } from '../utils/version.js';
|
16
16
|
import { loadSandboxConfig } from './sandboxConfig.js';
|
17
17
|
import * as dotenv from 'dotenv';
|
18
18
|
import * as os from 'node:os';
|
19
19
|
import { resolvePath } from '../utils/resolvePath.js';
|
20
|
+
import { isWorkspaceTrusted } from './trustedFolders.js';
|
20
21
|
const LLXPRT_DIR = '.llxprt';
|
21
22
|
// Simple console logger for now - replace with actual logger if available
|
22
23
|
const logger = {
|
@@ -26,8 +27,9 @@ const logger = {
|
|
26
27
|
};
|
27
28
|
export async function parseArguments() {
|
28
29
|
const yargsInstance = yargs(hideBin(process.argv))
|
29
|
-
.scriptName('
|
30
|
-
.usage('$0 [options]', '
|
30
|
+
.scriptName('llxprt')
|
31
|
+
.usage('$0 [options]', 'LLxprt Code - Launch an interactive CLI, use -p/--prompt for non-interactive mode')
|
32
|
+
.command('$0', 'Launch Gemini CLI', (yargsInstance) => yargsInstance
|
31
33
|
.option('model', {
|
32
34
|
alias: 'm',
|
33
35
|
type: 'string',
|
@@ -87,6 +89,11 @@ export async function parseArguments() {
|
|
87
89
|
type: 'boolean',
|
88
90
|
description: 'Automatically accept all actions (aka YOLO mode, see https://www.youtube.com/watch?v=xvFZjo5PgG0 for more details)?',
|
89
91
|
default: false,
|
92
|
+
})
|
93
|
+
.option('approval-mode', {
|
94
|
+
type: 'string',
|
95
|
+
choices: ['default', 'auto_edit', 'yolo'],
|
96
|
+
description: 'Set the approval mode: default (prompt for approval), auto_edit (auto-approve edit tools), yolo (auto-approve all tools)',
|
90
97
|
})
|
91
98
|
.option('telemetry', {
|
92
99
|
type: 'boolean',
|
@@ -134,6 +141,74 @@ export async function parseArguments() {
|
|
134
141
|
alias: 'l',
|
135
142
|
type: 'boolean',
|
136
143
|
description: 'List all available extensions and exit.',
|
144
|
+
})
|
145
|
+
.option('proxy', {
|
146
|
+
type: 'string',
|
147
|
+
description: 'Proxy for gemini client, like schema://user:password@host:port',
|
148
|
+
})
|
149
|
+
.option('include-directories', {
|
150
|
+
type: 'array',
|
151
|
+
string: true,
|
152
|
+
description: 'Additional directories to include in the workspace (comma-separated or multiple --include-directories)',
|
153
|
+
coerce: (dirs) =>
|
154
|
+
// Handle comma-separated values
|
155
|
+
dirs.flatMap((dir) => dir.split(',').map((d) => d.trim())),
|
156
|
+
})
|
157
|
+
.check((argv) => {
|
158
|
+
if (argv.prompt && argv.promptInteractive) {
|
159
|
+
throw new Error('Cannot use both --prompt (-p) and --prompt-interactive (-i) together');
|
160
|
+
}
|
161
|
+
if (argv.yolo && argv.approvalMode) {
|
162
|
+
throw new Error('Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.');
|
163
|
+
}
|
164
|
+
return true;
|
165
|
+
}))
|
166
|
+
.option('telemetry', {
|
167
|
+
type: 'boolean',
|
168
|
+
description: 'Enable telemetry? This flag specifically controls if telemetry is sent. Other --telemetry-* flags set specific values but do not enable telemetry on their own.',
|
169
|
+
})
|
170
|
+
.option('telemetry-target', {
|
171
|
+
type: 'string',
|
172
|
+
choices: ['local', 'gcp'],
|
173
|
+
description: 'Set the telemetry target (local or gcp). Overrides settings files.',
|
174
|
+
})
|
175
|
+
.option('telemetry-otlp-endpoint', {
|
176
|
+
type: 'string',
|
177
|
+
description: 'Set the OTLP endpoint for telemetry. Overrides environment variables and settings files.',
|
178
|
+
})
|
179
|
+
.option('telemetry-log-prompts', {
|
180
|
+
type: 'boolean',
|
181
|
+
description: 'Enable or disable logging of user prompts for telemetry. Overrides settings files.',
|
182
|
+
})
|
183
|
+
.option('telemetry-outfile', {
|
184
|
+
type: 'string',
|
185
|
+
description: 'Redirect all telemetry output to the specified file.',
|
186
|
+
})
|
187
|
+
.option('checkpointing', {
|
188
|
+
alias: 'c',
|
189
|
+
type: 'boolean',
|
190
|
+
description: 'Enables checkpointing of file edits',
|
191
|
+
default: false,
|
192
|
+
})
|
193
|
+
.option('experimental-acp', {
|
194
|
+
type: 'boolean',
|
195
|
+
description: 'Starts the agent in ACP mode',
|
196
|
+
})
|
197
|
+
.option('allowed-mcp-server-names', {
|
198
|
+
type: 'array',
|
199
|
+
string: true,
|
200
|
+
description: 'Allowed MCP server names',
|
201
|
+
})
|
202
|
+
.option('extensions', {
|
203
|
+
alias: 'e',
|
204
|
+
type: 'array',
|
205
|
+
string: true,
|
206
|
+
description: 'A list of extensions to use. If not provided, all extensions are used.',
|
207
|
+
})
|
208
|
+
.option('list-extensions', {
|
209
|
+
alias: 'l',
|
210
|
+
type: 'boolean',
|
211
|
+
description: 'List all available extensions and exit.',
|
137
212
|
})
|
138
213
|
.option('provider', {
|
139
214
|
type: 'string',
|
@@ -198,7 +273,41 @@ export async function parseArguments() {
|
|
198
273
|
const result = yargsInstance.parseSync();
|
199
274
|
// The import format is now only controlled by settings.memoryImportFormat
|
200
275
|
// We no longer accept it as a CLI argument
|
201
|
-
|
276
|
+
// Map camelCase names to match CliArgs interface
|
277
|
+
const cliArgs = {
|
278
|
+
model: result.model,
|
279
|
+
sandbox: result.sandbox,
|
280
|
+
sandboxImage: result.sandboxImage,
|
281
|
+
debug: result.debug,
|
282
|
+
prompt: result.prompt,
|
283
|
+
promptInteractive: result.promptInteractive,
|
284
|
+
allFiles: result.allFiles,
|
285
|
+
all_files: result.all_files,
|
286
|
+
showMemoryUsage: result.showMemoryUsage,
|
287
|
+
show_memory_usage: result.show_memory_usage,
|
288
|
+
yolo: result.yolo,
|
289
|
+
approvalMode: result.approvalMode,
|
290
|
+
telemetry: result.telemetry,
|
291
|
+
checkpointing: result.checkpointing,
|
292
|
+
telemetryTarget: result.telemetryTarget,
|
293
|
+
telemetryOtlpEndpoint: result.telemetryOtlpEndpoint,
|
294
|
+
telemetryLogPrompts: result.telemetryLogPrompts,
|
295
|
+
telemetryOutfile: result.telemetryOutfile,
|
296
|
+
allowedMcpServerNames: result.allowedMcpServerNames,
|
297
|
+
experimentalAcp: result.experimentalAcp,
|
298
|
+
extensions: result.extensions,
|
299
|
+
listExtensions: result.listExtensions,
|
300
|
+
provider: result.provider,
|
301
|
+
ideModeFeature: result.ideModeFeature,
|
302
|
+
key: result.key,
|
303
|
+
keyfile: result.keyfile,
|
304
|
+
baseurl: result.baseurl,
|
305
|
+
proxy: result.proxy,
|
306
|
+
includeDirectories: result.includeDirectories,
|
307
|
+
profileLoad: result.profileLoad,
|
308
|
+
loadMemoryFromIncludeDirectories: result.loadMemoryFromIncludeDirectories,
|
309
|
+
};
|
310
|
+
return cliArgs;
|
202
311
|
}
|
203
312
|
// This function is now a thin wrapper around the server's implementation.
|
204
313
|
// It's kept in the CLI for now as App.tsx directly calls it for memory refresh.
|
@@ -217,14 +326,16 @@ export async function loadHierarchicalLlxprtMemory(currentWorkingDirectory, incl
|
|
217
326
|
// Directly call the server function with the corrected path.
|
218
327
|
return loadServerHierarchicalMemory(effectiveCwd, includeDirectoriesToReadGemini, debugMode, fileService, extensionContextFilePaths, memoryImportFormat, fileFilteringOptions, settings.memoryDiscoveryMaxDirs);
|
219
328
|
}
|
220
|
-
export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
329
|
+
export async function loadCliConfig(settings, extensions, sessionId, argv, cwd = process.cwd()) {
|
221
330
|
// Handle --load flag early to apply profile settings
|
222
331
|
let effectiveSettings = settings;
|
223
332
|
let profileModel;
|
224
333
|
let profileProvider;
|
225
334
|
let profileModelParams;
|
226
335
|
// Check for profile to load - either from CLI arg or default profile setting
|
227
|
-
|
336
|
+
// BUT skip default profile if --provider is explicitly specified
|
337
|
+
const profileToLoad = argv.profileLoad ||
|
338
|
+
(argv.provider === undefined ? settings.defaultProfile : undefined);
|
228
339
|
if (profileToLoad) {
|
229
340
|
try {
|
230
341
|
const profileManager = new ProfileManager();
|
@@ -276,8 +387,9 @@ export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
|
276
387
|
!process.env.SANDBOX;
|
277
388
|
const ideClient = IdeClient.getInstance(ideMode && ideModeFeature);
|
278
389
|
const folderTrustFeature = settings.folderTrustFeature ?? false;
|
279
|
-
const folderTrustSetting = settings.folderTrust ??
|
390
|
+
const folderTrustSetting = settings.folderTrust ?? true;
|
280
391
|
const folderTrust = folderTrustFeature && folderTrustSetting;
|
392
|
+
const trustedFolder = folderTrust ? isWorkspaceTrusted() : true;
|
281
393
|
const allExtensions = annotateActiveExtensions(extensions, argv.extensions || []);
|
282
394
|
const activeExtensions = extensions.filter((_, i) => allExtensions[i].isActive);
|
283
395
|
// Set the context filename in the server's memoryTool module BEFORE loading memory
|
@@ -292,7 +404,7 @@ export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
|
292
404
|
setServerGeminiMdFilename(getCurrentLlxprtMdFilename());
|
293
405
|
}
|
294
406
|
const extensionContextFilePaths = activeExtensions.flatMap((e) => e.contextFiles);
|
295
|
-
const fileService = new FileDiscoveryService(
|
407
|
+
const fileService = new FileDiscoveryService(cwd);
|
296
408
|
const fileFiltering = {
|
297
409
|
...DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
|
298
410
|
...effectiveSettings.fileFiltering,
|
@@ -301,19 +413,57 @@ export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
|
301
413
|
.map(resolvePath)
|
302
414
|
.concat((argv.includeDirectories || []).map(resolvePath));
|
303
415
|
// Call the (now wrapper) loadHierarchicalLlxprtMemory which calls the server's version
|
304
|
-
const { memoryContent, fileCount } = await loadHierarchicalLlxprtMemory(
|
416
|
+
const { memoryContent, fileCount } = await loadHierarchicalLlxprtMemory(cwd, effectiveSettings.loadMemoryFromIncludeDirectories ||
|
305
417
|
argv.loadMemoryFromIncludeDirectories
|
306
418
|
? includeDirectories
|
307
419
|
: [], debugMode, fileService, effectiveSettings, extensionContextFilePaths, memoryImportFormat, fileFiltering);
|
308
420
|
let mcpServers = mergeMcpServers(effectiveSettings, activeExtensions);
|
309
421
|
const question = argv.promptInteractive || argv.prompt || '';
|
310
|
-
|
422
|
+
// Determine approval mode with backward compatibility
|
423
|
+
let approvalMode;
|
424
|
+
if (argv.approvalMode) {
|
425
|
+
// New --approval-mode flag takes precedence
|
426
|
+
switch (argv.approvalMode) {
|
427
|
+
case 'yolo':
|
428
|
+
approvalMode = ApprovalMode.YOLO;
|
429
|
+
break;
|
430
|
+
case 'auto_edit':
|
431
|
+
approvalMode = ApprovalMode.AUTO_EDIT;
|
432
|
+
break;
|
433
|
+
case 'default':
|
434
|
+
approvalMode = ApprovalMode.DEFAULT;
|
435
|
+
break;
|
436
|
+
default:
|
437
|
+
throw new Error(`Invalid approval mode: ${argv.approvalMode}. Valid values are: yolo, auto_edit, default`);
|
438
|
+
}
|
439
|
+
}
|
440
|
+
else {
|
441
|
+
// Fallback to legacy --yolo flag behavior
|
442
|
+
approvalMode =
|
443
|
+
argv.yolo || false ? ApprovalMode.YOLO : ApprovalMode.DEFAULT;
|
444
|
+
}
|
311
445
|
const interactive = !!argv.promptInteractive || (process.stdin.isTTY && question.length === 0);
|
312
|
-
// In non-interactive
|
313
|
-
const extraExcludes =
|
314
|
-
|
315
|
-
|
316
|
-
|
446
|
+
// In non-interactive mode, exclude tools that require a prompt.
|
447
|
+
const extraExcludes = [];
|
448
|
+
if (!interactive && !argv.experimentalAcp) {
|
449
|
+
switch (approvalMode) {
|
450
|
+
case ApprovalMode.DEFAULT:
|
451
|
+
// In default non-interactive mode, all tools that require approval are excluded.
|
452
|
+
extraExcludes.push(ShellTool.Name, EditTool.Name, WriteFileTool.Name);
|
453
|
+
break;
|
454
|
+
case ApprovalMode.AUTO_EDIT:
|
455
|
+
// In auto-edit non-interactive mode, only tools that still require a prompt are excluded.
|
456
|
+
extraExcludes.push(ShellTool.Name);
|
457
|
+
break;
|
458
|
+
case ApprovalMode.YOLO:
|
459
|
+
// No extra excludes for YOLO mode.
|
460
|
+
break;
|
461
|
+
default:
|
462
|
+
// This should never happen due to validation earlier, but satisfies the linter
|
463
|
+
break;
|
464
|
+
}
|
465
|
+
}
|
466
|
+
const excludeTools = mergeExcludeTools(effectiveSettings, activeExtensions, extraExcludes.length > 0 ? extraExcludes : undefined);
|
317
467
|
const blockedMcpServers = [];
|
318
468
|
if (!argv.allowedMcpServerNames) {
|
319
469
|
if (effectiveSettings.allowMCPServers) {
|
@@ -330,13 +480,7 @@ export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
|
330
480
|
mcpServers = allowedMcpServers(mcpServers, argv.allowedMcpServerNames, blockedMcpServers);
|
331
481
|
}
|
332
482
|
const sandboxConfig = await loadSandboxConfig(effectiveSettings, argv);
|
333
|
-
// Handle
|
334
|
-
const finalModel = argv.model ||
|
335
|
-
profileModel ||
|
336
|
-
process.env.LLXPRT_DEFAULT_MODEL ||
|
337
|
-
process.env.GEMINI_MODEL ||
|
338
|
-
DEFAULT_GEMINI_MODEL;
|
339
|
-
// Handle provider selection with proper precedence
|
483
|
+
// Handle provider selection FIRST with proper precedence
|
340
484
|
// Priority: CLI arg > Profile > Environment > Default
|
341
485
|
let finalProvider;
|
342
486
|
if (argv.provider) {
|
@@ -352,11 +496,18 @@ export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
|
352
496
|
else {
|
353
497
|
finalProvider = 'gemini';
|
354
498
|
}
|
499
|
+
// Handle model selection with proper precedence
|
500
|
+
const finalModel = argv.model ||
|
501
|
+
profileModel ||
|
502
|
+
effectiveSettings.model ||
|
503
|
+
process.env.LLXPRT_DEFAULT_MODEL ||
|
504
|
+
process.env.GEMINI_MODEL ||
|
505
|
+
DEFAULT_GEMINI_MODEL;
|
355
506
|
const config = new Config({
|
356
507
|
sessionId,
|
357
508
|
embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
|
358
509
|
sandbox: sandboxConfig,
|
359
|
-
targetDir:
|
510
|
+
targetDir: cwd,
|
360
511
|
includeDirectories,
|
361
512
|
loadMemoryFromIncludeDirectories: argv.loadMemoryFromIncludeDirectories ||
|
362
513
|
effectiveSettings.loadMemoryFromIncludeDirectories ||
|
@@ -408,13 +559,13 @@ export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
|
408
559
|
process.env.https_proxy ||
|
409
560
|
process.env.HTTP_PROXY ||
|
410
561
|
process.env.http_proxy,
|
411
|
-
cwd
|
562
|
+
cwd,
|
412
563
|
fileDiscoveryService: fileService,
|
413
564
|
bugCommand: effectiveSettings.bugCommand,
|
414
565
|
model: finalModel,
|
415
566
|
extensionContextFilePaths,
|
416
567
|
maxSessionTurns: effectiveSettings.maxSessionTurns ?? -1,
|
417
|
-
|
568
|
+
experimentalZedIntegration: argv.experimentalAcp || false,
|
418
569
|
listExtensions: argv.listExtensions || false,
|
419
570
|
activeExtensions: activeExtensions.map((e) => ({
|
420
571
|
name: e.config.name,
|
@@ -432,9 +583,16 @@ export async function loadCliConfig(settings, extensions, sessionId, argv) {
|
|
432
583
|
folderTrustFeature,
|
433
584
|
interactive,
|
434
585
|
folderTrust,
|
586
|
+
trustedFolder,
|
435
587
|
shellReplacement: effectiveSettings.shellReplacement,
|
436
588
|
});
|
437
589
|
const enhancedConfig = config;
|
590
|
+
// Apply emojifilter setting from settings.json to SettingsService
|
591
|
+
// Only set if there isn't already an ephemeral setting (from /set command)
|
592
|
+
const settingsService = getSettingsService();
|
593
|
+
if (effectiveSettings.emojifilter && !settingsService.get('emojifilter')) {
|
594
|
+
settingsService.set('emojifilter', effectiveSettings.emojifilter);
|
595
|
+
}
|
438
596
|
// Apply ephemeral settings from profile if loaded
|
439
597
|
// BUT skip ALL profile ephemeral settings if --provider was explicitly specified
|
440
598
|
if (profileToLoad && effectiveSettings && argv.provider === undefined) {
|