sentinelayer-cli 0.4.5 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +996 -998
- package/bin/create-sentinelayer.js +5 -5
- package/bin/sentinelayer-cli.js +4 -4
- package/bin/sl.js +5 -5
- package/package.json +63 -63
- package/src/agents/jules/config/definition.js +160 -209
- package/src/agents/jules/config/system-prompt.js +182 -175
- package/src/agents/jules/error-intake.js +51 -51
- package/src/agents/jules/fix-cycle.js +17 -377
- package/src/agents/jules/loop.js +450 -367
- package/src/agents/jules/pulse.js +10 -327
- package/src/agents/jules/stream.js +186 -186
- package/src/agents/jules/swarm/file-scanner.js +74 -74
- package/src/agents/jules/swarm/index.js +11 -11
- package/src/agents/jules/swarm/orchestrator.js +362 -362
- package/src/agents/jules/swarm/pattern-hunter.js +123 -123
- package/src/agents/jules/swarm/sub-agent.js +309 -308
- package/src/agents/jules/tools/aidenid-email.js +189 -0
- package/src/agents/jules/tools/auth-audit.js +1691 -557
- package/src/agents/jules/tools/dispatch.js +335 -327
- package/src/agents/jules/tools/file-edit.js +2 -180
- package/src/agents/jules/tools/file-read.js +2 -100
- package/src/agents/jules/tools/frontend-analyze.js +570 -570
- package/src/agents/jules/tools/glob.js +2 -168
- package/src/agents/jules/tools/grep.js +2 -228
- package/src/agents/jules/tools/index.js +29 -29
- package/src/agents/jules/tools/path-guards.js +2 -161
- package/src/agents/jules/tools/runtime-audit.js +507 -503
- package/src/agents/jules/tools/shell.js +2 -383
- package/src/agents/jules/tools/url-policy.js +100 -100
- package/src/agents/persona-visuals.js +61 -0
- package/src/agents/shared-tools/dispatch-core.js +315 -0
- package/src/agents/shared-tools/file-edit.js +180 -0
- package/src/agents/shared-tools/file-read.js +100 -0
- package/src/agents/shared-tools/glob.js +168 -0
- package/src/agents/shared-tools/grep.js +228 -0
- package/src/agents/shared-tools/index.js +46 -0
- package/src/agents/shared-tools/path-guards.js +161 -0
- package/src/agents/shared-tools/shell.js +383 -0
- package/src/ai/aidenid.js +1009 -972
- package/src/ai/client.js +553 -508
- package/src/ai/domain-target-store.js +268 -268
- package/src/ai/identity-store.js +270 -270
- package/src/ai/proxy.js +137 -0
- package/src/ai/site-store.js +145 -145
- package/src/audit/agents/architecture.js +180 -180
- package/src/audit/agents/compliance.js +179 -179
- package/src/audit/agents/documentation.js +165 -165
- package/src/audit/agents/performance.js +145 -145
- package/src/audit/agents/security.js +215 -215
- package/src/audit/agents/testing.js +172 -172
- package/src/audit/orchestrator.js +557 -557
- package/src/audit/package.js +204 -204
- package/src/audit/registry.js +284 -284
- package/src/audit/replay.js +103 -103
- package/src/auth/gate.js +371 -126
- package/src/auth/http.js +611 -270
- package/src/auth/service.js +1106 -891
- package/src/auth/session-store.js +813 -359
- package/src/cli.js +252 -252
- package/src/commands/ai/identity-lifecycle.js +1338 -1338
- package/src/commands/ai/provision-governance.js +1272 -1272
- package/src/commands/ai/shared.js +147 -147
- package/src/commands/ai.js +11 -11
- package/src/commands/apply.js +12 -12
- package/src/commands/audit.js +1166 -1166
- package/src/commands/auth.js +419 -375
- package/src/commands/chat.js +191 -191
- package/src/commands/config.js +184 -184
- package/src/commands/cost.js +311 -311
- package/src/commands/daemon/core.js +850 -850
- package/src/commands/daemon/extended.js +1048 -1048
- package/src/commands/daemon/shared.js +213 -213
- package/src/commands/daemon.js +11 -11
- package/src/commands/guide.js +174 -174
- package/src/commands/ingest.js +58 -58
- package/src/commands/init.js +55 -55
- package/src/commands/legacy-args.js +10 -10
- package/src/commands/mcp.js +461 -461
- package/src/commands/omargate.js +29 -21
- package/src/commands/persona.js +20 -20
- package/src/commands/plugin.js +260 -260
- package/src/commands/policy.js +132 -132
- package/src/commands/prompt.js +238 -238
- package/src/commands/review.js +704 -704
- package/src/commands/scan.js +872 -866
- package/src/commands/spec.js +716 -716
- package/src/commands/swarm.js +651 -651
- package/src/commands/telemetry.js +202 -202
- package/src/commands/watch.js +511 -510
- package/src/config/agent-dictionary.js +182 -182
- package/src/config/io.js +56 -56
- package/src/config/paths.js +18 -18
- package/src/config/schema.js +55 -55
- package/src/config/service.js +184 -184
- package/src/cost/budget.js +235 -235
- package/src/cost/history.js +188 -188
- package/src/cost/tracker.js +171 -171
- package/src/daemon/artifact-lineage.js +534 -534
- package/src/daemon/assignment-ledger.js +770 -770
- package/src/daemon/ast-parser-layer.js +258 -258
- package/src/daemon/budget-governor.js +633 -633
- package/src/daemon/callgraph-overlay.js +646 -646
- package/src/daemon/error-worker.js +626 -626
- package/src/daemon/fix-cycle.js +377 -0
- package/src/daemon/hybrid-mapper.js +929 -929
- package/src/daemon/jira-lifecycle.js +632 -632
- package/src/daemon/operator-control.js +657 -657
- package/src/daemon/pulse.js +327 -0
- package/src/daemon/reliability-lane.js +471 -471
- package/src/daemon/watchdog.js +971 -971
- package/src/guide/generator.js +316 -316
- package/src/ingest/engine.js +918 -918
- package/src/interactive/index.js +97 -95
- package/src/legacy-cli.js +2994 -2592
- package/src/mcp/registry.js +695 -695
- package/src/memory/blackboard.js +301 -301
- package/src/memory/retrieval.js +581 -581
- package/src/plugin/manifest.js +553 -553
- package/src/policy/packs.js +144 -144
- package/src/prompt/generator.js +118 -118
- package/src/review/ai-review.js +679 -669
- package/src/review/local-review.js +1305 -1295
- package/src/review/omargate-interactive.js +68 -0
- package/src/review/omargate-orchestrator.js +300 -0
- package/src/review/persona-prompts.js +296 -0
- package/src/review/replay.js +235 -235
- package/src/review/report.js +664 -664
- package/src/review/scan-modes.js +42 -0
- package/src/review/spec-binding.js +487 -487
- package/src/scaffold/generator.js +67 -67
- package/src/scaffold/templates.js +150 -150
- package/src/scan/generator.js +418 -418
- package/src/scan/gh-secrets.js +107 -107
- package/src/spec/generator.js +519 -519
- package/src/spec/regenerate.js +237 -237
- package/src/spec/templates.js +91 -91
- package/src/swarm/dashboard.js +247 -247
- package/src/swarm/factory.js +363 -363
- package/src/swarm/pentest.js +934 -934
- package/src/swarm/registry.js +419 -419
- package/src/swarm/report.js +158 -158
- package/src/swarm/runtime.js +576 -576
- package/src/swarm/scenario-dsl.js +272 -272
- package/src/telemetry/ledger.js +302 -302
- package/src/telemetry/session-tracker.js +234 -118
- package/src/telemetry/sync.js +203 -199
- package/src/ui/command-hints.js +13 -0
- package/src/ui/markdown.js +220 -220
|
@@ -1,362 +1,362 @@
|
|
|
1
|
-
import { randomUUID } from "node:crypto";
|
|
2
|
-
import path from "node:path";
|
|
3
|
-
import fsp from "node:fs/promises";
|
|
4
|
-
|
|
5
|
-
import { createFileScanner } from "./file-scanner.js";
|
|
6
|
-
import { createPatternHunter, HUNT_TYPES } from "./pattern-hunter.js";
|
|
7
|
-
import { runSubAgentBatch } from "./sub-agent.js";
|
|
8
|
-
import { frontendAnalyze } from "../tools/frontend-analyze.js";
|
|
9
|
-
import { createAgentContext } from "../tools/dispatch.js";
|
|
10
|
-
|
|
11
|
-
/**
|
|
12
|
-
* Jules Swarm Orchestrator
|
|
13
|
-
*
|
|
14
|
-
* Coordinates parallel sub-agents for thorough frontend audit.
|
|
15
|
-
* Multi-pass convergence ensures no file is missed:
|
|
16
|
-
* Pass 1 (FileScanners): Read all files, discover import deps
|
|
17
|
-
* Pass 2 (PatternHunters): Search for 6 issue classes in parallel
|
|
18
|
-
* Convergence: Expand scope with discovered deps, re-scan if needed
|
|
19
|
-
* Coverage verification: Ensure every reachable file was read
|
|
20
|
-
*/
|
|
21
|
-
|
|
22
|
-
const SPAWN_THRESHOLDS = {
|
|
23
|
-
minFilesForSwarm: 15,
|
|
24
|
-
minRouteGroupsForSwarm: 3,
|
|
25
|
-
minLocForSwarm: 5000,
|
|
26
|
-
maxFilesPerScanner: 12,
|
|
27
|
-
maxConcurrentAgents: 4,
|
|
28
|
-
};
|
|
29
|
-
|
|
30
|
-
/**
|
|
31
|
-
* Decide whether the frontend surface warrants sub-agent spawning.
|
|
32
|
-
*/
|
|
33
|
-
export function shouldSpawnSubAgents(scopeMap) {
|
|
34
|
-
const frontendFiles = (scopeMap.primary || []).filter(f => isFrontendFile(f.path || f));
|
|
35
|
-
const routeGroups = detectRouteGroups(frontendFiles);
|
|
36
|
-
const totalLoc = frontendFiles.reduce((sum, f) => sum + (f.loc || 80), 0);
|
|
37
|
-
|
|
38
|
-
return {
|
|
39
|
-
spawn: (
|
|
40
|
-
frontendFiles.length > SPAWN_THRESHOLDS.minFilesForSwarm ||
|
|
41
|
-
routeGroups.length >= SPAWN_THRESHOLDS.minRouteGroupsForSwarm ||
|
|
42
|
-
totalLoc > SPAWN_THRESHOLDS.minLocForSwarm
|
|
43
|
-
),
|
|
44
|
-
fileCount: frontendFiles.length,
|
|
45
|
-
routeGroups: routeGroups.length,
|
|
46
|
-
estimatedLoc: totalLoc,
|
|
47
|
-
reason: frontendFiles.length > SPAWN_THRESHOLDS.minFilesForSwarm
|
|
48
|
-
? `${frontendFiles.length} frontend files exceeds threshold (${SPAWN_THRESHOLDS.minFilesForSwarm})`
|
|
49
|
-
: routeGroups.length >= SPAWN_THRESHOLDS.minRouteGroupsForSwarm
|
|
50
|
-
? `${routeGroups.length} route groups exceeds threshold (${SPAWN_THRESHOLDS.minRouteGroupsForSwarm})`
|
|
51
|
-
: totalLoc > SPAWN_THRESHOLDS.minLocForSwarm
|
|
52
|
-
? `${totalLoc} LOC exceeds threshold (${SPAWN_THRESHOLDS.minLocForSwarm})`
|
|
53
|
-
: "below all thresholds",
|
|
54
|
-
};
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
/**
|
|
58
|
-
* Run the full swarm orchestration: scanners → hunters → convergence → coverage.
|
|
59
|
-
*
|
|
60
|
-
* @param {object} config
|
|
61
|
-
* @param {object} config.scopeMap - { primary, secondary, tertiary } file lists
|
|
62
|
-
* @param {string} config.rootPath - Codebase root
|
|
63
|
-
* @param {object} config.blackboard - Shared blackboard instance
|
|
64
|
-
* @param {object} config.budget - Total budget for all sub-agents
|
|
65
|
-
* @param {object} [config.provider] - LLM provider overrides
|
|
66
|
-
* @param {AbortController} [config.parentAbort]
|
|
67
|
-
* @param {function} [config.onEvent]
|
|
68
|
-
* @returns {Promise<SwarmResult>}
|
|
69
|
-
*/
|
|
70
|
-
export async function runJulesSwarm(config) {
|
|
71
|
-
const {
|
|
72
|
-
scopeMap, rootPath, blackboard, budget,
|
|
73
|
-
provider, parentAbort, onEvent,
|
|
74
|
-
} = config;
|
|
75
|
-
|
|
76
|
-
const runId = `swarm-jules-${Date.now()}-${randomUUID().slice(0, 8)}`;
|
|
77
|
-
const startedAt = Date.now();
|
|
78
|
-
const allResults = [];
|
|
79
|
-
|
|
80
|
-
emit(onEvent, "swarm_start", {
|
|
81
|
-
runId,
|
|
82
|
-
phases: ["file_scan", "pattern_hunt", "convergence", "coverage_verify"],
|
|
83
|
-
});
|
|
84
|
-
|
|
85
|
-
// ── Phase 1: File Scanners ──────────────────────────────────────
|
|
86
|
-
|
|
87
|
-
const primaryFiles = (scopeMap.primary || []).map(f => f.path || f);
|
|
88
|
-
const partitions = partitionFiles(primaryFiles, SPAWN_THRESHOLDS.maxFilesPerScanner);
|
|
89
|
-
|
|
90
|
-
emit(onEvent, "phase_start", {
|
|
91
|
-
phase: "file_scan",
|
|
92
|
-
scannerCount: partitions.length,
|
|
93
|
-
totalFiles: primaryFiles.length,
|
|
94
|
-
});
|
|
95
|
-
|
|
96
|
-
const scannerBudgetSlice = divideBudget(budget, partitions.length + HUNT_TYPES.length);
|
|
97
|
-
|
|
98
|
-
const scanners = partitions.map((files, i) =>
|
|
99
|
-
createFileScanner({
|
|
100
|
-
id: `scanner-${i}`,
|
|
101
|
-
files,
|
|
102
|
-
budget: scannerBudgetSlice,
|
|
103
|
-
blackboard,
|
|
104
|
-
provider,
|
|
105
|
-
parentAbort,
|
|
106
|
-
onEvent,
|
|
107
|
-
}),
|
|
108
|
-
);
|
|
109
|
-
|
|
110
|
-
const scanResults = await runSubAgentBatch(scanners, {
|
|
111
|
-
maxConcurrent: SPAWN_THRESHOLDS.maxConcurrentAgents,
|
|
112
|
-
});
|
|
113
|
-
allResults.push(...scanResults);
|
|
114
|
-
|
|
115
|
-
emit(onEvent, "phase_complete", {
|
|
116
|
-
phase: "file_scan",
|
|
117
|
-
agentsCompleted: scanResults.length,
|
|
118
|
-
findingsCount: scanResults.reduce((s, r) => s + r.findings.length, 0),
|
|
119
|
-
});
|
|
120
|
-
|
|
121
|
-
// ── Phase 2: Pattern Hunters ────────────────────────────────────
|
|
122
|
-
|
|
123
|
-
emit(onEvent, "phase_start", {
|
|
124
|
-
phase: "pattern_hunt",
|
|
125
|
-
hunterCount: HUNT_TYPES.length,
|
|
126
|
-
huntTypes: HUNT_TYPES,
|
|
127
|
-
});
|
|
128
|
-
|
|
129
|
-
const hunterBudgetSlice = divideBudget(budget, partitions.length + HUNT_TYPES.length);
|
|
130
|
-
|
|
131
|
-
const hunters = HUNT_TYPES.map(huntType =>
|
|
132
|
-
createPatternHunter({
|
|
133
|
-
huntType,
|
|
134
|
-
rootPath,
|
|
135
|
-
budget: hunterBudgetSlice,
|
|
136
|
-
blackboard,
|
|
137
|
-
provider,
|
|
138
|
-
parentAbort,
|
|
139
|
-
onEvent,
|
|
140
|
-
}),
|
|
141
|
-
);
|
|
142
|
-
|
|
143
|
-
const huntResults = await runSubAgentBatch(hunters, {
|
|
144
|
-
maxConcurrent: SPAWN_THRESHOLDS.maxConcurrentAgents,
|
|
145
|
-
});
|
|
146
|
-
allResults.push(...huntResults);
|
|
147
|
-
|
|
148
|
-
emit(onEvent, "phase_complete", {
|
|
149
|
-
phase: "pattern_hunt",
|
|
150
|
-
agentsCompleted: huntResults.length,
|
|
151
|
-
findingsCount: huntResults.reduce((s, r) => s + r.findings.length, 0),
|
|
152
|
-
});
|
|
153
|
-
|
|
154
|
-
// ── Convergence: Expand scope from discovered deps ──────────────
|
|
155
|
-
|
|
156
|
-
emit(onEvent, "phase_start", { phase: "convergence" });
|
|
157
|
-
|
|
158
|
-
const discoveredDeps = collectDiscoveredDeps(scanResults);
|
|
159
|
-
const alreadyScanned = new Set(primaryFiles);
|
|
160
|
-
const newFiles = discoveredDeps.filter(f => !alreadyScanned.has(f));
|
|
161
|
-
|
|
162
|
-
let convergenceResults = [];
|
|
163
|
-
if (newFiles.length > 0 && newFiles.length <= 30) {
|
|
164
|
-
emit(onEvent, "convergence_expansion", {
|
|
165
|
-
newFilesDiscovered: newFiles.length,
|
|
166
|
-
spawningExtraScanner: true,
|
|
167
|
-
});
|
|
168
|
-
|
|
169
|
-
const extraPartitions = partitionFiles(newFiles, SPAWN_THRESHOLDS.maxFilesPerScanner);
|
|
170
|
-
const extraScanners = extraPartitions.map((files, i) =>
|
|
171
|
-
createFileScanner({
|
|
172
|
-
id: `scanner-convergence-${i}`,
|
|
173
|
-
files,
|
|
174
|
-
budget: scannerBudgetSlice,
|
|
175
|
-
blackboard,
|
|
176
|
-
provider,
|
|
177
|
-
parentAbort,
|
|
178
|
-
onEvent,
|
|
179
|
-
}),
|
|
180
|
-
);
|
|
181
|
-
|
|
182
|
-
convergenceResults = await runSubAgentBatch(extraScanners, {
|
|
183
|
-
maxConcurrent: SPAWN_THRESHOLDS.maxConcurrentAgents,
|
|
184
|
-
});
|
|
185
|
-
allResults.push(...convergenceResults);
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
emit(onEvent, "phase_complete", {
|
|
189
|
-
phase: "convergence",
|
|
190
|
-
newFilesDiscovered: newFiles.length,
|
|
191
|
-
extraScannersRun: convergenceResults.length,
|
|
192
|
-
});
|
|
193
|
-
|
|
194
|
-
// ── Coverage Verification ───────────────────────────────────────
|
|
195
|
-
// Coverage is computed from CONFIRMED-READ files (via blackboard tool_call
|
|
196
|
-
// events), not from the seed set. This prevents overstating coverage when
|
|
197
|
-
// sub-agents hit budget limits before reading all assigned files.
|
|
198
|
-
|
|
199
|
-
emit(onEvent, "phase_start", { phase: "coverage_verify" });
|
|
200
|
-
|
|
201
|
-
// Collect confirmed-read files from sub-agent results
|
|
202
|
-
const confirmedReadFiles = new Set();
|
|
203
|
-
for (const result of allResults) {
|
|
204
|
-
// Sub-agents track which files they actually read via tool calls
|
|
205
|
-
if (result.findings) {
|
|
206
|
-
for (const f of result.findings) {
|
|
207
|
-
if (f.file) confirmedReadFiles.add(f.file);
|
|
208
|
-
// FileScanner results include discovered files
|
|
209
|
-
if (f.path) confirmedReadFiles.add(f.path);
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
// Also count any file explicitly tracked by agent usage
|
|
213
|
-
if (result.usage?.filesRead) {
|
|
214
|
-
for (const f of result.usage.filesRead) confirmedReadFiles.add(f);
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
// Add primary files only if they were in the confirmed set or no agents ran
|
|
218
|
-
const allScannedFiles = confirmedReadFiles.size > 0
|
|
219
|
-
? confirmedReadFiles
|
|
220
|
-
: new Set([...primaryFiles, ...newFiles]);
|
|
221
|
-
|
|
222
|
-
// Use FrontendAnalyze to check what files should exist
|
|
223
|
-
let frameworkInfo = {};
|
|
224
|
-
try {
|
|
225
|
-
frameworkInfo = frontendAnalyze({ operation: "detect_framework", path: rootPath });
|
|
226
|
-
} catch { /* proceed without framework info */ }
|
|
227
|
-
|
|
228
|
-
let scopeGraphInfo = {};
|
|
229
|
-
try {
|
|
230
|
-
scopeGraphInfo = frontendAnalyze({ operation: "scope_graph", path: rootPath });
|
|
231
|
-
} catch { /* proceed without scope graph */ }
|
|
232
|
-
|
|
233
|
-
const expectedFrontendFiles = scopeGraphInfo.components || 0;
|
|
234
|
-
const coverageRatio = expectedFrontendFiles > 0
|
|
235
|
-
? ((allScannedFiles.size / expectedFrontendFiles) * 100).toFixed(1)
|
|
236
|
-
: "N/A";
|
|
237
|
-
|
|
238
|
-
// Identify files that were assigned but not confirmed-read
|
|
239
|
-
const assignedButUnread = primaryFiles.filter(f => !confirmedReadFiles.has(f));
|
|
240
|
-
const missedFiles = assignedButUnread.length > 0 && confirmedReadFiles.size > 0
|
|
241
|
-
? assignedButUnread
|
|
242
|
-
: [];
|
|
243
|
-
|
|
244
|
-
const coverageLedger = {
|
|
245
|
-
seedFilesAssigned: primaryFiles.length,
|
|
246
|
-
confirmedReadFiles: confirmedReadFiles.size,
|
|
247
|
-
expandedFilesDiscovered: newFiles.length,
|
|
248
|
-
totalFilesReviewed: allScannedFiles.size,
|
|
249
|
-
expectedFrontendFiles,
|
|
250
|
-
coverageRatio,
|
|
251
|
-
missedFiles,
|
|
252
|
-
coverageMethod: confirmedReadFiles.size > 0 ? "confirmed_read" : "seed_based_fallback",
|
|
253
|
-
};
|
|
254
|
-
|
|
255
|
-
emit(onEvent, "phase_complete", {
|
|
256
|
-
phase: "coverage_verify",
|
|
257
|
-
coverage: coverageLedger,
|
|
258
|
-
});
|
|
259
|
-
|
|
260
|
-
// ── Build Swarm Result ──────────────────────────────────────────
|
|
261
|
-
|
|
262
|
-
const totalFindings = allResults.reduce((s, r) => s + r.findings.length, 0);
|
|
263
|
-
const totalCost = allResults.reduce((s, r) => s + (r.usage?.costUsd || 0), 0);
|
|
264
|
-
const totalToolCalls = allResults.reduce((s, r) => s + (r.usage?.toolCalls || 0), 0);
|
|
265
|
-
const durationMs = Date.now() - startedAt;
|
|
266
|
-
|
|
267
|
-
const result = {
|
|
268
|
-
runId,
|
|
269
|
-
status: "completed",
|
|
270
|
-
framework: frameworkInfo.framework || "unknown",
|
|
271
|
-
phases: {
|
|
272
|
-
fileScanning: { agents: scanResults.length, findings: scanResults.reduce((s, r) => s + r.findings.length, 0) },
|
|
273
|
-
patternHunting: { agents: huntResults.length, findings: huntResults.reduce((s, r) => s + r.findings.length, 0) },
|
|
274
|
-
convergence: { newFiles: newFiles.length, extraScanners: convergenceResults.length },
|
|
275
|
-
},
|
|
276
|
-
coverage: coverageLedger,
|
|
277
|
-
findings: {
|
|
278
|
-
total: totalFindings,
|
|
279
|
-
byAgent: allResults.map(r => ({ agentId: r.agentId, role: r.role, count: r.findings.length })),
|
|
280
|
-
},
|
|
281
|
-
usage: {
|
|
282
|
-
totalAgents: allResults.length,
|
|
283
|
-
totalCostUsd: totalCost,
|
|
284
|
-
totalToolCalls,
|
|
285
|
-
totalDurationMs: durationMs,
|
|
286
|
-
},
|
|
287
|
-
agentResults: allResults,
|
|
288
|
-
};
|
|
289
|
-
|
|
290
|
-
emit(onEvent, "swarm_complete", {
|
|
291
|
-
runId,
|
|
292
|
-
totalFindings,
|
|
293
|
-
totalAgents: allResults.length,
|
|
294
|
-
totalCostUsd: totalCost,
|
|
295
|
-
durationMs,
|
|
296
|
-
coverageRatio,
|
|
297
|
-
});
|
|
298
|
-
|
|
299
|
-
return result;
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
// ── Helpers ──────────────────────────────────────────────────────────
|
|
303
|
-
|
|
304
|
-
function isFrontendFile(filePath) {
|
|
305
|
-
return /\.(tsx|jsx|vue|svelte|css|scss|less)$/.test(filePath);
|
|
306
|
-
}
|
|
307
|
-
|
|
308
|
-
function detectRouteGroups(files) {
|
|
309
|
-
const routeDirs = new Set();
|
|
310
|
-
for (const f of files) {
|
|
311
|
-
const filePath = f.path || f;
|
|
312
|
-
const match = filePath.match(/(?:app|pages)\/([^/]+)/);
|
|
313
|
-
if (match) routeDirs.add(match[1]);
|
|
314
|
-
}
|
|
315
|
-
return [...routeDirs];
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
function partitionFiles(files, maxPerPartition) {
|
|
319
|
-
const partitions = [];
|
|
320
|
-
for (let i = 0; i < files.length; i += maxPerPartition) {
|
|
321
|
-
partitions.push(files.slice(i, i + maxPerPartition));
|
|
322
|
-
}
|
|
323
|
-
return partitions;
|
|
324
|
-
}
|
|
325
|
-
|
|
326
|
-
function divideBudget(totalBudget, agentCount) {
|
|
327
|
-
if (agentCount <= 0) return totalBudget;
|
|
328
|
-
return {
|
|
329
|
-
maxCostUsd: (totalBudget.maxCostUsd || 5) / agentCount,
|
|
330
|
-
maxOutputTokens: Math.floor((totalBudget.maxOutputTokens || 12000) / agentCount),
|
|
331
|
-
maxRuntimeMs: totalBudget.maxRuntimeMs || 300000,
|
|
332
|
-
maxToolCalls: Math.floor((totalBudget.maxToolCalls || 150) / agentCount),
|
|
333
|
-
warningThresholdPercent: totalBudget.warningThresholdPercent || 70,
|
|
334
|
-
};
|
|
335
|
-
}
|
|
336
|
-
|
|
337
|
-
function collectDiscoveredDeps(scanResults) {
|
|
338
|
-
const deps = new Set();
|
|
339
|
-
for (const result of scanResults) {
|
|
340
|
-
for (const finding of result.findings) {
|
|
341
|
-
if (finding.discoveredDependencies) {
|
|
342
|
-
for (const dep of finding.discoveredDependencies) {
|
|
343
|
-
if (typeof dep === "string" && dep.startsWith(".")) {
|
|
344
|
-
deps.add(dep);
|
|
345
|
-
}
|
|
346
|
-
}
|
|
347
|
-
}
|
|
348
|
-
}
|
|
349
|
-
}
|
|
350
|
-
return [...deps];
|
|
351
|
-
}
|
|
352
|
-
|
|
353
|
-
function emit(onEvent, event, payload) {
|
|
354
|
-
if (onEvent) {
|
|
355
|
-
onEvent({
|
|
356
|
-
stream: "sl_event",
|
|
357
|
-
event,
|
|
358
|
-
agent: { id: "frontend", persona: "Jules Tanaka", color: "cyan", avatar: "\u{1F3AF}" },
|
|
359
|
-
payload,
|
|
360
|
-
});
|
|
361
|
-
}
|
|
362
|
-
}
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import fsp from "node:fs/promises";
|
|
4
|
+
|
|
5
|
+
import { createFileScanner } from "./file-scanner.js";
|
|
6
|
+
import { createPatternHunter, HUNT_TYPES } from "./pattern-hunter.js";
|
|
7
|
+
import { runSubAgentBatch } from "./sub-agent.js";
|
|
8
|
+
import { frontendAnalyze } from "../tools/frontend-analyze.js";
|
|
9
|
+
import { createAgentContext } from "../tools/dispatch.js";
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Jules Swarm Orchestrator
|
|
13
|
+
*
|
|
14
|
+
* Coordinates parallel sub-agents for thorough frontend audit.
|
|
15
|
+
* Multi-pass convergence ensures no file is missed:
|
|
16
|
+
* Pass 1 (FileScanners): Read all files, discover import deps
|
|
17
|
+
* Pass 2 (PatternHunters): Search for 6 issue classes in parallel
|
|
18
|
+
* Convergence: Expand scope with discovered deps, re-scan if needed
|
|
19
|
+
* Coverage verification: Ensure every reachable file was read
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
const SPAWN_THRESHOLDS = {
|
|
23
|
+
minFilesForSwarm: 15,
|
|
24
|
+
minRouteGroupsForSwarm: 3,
|
|
25
|
+
minLocForSwarm: 5000,
|
|
26
|
+
maxFilesPerScanner: 12,
|
|
27
|
+
maxConcurrentAgents: 4,
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Decide whether the frontend surface warrants sub-agent spawning.
|
|
32
|
+
*/
|
|
33
|
+
export function shouldSpawnSubAgents(scopeMap) {
|
|
34
|
+
const frontendFiles = (scopeMap.primary || []).filter(f => isFrontendFile(f.path || f));
|
|
35
|
+
const routeGroups = detectRouteGroups(frontendFiles);
|
|
36
|
+
const totalLoc = frontendFiles.reduce((sum, f) => sum + (f.loc || 80), 0);
|
|
37
|
+
|
|
38
|
+
return {
|
|
39
|
+
spawn: (
|
|
40
|
+
frontendFiles.length > SPAWN_THRESHOLDS.minFilesForSwarm ||
|
|
41
|
+
routeGroups.length >= SPAWN_THRESHOLDS.minRouteGroupsForSwarm ||
|
|
42
|
+
totalLoc > SPAWN_THRESHOLDS.minLocForSwarm
|
|
43
|
+
),
|
|
44
|
+
fileCount: frontendFiles.length,
|
|
45
|
+
routeGroups: routeGroups.length,
|
|
46
|
+
estimatedLoc: totalLoc,
|
|
47
|
+
reason: frontendFiles.length > SPAWN_THRESHOLDS.minFilesForSwarm
|
|
48
|
+
? `${frontendFiles.length} frontend files exceeds threshold (${SPAWN_THRESHOLDS.minFilesForSwarm})`
|
|
49
|
+
: routeGroups.length >= SPAWN_THRESHOLDS.minRouteGroupsForSwarm
|
|
50
|
+
? `${routeGroups.length} route groups exceeds threshold (${SPAWN_THRESHOLDS.minRouteGroupsForSwarm})`
|
|
51
|
+
: totalLoc > SPAWN_THRESHOLDS.minLocForSwarm
|
|
52
|
+
? `${totalLoc} LOC exceeds threshold (${SPAWN_THRESHOLDS.minLocForSwarm})`
|
|
53
|
+
: "below all thresholds",
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* Run the full swarm orchestration: scanners → hunters → convergence → coverage.
|
|
59
|
+
*
|
|
60
|
+
* @param {object} config
|
|
61
|
+
* @param {object} config.scopeMap - { primary, secondary, tertiary } file lists
|
|
62
|
+
* @param {string} config.rootPath - Codebase root
|
|
63
|
+
* @param {object} config.blackboard - Shared blackboard instance
|
|
64
|
+
* @param {object} config.budget - Total budget for all sub-agents
|
|
65
|
+
* @param {object} [config.provider] - LLM provider overrides
|
|
66
|
+
* @param {AbortController} [config.parentAbort]
|
|
67
|
+
* @param {function} [config.onEvent]
|
|
68
|
+
* @returns {Promise<SwarmResult>}
|
|
69
|
+
*/
|
|
70
|
+
export async function runJulesSwarm(config) {
|
|
71
|
+
const {
|
|
72
|
+
scopeMap, rootPath, blackboard, budget,
|
|
73
|
+
provider, parentAbort, onEvent,
|
|
74
|
+
} = config;
|
|
75
|
+
|
|
76
|
+
const runId = `swarm-jules-${Date.now()}-${randomUUID().slice(0, 8)}`;
|
|
77
|
+
const startedAt = Date.now();
|
|
78
|
+
const allResults = [];
|
|
79
|
+
|
|
80
|
+
emit(onEvent, "swarm_start", {
|
|
81
|
+
runId,
|
|
82
|
+
phases: ["file_scan", "pattern_hunt", "convergence", "coverage_verify"],
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
// ── Phase 1: File Scanners ──────────────────────────────────────
|
|
86
|
+
|
|
87
|
+
const primaryFiles = (scopeMap.primary || []).map(f => f.path || f);
|
|
88
|
+
const partitions = partitionFiles(primaryFiles, SPAWN_THRESHOLDS.maxFilesPerScanner);
|
|
89
|
+
|
|
90
|
+
emit(onEvent, "phase_start", {
|
|
91
|
+
phase: "file_scan",
|
|
92
|
+
scannerCount: partitions.length,
|
|
93
|
+
totalFiles: primaryFiles.length,
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
const scannerBudgetSlice = divideBudget(budget, partitions.length + HUNT_TYPES.length);
|
|
97
|
+
|
|
98
|
+
const scanners = partitions.map((files, i) =>
|
|
99
|
+
createFileScanner({
|
|
100
|
+
id: `scanner-${i}`,
|
|
101
|
+
files,
|
|
102
|
+
budget: scannerBudgetSlice,
|
|
103
|
+
blackboard,
|
|
104
|
+
provider,
|
|
105
|
+
parentAbort,
|
|
106
|
+
onEvent,
|
|
107
|
+
}),
|
|
108
|
+
);
|
|
109
|
+
|
|
110
|
+
const scanResults = await runSubAgentBatch(scanners, {
|
|
111
|
+
maxConcurrent: SPAWN_THRESHOLDS.maxConcurrentAgents,
|
|
112
|
+
});
|
|
113
|
+
allResults.push(...scanResults);
|
|
114
|
+
|
|
115
|
+
emit(onEvent, "phase_complete", {
|
|
116
|
+
phase: "file_scan",
|
|
117
|
+
agentsCompleted: scanResults.length,
|
|
118
|
+
findingsCount: scanResults.reduce((s, r) => s + r.findings.length, 0),
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
// ── Phase 2: Pattern Hunters ────────────────────────────────────
|
|
122
|
+
|
|
123
|
+
emit(onEvent, "phase_start", {
|
|
124
|
+
phase: "pattern_hunt",
|
|
125
|
+
hunterCount: HUNT_TYPES.length,
|
|
126
|
+
huntTypes: HUNT_TYPES,
|
|
127
|
+
});
|
|
128
|
+
|
|
129
|
+
const hunterBudgetSlice = divideBudget(budget, partitions.length + HUNT_TYPES.length);
|
|
130
|
+
|
|
131
|
+
const hunters = HUNT_TYPES.map(huntType =>
|
|
132
|
+
createPatternHunter({
|
|
133
|
+
huntType,
|
|
134
|
+
rootPath,
|
|
135
|
+
budget: hunterBudgetSlice,
|
|
136
|
+
blackboard,
|
|
137
|
+
provider,
|
|
138
|
+
parentAbort,
|
|
139
|
+
onEvent,
|
|
140
|
+
}),
|
|
141
|
+
);
|
|
142
|
+
|
|
143
|
+
const huntResults = await runSubAgentBatch(hunters, {
|
|
144
|
+
maxConcurrent: SPAWN_THRESHOLDS.maxConcurrentAgents,
|
|
145
|
+
});
|
|
146
|
+
allResults.push(...huntResults);
|
|
147
|
+
|
|
148
|
+
emit(onEvent, "phase_complete", {
|
|
149
|
+
phase: "pattern_hunt",
|
|
150
|
+
agentsCompleted: huntResults.length,
|
|
151
|
+
findingsCount: huntResults.reduce((s, r) => s + r.findings.length, 0),
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
// ── Convergence: Expand scope from discovered deps ──────────────
|
|
155
|
+
|
|
156
|
+
emit(onEvent, "phase_start", { phase: "convergence" });
|
|
157
|
+
|
|
158
|
+
const discoveredDeps = collectDiscoveredDeps(scanResults);
|
|
159
|
+
const alreadyScanned = new Set(primaryFiles);
|
|
160
|
+
const newFiles = discoveredDeps.filter(f => !alreadyScanned.has(f));
|
|
161
|
+
|
|
162
|
+
let convergenceResults = [];
|
|
163
|
+
if (newFiles.length > 0 && newFiles.length <= 30) {
|
|
164
|
+
emit(onEvent, "convergence_expansion", {
|
|
165
|
+
newFilesDiscovered: newFiles.length,
|
|
166
|
+
spawningExtraScanner: true,
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
const extraPartitions = partitionFiles(newFiles, SPAWN_THRESHOLDS.maxFilesPerScanner);
|
|
170
|
+
const extraScanners = extraPartitions.map((files, i) =>
|
|
171
|
+
createFileScanner({
|
|
172
|
+
id: `scanner-convergence-${i}`,
|
|
173
|
+
files,
|
|
174
|
+
budget: scannerBudgetSlice,
|
|
175
|
+
blackboard,
|
|
176
|
+
provider,
|
|
177
|
+
parentAbort,
|
|
178
|
+
onEvent,
|
|
179
|
+
}),
|
|
180
|
+
);
|
|
181
|
+
|
|
182
|
+
convergenceResults = await runSubAgentBatch(extraScanners, {
|
|
183
|
+
maxConcurrent: SPAWN_THRESHOLDS.maxConcurrentAgents,
|
|
184
|
+
});
|
|
185
|
+
allResults.push(...convergenceResults);
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
emit(onEvent, "phase_complete", {
|
|
189
|
+
phase: "convergence",
|
|
190
|
+
newFilesDiscovered: newFiles.length,
|
|
191
|
+
extraScannersRun: convergenceResults.length,
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
// ── Coverage Verification ───────────────────────────────────────
|
|
195
|
+
// Coverage is computed from CONFIRMED-READ files (via blackboard tool_call
|
|
196
|
+
// events), not from the seed set. This prevents overstating coverage when
|
|
197
|
+
// sub-agents hit budget limits before reading all assigned files.
|
|
198
|
+
|
|
199
|
+
emit(onEvent, "phase_start", { phase: "coverage_verify" });
|
|
200
|
+
|
|
201
|
+
// Collect confirmed-read files from sub-agent results
|
|
202
|
+
const confirmedReadFiles = new Set();
|
|
203
|
+
for (const result of allResults) {
|
|
204
|
+
// Sub-agents track which files they actually read via tool calls
|
|
205
|
+
if (result.findings) {
|
|
206
|
+
for (const f of result.findings) {
|
|
207
|
+
if (f.file) confirmedReadFiles.add(f.file);
|
|
208
|
+
// FileScanner results include discovered files
|
|
209
|
+
if (f.path) confirmedReadFiles.add(f.path);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
// Also count any file explicitly tracked by agent usage
|
|
213
|
+
if (result.usage?.filesRead) {
|
|
214
|
+
for (const f of result.usage.filesRead) confirmedReadFiles.add(f);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
// Add primary files only if they were in the confirmed set or no agents ran
|
|
218
|
+
const allScannedFiles = confirmedReadFiles.size > 0
|
|
219
|
+
? confirmedReadFiles
|
|
220
|
+
: new Set([...primaryFiles, ...newFiles]);
|
|
221
|
+
|
|
222
|
+
// Use FrontendAnalyze to check what files should exist
|
|
223
|
+
let frameworkInfo = {};
|
|
224
|
+
try {
|
|
225
|
+
frameworkInfo = frontendAnalyze({ operation: "detect_framework", path: rootPath });
|
|
226
|
+
} catch { /* proceed without framework info */ }
|
|
227
|
+
|
|
228
|
+
let scopeGraphInfo = {};
|
|
229
|
+
try {
|
|
230
|
+
scopeGraphInfo = frontendAnalyze({ operation: "scope_graph", path: rootPath });
|
|
231
|
+
} catch { /* proceed without scope graph */ }
|
|
232
|
+
|
|
233
|
+
const expectedFrontendFiles = scopeGraphInfo.components || 0;
|
|
234
|
+
const coverageRatio = expectedFrontendFiles > 0
|
|
235
|
+
? ((allScannedFiles.size / expectedFrontendFiles) * 100).toFixed(1)
|
|
236
|
+
: "N/A";
|
|
237
|
+
|
|
238
|
+
// Identify files that were assigned but not confirmed-read
|
|
239
|
+
const assignedButUnread = primaryFiles.filter(f => !confirmedReadFiles.has(f));
|
|
240
|
+
const missedFiles = assignedButUnread.length > 0 && confirmedReadFiles.size > 0
|
|
241
|
+
? assignedButUnread
|
|
242
|
+
: [];
|
|
243
|
+
|
|
244
|
+
const coverageLedger = {
|
|
245
|
+
seedFilesAssigned: primaryFiles.length,
|
|
246
|
+
confirmedReadFiles: confirmedReadFiles.size,
|
|
247
|
+
expandedFilesDiscovered: newFiles.length,
|
|
248
|
+
totalFilesReviewed: allScannedFiles.size,
|
|
249
|
+
expectedFrontendFiles,
|
|
250
|
+
coverageRatio,
|
|
251
|
+
missedFiles,
|
|
252
|
+
coverageMethod: confirmedReadFiles.size > 0 ? "confirmed_read" : "seed_based_fallback",
|
|
253
|
+
};
|
|
254
|
+
|
|
255
|
+
emit(onEvent, "phase_complete", {
|
|
256
|
+
phase: "coverage_verify",
|
|
257
|
+
coverage: coverageLedger,
|
|
258
|
+
});
|
|
259
|
+
|
|
260
|
+
// ── Build Swarm Result ──────────────────────────────────────────
|
|
261
|
+
|
|
262
|
+
const totalFindings = allResults.reduce((s, r) => s + r.findings.length, 0);
|
|
263
|
+
const totalCost = allResults.reduce((s, r) => s + (r.usage?.costUsd || 0), 0);
|
|
264
|
+
const totalToolCalls = allResults.reduce((s, r) => s + (r.usage?.toolCalls || 0), 0);
|
|
265
|
+
const durationMs = Date.now() - startedAt;
|
|
266
|
+
|
|
267
|
+
const result = {
|
|
268
|
+
runId,
|
|
269
|
+
status: "completed",
|
|
270
|
+
framework: frameworkInfo.framework || "unknown",
|
|
271
|
+
phases: {
|
|
272
|
+
fileScanning: { agents: scanResults.length, findings: scanResults.reduce((s, r) => s + r.findings.length, 0) },
|
|
273
|
+
patternHunting: { agents: huntResults.length, findings: huntResults.reduce((s, r) => s + r.findings.length, 0) },
|
|
274
|
+
convergence: { newFiles: newFiles.length, extraScanners: convergenceResults.length },
|
|
275
|
+
},
|
|
276
|
+
coverage: coverageLedger,
|
|
277
|
+
findings: {
|
|
278
|
+
total: totalFindings,
|
|
279
|
+
byAgent: allResults.map(r => ({ agentId: r.agentId, role: r.role, count: r.findings.length })),
|
|
280
|
+
},
|
|
281
|
+
usage: {
|
|
282
|
+
totalAgents: allResults.length,
|
|
283
|
+
totalCostUsd: totalCost,
|
|
284
|
+
totalToolCalls,
|
|
285
|
+
totalDurationMs: durationMs,
|
|
286
|
+
},
|
|
287
|
+
agentResults: allResults,
|
|
288
|
+
};
|
|
289
|
+
|
|
290
|
+
emit(onEvent, "swarm_complete", {
|
|
291
|
+
runId,
|
|
292
|
+
totalFindings,
|
|
293
|
+
totalAgents: allResults.length,
|
|
294
|
+
totalCostUsd: totalCost,
|
|
295
|
+
durationMs,
|
|
296
|
+
coverageRatio,
|
|
297
|
+
});
|
|
298
|
+
|
|
299
|
+
return result;
|
|
300
|
+
}
|
|
301
|
+
|
|
302
|
+
// ── Helpers ──────────────────────────────────────────────────────────
|
|
303
|
+
|
|
304
|
+
function isFrontendFile(filePath) {
|
|
305
|
+
return /\.(tsx|jsx|vue|svelte|css|scss|less)$/.test(filePath);
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
function detectRouteGroups(files) {
|
|
309
|
+
const routeDirs = new Set();
|
|
310
|
+
for (const f of files) {
|
|
311
|
+
const filePath = f.path || f;
|
|
312
|
+
const match = filePath.match(/(?:app|pages)\/([^/]+)/);
|
|
313
|
+
if (match) routeDirs.add(match[1]);
|
|
314
|
+
}
|
|
315
|
+
return [...routeDirs];
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
function partitionFiles(files, maxPerPartition) {
|
|
319
|
+
const partitions = [];
|
|
320
|
+
for (let i = 0; i < files.length; i += maxPerPartition) {
|
|
321
|
+
partitions.push(files.slice(i, i + maxPerPartition));
|
|
322
|
+
}
|
|
323
|
+
return partitions;
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
function divideBudget(totalBudget, agentCount) {
|
|
327
|
+
if (agentCount <= 0) return totalBudget;
|
|
328
|
+
return {
|
|
329
|
+
maxCostUsd: (totalBudget.maxCostUsd || 5) / agentCount,
|
|
330
|
+
maxOutputTokens: Math.floor((totalBudget.maxOutputTokens || 12000) / agentCount),
|
|
331
|
+
maxRuntimeMs: totalBudget.maxRuntimeMs || 300000,
|
|
332
|
+
maxToolCalls: Math.floor((totalBudget.maxToolCalls || 150) / agentCount),
|
|
333
|
+
warningThresholdPercent: totalBudget.warningThresholdPercent || 70,
|
|
334
|
+
};
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
function collectDiscoveredDeps(scanResults) {
|
|
338
|
+
const deps = new Set();
|
|
339
|
+
for (const result of scanResults) {
|
|
340
|
+
for (const finding of result.findings) {
|
|
341
|
+
if (finding.discoveredDependencies) {
|
|
342
|
+
for (const dep of finding.discoveredDependencies) {
|
|
343
|
+
if (typeof dep === "string" && dep.startsWith(".")) {
|
|
344
|
+
deps.add(dep);
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
return [...deps];
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
function emit(onEvent, event, payload) {
|
|
354
|
+
if (onEvent) {
|
|
355
|
+
onEvent({
|
|
356
|
+
stream: "sl_event",
|
|
357
|
+
event,
|
|
358
|
+
agent: { id: "frontend", persona: "Jules Tanaka", color: "cyan", avatar: "\u{1F3AF}" },
|
|
359
|
+
payload,
|
|
360
|
+
});
|
|
361
|
+
}
|
|
362
|
+
}
|