visionclaw 0.1.185-beta.8 → 0.1.185
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/CHANGELOG.md +30 -0
- package/dist/agent/applied-credential-signature.d.ts +53 -0
- package/dist/agent/applied-credential-signature.d.ts.map +1 -0
- package/dist/agent/applied-credential-signature.js +137 -0
- package/dist/agent/applied-credential-signature.js.map +1 -0
- package/dist/agent/credential-bundle-handler.d.ts +98 -0
- package/dist/agent/credential-bundle-handler.d.ts.map +1 -0
- package/dist/agent/credential-bundle-handler.js +161 -0
- package/dist/agent/credential-bundle-handler.js.map +1 -0
- package/dist/agent/heartbeat-manager.d.ts +20 -14
- package/dist/agent/heartbeat-manager.d.ts.map +1 -1
- package/dist/agent/heartbeat-manager.js +34 -53
- package/dist/agent/heartbeat-manager.js.map +1 -1
- package/dist/agent/loop.d.ts.map +1 -1
- package/dist/agent/loop.js +7 -1
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/onboarding-gate.d.ts.map +1 -1
- package/dist/agent/onboarding-gate.js +27 -1
- package/dist/agent/onboarding-gate.js.map +1 -1
- package/dist/agent/providers/openai/tools.d.ts.map +1 -1
- package/dist/agent/providers/openai/tools.js +12 -1
- package/dist/agent/providers/openai/tools.js.map +1 -1
- package/dist/agent/runtime-credentials.d.ts +21 -7
- package/dist/agent/runtime-credentials.d.ts.map +1 -1
- package/dist/agent/runtime-credentials.js +131 -28
- package/dist/agent/runtime-credentials.js.map +1 -1
- package/dist/agent/tunnel-credential-handler.d.ts +90 -0
- package/dist/agent/tunnel-credential-handler.d.ts.map +1 -0
- package/dist/agent/tunnel-credential-handler.js +162 -0
- package/dist/agent/tunnel-credential-handler.js.map +1 -0
- package/dist/agent/wake-cycle-runner.d.ts.map +1 -1
- package/dist/agent/wake-cycle-runner.js +11 -11
- package/dist/agent/wake-cycle-runner.js.map +1 -1
- package/dist/calendar/google-calendar.d.ts +4 -0
- package/dist/calendar/google-calendar.d.ts.map +1 -1
- package/dist/calendar/google-calendar.js +8 -0
- package/dist/calendar/google-calendar.js.map +1 -1
- package/dist/channels/manager.d.ts +6 -0
- package/dist/channels/manager.d.ts.map +1 -1
- package/dist/channels/manager.js +11 -0
- package/dist/channels/manager.js.map +1 -1
- package/dist/channels/telegram.d.ts +7 -0
- package/dist/channels/telegram.d.ts.map +1 -1
- package/dist/channels/telegram.js +16 -0
- package/dist/channels/telegram.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/obs/legacy-tunnel-adoption.d.ts +1 -1
- package/dist/obs/legacy-tunnel-adoption.js +1 -1
- package/dist/obs/notify.d.ts +14 -2
- package/dist/obs/notify.d.ts.map +1 -1
- package/dist/obs/notify.js +107 -28
- package/dist/obs/notify.js.map +1 -1
- package/dist/obs/server.d.ts.map +1 -1
- package/dist/obs/server.js +18 -1
- package/dist/obs/server.js.map +1 -1
- package/dist/obs/tunnel.d.ts +1 -1
- package/dist/onboarding/index.js +2 -2
- package/dist/onboarding/index.js.map +1 -1
- package/dist/onboarding/onboarding-service-client.d.ts +41 -12
- package/dist/onboarding/onboarding-service-client.d.ts.map +1 -1
- package/dist/onboarding/onboarding-service-client.js.map +1 -1
- package/dist/onboarding/setup-steps.js +1 -1
- package/dist/onboarding/setup-steps.js.map +1 -1
- package/dist/onboarding/telegram-onboarding.d.ts.map +1 -1
- package/dist/onboarding/telegram-onboarding.js +1 -0
- package/dist/onboarding/telegram-onboarding.js.map +1 -1
- package/dist/reset.d.ts.map +1 -1
- package/dist/reset.js +16 -0
- package/dist/reset.js.map +1 -1
- package/dist/tools/android-executor.d.ts.map +1 -1
- package/dist/tools/android-executor.js +43 -35
- package/dist/tools/android-executor.js.map +1 -1
- package/dist/tools/computer-use.d.ts.map +1 -1
- package/dist/tools/computer-use.js +27 -2
- package/dist/tools/computer-use.js.map +1 -1
- package/dist/tools/desktop-executor-factory.d.ts +7 -0
- package/dist/tools/desktop-executor-factory.d.ts.map +1 -1
- package/dist/tools/desktop-executor-factory.js +12 -1
- package/dist/tools/desktop-executor-factory.js.map +1 -1
- package/dist/tools/desktop-executor-windows.d.ts +12 -0
- package/dist/tools/desktop-executor-windows.d.ts.map +1 -1
- package/dist/tools/desktop-executor-windows.js +47 -37
- package/dist/tools/desktop-executor-windows.js.map +1 -1
- package/dist/tools/desktop-executor.d.ts +14 -1
- package/dist/tools/desktop-executor.d.ts.map +1 -1
- package/dist/tools/desktop-executor.js +80 -66
- package/dist/tools/desktop-executor.js.map +1 -1
- package/dist/tools/helpers/macos-screenshot.swift +26 -0
- package/dist/tools/screenshot.d.ts +27 -0
- package/dist/tools/screenshot.d.ts.map +1 -1
- package/dist/tools/screenshot.js +114 -25
- package/dist/tools/screenshot.js.map +1 -1
- package/dist/tools/totp.d.ts.map +1 -1
- package/dist/tools/totp.js +2 -4
- package/dist/tools/totp.js.map +1 -1
- package/dist/tools/transcribe-audio.d.ts.map +1 -1
- package/dist/tools/transcribe-audio.js +5 -7
- package/dist/tools/transcribe-audio.js.map +1 -1
- package/dist/utils/exec.d.ts +78 -0
- package/dist/utils/exec.d.ts.map +1 -0
- package/dist/utils/exec.js +107 -0
- package/dist/utils/exec.js.map +1 -0
- package/dist-agent/bundle.cjs +904 -483
- package/package.json +1 -1
|
@@ -17,7 +17,7 @@ import { setSharedGeminiApiKey } from "../gemini-credentials.js";
|
|
|
17
17
|
import { setSharedPhonecallApiKey } from "../phonecall-credentials.js";
|
|
18
18
|
import { setSharedTosCredentials } from "../tos-credentials.js";
|
|
19
19
|
import { resetArchiveConfigCache } from "./image-archive.js";
|
|
20
|
-
import {
|
|
20
|
+
import { CredentialBundleHandler } from "./credential-bundle-handler.js";
|
|
21
21
|
import { logger } from "../logger.js";
|
|
22
22
|
const BUSY_HEARTBEAT_INTERVAL_MS = 30_000;
|
|
23
23
|
function applySharedKeysFromHeartbeat(config, _channelManager, sharedKeys) {
|
|
@@ -50,20 +50,25 @@ export class HeartbeatManager {
|
|
|
50
50
|
_lastBillingPlans = [];
|
|
51
51
|
_lastBillingMessage;
|
|
52
52
|
/**
|
|
53
|
-
*
|
|
54
|
-
*
|
|
55
|
-
*
|
|
53
|
+
* Owns all server-issued credential orchestration: signature tracking,
|
|
54
|
+
* bundle materialisation, restart coalescing. HeartbeatManager hands
|
|
55
|
+
* it each heartbeat response and reads its `appliedSignature` when
|
|
56
|
+
* building the next payload.
|
|
56
57
|
*/
|
|
57
|
-
|
|
58
|
-
constructor(config) {
|
|
58
|
+
credentialBundle;
|
|
59
|
+
constructor(config, options) {
|
|
59
60
|
this.config = config;
|
|
61
|
+
this.credentialBundle = new CredentialBundleHandler({
|
|
62
|
+
agentName: config.agentName,
|
|
63
|
+
restartTunnel: options?.restartTunnel,
|
|
64
|
+
});
|
|
60
65
|
this.commandDispatcher = new CommandDispatcher();
|
|
61
66
|
this.commandDispatcher.registerHandler("collect_data", createCollectDataHandler(config));
|
|
62
67
|
this.commandDispatcher.registerHandler("upgrade", createUpgradeHandler());
|
|
63
68
|
this.commandDispatcher.registerHandler("usage", createUsageHandler());
|
|
64
69
|
}
|
|
65
70
|
/** Build a base heartbeat payload including owner info for server-side backfill. */
|
|
66
|
-
buildPayload(busy
|
|
71
|
+
buildPayload(busy) {
|
|
67
72
|
const payload = {
|
|
68
73
|
version: getCurrentVersion(),
|
|
69
74
|
model: this.config.model,
|
|
@@ -73,7 +78,9 @@ export class HeartbeatManager {
|
|
|
73
78
|
onboardingComplete: isOnboardingComplete(),
|
|
74
79
|
};
|
|
75
80
|
// Include owner info so the server can backfill if a "Start Over" reset
|
|
76
|
-
// cleared the fields while the agent was mid-onboarding.
|
|
81
|
+
// cleared the fields while the agent was mid-onboarding. Also forward
|
|
82
|
+
// the Telegram chat ID so the server can store it on the agent row
|
|
83
|
+
// and reach the owner directly when the agent is offline.
|
|
77
84
|
if (ownerConfigExists()) {
|
|
78
85
|
try {
|
|
79
86
|
const owner = loadOwnerConfig();
|
|
@@ -81,45 +88,24 @@ export class HeartbeatManager {
|
|
|
81
88
|
payload.ownerEmail = owner.ownerEmail;
|
|
82
89
|
if (owner.ownerName)
|
|
83
90
|
payload.ownerName = owner.ownerName;
|
|
91
|
+
if (owner.telegramChatId !== undefined) {
|
|
92
|
+
payload.ownerChatId = String(owner.telegramChatId);
|
|
93
|
+
}
|
|
84
94
|
}
|
|
85
95
|
catch {
|
|
86
96
|
/* best-effort */
|
|
87
97
|
}
|
|
88
98
|
}
|
|
89
|
-
|
|
90
|
-
|
|
99
|
+
// Always include the applied signature when we have one. The server
|
|
100
|
+
// compares it to its current credential signature and only ships
|
|
101
|
+
// back a `credentialBundle` on mismatch — so steady-state payloads
|
|
102
|
+
// pay just the signature string (a few dozen bytes).
|
|
103
|
+
const sig = this.credentialBundle.appliedSignature;
|
|
104
|
+
if (sig) {
|
|
105
|
+
payload.appliedCredentialSignature = sig;
|
|
91
106
|
}
|
|
92
107
|
return payload;
|
|
93
108
|
}
|
|
94
|
-
/**
|
|
95
|
-
* Apply any `runtimeCredentials` delivered by the server.
|
|
96
|
-
*
|
|
97
|
-
* Runs inside a try/catch so a failed materialization never breaks the
|
|
98
|
-
* heartbeat critical path. If the server omitted `runtimeCredentials` but
|
|
99
|
-
* the agent has no local tunnel credential either, we arm the next
|
|
100
|
-
* heartbeat to request a bootstrap refresh.
|
|
101
|
-
*/
|
|
102
|
-
handleRuntimeCredentialsFromResponse(resp) {
|
|
103
|
-
try {
|
|
104
|
-
const result = applyRuntimeCredentials(resp?.runtimeCredentials, {
|
|
105
|
-
agentName: this.config.agentName,
|
|
106
|
-
});
|
|
107
|
-
if (result.tunnelApplied) {
|
|
108
|
-
this._needsCredentialBootstrap = false;
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
catch (err) {
|
|
112
|
-
logger.warn(`Runtime credential apply failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
113
|
-
}
|
|
114
|
-
// If we still don't have a local tunnel credential after applying,
|
|
115
|
-
// keep asking the server to bootstrap on the next heartbeat. This
|
|
116
|
-
// also covers the case where the server hasn't provisioned a tunnel
|
|
117
|
-
// for this agent yet — subsequent heartbeats stay cheap (only the
|
|
118
|
-
// flag is sent), and we pick up the credential the moment it exists.
|
|
119
|
-
if (probeLocalTunnelCredential() === null) {
|
|
120
|
-
this._needsCredentialBootstrap = true;
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
109
|
/**
|
|
124
110
|
* Initialize the heartbeat client and validate the API key.
|
|
125
111
|
* Should be called once at startup. If validation fails, heartbeats
|
|
@@ -142,11 +128,12 @@ export class HeartbeatManager {
|
|
|
142
128
|
return;
|
|
143
129
|
}
|
|
144
130
|
this.client = new OnboardingServiceClient(this.config.onboardingServiceUrl, this.config.agentName, this.config.visionclawServiceApiKey);
|
|
145
|
-
// The startup heartbeat
|
|
146
|
-
//
|
|
147
|
-
//
|
|
148
|
-
//
|
|
149
|
-
|
|
131
|
+
// The startup heartbeat carries whatever signature we have on disk
|
|
132
|
+
// (or none, on a fresh install). The server returns a
|
|
133
|
+
// `credentialBundle` only on signature mismatch, so the steady-state
|
|
134
|
+
// restart costs nothing extra; first installs and recovery cases
|
|
135
|
+
// get the full bundle automatically.
|
|
136
|
+
const startupPayload = this.buildPayload(false);
|
|
150
137
|
// Register billing handler for bundle purchases.
|
|
151
138
|
// Subscription payment is handled by the subscription gate (subscription-gate.ts),
|
|
152
139
|
// not via a command — the gate reads plans from the heartbeat response directly.
|
|
@@ -169,7 +156,7 @@ export class HeartbeatManager {
|
|
|
169
156
|
if (applySharedKeysFromHeartbeat(this.config, this.channelManager, startupResp?.sharedKeys)) {
|
|
170
157
|
logger.debug("Shared keys applied from startup heartbeat");
|
|
171
158
|
}
|
|
172
|
-
this.
|
|
159
|
+
this.credentialBundle.handle(startupResp?.credentialBundle);
|
|
173
160
|
}
|
|
174
161
|
catch (err) {
|
|
175
162
|
logger.err(`Runtime heartbeat: API key validation failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
@@ -218,13 +205,7 @@ export class HeartbeatManager {
|
|
|
218
205
|
return;
|
|
219
206
|
const acks = this.commandDispatcher.drainAcks();
|
|
220
207
|
try {
|
|
221
|
-
const payload = this.buildPayload(busy
|
|
222
|
-
// Keep wake heartbeats cheap: only opt into the bootstrap payload
|
|
223
|
-
// when the agent lost its local credential between runs. The flag
|
|
224
|
-
// is cleared inside handleRuntimeCredentialsFromResponse() once the
|
|
225
|
-
// server delivers a credential we successfully materialize.
|
|
226
|
-
bootstrapCredentials: this._needsCredentialBootstrap,
|
|
227
|
-
});
|
|
208
|
+
const payload = this.buildPayload(busy);
|
|
228
209
|
if (acks.length > 0)
|
|
229
210
|
payload.commandAcks = acks;
|
|
230
211
|
const resp = await this.client.heartbeat(payload);
|
|
@@ -246,7 +227,7 @@ export class HeartbeatManager {
|
|
|
246
227
|
if (applySharedKeysFromHeartbeat(this.config, this.channelManager, resp?.sharedKeys)) {
|
|
247
228
|
logger.debug("Shared keys updated from heartbeat");
|
|
248
229
|
}
|
|
249
|
-
this.
|
|
230
|
+
this.credentialBundle.handle(resp?.credentialBundle);
|
|
250
231
|
}
|
|
251
232
|
catch {
|
|
252
233
|
// Put undelivered acks back so the next heartbeat can retry them.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeat-manager.js","sourceRoot":"","sources":["../../src/agent/heartbeat-manager.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EACL,uBAAuB,
|
|
1
|
+
{"version":3,"file":"heartbeat-manager.js","sourceRoot":"","sources":["../../src/agent/heartbeat-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/loop.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAA+B,KAAK,gBAAgB,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAG1G,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAapD,OAAO,EAAE,KAAK,UAAU,EAA4C,MAAM,YAAY,CAAC;AAoBvF,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAM3C;;GAEG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE;IACR,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,cAAc,EAAE,cAAc,CAAC;QAAC,YAAY,EAAE,YAAY,CAAC;QAAC,WAAW,EAAE,WAAW,CAAA;KAAE,KAAK,IAAI,CAAC;CAC5I,GACA,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAA+B,KAAK,gBAAgB,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAG1G,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAapD,OAAO,EAAE,KAAK,UAAU,EAA4C,MAAM,YAAY,CAAC;AAoBvF,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAM3C;;GAEG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE;IACR,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,cAAc,EAAE,cAAc,CAAC;QAAC,YAAY,EAAE,YAAY,CAAC;QAAC,WAAW,EAAE,WAAW,CAAA;KAAE,KAAK,IAAI,CAAC;CAC5I,GACA,OAAO,CAAC,IAAI,CAAC,CA8ef"}
|
package/dist/agent/loop.js
CHANGED
|
@@ -78,7 +78,13 @@ export async function startAgentLoop(config, options) {
|
|
|
78
78
|
const justUpgraded = consumePendingUpgrade();
|
|
79
79
|
const ownerConfig = loadOwnerConfig();
|
|
80
80
|
// --- Heartbeat manager ---
|
|
81
|
-
|
|
81
|
+
// Pass `restartTunnel` eagerly (as an option) rather than via
|
|
82
|
+
// `agentState`, because the startup heartbeat fires inside
|
|
83
|
+
// `heartbeat.init(...)` below — agentState is still being assembled
|
|
84
|
+
// at that point, so `getAgentState().restartTunnel` is not yet wired.
|
|
85
|
+
const heartbeat = new HeartbeatManager(config, {
|
|
86
|
+
restartTunnel: options?.restartTunnel,
|
|
87
|
+
});
|
|
82
88
|
await heartbeat.init(channelManager, ownerConfig.telegramChatId, justUpgraded);
|
|
83
89
|
if (ownerConfig.telegramChatId) {
|
|
84
90
|
channelManager.setTelegramOwnerUserId(ownerConfig.telegramChatId);
|
package/dist/agent/loop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,2BAA2B,EAA2C,MAAM,oBAAoB,CAAC;AAE1G,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAmB,cAAc,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,mCAAmC,EAAE,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAIpH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,kEAAkE;AAClE,qDAAqD;AACrD,IAAI,oBAAoB,GAAwB,IAAI,CAAC;AAErD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAwB,EACxB,OAIC;IAED,wEAAwE;IACxE,oBAAoB;IACpB,wEAAwE;IAExE,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IACxC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAE9C,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC;IAEhC,wBAAwB,CAAC,KAAK,IAAI,EAAE;QAClC,MAAM,mBAAmB,GAAG,KAAK,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,iDAAiD,CAAC,CAAC;QACjE,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,IAAI,CAAC;gBACjB,cAAc,CAAC,OAAO,EAAE;gBACxB,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAC/B,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAC/E;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CACT,+CAA+C,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAClG,CAAC;QACJ,CAAC;QACD,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,0BAA0B;IAC1B,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACpF,MAAM,YAAY,GAAG,qBAAqB,EAAE,CAAC;IAC7C,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;IAEtC,4BAA4B;IAC5B,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAE/E,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;QAC/B,cAAc,CAAC,sBAAsB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,WAAW,CAAC,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpD,cAAc,CAAC,2BAA2B,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnF,CAAC;IAED,IAAI,kBAAkB,GAAe,GAAG,EAAE,GAAwB,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAe;QAC7B,MAAM;QACN,WAAW;QACX,cAAc;QACd,YAAY;QACZ,eAAe;QACf,IAAI,EAAE,KAAK;QACX,aAAa,EAAE,KAAK;QACpB,WAAW,EAAE,GAAG,EAAE;YAChB,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC;YAChC,kBAAkB,EAAE,CAAC;QACvB,CAAC;QACD,QAAQ,EAAE,IAAI,GAAG,EAAE;QACnB,iBAAiB,EAAE,KAAK;QACxB,aAAa,EAAE,OAAO,EAAE,aAAa;QACrC,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;QAC9C,UAAU,EAAE,KAAK;QACjB,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,KAAK;KACb,CAAC;IAEF,cAAc,CAAC,UAAU,CAAC,CAAC;IAE3B,MAAM,CAAC,MAAM,CAAC,UAAU,MAAM,CAAC,SAAS,KAAK,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;IAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC;IAC7E,MAAM,CAAC,MAAM,CAAC,uBAAuB,WAAW,CAAC,mBAAmB,GAAG,IAAI,GAAG,CAAC,CAAC;IAChF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAElB,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEjC,qEAAqE;IACrE,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,mCAAmC,CAAC,YAAY,EAAE,CAAC,CAAC;QAC1E,qBAAqB,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAE7B,MAAM,EAAE,cAAc,EAAE,4BAA4B,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACrF,IAAI,4BAA4B,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,UAAU,4BAA4B,kCAAkC,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,cAAc,CAChC,MAAM,EACN,GAAG,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,EAC5C,cAAc,EACd,EAAE,kBAAkB,EAAE,WAAW,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,EAAE,CACzG,CAAC;IACF,MAAM,CAAC,MAAM,CAAC,iBAAiB,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IAC1F,MAAM,CAAC,MAAM,CAAC,gBAAgB,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IACxF,MAAM,CAAC,MAAM,CAAC,iBAAiB,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IAC1F,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;QACnC,kBAAkB,EAAE,CAAC;QACrB,IAAI,YAAY,EAAE,EAAE,CAAC;YACnB,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;gBAC5B,IAAI,CAAC;oBACH,gBAAgB,EAAE,CAAC;gBACrB,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,CACT,sCAAsC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACzF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,MAAM,CAAC,gGAAgG,CAAC,CAAC;QAClH,CAAC;IACH,CAAC;IAED,UAAU,CAAC,cAAc,GAAG,OAAO,CAAC;IAEpC,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;IACpD,OAAO,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;IAClD,kBAAkB,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAEjD,6BAA6B;IAC7B,IAAI,YAAY,GAAwB,IAAI,CAAC;IAE7C,SAAS,YAAY;QACnB,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,YAAY,EAAE,CAAC;YACf,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC;QAC5C,OAAO,EAAE,OAAO,CAAC,aAAa;QAC9B,cAAc,EAAE,OAAO;QACvB,MAAM;QACN,WAAW;QACX,cAAc;QACd,YAAY;QACZ,eAAe;QACf,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU;QAC/B,YAAY;KACb,CAAC,CAAC;IAEH,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QAChC,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,YAAY,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QACD,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YACpB,gBAAgB,CAAC,QAAQ,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,0DAA0D;IAC1D,wEAAwE;IACxE,oEAAoE;IACpE,SAAS,CAAC,iBAAiB,CAAC,eAAe,CACzC,QAAQ,EACR,mBAAmB,CAAC,YAAY,EAAE,YAAY,CAAC,CAChD,CAAC;IAEF,iDAAiD;IACjD,8EAA8E;IAC9E,0EAA0E;IAC1E,2EAA2E;IAC3E,uEAAuE;IACvE,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAC1D,CAAC;IACD,oBAAoB,GAAG,GAAS,EAAE;QAChC,IAAI,YAAY,CAAC,sBAAsB,EAAE,EAAE,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,2EAA2E,CAAC,CAAC;YAC3F,YAAY,EAAE,CAAC;QACjB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,MAAM,CAAC,mEAAmE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC,CAAC;IACF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAE5C,uBAAuB,CAAC;QACtB,UAAU;QACV,cAAc;QACd,YAAY;QACZ,OAAO;QACP,MAAM;QACN,WAAW;QACX,SAAS;QACT,QAAQ,EAAE,OAAO,EAAE,QAAQ;KAC5B,CAAC,CAAC;IAEH,oCAAoC;IACpC,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAAC,0CAA0C,CAAC,CAAC;IAC7F,MAAM,cAAc,GAAG,IAAI,uBAAuB,CAAC;QACjD,MAAM;QACN,cAAc,EAAE,OAAO;QACvB,YAAY;QACZ,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU;QAC/B,YAAY;KACb,CAAC,CAAC;IACH,cAAc,CAAC,KAAK,EAAE,CAAC;IACvB,wBAAwB,CAAC,GAAG,EAAE;QAC5B,cAAc,CAAC,IAAI,EAAE,CAAC;QACtB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,qDAAqD;IACrD,wBAAwB,CAAC,GAAG,EAAE;QAC5B,kBAAkB,EAAE,CAAC;QACrB,uBAAuB,EAAE,CAAC;QAC1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,KAAK,iBAAiB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACpD,MAAM,CAAC,IAAI,CACT,+CAA+C,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAClG,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,yBAAyB;IACzB,MAAM,QAAQ,GAAG,IAAI,aAAa,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC;IAEvE,4BAA4B;IAC5B,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC;QACtC,MAAM;QACN,WAAW;QACX,OAAO;QACP,eAAe;QACf,gBAAgB;QAChB,cAAc;QACd,YAAY;KACb,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,OAAO,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,0DAA0D,CAAC,CAAC;IAE1E,wEAAwE;IACxE,eAAe;IACf,wEAAwE;IAExE,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,yBAAyB,GAAG,CAAC,CAAC;IAElC,oGAAoG;IACpG,OAAO,IAAI,EAAE,CAAC;QACZ,gCAAgC;QAChC,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC;QACxB,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;QACzB,UAAU,CAAC,aAAa,GAAG,KAAK,CAAC;QACjC,UAAU,CAAC,iBAAiB,GAAG,KAAK,CAAC;QACrC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC;QAC5B,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC5B,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,eAAe,CAAC,KAAK,EAAE,CAAC;QACxB,gBAAgB,CAAC,yBAAyB,EAAE,CAAC;QAC7C,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAE3B,sDAAsD;QACtD,EAAE;QACF,qEAAqE;QACrE,sEAAsE;QACtE,sEAAsE;QACtE,mEAAmE;QACnE,gEAAgE;QAChE,mCAAmC;QACnC,KAAK,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;YACzD,MAAM,CAAC,KAAK,CACV,4BAA4B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC/E,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,0DAA0D;QAC1D,+DAA+D;QAC/D,kEAAkE;QAClE,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;QACnC,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,WAAW,CAAC,mBAAmB,CAAC;QACpD,MAAM,OAAO,GAAG,cAAc;YAC5B,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,YAAY;gBACZ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,2BAA2B,CAAC;gBACpD,CAAC,CAAC,WAAW,CAAC;QAClB,MAAM,WAAW,GAAG,cAAc,CAAC;QACnC,cAAc,GAAG,KAAK,CAAC;QAEvB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,YAAY,GAAG,OAAO,CAAC;YACvB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,YAAY,KAAK,OAAO,EAAE,CAAC;oBAC7B,YAAY,GAAG,IAAI,CAAC;oBACpB,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,EAAE,OAAO,CAAC,CAAC;YAEZ,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC5B,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,YAAY,GAAG,IAAI,CAAC;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,eAAe;QACf,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,eAAe,CAAC,KAAK,EAAE,CAAC;QACxB,mBAAmB,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAqB,CAAC,CAAC,CAAC;QAEzD,MAAM,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAExC,4BAA4B;QAC5B,IAAI,SAAS,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;YACnD,MAAM,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7D,qEAAqE;QACvE,CAAC;QAED,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAE9B,8BAA8B;QAC9B,kEAAkE;QAClE,gEAAgE;QAChE,yDAAyD;QACzD,EAAE;QACF,oBAAoB;QACpB,wEAAwE;QACxE,mEAAmE;QACnE,6CAA6C;QAC7C,oCAAoC;QACpC,yDAAyD;QACzD,EAAE;QACF,oEAAoE;QACpE,gEAAgE;QAChE,6DAA6D;QAC7D,MAAM,+BAA+B,GAAG,CAAC,CAAC;QAE1C,IAAI,uBAAuB,EAAE,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,oBAAoB,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;YAEnD,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,0EAA0E;gBAC1E,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC;gBACnF,yBAAyB,GAAG,CAAC,CAAC;YAChC,CAAC;iBAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,yBAAyB,IAAI,+BAA+B,EAAE,CAAC;gBACnG,kEAAkE;gBAClE,iEAAiE;gBACjE,MAAM,CAAC,MAAM,CACX,iEAAiE,yBAAyB,iCAAiC,CAC5H,CAAC;gBACF,yBAAyB,GAAG,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,8BAA8B;gBAC9B,yBAAyB,EAAE,CAAC;gBAC5B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;gBAC3B,MAAM,CAAC,MAAM,CAAC,wCAAwC,yBAAyB,IAAI,+BAA+B,IAAI,CAAC,CAAC;gBACxH,MAAM,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;gBAC7C,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC5B,SAAS,CAAC,gBAAgB,EAAE,CAAC;gBAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAClB,SAAS;YACX,CAAC;QACH,CAAC;aAAM,CAAC;YACN,uCAAuC;YACvC,yBAAyB,GAAG,CAAC,CAAC;QAChC,CAAC;QAED,yBAAyB;QACzB,MAAM,WAAW,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QAEtD,MAAM,QAAQ,GAAqB,EAAE,CAAC;QACtC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,GAAG;gBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;gBAC3B,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,MAAM,EAAE,EAAE;oBACvD,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,YAAY,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;iBACpD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GACZ,QAAQ,CAAC,MAAM,GAAG,CAAC;YACjB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACzD,CAAC,CAAC,WAAW,CAAC;QAClB,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEpC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,eAAe,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,mBAAmB,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;YAC7C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CACT,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACjF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,yEAAyE;YACzE,wEAAwE;YACxE,qEAAqE;YACrE,qBAAqB;YACrB,MAAM,CAAC,GAAG,CACR,MAAM,EACN,UAAU,EACV,IAAI,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,MAAM,KAAK,yBAAyB,CAAC,GAAG,CAAC,EAAE,EACnE,oBAAoB,CAAC,GAAG,CAAC,CAC1B,CAAC;QACJ,CAAC;QAED,2DAA2D;QAC3D,EAAE;QACF,yEAAyE;QACzE,0EAA0E;QAC1E,kEAAkE;QAClE,yEAAyE;QACzE,wEAAwE;QACxE,qEAAqE;QACrE,kEAAkE;QAClE,KAAK,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;YACzD,MAAM,CAAC,KAAK,CACV,6BAA6B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAChF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,yBAAyB;QACzB,MAAM,cAAc,GAAG,OAAO,KAAK,WAAW,IAAI,kBAAkB,EAAE,CAAC;QACvE,MAAM,cAAc,GAAG,iBAAiB,GAAG,CAAC,CAAC;QAC7C,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,GAClD,MAAM,iBAAiB,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;QAEnG,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC;YAC3C,MAAM;YACN,OAAO;YACP,QAAQ;YACR,eAAe;YACf,UAAU;YACV,aAAa;YACb,aAAa,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;YAC1E,YAAY,EAAE,OAAO,CAAC,qBAAqB,EAAE;YAC7C,mBAAmB,EAAE,OAAO,CAAC,sBAAsB,EAAE;YACrD,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK;YAClD,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI;SAChD,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAErC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;gBAC3B,cAAc,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAqB,CAAC,CAAC,CAAC;YACjG,CAAC;QACH,CAAC;QAED,mCAAmC;QACnC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAClC,aAAa,EACb,OAAO,EACP,QAAQ,EACR,eAAe,EACf,iBAAiB,CAClB,CAAC;YACF,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAC/C,CAAC;gBAAS,CAAC;YACT,qEAAqE;YACrE,gEAAgE;YAChE,8CAA8C;YAC9C,SAAS,CAAC,gBAAgB,EAAE,CAAC;YAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboarding-gate.d.ts","sourceRoot":"","sources":["../../src/agent/onboarding-gate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"onboarding-gate.d.ts","sourceRoot":"","sources":["../../src/agent/onboarding-gate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AA8CzD;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,gBAAgB,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,OAAO,CAAC,CAyJlB"}
|
|
@@ -12,7 +12,7 @@ function createOnboardingClient(config) {
|
|
|
12
12
|
return new OnboardingServiceClient(config.onboardingServiceUrl, config.agentName, config.visionclawServiceApiKey);
|
|
13
13
|
}
|
|
14
14
|
function buildOnboardingHeartbeatPayload(config) {
|
|
15
|
-
|
|
15
|
+
const payload = {
|
|
16
16
|
version: getCurrentVersion(),
|
|
17
17
|
model: config.model,
|
|
18
18
|
provider: config.provider,
|
|
@@ -20,6 +20,25 @@ function buildOnboardingHeartbeatPayload(config) {
|
|
|
20
20
|
busy: false,
|
|
21
21
|
onboardingComplete: false,
|
|
22
22
|
};
|
|
23
|
+
// Forward owner info (including telegramChatId) once the owner is set
|
|
24
|
+
// so the server can store the chat ID on the agent row even before
|
|
25
|
+
// onboarding completion is recorded.
|
|
26
|
+
if (ownerConfigExists()) {
|
|
27
|
+
try {
|
|
28
|
+
const owner = loadOwnerConfig();
|
|
29
|
+
if (owner.ownerEmail)
|
|
30
|
+
payload.ownerEmail = owner.ownerEmail;
|
|
31
|
+
if (owner.ownerName)
|
|
32
|
+
payload.ownerName = owner.ownerName;
|
|
33
|
+
if (owner.telegramChatId !== undefined) {
|
|
34
|
+
payload.ownerChatId = String(owner.telegramChatId);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
/* best-effort */
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return payload;
|
|
23
42
|
}
|
|
24
43
|
/**
|
|
25
44
|
* Run the onboarding gate. If onboarding is not yet complete, this drives
|
|
@@ -147,11 +166,18 @@ export async function runOnboardingGate(config, channelManager, messageQueue) {
|
|
|
147
166
|
});
|
|
148
167
|
if (heartbeatTimer)
|
|
149
168
|
clearInterval(heartbeatTimer);
|
|
169
|
+
// Fresh onboarding establishes a new owner session, so we discard any
|
|
170
|
+
// queued inbound work accumulated during onboarding before entering the
|
|
171
|
+
// normal agent loop.
|
|
172
|
+
messageQueue.clear();
|
|
150
173
|
if (onboardingClient) {
|
|
151
174
|
const finalOwner = loadOwnerConfig();
|
|
152
175
|
await onboardingClient.notifyComplete({
|
|
153
176
|
ownerEmail: finalOwner.ownerEmail,
|
|
154
177
|
ownerName: finalOwner.ownerName,
|
|
178
|
+
ownerChatId: finalOwner.telegramChatId !== undefined
|
|
179
|
+
? String(finalOwner.telegramChatId)
|
|
180
|
+
: undefined,
|
|
155
181
|
});
|
|
156
182
|
}
|
|
157
183
|
logger.system("Owner onboarding complete! Continuing to normal operation...\n");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboarding-gate.js","sourceRoot":"","sources":["../../src/agent/onboarding-gate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC/G,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAyB,MAAM,4CAA4C,CAAC;AAC5G,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,SAAS,sBAAsB,CAAC,MAAwB;IACtD,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,CAAC,MAAM,CAAC,uBAAuB;QAAE,OAAO,IAAI,CAAC;IACjF,OAAO,IAAI,uBAAuB,CAChC,MAAM,CAAC,oBAAoB,EAC3B,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,uBAAuB,CAC/B,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CAAC,MAAwB;IAC/D,OAAO;
|
|
1
|
+
{"version":3,"file":"onboarding-gate.js","sourceRoot":"","sources":["../../src/agent/onboarding-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../../src/agent/providers/openai/tools.ts"],"names":[],"mappings":"AACA,OAAO,EAA2G,KAAK,SAAS,EAAE,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../../src/agent/providers/openai/tools.ts"],"names":[],"mappings":"AACA,OAAO,EAA2G,KAAK,SAAS,EAAE,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AA8BpK,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAS/D,KAAK,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAiKrD,wBAAgB,4BAA4B,IAAI,IAAI,CAMnD;AAED,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,GACnD,SAAS,EAAE,CA2Bb;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,IAAI,EAAE,CA0ET"}
|
|
@@ -17,6 +17,8 @@ import { webFetchTool } from "../../../tools/web-fetch.js";
|
|
|
17
17
|
import { androidUseClickTool, androidUseLongPressTool, androidUseTypeTool, androidUseScrollTool, androidUseDragTool, androidUsePressTool, androidUseScreenshotTool, androidUseOpenTool, } from "../../../tools/android-use.js";
|
|
18
18
|
import { stockDataTool } from "../../../tools/stock-data.js";
|
|
19
19
|
import { captureScreen, click, doubleClick, drag, getDisplaySize, moveTo, pressKey, rightClick, scrollBy, typeText } from "../../../tools/desktop-executor.js";
|
|
20
|
+
import { isDisplaySizeInitialized } from "../../../tools/desktop-executor-factory.js";
|
|
21
|
+
import { logger } from "../../../logger.js";
|
|
20
22
|
function toOpenAIParameterSchema(schema) {
|
|
21
23
|
let current = schema;
|
|
22
24
|
// OpenAI's strict function schemas expect every property to appear in
|
|
@@ -178,7 +180,16 @@ export function createOpenAIMcpServers(serverConfigs) {
|
|
|
178
180
|
export function createOpenAITools(options) {
|
|
179
181
|
const tools = [];
|
|
180
182
|
if (options.runtimeSurface.visionClawToolTransport.transport === "openai-functions") {
|
|
181
|
-
tools.push(adaptClaudeTool(waitTool), adaptClaudeTool(webFetchTool), adaptClaudeTool(notifyUserTool), adaptClaudeTool(finishTool), adaptClaudeTool(manageSkillsTool), adaptClaudeTool(upgradeTool), adaptClaudeTool(manageCalendarTool), adaptClaudeTool(manageEmailTool), adaptClaudeTool(manageDriveTool), adaptClaudeTool(memoryTool), adaptClaudeTool(manageMcpServersTool)
|
|
183
|
+
tools.push(adaptClaudeTool(waitTool), adaptClaudeTool(webFetchTool), adaptClaudeTool(notifyUserTool), adaptClaudeTool(finishTool), adaptClaudeTool(manageSkillsTool), adaptClaudeTool(upgradeTool), adaptClaudeTool(manageCalendarTool), adaptClaudeTool(manageEmailTool), adaptClaudeTool(manageDriveTool), adaptClaudeTool(memoryTool), adaptClaudeTool(manageMcpServersTool));
|
|
184
|
+
// Only expose the OpenAI computer tool when display size is known —
|
|
185
|
+
// `VisionClawComputer.dimensions` reads it synchronously and the tool
|
|
186
|
+
// descriptor would otherwise advertise bogus coordinates to the model.
|
|
187
|
+
if (isDisplaySizeInitialized()) {
|
|
188
|
+
tools.push(createVisionClawComputerTool());
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
logger.warn("[openai-tools] Skipping computer tool registration: display size unavailable.");
|
|
192
|
+
}
|
|
182
193
|
if (options.androidUse) {
|
|
183
194
|
tools.push(adaptClaudeTool(androidUseClickTool), adaptClaudeTool(androidUseLongPressTool), adaptClaudeTool(androidUseTypeTool), adaptClaudeTool(androidUseScrollTool), adaptClaudeTool(androidUseDragTool), adaptClaudeTool(androidUsePressTool), adaptClaudeTool(androidUseScreenshotTool), adaptClaudeTool(androidUseOpenTool));
|
|
184
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../../src/agent/providers/openai/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,uBAAuB,EAAE,IAAI,EAAE,aAAa,EAA4C,MAAM,gBAAgB,CAAC;AACpK,OAAO,EAAE,SAAS,EAAE,MAAM,8CAA8C,CAAC;AAEzE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../../src/agent/providers/openai/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Runtime credential store.
|
|
3
3
|
*
|
|
4
|
-
* Phase 1 scope: consume `
|
|
4
|
+
* Phase 1 scope: consume `credentialBundle.body.tunnel` delivered by the
|
|
5
5
|
* onboarding-service heartbeat and materialize it to the active profile's
|
|
6
6
|
* private tunnel directory.
|
|
7
7
|
*
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
* - Files are written with 0o600 permissions to keep the minimum exposure
|
|
22
22
|
* surface, and the enclosing directory is 0o700.
|
|
23
23
|
*/
|
|
24
|
-
import type {
|
|
24
|
+
import type { CredentialBundleBody } from "../onboarding/onboarding-service-client.js";
|
|
25
25
|
export interface AppliedTunnelMaterialization {
|
|
26
26
|
tunnelId: string;
|
|
27
27
|
tunnelName: string;
|
|
@@ -33,6 +33,20 @@ export interface AppliedTunnelMaterialization {
|
|
|
33
33
|
export interface ApplyRuntimeCredentialsResult {
|
|
34
34
|
tunnelApplied: boolean;
|
|
35
35
|
tunnel: AppliedTunnelMaterialization | null;
|
|
36
|
+
/**
|
|
37
|
+
* True iff the tunnel credential apply wrote at least one file to
|
|
38
|
+
* disk in this call. Idempotent re-applies (or bundles without a
|
|
39
|
+
* `tunnel` field) return false. Callers use this to decide whether
|
|
40
|
+
* to bounce cloudflared so it picks up the new credential.
|
|
41
|
+
*/
|
|
42
|
+
tunnelChanged: boolean;
|
|
43
|
+
/**
|
|
44
|
+
* The tunnel UUID observed on disk *before* this apply ran, or null
|
|
45
|
+
* when no `config.yml` existed. Meaningful only when `tunnelApplied`
|
|
46
|
+
* is true. Lets callers distinguish a tunnel rotation from a pure
|
|
47
|
+
* credentialsJson refresh.
|
|
48
|
+
*/
|
|
49
|
+
previousTunnelId: string | null;
|
|
36
50
|
}
|
|
37
51
|
export interface ApplyRuntimeCredentialsOptions {
|
|
38
52
|
/**
|
|
@@ -45,12 +59,12 @@ export interface ApplyRuntimeCredentialsOptions {
|
|
|
45
59
|
agentName?: string;
|
|
46
60
|
}
|
|
47
61
|
/**
|
|
48
|
-
* Apply a
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
*
|
|
62
|
+
* Apply a server-delivered credential bundle body. Tolerates a missing
|
|
63
|
+
* or undefined body (returns a no-op result). Never throws on IO errors
|
|
64
|
+
* — callers use this from the heartbeat critical path and a failed
|
|
65
|
+
* materialisation must not block heartbeats or shut the agent down.
|
|
52
66
|
*/
|
|
53
|
-
export declare function applyRuntimeCredentials(bundle:
|
|
67
|
+
export declare function applyRuntimeCredentials(bundle: CredentialBundleBody | undefined, options?: ApplyRuntimeCredentialsOptions): ApplyRuntimeCredentialsResult;
|
|
54
68
|
export interface LocalTunnelCredentialSnapshot {
|
|
55
69
|
tunnelId: string;
|
|
56
70
|
tunnelName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-credentials.d.ts","sourceRoot":"","sources":["../../src/agent/runtime-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;
|
|
1
|
+
{"version":3,"file":"runtime-credentials.d.ts","sourceRoot":"","sources":["../../src/agent/runtime-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAaH,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,4CAA4C,CAAC;AAEpD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAmRD,MAAM,WAAW,6BAA6B;IAC5C,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAAC;IAC5C;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IACvB;;;;;OAKG;IACH,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,8BAA8B;IAC7C;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,oBAAoB,GAAG,SAAS,EACxC,OAAO,GAAE,8BAAmC,GAC3C,6BAA6B,CAkC/B;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,IAAI,4BAA4B,GAAG,IAAI,CAEhF;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,IAAI,6BAA6B,GAAG,IAAI,CAwDjF;AAED;;GAEG;AACH,wBAAgB,qCAAqC,IAAI,IAAI,CAG5D"}
|