@desplega.ai/agent-swarm 1.92.2 → 1.94.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.
Files changed (122) hide show
  1. package/README.md +2 -2
  2. package/openapi.json +242 -3
  3. package/package.json +5 -5
  4. package/src/be/db.ts +152 -11
  5. package/src/be/memory/boot-reembed.ts +0 -1
  6. package/src/be/memory/providers/sqlite-store.ts +42 -25
  7. package/src/be/memory/raters/llm-client.ts +12 -5
  8. package/src/be/memory/types.ts +3 -0
  9. package/src/be/migrations/088_script_runs_list_indexes.sql +10 -0
  10. package/src/be/migrations/089_harness_variant.sql +2 -0
  11. package/src/be/migrations/090_model_tiers.sql +2 -0
  12. package/src/be/migrations/091_seed_swarm_operations_metrics.sql +12 -0
  13. package/src/be/migrations/092_metrics_dashboard_combobox_filters.sql +68 -0
  14. package/src/be/migrations/093_slack_message_tracking.sql +6 -0
  15. package/src/be/migrations/runner.ts +52 -0
  16. package/src/be/modelsdev-cache.json +3264 -1166
  17. package/src/be/scripts/boot-reembed.ts +74 -0
  18. package/src/be/scripts/db.ts +19 -3
  19. package/src/be/seed/index.ts +1 -1
  20. package/src/be/seed/registry.ts +2 -2
  21. package/src/be/seed/runner.ts +5 -5
  22. package/src/be/seed/types.ts +6 -1
  23. package/src/be/seed-pricing.ts +2 -0
  24. package/src/be/seed-scripts/catalog/boot-triage.inline.ts +221 -0
  25. package/src/be/seed-scripts/catalog/catalog-report.inline.ts +457 -0
  26. package/src/be/seed-scripts/catalog/compound-insights.inline.ts +863 -0
  27. package/src/be/seed-scripts/catalog/ops-catalog-audit.inline.ts +506 -0
  28. package/src/be/seed-scripts/index.ts +8 -7
  29. package/src/be/skill-sync.ts +28 -179
  30. package/src/commands/runner.ts +197 -10
  31. package/src/http/api-keys.ts +42 -0
  32. package/src/http/index.ts +13 -2
  33. package/src/http/mcp-bridge.ts +1 -1
  34. package/src/http/memory.ts +23 -24
  35. package/src/http/metrics.ts +55 -6
  36. package/src/http/schedules.ts +16 -15
  37. package/src/http/script-runs.ts +7 -1
  38. package/src/http/scripts.ts +147 -1
  39. package/src/http/tasks.ts +17 -6
  40. package/src/model-tiers.ts +140 -0
  41. package/src/providers/claude-adapter.ts +33 -1
  42. package/src/providers/claude-managed-adapter.ts +3 -0
  43. package/src/providers/claude-managed-models.ts +16 -0
  44. package/src/providers/codex-adapter.ts +8 -1
  45. package/src/providers/codex-models.ts +1 -0
  46. package/src/providers/codex-oauth/auth-json.ts +1 -0
  47. package/src/providers/harness-version.ts +7 -0
  48. package/src/providers/opencode-adapter.ts +12 -4
  49. package/src/providers/pi-mono-adapter.ts +90 -8
  50. package/src/providers/types.ts +2 -0
  51. package/src/scheduler/scheduler.ts +22 -34
  52. package/src/scripts-runtime/egress-secrets.ts +83 -0
  53. package/src/scripts-runtime/eval-harness.ts +4 -0
  54. package/src/scripts-runtime/executors/types.ts +7 -0
  55. package/src/scripts-runtime/loader.ts +2 -0
  56. package/src/server-user.ts +8 -2
  57. package/src/slack/channel-join.ts +41 -0
  58. package/src/slack/responses.ts +39 -11
  59. package/src/slack/watcher.ts +121 -8
  60. package/src/tests/additive-buffer.test.ts +0 -1
  61. package/src/tests/agents-list-model-display.test.ts +13 -0
  62. package/src/tests/api-key-tracking.test.ts +113 -0
  63. package/src/tests/approval-requests.test.ts +0 -6
  64. package/src/tests/aws-error-classifier.test.ts +148 -0
  65. package/src/tests/claude-managed-adapter.test.ts +12 -0
  66. package/src/tests/claude-managed-setup.test.ts +0 -4
  67. package/src/tests/codex-pool.test.ts +2 -6
  68. package/src/tests/context-window.test.ts +7 -0
  69. package/src/tests/http-api-integration.test.ts +23 -6
  70. package/src/tests/memory-edges.test.ts +0 -2
  71. package/src/tests/memory-rate-endpoint.test.ts +0 -2
  72. package/src/tests/memory-rater-e2e.test.ts +0 -2
  73. package/src/tests/memory-store.test.ts +19 -1
  74. package/src/tests/memory.test.ts +51 -0
  75. package/src/tests/metrics-http.test.ts +137 -3
  76. package/src/tests/migration-046-budgets.test.ts +33 -0
  77. package/src/tests/migration-runner-regressions.test.ts +69 -0
  78. package/src/tests/model-control.test.ts +162 -46
  79. package/src/tests/opencode-adapter.test.ts +9 -0
  80. package/src/tests/pi-mono-adapter.test.ts +319 -0
  81. package/src/tests/providers/pi-cost.test.ts +9 -0
  82. package/src/tests/reload-config.test.ts +33 -17
  83. package/src/tests/runner-fallback-output.test.ts +50 -0
  84. package/src/tests/runner-skills-refresh.test.ts +216 -46
  85. package/src/tests/script-runs-http.test.ts +7 -1
  86. package/src/tests/scripts-boot-reembed.test.ts +163 -0
  87. package/src/tests/scripts-embeddings.test.ts +90 -0
  88. package/src/tests/scripts-runtime-secret-egress.test.ts +129 -0
  89. package/src/tests/seed-scripts.test.ts +13 -1
  90. package/src/tests/seed.test.ts +26 -1
  91. package/src/tests/session-attach.test.ts +6 -6
  92. package/src/tests/session-costs-model-key-normalize.test.ts +2 -0
  93. package/src/tests/skill-fs-writer.test.ts +250 -0
  94. package/src/tests/slack-attachments-block.test.ts +0 -1
  95. package/src/tests/slack-blocks.test.ts +0 -1
  96. package/src/tests/slack-channel-join.test.ts +80 -0
  97. package/src/tests/slack-identity-resolution.test.ts +0 -1
  98. package/src/tests/slack-watcher.test.ts +66 -0
  99. package/src/tests/structured-output.test.ts +0 -2
  100. package/src/tests/use-dismissible-card.test.ts +0 -4
  101. package/src/tests/workflow-agent-task.test.ts +5 -2
  102. package/src/tests/workflow-validation-port-routing.test.ts +181 -0
  103. package/src/tools/memory-get.ts +11 -0
  104. package/src/tools/memory-search.ts +18 -0
  105. package/src/tools/schedules/create-schedule.ts +71 -70
  106. package/src/tools/schedules/update-schedule.ts +43 -31
  107. package/src/tools/send-task.ts +16 -5
  108. package/src/tools/slack-post.ts +18 -15
  109. package/src/tools/slack-read.ts +9 -11
  110. package/src/tools/slack-reply.ts +18 -15
  111. package/src/tools/slack-start-thread.ts +17 -14
  112. package/src/tools/task-action.ts +11 -3
  113. package/src/types.ts +40 -0
  114. package/src/utils/aws-error-classifier.ts +97 -0
  115. package/src/utils/context-window.ts +5 -0
  116. package/src/utils/credentials.test.ts +68 -0
  117. package/src/utils/credentials.ts +66 -5
  118. package/src/utils/pretty-print.ts +25 -10
  119. package/src/utils/skill-fs-writer.ts +220 -0
  120. package/src/utils/skills-refresh.ts +123 -40
  121. package/src/workflows/engine.ts +3 -2
  122. package/src/workflows/executors/agent-task.ts +3 -1
