@lobu/worker 7.0.0 → 7.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/error-handler.d.ts +0 -4
- package/dist/core/error-handler.d.ts.map +1 -1
- package/dist/core/error-handler.js +4 -15
- package/dist/core/error-handler.js.map +1 -1
- package/dist/core/types.d.ts +19 -19
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +0 -4
- package/dist/core/types.js.map +1 -1
- package/dist/core/workspace.d.ts +2 -11
- package/dist/core/workspace.d.ts.map +1 -1
- package/dist/core/workspace.js +14 -36
- package/dist/core/workspace.js.map +1 -1
- package/dist/embedded/just-bash-bootstrap.d.ts.map +1 -1
- package/dist/embedded/just-bash-bootstrap.js +34 -4
- package/dist/embedded/just-bash-bootstrap.js.map +1 -1
- package/dist/embedded/mcp-cli-commands.d.ts.map +1 -1
- package/dist/embedded/mcp-cli-commands.js +3 -38
- package/dist/embedded/mcp-cli-commands.js.map +1 -1
- package/dist/gateway/sse-client.d.ts.map +1 -1
- package/dist/gateway/sse-client.js +72 -10
- package/dist/gateway/sse-client.js.map +1 -1
- package/dist/gateway/types.d.ts +2 -0
- package/dist/gateway/types.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -24
- package/dist/index.js.map +1 -1
- package/dist/instructions/builder.d.ts.map +1 -1
- package/dist/instructions/builder.js +2 -1
- package/dist/instructions/builder.js.map +1 -1
- package/dist/openclaw/plugin-loader.d.ts.map +1 -1
- package/dist/openclaw/plugin-loader.js +8 -19
- package/dist/openclaw/plugin-loader.js.map +1 -1
- package/dist/openclaw/processor.d.ts.map +1 -1
- package/dist/openclaw/processor.js +2 -0
- package/dist/openclaw/processor.js.map +1 -1
- package/dist/openclaw/sandbox-leak.d.ts.map +1 -1
- package/dist/openclaw/sandbox-leak.js +1 -6
- package/dist/openclaw/sandbox-leak.js.map +1 -1
- package/dist/openclaw/session-context.d.ts.map +1 -1
- package/dist/openclaw/session-context.js +3 -0
- package/dist/openclaw/session-context.js.map +1 -1
- package/dist/openclaw/tool-policy.d.ts.map +1 -1
- package/dist/openclaw/tool-policy.js +5 -11
- package/dist/openclaw/tool-policy.js.map +1 -1
- package/dist/openclaw/transcript-snapshot.d.ts +88 -0
- package/dist/openclaw/transcript-snapshot.d.ts.map +1 -0
- package/dist/openclaw/transcript-snapshot.js +223 -0
- package/dist/openclaw/transcript-snapshot.js.map +1 -0
- package/dist/openclaw/worker.d.ts +14 -0
- package/dist/openclaw/worker.d.ts.map +1 -1
- package/dist/openclaw/worker.js +147 -10
- package/dist/openclaw/worker.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +3 -40
- package/dist/server.js.map +1 -1
- package/dist/shared/audio-provider-suggestions.d.ts.map +1 -1
- package/dist/shared/audio-provider-suggestions.js +4 -6
- package/dist/shared/audio-provider-suggestions.js.map +1 -1
- package/dist/shared/tool-implementations.d.ts.map +1 -1
- package/dist/shared/tool-implementations.js +62 -24
- package/dist/shared/tool-implementations.js.map +1 -1
- package/package.json +2 -2
- package/src/__tests__/processor-harden.test.ts +6 -16
- package/src/__tests__/sse-client.test.ts +99 -0
- package/src/__tests__/transcript-snapshot.test.ts +275 -0
- package/src/core/error-handler.ts +5 -20
- package/src/core/types.ts +19 -35
- package/src/core/workspace.ts +22 -45
- package/src/embedded/just-bash-bootstrap.ts +36 -4
- package/src/embedded/mcp-cli-commands.ts +9 -6
- package/src/gateway/sse-client.ts +87 -22
- package/src/gateway/types.ts +15 -0
- package/src/index.ts +8 -26
- package/src/instructions/builder.ts +2 -3
- package/src/openclaw/plugin-loader.ts +15 -19
- package/src/openclaw/processor.ts +1 -0
- package/src/openclaw/sandbox-leak.ts +1 -6
- package/src/openclaw/session-context.ts +3 -0
- package/src/openclaw/tool-policy.ts +5 -12
- package/src/openclaw/transcript-snapshot.ts +238 -0
- package/src/openclaw/worker.ts +167 -13
- package/src/server.ts +1 -5
- package/src/shared/audio-provider-suggestions.ts +4 -6
- package/src/shared/tool-implementations.ts +57 -16
|
@@ -41,6 +41,7 @@ exports.consumePendingConfigNotifications = consumePendingConfigNotifications;
|
|
|
41
41
|
const node_child_process_1 = require("node:child_process");
|
|
42
42
|
const core_1 = require("@lobu/core");
|
|
43
43
|
const zod_1 = require("zod");
|
|
44
|
+
const worker_env_keys_1 = require("../shared/worker-env-keys");
|
|
44
45
|
const gateway_integration_1 = require("./gateway-integration");
|
|
45
46
|
const message_batcher_1 = require("./message-batcher");
|
|
46
47
|
const logger = (0, core_1.createLogger)("sse-client");
|
|
@@ -87,7 +88,8 @@ const AgentOptionsSchema = zod_1.z
|
|
|
87
88
|
})
|
|
88
89
|
.passthrough();
|
|
89
90
|
const JobEventSchema = zod_1.z.object({
|
|
90
|
-
payload: zod_1.z
|
|
91
|
+
payload: zod_1.z
|
|
92
|
+
.object({
|
|
91
93
|
botId: zod_1.z.string(),
|
|
92
94
|
userId: zod_1.z.string(),
|
|
93
95
|
agentId: zod_1.z.string(),
|
|
@@ -100,7 +102,19 @@ const JobEventSchema = zod_1.z.object({
|
|
|
100
102
|
agentOptions: AgentOptionsSchema,
|
|
101
103
|
jobId: zod_1.z.string().optional(),
|
|
102
104
|
teamId: zod_1.z.string().optional(), // Optional for WhatsApp (top-level) and Slack (in platformMetadata)
|
|
103
|
-
|
|
105
|
+
// Threaded through from MessageConsumer's runs-queue claim. The worker
|
|
106
|
+
// asserts these in snapshot mode (LOBU_SESSION_STORE != "file") — see
|
|
107
|
+
// worker.ts:353-360. The default zod object mode strips unknown keys,
|
|
108
|
+
// which silently dropped these fields and broke every Telegram chat
|
|
109
|
+
// when snapshot mode became the default in PR #871. Declare them
|
|
110
|
+
// explicitly so they survive parsing, and `.passthrough()` keeps any
|
|
111
|
+
// future MessagePayload field (mcpConfig, nixConfig, egressConfig,
|
|
112
|
+
// preApprovedTools, exec* fields, organizationId, networkConfig...)
|
|
113
|
+
// from regressing the same way.
|
|
114
|
+
runId: zod_1.z.number().optional(),
|
|
115
|
+
runJobToken: zod_1.z.string().optional(),
|
|
116
|
+
})
|
|
117
|
+
.passthrough(),
|
|
104
118
|
processedIds: zod_1.z.array(zod_1.z.string()).optional(),
|
|
105
119
|
});
|
|
106
120
|
/**
|
|
@@ -463,19 +477,31 @@ class GatewayClient {
|
|
|
463
477
|
platformMetadata: data.platformMetadata,
|
|
464
478
|
});
|
|
465
479
|
let completed = false;
|
|
480
|
+
let sigkillTimer = null;
|
|
466
481
|
try {
|
|
467
|
-
//
|
|
482
|
+
// Strip the worker's own gateway credentials before handing the shell
|
|
483
|
+
// its env. An `exec` command is an arbitrary string from the gateway
|
|
484
|
+
// that ends up under `sh -c`; leaking WORKER_TOKEN / DISPATCHER_URL
|
|
485
|
+
// into that environment would let a malicious or buggy exec impersonate
|
|
486
|
+
// the worker against its own gateway. The bash-tool and just-bash
|
|
487
|
+
// spawners already apply the same filter (see openclaw/tools.ts and
|
|
488
|
+
// embedded/just-bash-bootstrap.ts) — keep parity here.
|
|
489
|
+
const baseEnv = (0, core_1.stripEnv)(process.env, worker_env_keys_1.SENSITIVE_WORKER_ENV_KEYS);
|
|
468
490
|
const proc = (0, node_child_process_1.spawn)("sh", ["-c", execCommand], {
|
|
469
491
|
cwd: workingDir,
|
|
470
|
-
env: { ...
|
|
492
|
+
env: { ...baseEnv, ...execEnv },
|
|
471
493
|
stdio: ["ignore", "pipe", "pipe"],
|
|
472
494
|
});
|
|
473
|
-
// Setup timeout
|
|
495
|
+
// Setup timeout. The SIGKILL escalation timer is tracked so the `close`
|
|
496
|
+
// handler can clear it when the child exits between SIGTERM and SIGKILL;
|
|
497
|
+
// otherwise the timer pins the event loop for an extra 5s after every
|
|
498
|
+
// timed-out exec and (worse) leaks if `close`/`error` never fires.
|
|
474
499
|
const timeoutId = setTimeout(() => {
|
|
475
500
|
if (!completed) {
|
|
476
501
|
logger.warn({ traceId, execId }, "Exec timeout reached, killing process");
|
|
477
502
|
proc.kill("SIGTERM");
|
|
478
|
-
setTimeout(() => {
|
|
503
|
+
sigkillTimer = setTimeout(() => {
|
|
504
|
+
sigkillTimer = null;
|
|
479
505
|
if (!completed) {
|
|
480
506
|
proc.kill("SIGKILL");
|
|
481
507
|
}
|
|
@@ -483,29 +509,45 @@ class GatewayClient {
|
|
|
483
509
|
}
|
|
484
510
|
}, timeout);
|
|
485
511
|
// Stream stdout
|
|
486
|
-
|
|
512
|
+
const onStdout = (chunk) => {
|
|
487
513
|
const content = chunk.toString();
|
|
488
514
|
transport.sendExecOutput(execId, "stdout", content).catch((err) => {
|
|
489
515
|
logger.error({ traceId, execId, error: err }, "Failed to send stdout");
|
|
490
516
|
});
|
|
491
|
-
}
|
|
517
|
+
};
|
|
518
|
+
proc.stdout?.on("data", onStdout);
|
|
492
519
|
// Stream stderr
|
|
493
|
-
|
|
520
|
+
const onStderr = (chunk) => {
|
|
494
521
|
const content = chunk.toString();
|
|
495
522
|
transport.sendExecOutput(execId, "stderr", content).catch((err) => {
|
|
496
523
|
logger.error({ traceId, execId, error: err }, "Failed to send stderr");
|
|
497
524
|
});
|
|
498
|
-
}
|
|
525
|
+
};
|
|
526
|
+
proc.stderr?.on("data", onStderr);
|
|
499
527
|
// Wait for process to complete
|
|
500
528
|
const exitCode = await new Promise((resolve, reject) => {
|
|
501
529
|
proc.on("close", (code) => {
|
|
502
530
|
completed = true;
|
|
503
531
|
clearTimeout(timeoutId);
|
|
532
|
+
if (sigkillTimer) {
|
|
533
|
+
clearTimeout(sigkillTimer);
|
|
534
|
+
sigkillTimer = null;
|
|
535
|
+
}
|
|
536
|
+
// Stop accepting late `data` events so a chunk buffered after exit
|
|
537
|
+
// can't fire `sendExecOutput` AFTER we've signalled completion.
|
|
538
|
+
proc.stdout?.removeListener("data", onStdout);
|
|
539
|
+
proc.stderr?.removeListener("data", onStderr);
|
|
504
540
|
resolve(code ?? 0);
|
|
505
541
|
});
|
|
506
542
|
proc.on("error", (error) => {
|
|
507
543
|
completed = true;
|
|
508
544
|
clearTimeout(timeoutId);
|
|
545
|
+
if (sigkillTimer) {
|
|
546
|
+
clearTimeout(sigkillTimer);
|
|
547
|
+
sigkillTimer = null;
|
|
548
|
+
}
|
|
549
|
+
proc.stdout?.removeListener("data", onStdout);
|
|
550
|
+
proc.stderr?.removeListener("data", onStderr);
|
|
509
551
|
reject(error);
|
|
510
552
|
});
|
|
511
553
|
});
|
|
@@ -529,6 +571,13 @@ class GatewayClient {
|
|
|
529
571
|
logger.error({ traceId, execId, error: errorMessage }, "Exec failed");
|
|
530
572
|
}
|
|
531
573
|
finally {
|
|
574
|
+
// Defensive: if we threw before `close`/`error` fired (e.g. transport
|
|
575
|
+
// throwing during sendExecOutput on a long-running child), make sure
|
|
576
|
+
// the SIGKILL escalation timer doesn't outlive this exec.
|
|
577
|
+
if (sigkillTimer) {
|
|
578
|
+
clearTimeout(sigkillTimer);
|
|
579
|
+
sigkillTimer = null;
|
|
580
|
+
}
|
|
532
581
|
this.currentJobId = undefined;
|
|
533
582
|
}
|
|
534
583
|
}
|
|
@@ -699,6 +748,19 @@ class GatewayClient {
|
|
|
699
748
|
workspace: {
|
|
700
749
|
baseDirectory: process.env.WORKSPACE_DIR || "/workspace",
|
|
701
750
|
},
|
|
751
|
+
// Threaded through from MessageConsumer (set from the runs-queue
|
|
752
|
+
// claim's job.id). Used by cleanup() to attribute the snapshot to
|
|
753
|
+
// the correct run; codex P1#1 on PR #865.
|
|
754
|
+
runId: typeof payload.runId === "number" && Number.isFinite(payload.runId)
|
|
755
|
+
? payload.runId
|
|
756
|
+
: undefined,
|
|
757
|
+
// Per-run JWT minted by MessageConsumer alongside runId. Worker
|
|
758
|
+
// uses this for the snapshot POST instead of the deployment-
|
|
759
|
+
// lifetime WORKER_TOKEN, so the gateway can enforce
|
|
760
|
+
// tokenData.runId === body.runId — codex round 2 finding A.
|
|
761
|
+
runJobToken: typeof payload.runJobToken === "string" && payload.runJobToken
|
|
762
|
+
? payload.runJobToken
|
|
763
|
+
: undefined,
|
|
702
764
|
};
|
|
703
765
|
}
|
|
704
766
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-client.js","sourceRoot":"","sources":["../../src/gateway/sse-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sse-client.js","sourceRoot":"","sources":["../../src/gateway/sse-client.ts"],"names":[],"mappings":"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"}
|
package/dist/gateway/types.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/gateway/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEtE;;GAEG;AACH,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/gateway/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEtE;;GAEG;AACH,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAOhB,KAAK,CAAC,EAAE,MAAM,CAAC;IAQf,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAGlB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,qBAAqB,GAAG;IACjD,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAqHA,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -9,7 +9,6 @@ const server_1 = require("./server");
|
|
|
9
9
|
* Main entry point for gateway-based persistent worker
|
|
10
10
|
*/
|
|
11
11
|
async function main() {
|
|
12
|
-
// Register global rejection/exception handlers early
|
|
13
12
|
process.on("unhandledRejection", (reason) => {
|
|
14
13
|
logger.error("Unhandled rejection:", reason);
|
|
15
14
|
process.exit(1);
|
|
@@ -19,9 +18,7 @@ async function main() {
|
|
|
19
18
|
process.exit(1);
|
|
20
19
|
});
|
|
21
20
|
logger.info("Starting worker...");
|
|
22
|
-
// Initialize Sentry for error tracking
|
|
23
21
|
await (0, core_1.initSentry)();
|
|
24
|
-
// Initialize OpenTelemetry tracing for distributed tracing
|
|
25
22
|
const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
|
|
26
23
|
if (otlpEndpoint) {
|
|
27
24
|
(0, core_1.initTracing)({
|
|
@@ -30,20 +27,16 @@ async function main() {
|
|
|
30
27
|
});
|
|
31
28
|
logger.info(`Tracing initialized: lobu-worker -> ${otlpEndpoint}`);
|
|
32
29
|
}
|
|
33
|
-
// Discover and register available modules
|
|
34
30
|
await core_1.moduleRegistry.registerAvailableModules();
|
|
35
|
-
// Initialize all registered modules
|
|
36
31
|
await core_1.moduleRegistry.initAll();
|
|
37
32
|
logger.info("✅ Modules initialized");
|
|
38
33
|
logger.info("🔄 Starting in gateway mode (SSE/HTTP-based persistent worker)");
|
|
39
|
-
// Get user ID from environment
|
|
40
34
|
const userId = process.env.USER_ID;
|
|
41
35
|
if (!userId) {
|
|
42
36
|
logger.error("❌ USER_ID environment variable is required for gateway mode");
|
|
43
37
|
process.exit(1);
|
|
44
38
|
}
|
|
45
39
|
try {
|
|
46
|
-
// Get required environment variables
|
|
47
40
|
const deploymentName = process.env.DEPLOYMENT_NAME;
|
|
48
41
|
const dispatcherUrl = process.env.DISPATCHER_URL;
|
|
49
42
|
const workerToken = process.env.WORKER_TOKEN;
|
|
@@ -59,10 +52,8 @@ async function main() {
|
|
|
59
52
|
logger.error("❌ WORKER_TOKEN environment variable is required");
|
|
60
53
|
process.exit(1);
|
|
61
54
|
}
|
|
62
|
-
// Start HTTP server before connecting to gateway
|
|
63
55
|
const httpPort = await (0, server_1.startWorkerHttpServer)();
|
|
64
56
|
logger.info(`Worker HTTP server started on port ${httpPort}`);
|
|
65
|
-
// Initialize gateway client directly
|
|
66
57
|
logger.info(`🚀 Starting Gateway-based Persistent Worker`);
|
|
67
58
|
logger.info(`- User ID: ${userId}`);
|
|
68
59
|
logger.info(`- Deployment: ${deploymentName}`);
|
|
@@ -70,31 +61,23 @@ async function main() {
|
|
|
70
61
|
const gatewayClient = new sse_client_1.GatewayClient(dispatcherUrl, workerToken, userId, deploymentName, httpPort);
|
|
71
62
|
// Register signal handlers before async operations
|
|
72
63
|
let isShuttingDown = false;
|
|
73
|
-
|
|
64
|
+
const shutdown = async (signal) => {
|
|
74
65
|
if (isShuttingDown)
|
|
75
66
|
return;
|
|
76
67
|
isShuttingDown = true;
|
|
77
|
-
logger.info(
|
|
68
|
+
logger.info(`Received ${signal}, shutting down gateway worker...`);
|
|
78
69
|
await gatewayClient.stop();
|
|
79
70
|
await (0, server_1.stopWorkerHttpServer)();
|
|
80
71
|
process.exit(0);
|
|
81
|
-
}
|
|
82
|
-
process.on("
|
|
83
|
-
|
|
84
|
-
return;
|
|
85
|
-
isShuttingDown = true;
|
|
86
|
-
logger.info("Received SIGINT, shutting down gateway worker...");
|
|
87
|
-
await gatewayClient.stop();
|
|
88
|
-
await (0, server_1.stopWorkerHttpServer)();
|
|
89
|
-
process.exit(0);
|
|
90
|
-
});
|
|
72
|
+
};
|
|
73
|
+
process.on("SIGTERM", () => shutdown("SIGTERM"));
|
|
74
|
+
process.on("SIGINT", () => shutdown("SIGINT"));
|
|
91
75
|
logger.info("🔌 Connecting to dispatcher...");
|
|
92
76
|
await gatewayClient.start();
|
|
93
77
|
logger.info("✅ Gateway worker started successfully");
|
|
94
|
-
// Keep process alive
|
|
95
78
|
await new Promise(() => {
|
|
96
|
-
//
|
|
97
|
-
});
|
|
79
|
+
// Intentionally never resolves — block process until signal.
|
|
80
|
+
});
|
|
98
81
|
}
|
|
99
82
|
catch (error) {
|
|
100
83
|
logger.error("❌ Gateway worker failed:", error);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,qCAKoB;AAEpB,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;AAEtC,qDAAqD;AACrD,qCAAuE;AAEvE;;GAEG;AACH,KAAK,UAAU,IAAI;IACjB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/instructions/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACzB,MAAM,YAAY,CAAC;AAIpB;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,mBAAmB,EAAE,EAChC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/instructions/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACzB,MAAM,YAAY,CAAC;AAIpB;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,mBAAmB,EAAE,EAChC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAuBjB"}
|
|
@@ -14,8 +14,9 @@ const logger = (0, core_1.createLogger)("instruction-generator");
|
|
|
14
14
|
*/
|
|
15
15
|
async function generateCustomInstructions(providers, context) {
|
|
16
16
|
try {
|
|
17
|
+
const sorted = [...providers].sort((a, b) => a.priority - b.priority);
|
|
17
18
|
const sections = [];
|
|
18
|
-
for (const provider of
|
|
19
|
+
for (const provider of sorted) {
|
|
19
20
|
const instructions = await provider.getInstructions(context);
|
|
20
21
|
if (instructions?.trim()) {
|
|
21
22
|
sections.push(instructions.trim());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/instructions/builder.ts"],"names":[],"mappings":";;AAiBA,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/instructions/builder.ts"],"names":[],"mappings":";;AAiBA,gEA0BC;AA3CD,qCAIoB;AAEpB,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,uBAAuB,CAAC,CAAC;AAErD;;;;;;;;GAQG;AACI,KAAK,UAAU,0BAA0B,CAC9C,SAAgC,EAChC,OAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC;gBACzB,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CACT,mCAAmC,YAAY,CAAC,MAAM,oBAAoB,SAAS,CAAC,MAAM,kBAAkB,CAC7G,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC;QACxD,OAAO,YAAY,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,uCAAuC,OAAO,CAAC,MAAM,GAAG,CAAC;QAC1E,MAAM,CAAC,IAAI,CAAC,yCAAyC,QAAQ,EAAE,CAAC,CAAC;QACjE,OAAO,QAAQ,CAAC;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-loader.d.ts","sourceRoot":"","sources":["../../src/openclaw/plugin-loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAIpE,KAAK,cAAc,GAAG,oBAAoB,GAAG,WAAW,CAAC;AAEzD,KAAK,iBAAiB,GAAG,CACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC,UAAU,aAAa;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACzC;AAED,wCAAwC;AACxC,UAAU,YAAY;IACpB,QAAQ,EAAE,cAAc,CAAC;IACzB,mFAAmF;IACnF,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,SAAS,EAAE,oBAAoB,EAAE,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC,cAAc,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACnD,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,YAAY,EAAE,CAAC,CA0CzB;
|
|
1
|
+
{"version":3,"file":"plugin-loader.d.ts","sourceRoot":"","sources":["../../src/openclaw/plugin-loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAIpE,KAAK,cAAc,GAAG,oBAAoB,GAAG,WAAW,CAAC;AAEzD,KAAK,iBAAiB,GAAG,CACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC,UAAU,aAAa;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACzC;AAED,wCAAwC;AACxC,UAAU,YAAY;IACpB,QAAQ,EAAE,cAAc,CAAC;IACzB,mFAAmF;IACnF,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,SAAS,EAAE,oBAAoB,EAAE,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC,cAAc,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACnD,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,YAAY,EAAE,CAAC,CA0CzB;AAmQD,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAmBrB;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,YAAY,EAAE,GACtB,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,YAAY,EAAE,GACtB,OAAO,CAAC,IAAI,CAAC,CAaf"}
|
|
@@ -89,13 +89,9 @@ async function loadPlugins(config, cwd) {
|
|
|
89
89
|
*/
|
|
90
90
|
async function loadSinglePlugin(config, cwd) {
|
|
91
91
|
const { source, slot, config: pluginConfig } = config;
|
|
92
|
-
|
|
93
|
-
try {
|
|
94
|
-
mod = (await Promise.resolve(`${source}`).then(s => __importStar(require(s))));
|
|
95
|
-
}
|
|
96
|
-
catch (err) {
|
|
92
|
+
const mod = await Promise.resolve(`${source}`).then(s => __importStar(require(s))).catch((err) => {
|
|
97
93
|
throw new Error(`Cannot import "${source}": ${err instanceof Error ? err.message : String(err)}`);
|
|
98
|
-
}
|
|
94
|
+
});
|
|
99
95
|
const pluginEntrypoint = resolvePluginEntrypoint(mod);
|
|
100
96
|
if (!pluginEntrypoint) {
|
|
101
97
|
logger.warn(`Plugin "${source}" has no registerable entrypoint - skipping`);
|
|
@@ -178,21 +174,14 @@ function readStringProperty(obj, key) {
|
|
|
178
174
|
function createShimApi(params) {
|
|
179
175
|
const { source, pluginConfig, capturedTools, capturedProviders, capturedHooks, capturedServices, cwd, } = params;
|
|
180
176
|
const noop = () => {
|
|
181
|
-
|
|
177
|
+
// No-op stub for shim plugin APIs that this loader does not implement.
|
|
182
178
|
};
|
|
179
|
+
const prefix = `[plugin:${extractPluginName(source)}]`;
|
|
183
180
|
const shimLogger = {
|
|
184
|
-
info(message, ...args) {
|
|
185
|
-
|
|
186
|
-
},
|
|
187
|
-
|
|
188
|
-
logger.warn(`[plugin:${extractPluginName(source)}] ${message}`, ...args);
|
|
189
|
-
},
|
|
190
|
-
error(message, ...args) {
|
|
191
|
-
logger.error(`[plugin:${extractPluginName(source)}] ${message}`, ...args);
|
|
192
|
-
},
|
|
193
|
-
debug(message, ...args) {
|
|
194
|
-
logger.debug(`[plugin:${extractPluginName(source)}] ${message}`, ...args);
|
|
195
|
-
},
|
|
181
|
+
info: (message, ...args) => logger.info(`${prefix} ${message}`, ...args),
|
|
182
|
+
warn: (message, ...args) => logger.warn(`${prefix} ${message}`, ...args),
|
|
183
|
+
error: (message, ...args) => logger.error(`${prefix} ${message}`, ...args),
|
|
184
|
+
debug: (message, ...args) => logger.debug(`${prefix} ${message}`, ...args),
|
|
196
185
|
};
|
|
197
186
|
return {
|
|
198
187
|
pluginConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-loader.js","sourceRoot":"","sources":["../../src/openclaw/plugin-loader.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCH,kCA6CC;
|
|
1
|
+
{"version":3,"file":"plugin-loader.js","sourceRoot":"","sources":["../../src/openclaw/plugin-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../src/openclaw/processor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAKvE;;;GAGG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,mBAAmB,CAAM;IACjC,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAmD;IACtE,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,iBAAiB,CAAuB;IAEhD,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAKzC;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../src/openclaw/processor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAKvE;;;GAGG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,mBAAmB,CAAM;IACjC,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAmD;IACtE,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,iBAAiB,CAAuB;IAEhD,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAKzC;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;IAiH/C;;;OAGG;IACH,QAAQ,IAAI,MAAM,GAAG,IAAI;IAqBzB,cAAc,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAIhE,cAAc,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAM3D,wBAAwB,IAAI,MAAM,GAAG,IAAI;IAMzC,kBAAkB,IAAI,MAAM,GAAG,IAAI;IAInC,iBAAiB,IAAI,MAAM;IAI3B,KAAK,IAAI,IAAI;CAQd"}
|
|
@@ -31,6 +31,8 @@ class OpenClawProgressProcessor {
|
|
|
31
31
|
return false;
|
|
32
32
|
}
|
|
33
33
|
const assistantEvent = event.assistantMessageEvent;
|
|
34
|
+
if (!assistantEvent)
|
|
35
|
+
return false;
|
|
34
36
|
if (assistantEvent.type === "text_delta") {
|
|
35
37
|
this.hasStreamedText = true;
|
|
36
38
|
this.chronologicalOutput += assistantEvent.delta;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../src/openclaw/processor.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAE1C,+DAAgE;AAEhE,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,oBAAoB,CAAC,CAAC;AAElD;;;GAGG;AACH,MAAa,yBAAyB;IAC5B,mBAAmB,GAAG,EAAE,CAAC;IACzB,eAAe,GAAG,EAAE,CAAC;IACrB,eAAe,GAAG,EAAE,CAAC;IACrB,cAAc,GAAG,KAAK,CAAC;IACvB,WAAW,GAA8C,IAAI,CAAC;IAC9D,eAAe,GAAG,KAAK,CAAC;IACxB,iBAAiB,GAAkB,IAAI,CAAC;IAEhD,iBAAiB,CAAC,OAAgB;QAChC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IACrE,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,KAAwB;QACnC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,gBAAgB,CAAC,CAAC,CAAC;gBACtB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACvC,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,MAAM,cAAc,GAAG,KAAK,CAAC,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../src/openclaw/processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-leak.d.ts","sourceRoot":"","sources":["../../src/openclaw/sandbox-leak.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAgCH,UAAU,eAAe;IACvB,0EAA0E;IAC1E,MAAM,EAAE,OAAO,CAAC;IAChB;6CACyC;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,OAAO,GAC5B,eAAe,
|
|
1
|
+
{"version":3,"file":"sandbox-leak.d.ts","sourceRoot":"","sources":["../../src/openclaw/sandbox-leak.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAgCH,UAAU,eAAe;IACvB,0EAA0E;IAC1E,MAAM,EAAE,OAAO,CAAC;IAChB;6CACyC;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,OAAO,GAC5B,eAAe,CAuCjB"}
|
|
@@ -64,12 +64,7 @@ function checkSandboxLeak(finalText, sawUploadedFileEvent) {
|
|
|
64
64
|
redacted = redacted.replace(SANDBOX_URL_RE, "[local file, not uploaded]");
|
|
65
65
|
redacted = redacted.replace(LOCAL_MD_LINK_RE, "](about:blank)");
|
|
66
66
|
redacted = redacted.replace(LOCAL_HREF_RE, (_match, attr) => `${attr}="about:blank"`);
|
|
67
|
-
redacted = redacted.replace(DELIVERY_PHRASE_RE,
|
|
68
|
-
// Reconstruct the phrase prefix (everything before the path) by
|
|
69
|
-
// re-matching on the original substring. Simpler: replace the whole
|
|
70
|
-
// match with a generic note.
|
|
71
|
-
return "[file was created but not uploaded — use `UploadUserFile` to deliver it]";
|
|
72
|
-
});
|
|
67
|
+
redacted = redacted.replace(DELIVERY_PHRASE_RE, "[file was created but not uploaded — use `UploadUserFile` to deliver it]");
|
|
73
68
|
const note = "\n\n_Note: I referenced a local file but did not actually upload it. " +
|
|
74
69
|
"Ask me to retry and I will use `UploadUserFile` to deliver it._";
|
|
75
70
|
return { leaked: true, redactedText: `${redacted}${note}` };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-leak.js","sourceRoot":"","sources":["../../src/openclaw/sandbox-leak.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;AA+CH,
|
|
1
|
+
{"version":3,"file":"sandbox-leak.js","sourceRoot":"","sources":["../../src/openclaw/sandbox-leak.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;AA+CH,4CA0CC;AAvFD,6EAA6E;AAC7E,MAAM,cAAc,GAAG,mCAAmC,CAAC;AAE3D;;;GAGG;AACH,MAAM,gBAAgB,GACpB,4EAA4E,CAAC;AAE/E;;;GAGG;AACH,MAAM,aAAa,GACjB,0FAA0F,CAAC;AAE7F;;;;;;;;;GASG;AACH,MAAM,kBAAkB,GACtB,oNAAoN,CAAC;AAUvN;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAC9B,SAAiB,EACjB,oBAA6B;IAE7B,IAAI,oBAAoB,IAAI,CAAC,SAAS,EAAE,CAAC;QACvC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IACpD,CAAC;IAED,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAE7D,2DAA2D;IAC3D,cAAc,CAAC,SAAS,GAAG,CAAC,CAAC;IAC7B,gBAAgB,CAAC,SAAS,GAAG,CAAC,CAAC;IAC/B,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC;IAC5B,kBAAkB,CAAC,SAAS,GAAG,CAAC,CAAC;IAEjC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACnE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IACpD,CAAC;IAED,uEAAuE;IACvE,2DAA2D;IAC3D,IAAI,QAAQ,GAAG,SAAS,CAAC;IACzB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAC;IAC1E,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;IAChE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACzB,aAAa,EACb,CAAC,MAAM,EAAE,IAAY,EAAE,EAAE,CAAC,GAAG,IAAI,gBAAgB,CAClD,CAAC;IACF,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACzB,kBAAkB,EAClB,0EAA0E,CAC3E,CAAC;IAEF,MAAM,IAAI,GACR,uEAAuE;QACvE,iEAAiE,CAAC;IAEpE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,GAAG,IAAI,EAAE,EAAE,CAAC;AAC9D,CAAC"}
|