@@ -0,0 +1,457 @@
1
+ export type CatalogReportFinding = {
2
+ id: string;
3
+ severity?: string;
4
+ summary: string;
5
+ action?: string;
6
+ samples?: unknown[];
7
+ };
8
+
9
+ export type CatalogReportSection = {
10
+ key: string;
11
+ label?: string;
12
+ goal: string;
13
+ findingCount?: number;
14
+ checks?: Record<string, unknown>;
15
+ findings?: CatalogReportFinding[];
16
+ };
17
+
18
+ export type CatalogReport = {
19
+ title: string;
20
+ slug: string;
21
+ description: string;
22
+ generatedAt: string;
23
+ lede: string;
24
+ metrics: Array<[string, unknown]>;
25
+ sections: CatalogReportSection[];
26
+ appendix: unknown;
27
+ };
28
+
29
+ function catalogReportAsText(value: unknown): string {
30
+ return typeof value === "string" ? value : value == null ? "" : JSON.stringify(value);
31
+ }
32
+
33
+ function catalogReportHtmlEscape(value: unknown): string {
34
+ return catalogReportAsText(value)
35
+ .replace(/&/g, "&amp;")
36
+ .replace(/</g, "&lt;")
37
+ .replace(/>/g, "&gt;")
38
+ .replace(/"/g, "&quot;");
39
+ }
40
+
41
+ function catalogReportHumanLabel(value: string): string {
42
+ return value
43
+ .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
44
+ .replace(/[-_.]+/g, " ")
45
+ .replace(/\b\w/g, (char) => char.toUpperCase());
46
+ }
47
+
48
+ function catalogReportFormatMetric(value: unknown): string {
49
+ if (typeof value === "number") return new Intl.NumberFormat("en-US").format(value);
50
+ return catalogReportAsText(value);
51
+ }
52
+
53
+ function catalogReportSeverityTone(value?: string): string {
54
+ if (value === "critical") return "danger";
55
+ if (value === "high") return "warn";
56
+ if (value === "medium") return "note";
57
+ return "low";
58
+ }
59
+
60
+ function catalogReportRenderSampleValue(value: unknown): string {
61
+ if (Array.isArray(value)) {
62
+ return value
63
+ .map((item) => (typeof item === "object" && item !== null ? JSON.stringify(item) : catalogReportAsText(item)))
64
+ .join(", ");
65
+ }
66
+ if (value && typeof value === "object") return JSON.stringify(value);
67
+ return catalogReportAsText(value);
68
+ }
69
+
70
+ function catalogReportRenderSamples(samples?: unknown[]): string {
71
+ if (!Array.isArray(samples) || samples.length === 0) return "";
72
+ const normalized = samples.map((sampleRow) =>
73
+ sampleRow && typeof sampleRow === "object" && !Array.isArray(sampleRow)
74
+ ? (sampleRow as Record<string, unknown>)
75
+ : { value: sampleRow },
76
+ );
77
+ const columns = Array.from(
78
+ new Set(normalized.flatMap((sampleRow) => Object.keys(sampleRow).slice(0, 6))),
79
+ ).slice(0, 6);
80
+ if (columns.length === 0) return "";
81
+ const rows = normalized
82
+ .map(
83
+ (sampleRow) =>
84
+ `<tr>${columns
85
+ .map((column) => `<td>${catalogReportHtmlEscape(catalogReportRenderSampleValue(sampleRow[column]))}</td>`)
86
+ .join("")}</tr>`,
87
+ )
88
+ .join("");
89
+ return `<div class="sample-table" aria-label="Sample rows">
90
+ <table>
91
+ <thead><tr>${columns.map((column) => `<th>${catalogReportHtmlEscape(catalogReportHumanLabel(column))}</th>`).join("")}</tr></thead>
92
+ <tbody>${rows}</tbody>
93
+ </table>
94
+ </div>`;
95
+ }
96
+
97
+ export function renderCatalogReportPage(report: CatalogReport): string {
98
+ const sections = report.sections
99
+ .map((section) => {
100
+ const findings = (section.findings || [])
101
+ .map(
102
+ (finding) => `<article class="finding ${catalogReportHtmlEscape(catalogReportSeverityTone(finding.severity))}">
103
+ <div class="finding-head">
104
+ <div>
105
+ <p class="finding-id">${catalogReportHtmlEscape(finding.id)}</p>
106
+ <h3>${catalogReportHtmlEscape(finding.summary)}</h3>
107
+ </div>
108
+ <span class="pill ${catalogReportHtmlEscape(catalogReportSeverityTone(finding.severity))}">${catalogReportHtmlEscape(
109
+ finding.severity || "low",
110
+ )}</span>
111
+ </div>
112
+ ${finding.action ? `<p class="action">${catalogReportHtmlEscape(finding.action)}</p>` : ""}
113
+ ${catalogReportRenderSamples(finding.samples)}
114
+ </article>`,
115
+ )
116
+ .join("");
117
+ const checks = Object.entries(section.checks || {})
118
+ .map(
119
+ ([label, value]) =>
120
+ `<div class="check"><span>${catalogReportHtmlEscape(catalogReportHumanLabel(label))}</span><strong>${catalogReportHtmlEscape(
121
+ catalogReportFormatMetric(value),
122
+ )}</strong></div>`,
123
+ )
124
+ .join("");
125
+ return `<section class="section">
126
+ <div class="section-grid">
127
+ <aside class="checks">
128
+ <p class="section-kicker">${catalogReportHtmlEscape(section.label || catalogReportHumanLabel(section.key))}</p>
129
+ <div class="check-list">${checks}</div>
130
+ </aside>
131
+ <div>
132
+ <div class="section-head">
133
+ <h2>${catalogReportHtmlEscape(section.goal)}</h2>
134
+ <span>${catalogReportHtmlEscape(catalogReportFormatMetric(section.findingCount ?? section.findings?.length ?? 0))} finding(s)</span>
135
+ </div>
136
+ <div class="findings">
137
+ ${findings || '<p class="empty">No actionable findings in this cluster.</p>'}
138
+ </div>
139
+ </div>
140
+ </div>
141
+ </section>`;
142
+ })
143
+ .join("\n");
144
+ return `<!doctype html>
145
+ <html lang="en">
146
+ <head>
147
+ <meta charset="utf-8">
148
+ <meta name="viewport" content="width=device-width, initial-scale=1">
149
+ <meta name="theme-color" content="#f5f2ea">
150
+ <title>${catalogReportHtmlEscape(report.title)}</title>
151
+ <style>
152
+ :root {
153
+ color-scheme: light;
154
+ --bg: #f5f2ea;
155
+ --panel: #ffffff;
156
+ --ink: #18181b;
157
+ --muted: #5f6368;
158
+ --line: #ded8cb;
159
+ --accent: #255c99;
160
+ --danger: #b42318;
161
+ --danger-bg: #fff1f0;
162
+ --warn: #b54708;
163
+ --warn-bg: #fff7ed;
164
+ --note: #175cd3;
165
+ --note-bg: #eff6ff;
166
+ --low: #067647;
167
+ --low-bg: #ecfdf3;
168
+ --radius: 8px;
169
+ --shadow: 0 1px 2px rgba(24, 24, 27, 0.06), 0 14px 36px rgba(24, 24, 27, 0.07);
170
+ }
171
+ * { box-sizing: border-box; }
172
+ body {
173
+ margin: 0;
174
+ background: var(--bg);
175
+ color: var(--ink);
176
+ font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
177
+ font-size: 16px;
178
+ line-height: 1.55;
179
+ }
180
+ main {
181
+ width: min(1120px, calc(100% - 32px));
182
+ margin: 0 auto;
183
+ padding: 48px 0 72px;
184
+ }
185
+ header { margin-bottom: 28px; }
186
+ .eyebrow {
187
+ margin: 0 0 8px;
188
+ color: var(--muted);
189
+ font-size: 13px;
190
+ font-weight: 750;
191
+ letter-spacing: 0.08em;
192
+ text-transform: uppercase;
193
+ }
194
+ h1 {
195
+ margin: 0;
196
+ max-width: 860px;
197
+ font-size: clamp(2rem, 4vw, 3rem);
198
+ line-height: 1.05;
199
+ letter-spacing: 0;
200
+ }
201
+ .lede {
202
+ max-width: 780px;
203
+ margin: 16px 0 0;
204
+ color: var(--muted);
205
+ font-size: 18px;
206
+ }
207
+ .metrics {
208
+ display: grid;
209
+ grid-template-columns: repeat(4, minmax(0, 1fr));
210
+ gap: 12px;
211
+ margin: 32px 0;
212
+ }
213
+ .metric, .section, details {
214
+ background: var(--panel);
215
+ border: 1px solid var(--line);
216
+ border-radius: var(--radius);
217
+ box-shadow: var(--shadow);
218
+ }
219
+ .metric { padding: 18px; }
220
+ .metric strong {
221
+ display: block;
222
+ font-size: 32px;
223
+ line-height: 1;
224
+ font-variant-numeric: tabular-nums;
225
+ }
226
+ .metric span {
227
+ display: block;
228
+ margin-top: 8px;
229
+ color: var(--muted);
230
+ font-size: 13px;
231
+ font-weight: 650;
232
+ }
233
+ .section {
234
+ margin-top: 18px;
235
+ padding: 24px;
236
+ }
237
+ .section-grid {
238
+ display: grid;
239
+ grid-template-columns: 260px minmax(0, 1fr);
240
+ gap: 28px;
241
+ }
242
+ .section-kicker {
243
+ margin: 0 0 12px;
244
+ color: var(--accent);
245
+ font-size: 13px;
246
+ font-weight: 800;
247
+ letter-spacing: 0.08em;
248
+ text-transform: uppercase;
249
+ }
250
+ .check-list {
251
+ display: grid;
252
+ gap: 8px;
253
+ }
254
+ .check {
255
+ display: flex;
256
+ align-items: baseline;
257
+ justify-content: space-between;
258
+ gap: 12px;
259
+ padding: 10px 0;
260
+ border-bottom: 1px solid var(--line);
261
+ }
262
+ .check span {
263
+ color: var(--muted);
264
+ font-size: 13px;
265
+ }
266
+ .check strong {
267
+ font-size: 18px;
268
+ font-variant-numeric: tabular-nums;
269
+ }
270
+ .section-head {
271
+ display: flex;
272
+ align-items: start;
273
+ justify-content: space-between;
274
+ gap: 16px;
275
+ margin-bottom: 16px;
276
+ }
277
+ .section-head h2 {
278
+ max-width: 680px;
279
+ margin: 0;
280
+ font-size: 24px;
281
+ line-height: 1.2;
282
+ letter-spacing: 0;
283
+ }
284
+ .section-head > span {
285
+ flex: 0 0 auto;
286
+ color: var(--muted);
287
+ font-size: 13px;
288
+ font-weight: 700;
289
+ white-space: nowrap;
290
+ }
291
+ .findings {
292
+ display: grid;
293
+ gap: 12px;
294
+ }
295
+ .finding {
296
+ border: 1px solid var(--line);
297
+ border-left: 4px solid var(--note);
298
+ border-radius: var(--radius);
299
+ padding: 16px;
300
+ background: #fffdf8;
301
+ }
302
+ .finding.danger { border-left-color: var(--danger); }
303
+ .finding.warn { border-left-color: var(--warn); }
304
+ .finding.low { border-left-color: var(--low); }
305
+ .finding-head {
306
+ display: flex;
307
+ align-items: start;
308
+ justify-content: space-between;
309
+ gap: 16px;
310
+ }
311
+ .finding-id {
312
+ margin: 0 0 4px;
313
+ color: var(--muted);
314
+ font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
315
+ font-size: 12px;
316
+ }
317
+ h3 {
318
+ margin: 0;
319
+ font-size: 17px;
320
+ line-height: 1.3;
321
+ letter-spacing: 0;
322
+ }
323
+ .pill {
324
+ display: inline-flex;
325
+ align-items: center;
326
+ min-height: 26px;
327
+ padding: 4px 9px;
328
+ border-radius: 999px;
329
+ font-size: 12px;
330
+ font-weight: 800;
331
+ text-transform: uppercase;
332
+ white-space: nowrap;
333
+ }
334
+ .pill.danger { background: var(--danger-bg); color: var(--danger); }
335
+ .pill.warn { background: var(--warn-bg); color: var(--warn); }
336
+ .pill.note { background: var(--note-bg); color: var(--note); }
337
+ .pill.low { background: var(--low-bg); color: var(--low); }
338
+ .action {
339
+ margin: 10px 0 0;
340
+ color: var(--muted);
341
+ }
342
+ .sample-table {
343
+ margin-top: 14px;
344
+ overflow-x: auto;
345
+ border: 1px solid var(--line);
346
+ border-radius: var(--radius);
347
+ background: var(--panel);
348
+ }
349
+ table {
350
+ width: 100%;
351
+ min-width: 640px;
352
+ border-collapse: collapse;
353
+ }
354
+ th, td {
355
+ padding: 10px 12px;
356
+ border-bottom: 1px solid var(--line);
357
+ text-align: left;
358
+ vertical-align: top;
359
+ }
360
+ th {
361
+ color: var(--muted);
362
+ font-size: 12px;
363
+ font-weight: 800;
364
+ letter-spacing: 0.06em;
365
+ text-transform: uppercase;
366
+ }
367
+ td {
368
+ max-width: 360px;
369
+ color: #27272a;
370
+ font-size: 13px;
371
+ overflow-wrap: anywhere;
372
+ }
373
+ tr:last-child td { border-bottom: 0; }
374
+ .empty {
375
+ margin: 0;
376
+ color: var(--muted);
377
+ }
378
+ details {
379
+ margin-top: 24px;
380
+ padding: 18px;
381
+ }
382
+ summary {
383
+ cursor: pointer;
384
+ font-weight: 800;
385
+ }
386
+ pre {
387
+ margin: 16px 0 0;
388
+ max-height: 560px;
389
+ overflow: auto;
390
+ padding: 16px;
391
+ border-radius: var(--radius);
392
+ background: #111827;
393
+ color: #f9fafb;
394
+ font-size: 12px;
395
+ line-height: 1.45;
396
+ }
397
+ @media (max-width: 860px) {
398
+ main { width: min(100% - 24px, 1120px); padding-top: 32px; }
399
+ .metrics { grid-template-columns: repeat(2, minmax(0, 1fr)); }
400
+ .section-grid { grid-template-columns: 1fr; gap: 18px; }
401
+ .section { padding: 18px; }
402
+ .section-head { display: block; }
403
+ .section-head > span { display: block; margin-top: 8px; }
404
+ }
405
+ @media (max-width: 520px) {
406
+ .metrics { grid-template-columns: 1fr; }
407
+ .lede { font-size: 16px; }
408
+ .finding-head { display: block; }
409
+ .pill { margin-top: 10px; }
410
+ }
411
+ </style>
412
+ </head>
413
+ <body>
414
+ <main>
415
+ <header>
416
+ <p class="eyebrow">Generated ${catalogReportHtmlEscape(report.generatedAt)}</p>
417
+ <h1>${catalogReportHtmlEscape(report.title)}</h1>
418
+ <p class="lede">${catalogReportHtmlEscape(report.lede)}</p>
419
+ </header>
420
+ <section class="metrics" aria-label="Audit summary">
421
+ ${report.metrics
422
+ .map(
423
+ ([label, value]) =>
424
+ `<div class="metric"><strong>${catalogReportHtmlEscape(catalogReportFormatMetric(value))}</strong><span>${catalogReportHtmlEscape(
425
+ label,
426
+ )}</span></div>`,
427
+ )
428
+ .join("")}
429
+ </section>
430
+ ${sections}
431
+ <details>
432
+ <summary>Compressed JSON appendix</summary>
433
+ <pre>${catalogReportHtmlEscape(JSON.stringify(report.appendix, null, 2))}</pre>
434
+ </details>
435
+ </main>
436
+ </body>
437
+ </html>`;
438
+ }
439
+
440
+ export async function publishCatalogReportPage(report: CatalogReport, ctx: any): Promise<any> {
441
+ const response = await ctx.swarm.page_create({
442
+ title: report.title,
443
+ slug: report.slug,
444
+ description: report.description,
445
+ contentType: "text/html",
446
+ authMode: "authed",
447
+ body: renderCatalogReportPage(report),
448
+ });
449
+ const payload = response?.data ?? response;
450
+ if (payload?.success === false) return { error: payload.error || "page_create failed" };
451
+ return {
452
+ id: payload?.id ?? payload?.page?.id ?? null,
453
+ appUrl: payload?.appUrl ?? payload?.app_url ?? null,
454
+ apiUrl: payload?.apiUrl ?? payload?.api_url ?? null,
455
+ version: payload?.version ?? payload?.page?.version ?? null,
456
+ };
457
+ }