logicstamp-context 0.8.4 → 0.8.5
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 +13 -4
- package/dist/cli/commands/compare/core.js +1 -1
- package/dist/cli/commands/compare/core.js.map +1 -1
- package/dist/cli/commands/context/watchMode/watchMode.d.ts.map +1 -1
- package/dist/cli/commands/context/watchMode/watchMode.js +249 -253
- package/dist/cli/commands/context/watchMode/watchMode.js.map +1 -1
- package/dist/utils/fileLock.d.ts.map +1 -1
- package/dist/utils/fileLock.js +70 -6
- package/dist/utils/fileLock.js.map +1 -1
- package/dist/utils/secretDetector.d.ts.map +1 -1
- package/dist/utils/secretDetector.js +11 -6
- package/dist/utils/secretDetector.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -65,6 +65,15 @@ Example: your `Button` accepts `variant` and `disabled`, but the AI suggests `is
|
|
|
65
65
|
|
|
66
66
|
**LogicStamp Context** derives that layer from your TypeScript - explicit interfaces and dependency structure for tools to consume instead of inferring from implementation.
|
|
67
67
|
|
|
68
|
+
#### Key Capabilities:
|
|
69
|
+
|
|
70
|
+
- **Contracts, not raw source** - Props, hooks, routes, and dependency edges extracted for tools
|
|
71
|
+
- **Deterministic & diffable** - Same code → same bundles
|
|
72
|
+
- **Stays current** - Watch mode keeps context aligned with your codebase
|
|
73
|
+
- **MCP-ready** - Works with Claude, Cursor, and MCP-compatible assistants
|
|
74
|
+
|
|
75
|
+
See the full list in [Features](#-features).
|
|
76
|
+
|
|
68
77
|

|
|
69
78
|
*Example workflow: `stamp context --strict-watch` generates context bundles that MCP-powered assistants use to explain component architecture (ThemeContext shown here).*
|
|
70
79
|
|
|
@@ -80,7 +89,7 @@ TypeScript Code → Compilation → Deterministic Contracts → AI Assista
|
|
|
80
89
|
No install required:
|
|
81
90
|
|
|
82
91
|
```bash
|
|
83
|
-
npx logicstamp-context context
|
|
92
|
+
npx -y logicstamp-context@latest context
|
|
84
93
|
```
|
|
85
94
|
|
|
86
95
|
Scans your repo and writes `context.json` files + `context_main.json` for AI tools.
|
|
@@ -104,7 +113,7 @@ stamp init # sets up .gitignore, scans for secrets
|
|
|
104
113
|
stamp context
|
|
105
114
|
```
|
|
106
115
|
|
|
107
|
-
> **ℹ️ Note:**
|
|
116
|
+
> **ℹ️ Note:** Without a global install, use `npx -y logicstamp-context@latest context`. After `npm install -g logicstamp-context`, use `stamp context`.
|
|
108
117
|
|
|
109
118
|
📋 **For detailed setup instructions, see the [Getting Started Guide](https://logicstamp.dev/docs/getting-started).**
|
|
110
119
|
|
|
@@ -155,7 +164,7 @@ On disk, each folder’s `context.json` is a **LogicStampBundle**: contracts liv
|
|
|
155
164
|
|
|
156
165
|
## ⚡ Features
|
|
157
166
|
|
|
158
|
-
**Under the hood:** the TypeScript compiler API (via ts-morph). **Analysis-only** - it describes your codebase and emits context files.
|
|
167
|
+
**Under the hood:** the TypeScript compiler API (via ts-morph). **Analysis-only** - it describes your codebase and emits context files. It does not transform or refactor your source.
|
|
159
168
|
|
|
160
169
|
**Core:**
|
|
161
170
|
- **Deterministic contracts** - Same input = same output, auditable in version control
|
|
@@ -259,7 +268,7 @@ The compilation pipeline:
|
|
|
259
268
|
|
|
260
269
|
One command. No build step required.
|
|
261
270
|
|
|
262
|
-
> **💡Tip:** Use `stamp context` for basic contracts. Use `stamp context style` when you need style metadata (Tailwind classes, SCSS selectors, layout patterns). Use `--style-mode lean` (default) for compact output or `--style-mode full` for detailed arrays.
|
|
271
|
+
> **💡 Tip:** Use `stamp context` for basic contracts. Use `stamp context style` when you need style metadata (Tailwind classes, SCSS selectors, layout patterns). Use `--style-mode lean` (default) for compact output or `--style-mode full` for detailed arrays.
|
|
263
272
|
|
|
264
273
|
## MCP Server
|
|
265
274
|
|
|
@@ -114,7 +114,7 @@ export function index(bundles, normalize = false) {
|
|
|
114
114
|
variables: normalize ? normalizeNames(c.composition?.variables ?? []) : (c.composition?.variables ?? []),
|
|
115
115
|
state: c.interface?.state ?? {},
|
|
116
116
|
exportKind: typeof c.exports === 'string' ? 'default'
|
|
117
|
-
: c.exports?.named
|
|
117
|
+
: Array.isArray(c.exports?.named) && c.exports.named.length > 0 ? 'named' : 'none',
|
|
118
118
|
apiSignature: c.interface?.apiSignature,
|
|
119
119
|
};
|
|
120
120
|
m.set(c.entryId.toLowerCase(), sig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/cli/commands/compare/core.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/cli/commands/compare/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchMode.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/context/watchMode/watchMode.ts"],"names":[],"mappings":"AAAA;;GAEG;AAyBH,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AASpB,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAsBvE;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,GAAE,UAAU,GAAG,IAAW,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"watchMode.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/context/watchMode/watchMode.ts"],"names":[],"mappings":"AAAA;;GAEG;AAyBH,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AASpB,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAsBvE;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,GAAE,UAAU,GAAG,IAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA2qBxI"}
|
|
@@ -69,7 +69,7 @@ export async function startWatchMode(options, projectRoot, initialCache = null)
|
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
let debounceTimer = null;
|
|
72
|
-
let
|
|
72
|
+
let isRegenerating = false; // Flag-based lock to prevent race conditions
|
|
73
73
|
let changedFiles = new Set();
|
|
74
74
|
/** Snapshot for `getChanges` / strict-watch: set on first load; reset when watch cache is recovered after an error (new stable tree). */
|
|
75
75
|
let baselineBundles = null;
|
|
@@ -180,179 +180,193 @@ export async function startWatchMode(options, projectRoot, initialCache = null)
|
|
|
180
180
|
}
|
|
181
181
|
};
|
|
182
182
|
const regenerate = async () => {
|
|
183
|
-
//
|
|
184
|
-
// If already regenerating,
|
|
185
|
-
if (
|
|
186
|
-
|
|
187
|
-
// After waiting, if no new changes accumulated, skip
|
|
188
|
-
if (changedFiles.size === 0) {
|
|
189
|
-
return;
|
|
190
|
-
}
|
|
191
|
-
// Otherwise, fall through to process new changes
|
|
183
|
+
// Synchronous flag check - safe in JS single-threaded event loop
|
|
184
|
+
// If already regenerating, return - the while loop will pick up new changes
|
|
185
|
+
if (isRegenerating) {
|
|
186
|
+
return;
|
|
192
187
|
}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
const fileList = changedFileList.length > 3
|
|
210
|
-
? `${changedFileList.slice(0, 3).join(', ')}, ... (+${changedFileList.length - 3} more)`
|
|
211
|
-
: changedFileList.join(', ');
|
|
212
|
-
console.log(`\n🔄 Recompiling (${changedFileList.length} file${changedFileList.length > 1 ? 's' : ''} changed)...`);
|
|
213
|
-
}
|
|
214
|
-
let newBundles;
|
|
215
|
-
// Use incremental rebuild if cache exists, otherwise do full rebuild (fallback)
|
|
216
|
-
if (watchCache) {
|
|
217
|
-
// Incremental rebuild - only rebuild affected bundles
|
|
218
|
-
const result = await incrementalRebuild(changedFileList, watchCache, options, projectRoot);
|
|
219
|
-
newBundles = result.bundles;
|
|
220
|
-
// Write only changed context files
|
|
221
|
-
const bundlesByFolder = groupBundlesByFolder(newBundles);
|
|
222
|
-
const changedFolders = new Set();
|
|
223
|
-
for (const bundleId of result.updatedBundles) {
|
|
224
|
-
const bundle = newBundles.find(b => b.entryId === bundleId);
|
|
225
|
-
if (bundle) {
|
|
226
|
-
const folderPath = bundle.entryId.substring(0, bundle.entryId.lastIndexOf('/') || bundle.entryId.length);
|
|
227
|
-
changedFolders.add(folderPath);
|
|
228
|
-
}
|
|
188
|
+
isRegenerating = true;
|
|
189
|
+
try {
|
|
190
|
+
// Loop to process any changes that arrive during regeneration
|
|
191
|
+
while (changedFiles.size > 0) {
|
|
192
|
+
const changedFileList = Array.from(changedFiles);
|
|
193
|
+
changedFiles.clear(); // Clear for next batch
|
|
194
|
+
const startTime = Date.now();
|
|
195
|
+
try {
|
|
196
|
+
// Determine output directory
|
|
197
|
+
const outPath = resolve(options.out);
|
|
198
|
+
const outputDir = outPath.endsWith('.json') ? dirname(outPath) : outPath;
|
|
199
|
+
// Load baseline bundles for state-based comparison (like git diff).
|
|
200
|
+
// Set on first successful load; also updated after error recovery (full rebuild) so diffs stay meaningful.
|
|
201
|
+
if (!baselineBundles) {
|
|
202
|
+
baselineBundles = await loadAllBundles(outputDir);
|
|
203
|
+
previousBundles = baselineBundles;
|
|
229
204
|
}
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
//
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
const
|
|
261
|
-
|
|
262
|
-
const { contracts } = await buildContractsFromFiles(filteredFiles, projectRoot, {
|
|
263
|
-
includeStyle: options.includeStyle,
|
|
264
|
-
styleMode: options.styleMode,
|
|
265
|
-
predictBehavior: options.predictBehavior,
|
|
205
|
+
if (!options.quiet) {
|
|
206
|
+
const fileList = changedFileList.length > 3
|
|
207
|
+
? `${changedFileList.slice(0, 3).join(', ')}, ... (+${changedFileList.length - 3} more)`
|
|
208
|
+
: changedFileList.join(', ');
|
|
209
|
+
console.log(`\n🔄 Recompiling (${changedFileList.length} file${changedFileList.length > 1 ? 's' : ''} changed)...`);
|
|
210
|
+
}
|
|
211
|
+
let newBundles;
|
|
212
|
+
// Use incremental rebuild if cache exists, otherwise do full rebuild (fallback)
|
|
213
|
+
if (watchCache) {
|
|
214
|
+
// Incremental rebuild - only rebuild affected bundles
|
|
215
|
+
const result = await incrementalRebuild(changedFileList, watchCache, options, projectRoot);
|
|
216
|
+
newBundles = result.bundles;
|
|
217
|
+
// Write only changed context files
|
|
218
|
+
const bundlesByFolder = groupBundlesByFolder(newBundles);
|
|
219
|
+
const changedFolders = new Set();
|
|
220
|
+
for (const bundleId of result.updatedBundles) {
|
|
221
|
+
const bundle = newBundles.find(b => b.entryId === bundleId);
|
|
222
|
+
if (bundle) {
|
|
223
|
+
const folderPath = bundle.entryId.substring(0, bundle.entryId.lastIndexOf('/') || bundle.entryId.length);
|
|
224
|
+
changedFolders.add(folderPath);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
// Write context files for changed folders only
|
|
228
|
+
// (This is a simplified version - full implementation would write individual files)
|
|
229
|
+
// For now, we'll write all files but this can be optimized further
|
|
230
|
+
const { folderInfos, totalTokenEstimate } = await writeContextFiles(newBundles, outputDir, projectRoot, {
|
|
231
|
+
format: options.format,
|
|
232
|
+
quiet: true,
|
|
233
|
+
});
|
|
234
|
+
// Get contracts for main index (from cache if available)
|
|
235
|
+
const allContracts = watchCache ? Array.from(watchCache.contracts.values()) : [];
|
|
236
|
+
await writeMainIndex(outputDir, folderInfos, allContracts, newBundles, bundlesByFolder.size, totalTokenEstimate, projectRoot, {
|
|
266
237
|
quiet: true,
|
|
238
|
+
suppressSuccessIndicator: true,
|
|
267
239
|
});
|
|
268
|
-
const manifest = buildDependencyGraph(contracts);
|
|
269
|
-
watchCache = await initializeWatchCache(filteredFiles, contracts, manifest, newBundles, projectRoot);
|
|
270
240
|
}
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
241
|
+
else {
|
|
242
|
+
// Fallback: Full rebuild if cache not available (shouldn't happen normally)
|
|
243
|
+
const regenerateOptions = {
|
|
244
|
+
...options,
|
|
245
|
+
watch: false,
|
|
246
|
+
strictMissing: false,
|
|
247
|
+
quiet: true,
|
|
248
|
+
suppressSuccessIndicator: true,
|
|
249
|
+
};
|
|
250
|
+
await contextCommand(regenerateOptions);
|
|
251
|
+
// Load bundles and initialize cache
|
|
252
|
+
newBundles = await loadAllBundles(outputDir);
|
|
253
|
+
// Initialize cache for next incremental rebuild
|
|
254
|
+
if (newBundles.length > 0) {
|
|
255
|
+
// We need contracts and manifest - reload them from the build
|
|
256
|
+
const files = await globFiles(projectRoot);
|
|
257
|
+
const stampignore = await readStampignore(projectRoot);
|
|
258
|
+
const filteredFiles = stampignore ? filterIgnoredFiles(files, stampignore.ignore, projectRoot) : files;
|
|
259
|
+
const { contracts } = await buildContractsFromFiles(filteredFiles, projectRoot, {
|
|
260
|
+
includeStyle: options.includeStyle,
|
|
261
|
+
styleMode: options.styleMode,
|
|
262
|
+
predictBehavior: options.predictBehavior,
|
|
263
|
+
quiet: true,
|
|
264
|
+
});
|
|
265
|
+
const manifest = buildDependencyGraph(contracts);
|
|
266
|
+
watchCache = await initializeWatchCache(filteredFiles, contracts, manifest, newBundles, projectRoot);
|
|
267
|
+
}
|
|
281
268
|
}
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
const
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
269
|
+
const durationMs = Date.now() - startTime;
|
|
270
|
+
// Compare against BASELINE (starting state), not previous state
|
|
271
|
+
// This gives us cumulative diff like `git diff` - if changes are reverted, diff is empty
|
|
272
|
+
const changes = baselineBundles && baselineBundles.length > 0
|
|
273
|
+
? getChanges(baselineBundles, newBundles)
|
|
274
|
+
: null;
|
|
275
|
+
if (!options.quiet) {
|
|
276
|
+
if (changes && (changes.changed.length > 0 || changes.added.length > 0 || changes.removed.length > 0 || changes.bundleChanged.length > 0)) {
|
|
277
|
+
showChanges(baselineBundles, newBundles, changedFileList[0] || 'unknown', { debug: options.debug });
|
|
278
|
+
}
|
|
279
|
+
console.log(`\n✅ Recompiled\n`);
|
|
280
|
+
}
|
|
281
|
+
// Update previousBundles for incremental tracking (still useful for other operations)
|
|
282
|
+
previousBundles = newBundles;
|
|
283
|
+
// Strict watch mode: detect and report violations (state-based, like git diff)
|
|
284
|
+
// Violations are calculated from current state vs baseline, not accumulated
|
|
285
|
+
if (options.strictWatch && strictWatchStatus) {
|
|
286
|
+
const hasChanges = changes && (changes.changed.length > 0 ||
|
|
287
|
+
changes.added.length > 0 ||
|
|
288
|
+
changes.removed.length > 0 ||
|
|
289
|
+
changes.bundleChanged.length > 0);
|
|
290
|
+
// Track previous state to detect new violations and resolution
|
|
291
|
+
const previousActiveErrors = strictWatchStatus.lastCheck?.errors ?? 0;
|
|
292
|
+
const previousActiveWarnings = strictWatchStatus.lastCheck?.warnings ?? 0;
|
|
293
|
+
const hadActiveViolations = previousActiveErrors > 0 || previousActiveWarnings > 0;
|
|
294
|
+
if (hasChanges) {
|
|
295
|
+
const violations = detectViolations({ type: 'watch', changes });
|
|
296
|
+
const errors = violations.filter(v => v.severity === 'error');
|
|
297
|
+
const warnings = violations.filter(v => v.severity === 'warning');
|
|
298
|
+
strictWatchStatus.regenerationCount++;
|
|
299
|
+
if (violations.length > 0) {
|
|
300
|
+
// Only increment totals if these are NEW violations (first time seeing violations, or count increased)
|
|
301
|
+
const isNewViolation = !hadActiveViolations;
|
|
302
|
+
const violationCountIncreased = errors.length > previousActiveErrors || warnings.length > previousActiveWarnings;
|
|
303
|
+
if (isNewViolation || violationCountIncreased) {
|
|
304
|
+
// Calculate new violations (only count increases, not existing ones)
|
|
305
|
+
if (isNewViolation) {
|
|
306
|
+
// First time violations appear - count all of them
|
|
307
|
+
strictWatchStatus.totalErrorsDetected += errors.length;
|
|
308
|
+
strictWatchStatus.totalWarningsDetected += warnings.length;
|
|
309
|
+
}
|
|
310
|
+
else {
|
|
311
|
+
// Violations increased - only count the new ones
|
|
312
|
+
const newErrors = Math.max(0, errors.length - previousActiveErrors);
|
|
313
|
+
const newWarnings = Math.max(0, warnings.length - previousActiveWarnings);
|
|
314
|
+
strictWatchStatus.totalErrorsDetected += newErrors;
|
|
315
|
+
strictWatchStatus.totalWarningsDetected += newWarnings;
|
|
316
|
+
}
|
|
319
317
|
}
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
318
|
+
// Update state-based counts (current state, not cumulative)
|
|
319
|
+
strictWatchStatus.cumulativeViolations = violations.length;
|
|
320
|
+
strictWatchStatus.cumulativeErrors = errors.length;
|
|
321
|
+
strictWatchStatus.cumulativeWarnings = warnings.length;
|
|
322
|
+
// Store current violations
|
|
323
|
+
strictWatchStatus.lastCheck = {
|
|
324
|
+
timestamp: new Date().toISOString(),
|
|
325
|
+
totalViolations: violations.length,
|
|
326
|
+
errors: errors.length,
|
|
327
|
+
warnings: warnings.length,
|
|
328
|
+
violations,
|
|
329
|
+
changedFiles: changedFileList,
|
|
330
|
+
};
|
|
331
|
+
// Display violations to console (only if status changed)
|
|
332
|
+
if (!options.quiet) {
|
|
333
|
+
const statusChanged = errors.length !== previousActiveErrors || warnings.length !== previousActiveWarnings;
|
|
334
|
+
if (statusChanged) {
|
|
335
|
+
if (isNewViolation || violationCountIncreased) {
|
|
336
|
+
// Show appropriate emoji based on severity: ❌ for errors, ⚠️ for warnings only
|
|
337
|
+
if (errors.length > 0) {
|
|
338
|
+
console.log(`\n❌ Breaking change detected`);
|
|
339
|
+
}
|
|
340
|
+
else if (warnings.length > 0) {
|
|
341
|
+
console.log(`\n⚠️ Warning detected`);
|
|
342
|
+
}
|
|
345
343
|
}
|
|
344
|
+
displayViolations(violations, { quiet: options.quiet });
|
|
345
|
+
displaySessionStatus(strictWatchStatus, { quiet: options.quiet });
|
|
346
346
|
}
|
|
347
|
-
|
|
347
|
+
}
|
|
348
|
+
// Write current violations state to disk
|
|
349
|
+
await writeStrictWatchStatus(projectRoot, strictWatchStatus);
|
|
350
|
+
}
|
|
351
|
+
else {
|
|
352
|
+
// Changes exist but no violations - violations were resolved
|
|
353
|
+
if (hadActiveViolations) {
|
|
354
|
+
strictWatchStatus.resolvedCount++;
|
|
355
|
+
}
|
|
356
|
+
strictWatchStatus.cumulativeViolations = 0;
|
|
357
|
+
strictWatchStatus.cumulativeErrors = 0;
|
|
358
|
+
strictWatchStatus.cumulativeWarnings = 0;
|
|
359
|
+
strictWatchStatus.lastCheck = undefined;
|
|
360
|
+
// Display resolution message and status
|
|
361
|
+
if (!options.quiet && hadActiveViolations) {
|
|
362
|
+
console.log(`\n✅ Violation resolved`);
|
|
348
363
|
displaySessionStatus(strictWatchStatus, { quiet: options.quiet });
|
|
349
364
|
}
|
|
365
|
+
await deleteStrictWatchStatus(projectRoot);
|
|
350
366
|
}
|
|
351
|
-
// Write current violations state to disk
|
|
352
|
-
await writeStrictWatchStatus(projectRoot, strictWatchStatus);
|
|
353
367
|
}
|
|
354
368
|
else {
|
|
355
|
-
//
|
|
369
|
+
// No changes from baseline - clear violations (state reverted)
|
|
356
370
|
if (hadActiveViolations) {
|
|
357
371
|
strictWatchStatus.resolvedCount++;
|
|
358
372
|
}
|
|
@@ -368,111 +382,93 @@ export async function startWatchMode(options, projectRoot, initialCache = null)
|
|
|
368
382
|
await deleteStrictWatchStatus(projectRoot);
|
|
369
383
|
}
|
|
370
384
|
}
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
385
|
+
// Log structured data for MCP server (only if --log-file flag is set)
|
|
386
|
+
// Appends each event to the log file for event history
|
|
387
|
+
if (options.logFile) {
|
|
388
|
+
if (changes) {
|
|
389
|
+
const logEntry = {
|
|
390
|
+
timestamp: new Date().toISOString(),
|
|
391
|
+
changedFiles: changedFileList,
|
|
392
|
+
fileCount: changedFileList.length,
|
|
393
|
+
durationMs,
|
|
394
|
+
modifiedContracts: changes.changed.map(c => ({
|
|
395
|
+
entryId: c.entryId,
|
|
396
|
+
semanticHashChanged: !!c.semanticHash,
|
|
397
|
+
fileHashChanged: !!c.fileHash,
|
|
398
|
+
semanticHash: c.semanticHash,
|
|
399
|
+
fileHash: c.fileHash,
|
|
400
|
+
})),
|
|
401
|
+
modifiedBundles: changes.bundleChanged.map(b => ({
|
|
402
|
+
entryId: b.entryId,
|
|
403
|
+
bundleHash: { old: b.oldHash, new: b.newHash },
|
|
404
|
+
})),
|
|
405
|
+
addedContracts: changes.added.length > 0 ? changes.added : undefined,
|
|
406
|
+
removedContracts: changes.removed.length > 0 ? changes.removed : undefined,
|
|
407
|
+
summary: {
|
|
408
|
+
modifiedContractsCount: changes.changed.length,
|
|
409
|
+
modifiedBundlesCount: changes.bundleChanged.length,
|
|
410
|
+
addedContractsCount: changes.added.length,
|
|
411
|
+
removedContractsCount: changes.removed.length,
|
|
412
|
+
},
|
|
413
|
+
};
|
|
414
|
+
await appendWatchLog(projectRoot, logEntry);
|
|
375
415
|
}
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
416
|
+
else if (changedFileList.length > 0) {
|
|
417
|
+
// Log even if no changes detected (file changed but no contract changes)
|
|
418
|
+
const logEntry = {
|
|
419
|
+
timestamp: new Date().toISOString(),
|
|
420
|
+
changedFiles: changedFileList,
|
|
421
|
+
fileCount: changedFileList.length,
|
|
422
|
+
durationMs,
|
|
423
|
+
};
|
|
424
|
+
await appendWatchLog(projectRoot, logEntry);
|
|
384
425
|
}
|
|
385
|
-
await deleteStrictWatchStatus(projectRoot);
|
|
386
426
|
}
|
|
387
427
|
}
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
if (
|
|
392
|
-
|
|
393
|
-
timestamp: new Date().toISOString(),
|
|
394
|
-
changedFiles: changedFileList,
|
|
395
|
-
fileCount: changedFileList.length,
|
|
396
|
-
durationMs,
|
|
397
|
-
modifiedContracts: changes.changed.map(c => ({
|
|
398
|
-
entryId: c.entryId,
|
|
399
|
-
semanticHashChanged: !!c.semanticHash,
|
|
400
|
-
fileHashChanged: !!c.fileHash,
|
|
401
|
-
semanticHash: c.semanticHash,
|
|
402
|
-
fileHash: c.fileHash,
|
|
403
|
-
})),
|
|
404
|
-
modifiedBundles: changes.bundleChanged.map(b => ({
|
|
405
|
-
entryId: b.entryId,
|
|
406
|
-
bundleHash: { old: b.oldHash, new: b.newHash },
|
|
407
|
-
})),
|
|
408
|
-
addedContracts: changes.added.length > 0 ? changes.added : undefined,
|
|
409
|
-
removedContracts: changes.removed.length > 0 ? changes.removed : undefined,
|
|
410
|
-
summary: {
|
|
411
|
-
modifiedContractsCount: changes.changed.length,
|
|
412
|
-
modifiedBundlesCount: changes.bundleChanged.length,
|
|
413
|
-
addedContractsCount: changes.added.length,
|
|
414
|
-
removedContractsCount: changes.removed.length,
|
|
415
|
-
},
|
|
416
|
-
};
|
|
417
|
-
await appendWatchLog(projectRoot, logEntry);
|
|
418
|
-
}
|
|
419
|
-
else if (changedFileList.length > 0) {
|
|
420
|
-
// Log even if no changes detected (file changed but no contract changes)
|
|
421
|
-
const logEntry = {
|
|
422
|
-
timestamp: new Date().toISOString(),
|
|
423
|
-
changedFiles: changedFileList,
|
|
424
|
-
fileCount: changedFileList.length,
|
|
425
|
-
durationMs,
|
|
426
|
-
};
|
|
427
|
-
await appendWatchLog(projectRoot, logEntry);
|
|
428
|
+
catch (error) {
|
|
429
|
+
const durationMs = Date.now() - startTime;
|
|
430
|
+
const errorMessage = formatErrorMessage(error);
|
|
431
|
+
if (!options.quiet) {
|
|
432
|
+
console.error(` ❌ Error: ${errorMessage}\n`);
|
|
428
433
|
}
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
};
|
|
446
|
-
await appendWatchLog(projectRoot, logEntry);
|
|
434
|
+
if (options.logFile) {
|
|
435
|
+
try {
|
|
436
|
+
const logEntry = {
|
|
437
|
+
timestamp: new Date().toISOString(),
|
|
438
|
+
changedFiles: changedFileList,
|
|
439
|
+
fileCount: changedFileList.length,
|
|
440
|
+
durationMs,
|
|
441
|
+
error: errorMessage,
|
|
442
|
+
};
|
|
443
|
+
await appendWatchLog(projectRoot, logEntry);
|
|
444
|
+
}
|
|
445
|
+
catch (logError) {
|
|
446
|
+
if (!options.quiet) {
|
|
447
|
+
console.warn(` ⚠️ Watch: could not append watch log: ${formatErrorMessage(logError)}`);
|
|
448
|
+
}
|
|
449
|
+
}
|
|
447
450
|
}
|
|
448
|
-
|
|
451
|
+
const recovery = await attemptWatchCacheRecovery();
|
|
452
|
+
if (recovery != null) {
|
|
453
|
+
watchCache = recovery.cache;
|
|
454
|
+
baselineBundles = recovery.bundles;
|
|
455
|
+
previousBundles = recovery.bundles;
|
|
449
456
|
if (!options.quiet) {
|
|
450
|
-
console.
|
|
457
|
+
console.log(` ✅ Watch cache restored after full rebuild.\n`);
|
|
451
458
|
}
|
|
452
459
|
}
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
previousBundles = recovery.bundles;
|
|
459
|
-
if (!options.quiet) {
|
|
460
|
-
console.log(` ✅ Watch cache restored after full rebuild.\n`);
|
|
461
|
-
}
|
|
462
|
-
}
|
|
463
|
-
else {
|
|
464
|
-
watchCache = null;
|
|
465
|
-
if (!options.quiet) {
|
|
466
|
-
console.warn(' ⚠️ Each file change will run a full context rebuild until a rebuild succeeds.\n');
|
|
460
|
+
else {
|
|
461
|
+
watchCache = null;
|
|
462
|
+
if (!options.quiet) {
|
|
463
|
+
console.warn(' ⚠️ Each file change will run a full context rebuild until a rebuild succeeds.\n');
|
|
464
|
+
}
|
|
467
465
|
}
|
|
468
466
|
}
|
|
469
467
|
}
|
|
470
|
-
}
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
});
|
|
475
|
-
await regenerationPromise;
|
|
468
|
+
}
|
|
469
|
+
finally {
|
|
470
|
+
isRegenerating = false;
|
|
471
|
+
}
|
|
476
472
|
};
|
|
477
473
|
const debouncedRegenerate = () => {
|
|
478
474
|
if (debounceTimer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchMode.js","sourceRoot":"","sources":["../../../../../src/cli/commands/context/watchMode/watchMode.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"watchMode.js","sourceRoot":"","sources":["../../../../../src/cli/commands/context/watchMode/watchMode.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAKlI,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyC,MAAM,gBAAgB,CAAC;AAChG,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GAEnB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACd,oBAAoB,EAEpB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAuB,MAAM,kBAAkB,CAAC;AAEvE,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChE,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAAC,MAAyB,EAAE,UAA+B,EAAE;IACxF,IAAI,OAAO,CAAC,KAAK;QAAE,OAAO;IAE1B,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,EAAE,QAAQ,IAAI,CAAC,CAAC;IAEvD,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,6BAA6B,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,4BAA4B,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,4BAA4B,YAAY,GAAG,cAAc,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAuB,EAAE,WAAmB,EAAE,eAAkC,IAAI;IACvH,mEAAmE;IACnE,sBAAsB,EAAE,CAAC;IAEzB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACrE,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;QAC7E,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,6BAA6B;IAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAEzE,8DAA8D;IAC9D,MAAM,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC;QACH,MAAM,gBAAgB,CAAC,WAAW,EAAE;YAClC,MAAM,EAAE,IAAI;YACZ,WAAW;YACX,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,SAAS;YACT,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,KAAK;SAC1C,CAAC,CAAC;QACH,6FAA6F;QAC7F,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,4DAA4D;QAC5D,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,sDAAuD,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACjG,CAAC;IACH,CAAC;IAED,IAAI,aAAa,GAA0B,IAAI,CAAC;IAChD,IAAI,cAAc,GAAG,KAAK,CAAC,CAAC,6CAA6C;IACzE,IAAI,YAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC1C,yIAAyI;IACzI,IAAI,eAAe,GAA8B,IAAI,CAAC;IACtD,IAAI,eAAe,GAA8B,IAAI,CAAC,CAAC,wCAAwC;IAC/F,IAAI,UAAU,GAAsB,YAAY,CAAC;IAEjD,0BAA0B;IAC1B,IAAI,iBAAiB,GAA6B,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACtE,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,oBAAoB,EAAE,CAAC;QACvB,gBAAgB,EAAE,CAAC;QACnB,kBAAkB,EAAE,CAAC;QACrB,mBAAmB,EAAE,CAAC;QACtB,qBAAqB,EAAE,CAAC;QACxB,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,CAAC;KACrB,CAAC,CAAC,CAAC,IAAI,CAAC;IAET,oFAAoF;IACpF,MAAM,cAAc,GAAG,GAAG,CAAC;IAE3B,gDAAgD;IAChD,MAAM,cAAc,GAAG,KAAK,EAAE,SAAiB,EAA+B,EAAE;QAC9E,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;QAC3D,IAAI,gBAAwB,CAAC;QAC7B,IAAI,CAAC;YACH,gBAAgB,GAAG,MAAM,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,GAAI,KAA+B,EAAE,IAAI,CAAC;YACpD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtB,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,+CAA+C,aAAa,MAAM,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC9G,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,SAAwD,CAAC;QAC7D,IAAI,CAAC;YACH,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAkD,CAAC;QAC5F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,kDAAkD,aAAa,MAAM,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACjH,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,UAAU,GAAuB,EAAE,CAAC;QAE1C,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;gBACvC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;oBACxD,IAAI,CAAC;wBACH,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;wBAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAuB,CAAC;wBACjE,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;oBAC9B,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;4BACnB,OAAO,CAAC,IAAI,CAAC,+CAA+C,WAAW,KAAK,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC3G,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEF,iGAAiG;IACjG,MAAM,yBAAyB,GAAG,KAAK,IAAwE,EAAE;QAC/G,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,iBAAiB,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;YACzG,MAAM,iBAAiB,GAAmB;gBACxC,GAAG,OAAO;gBACV,KAAK,EAAE,KAAK;gBACZ,aAAa,EAAE,KAAK;gBACpB,KAAK,EAAE,IAAI;gBACX,wBAAwB,EAAE,IAAI;aAC/B,CAAC;YACF,MAAM,cAAc,CAAC,iBAAiB,CAAC,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,CAAC;YAC3D,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;oBACnB,OAAO,CAAC,IAAI,CAAC,wFAAwF,CAAC,CAAC;gBACzG,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;YAC3C,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;YACvD,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACvG,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,uBAAuB,CAAC,aAAa,EAAE,WAAW,EAAE;gBAC9E,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,KAAK,EAAE,IAAI;aACZ,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;YACjD,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YACtG,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,+CAA+C,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3F,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;QAC5B,iEAAiE;QACjE,4EAA4E;QAC5E,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,cAAc,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC;YACH,8DAA8D;YAC9D,OAAO,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACjD,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,uBAAuB;gBAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAE7B,IAAI,CAAC;oBACL,6BAA6B;oBAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBACrC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oBAEzE,oEAAoE;oBACpE,2GAA2G;oBAC3G,IAAI,CAAC,eAAe,EAAE,CAAC;wBACrB,eAAe,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;wBAClD,eAAe,GAAG,eAAe,CAAC;oBACpC,CAAC;oBAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;wBACnB,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC;4BACzC,CAAC,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,eAAe,CAAC,MAAM,GAAG,CAAC,QAAQ;4BACxF,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC/B,OAAO,CAAC,GAAG,CAAC,qBAAqB,eAAe,CAAC,MAAM,QAAQ,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;oBACtH,CAAC;oBAED,IAAI,UAA8B,CAAC;oBAEnC,gFAAgF;oBAChF,IAAI,UAAU,EAAE,CAAC;wBACf,sDAAsD;wBACtD,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;wBAC3F,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;wBAE5B,mCAAmC;wBACnC,MAAM,eAAe,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;wBACzD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;wBACzC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;4BAC7C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC;4BAC5D,IAAI,MAAM,EAAE,CAAC;gCACX,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gCACzG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;4BACjC,CAAC;wBACH,CAAC;wBAED,+CAA+C;wBAC/C,oFAAoF;wBACpF,mEAAmE;wBACnE,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,MAAM,iBAAiB,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE;4BACtG,MAAM,EAAE,OAAO,CAAC,MAAM;4BACtB,KAAK,EAAE,IAAI;yBACZ,CAAC,CAAC;wBAEH,yDAAyD;wBACzD,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACjF,MAAM,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,eAAe,CAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE;4BAC5H,KAAK,EAAE,IAAI;4BACX,wBAAwB,EAAE,IAAI;yBAC/B,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,4EAA4E;wBAC5E,MAAM,iBAAiB,GAAmB;4BACxC,GAAG,OAAO;4BACV,KAAK,EAAE,KAAK;4BACZ,aAAa,EAAE,KAAK;4BACpB,KAAK,EAAE,IAAI;4BACX,wBAAwB,EAAE,IAAI;yBAC/B,CAAC;wBAEF,MAAM,cAAc,CAAC,iBAAiB,CAAC,CAAC;wBAExC,oCAAoC;wBACpC,UAAU,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;wBAE7C,gDAAgD;wBAChD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC1B,8DAA8D;4BAC9D,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;4BAC3C,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;4BACvD,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;4BACvG,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,uBAAuB,CAAC,aAAa,EAAE,WAAW,EAAE;gCAC9E,YAAY,EAAE,OAAO,CAAC,YAAY;gCAClC,SAAS,EAAE,OAAO,CAAC,SAAS;gCAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;gCACxC,KAAK,EAAE,IAAI;6BACZ,CAAC,CAAC;4BACH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;4BACjD,UAAU,GAAG,MAAM,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;wBACvG,CAAC;oBACH,CAAC;oBAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;oBAC1C,gEAAgE;oBAChE,yFAAyF;oBACzF,MAAM,OAAO,GAAG,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC;wBAC3D,CAAC,CAAC,UAAU,CAAC,eAAe,EAAE,UAAU,CAAC;wBACzC,CAAC,CAAC,IAAI,CAAC;oBAET,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;wBACnB,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;4BAC1I,WAAW,CAAC,eAAgB,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;wBACvG,CAAC;wBACD,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;oBAClC,CAAC;oBAED,sFAAsF;oBACtF,eAAe,GAAG,UAAU,CAAC;oBAE7B,+EAA+E;oBAC/E,4EAA4E;oBAC5E,IAAI,OAAO,CAAC,WAAW,IAAI,iBAAiB,EAAE,CAAC;wBAC7C,MAAM,UAAU,GAAG,OAAO,IAAI,CAC5B,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;4BAC1B,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;4BACxB,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;4BAC1B,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CACjC,CAAC;wBAEF,+DAA+D;wBAC/D,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC;wBACtE,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,SAAS,EAAE,QAAQ,IAAI,CAAC,CAAC;wBAC1E,MAAM,mBAAmB,GAAG,oBAAoB,GAAG,CAAC,IAAI,sBAAsB,GAAG,CAAC,CAAC;wBAEnF,IAAI,UAAU,EAAE,CAAC;4BACf,MAAM,UAAU,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;4BAChE,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;4BAC9D,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;4BAElE,iBAAiB,CAAC,iBAAiB,EAAE,CAAC;4BAEtC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCAC1B,uGAAuG;gCACvG,MAAM,cAAc,GAAG,CAAC,mBAAmB,CAAC;gCAC5C,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,GAAG,oBAAoB,IAAI,QAAQ,CAAC,MAAM,GAAG,sBAAsB,CAAC;gCAEjH,IAAI,cAAc,IAAI,uBAAuB,EAAE,CAAC;oCAC9C,qEAAqE;oCACrE,IAAI,cAAc,EAAE,CAAC;wCACnB,mDAAmD;wCACnD,iBAAiB,CAAC,mBAAmB,IAAI,MAAM,CAAC,MAAM,CAAC;wCACvD,iBAAiB,CAAC,qBAAqB,IAAI,QAAQ,CAAC,MAAM,CAAC;oCAC7D,CAAC;yCAAM,CAAC;wCACN,iDAAiD;wCACjD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,oBAAoB,CAAC,CAAC;wCACpE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,sBAAsB,CAAC,CAAC;wCAC1E,iBAAiB,CAAC,mBAAmB,IAAI,SAAS,CAAC;wCACnD,iBAAiB,CAAC,qBAAqB,IAAI,WAAW,CAAC;oCACzD,CAAC;gCACH,CAAC;gCAED,4DAA4D;gCAC5D,iBAAiB,CAAC,oBAAoB,GAAG,UAAU,CAAC,MAAM,CAAC;gCAC3D,iBAAiB,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;gCACnD,iBAAiB,CAAC,kBAAkB,GAAG,QAAQ,CAAC,MAAM,CAAC;gCAEvD,2BAA2B;gCAC3B,iBAAiB,CAAC,SAAS,GAAG;oCAC5B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;oCACnC,eAAe,EAAE,UAAU,CAAC,MAAM;oCAClC,MAAM,EAAE,MAAM,CAAC,MAAM;oCACrB,QAAQ,EAAE,QAAQ,CAAC,MAAM;oCACzB,UAAU;oCACV,YAAY,EAAE,eAAe;iCAC9B,CAAC;gCAEF,yDAAyD;gCACzD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;oCACnB,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,KAAK,oBAAoB,IAAI,QAAQ,CAAC,MAAM,KAAK,sBAAsB,CAAC;oCAC3G,IAAI,aAAa,EAAE,CAAC;wCAClB,IAAI,cAAc,IAAI,uBAAuB,EAAE,CAAC;4CAC9C,+EAA+E;4CAC/E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gDACtB,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;4CAC9C,CAAC;iDAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gDAC/B,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;4CACxC,CAAC;wCACH,CAAC;wCACD,iBAAiB,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;wCACxD,oBAAoB,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;oCACpE,CAAC;gCACH,CAAC;gCAED,yCAAyC;gCACzC,MAAM,sBAAsB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;4BAC/D,CAAC;iCAAM,CAAC;gCACN,6DAA6D;gCAC7D,IAAI,mBAAmB,EAAE,CAAC;oCACxB,iBAAiB,CAAC,aAAa,EAAE,CAAC;gCACpC,CAAC;gCAED,iBAAiB,CAAC,oBAAoB,GAAG,CAAC,CAAC;gCAC3C,iBAAiB,CAAC,gBAAgB,GAAG,CAAC,CAAC;gCACvC,iBAAiB,CAAC,kBAAkB,GAAG,CAAC,CAAC;gCACzC,iBAAiB,CAAC,SAAS,GAAG,SAAS,CAAC;gCAExC,wCAAwC;gCACxC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,mBAAmB,EAAE,CAAC;oCAC1C,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;oCACtC,oBAAoB,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;gCACpE,CAAC;gCAED,MAAM,uBAAuB,CAAC,WAAW,CAAC,CAAC;4BAC7C,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,+DAA+D;4BAC/D,IAAI,mBAAmB,EAAE,CAAC;gCACxB,iBAAiB,CAAC,aAAa,EAAE,CAAC;4BACpC,CAAC;4BAED,iBAAiB,CAAC,oBAAoB,GAAG,CAAC,CAAC;4BAC3C,iBAAiB,CAAC,gBAAgB,GAAG,CAAC,CAAC;4BACvC,iBAAiB,CAAC,kBAAkB,GAAG,CAAC,CAAC;4BACzC,iBAAiB,CAAC,SAAS,GAAG,SAAS,CAAC;4BAExC,wCAAwC;4BACxC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,mBAAmB,EAAE,CAAC;gCAC1C,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gCACtC,oBAAoB,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;4BACpE,CAAC;4BAED,MAAM,uBAAuB,CAAC,WAAW,CAAC,CAAC;wBAC7C,CAAC;oBACH,CAAC;oBAED,sEAAsE;oBACtE,uDAAuD;oBACvD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;wBACpB,IAAI,OAAO,EAAE,CAAC;4BACZ,MAAM,QAAQ,GAAkB;gCAC9B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gCACnC,YAAY,EAAE,eAAe;gCAC7B,SAAS,EAAE,eAAe,CAAC,MAAM;gCACjC,UAAU;gCACV,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oCAC3C,OAAO,EAAE,CAAC,CAAC,OAAO;oCAClB,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY;oCACrC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ;oCAC7B,YAAY,EAAE,CAAC,CAAC,YAAY;oCAC5B,QAAQ,EAAE,CAAC,CAAC,QAAQ;iCACrB,CAAC,CAAC;gCACH,eAAe,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oCAC/C,OAAO,EAAE,CAAC,CAAC,OAAO;oCAClB,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE;iCAC/C,CAAC,CAAC;gCACH,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;gCACpE,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gCAC1E,OAAO,EAAE;oCACP,sBAAsB,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;oCAC9C,oBAAoB,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM;oCAClD,mBAAmB,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;oCACzC,qBAAqB,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;iCAC9C;6BACF,CAAC;4BACF,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;wBAC9C,CAAC;6BAAM,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACtC,yEAAyE;4BACzE,MAAM,QAAQ,GAAkB;gCAC9B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gCACnC,YAAY,EAAE,eAAe;gCAC7B,SAAS,EAAE,eAAe,CAAC,MAAM;gCACjC,UAAU;6BACX,CAAC;4BACF,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;wBAC9C,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;oBAC1C,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;oBAE/C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;wBACnB,OAAO,CAAC,KAAK,CAAC,eAAe,YAAY,IAAI,CAAC,CAAC;oBACjD,CAAC;oBAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;wBACpB,IAAI,CAAC;4BACH,MAAM,QAAQ,GAAkB;gCAC9B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gCACnC,YAAY,EAAE,eAAe;gCAC7B,SAAS,EAAE,eAAe,CAAC,MAAM;gCACjC,UAAU;gCACV,KAAK,EAAE,YAAY;6BACpB,CAAC;4BACF,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;wBAC9C,CAAC;wBAAC,OAAO,QAAQ,EAAE,CAAC;4BAClB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gCACnB,OAAO,CAAC,IAAI,CAAC,6CAA6C,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;4BAC5F,CAAC;wBACH,CAAC;oBACH,CAAC;oBAED,MAAM,QAAQ,GAAG,MAAM,yBAAyB,EAAE,CAAC;oBACnD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;wBACrB,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC;wBAC5B,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC;wBACnC,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC;wBACnC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;4BACnB,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;wBACjE,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,UAAU,GAAG,IAAI,CAAC;wBAClB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;4BACnB,OAAO,CAAC,IAAI,CACV,qFAAqF,CACtF,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;YACC,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,cAAc,GAAG,KAAK,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,GAAG,EAAE;QAC/B,IAAI,aAAa,EAAE,CAAC;YAClB,YAAY,CAAC,aAAa,CAAC,CAAC;QAC9B,CAAC;QACD,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,KAAK,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,8CAA8C,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC3F,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,cAAc,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,sDAAsD;QACtD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACzE,MAAM,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAE/C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,gBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAC/D,IAAI,mBAAmB,KAAK,WAAW,EAAE,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,iCAAiC,kBAAkB,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;YAC1F,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;QACpF,CAAC;QAED,iCAAiC;QACjC,MAAM,iBAAiB,GAAG,OAAO,CAAC,YAAY;YAC5C,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,CAAC;YACjE,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,2BAA2B,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,kDAAkD;QAClD,gEAAgE;QAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE;YAC1C,OAAO,EAAE;gBACP,gCAAgC;gBAChC,gBAAgB;gBAChB,qBAAqB;gBACrB,8BAA8B;gBAC9B,yDAAyD;gBACzD,GAAG,CAAC,SAAS,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,gBAAgB,CAAC,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtH,6CAA6C;gBAC7C,cAAc;gBACd,MAAM;gBACN,OAAO;gBACP,QAAQ;gBACR,UAAU;aACX;YACD,aAAa,EAAE,IAAI,EAAE,gCAAgC;YACrD,gBAAgB,EAAE;gBAChB,kBAAkB,EAAE,GAAG,EAAE,uCAAuC;gBAChE,YAAY,EAAE,GAAG,EAAE,6CAA6C;aACjE;YACD,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,EAAE,EAAE,eAAe;SAC3B,CAAC,CAAC;QAEH,wDAAwD;QACxD,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAW,EAAE;YAClD,4BAA4B;YAC5B,MAAM,cAAc,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAElD,yDAAyD;YACzD,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC3D,OAAO,CAAC,GAAG,CAAC,4BAA4B,cAAc,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,oCAAoC;YACpC,IAAI,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;gBACxF,OAAO,IAAI,CAAC;YACd,CAAC;YAED,yCAAyC;YACzC,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;YAE5E,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC;gBACtE,OAAO,CAAC,GAAG,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;YAClE,CAAC;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC;QAEF,uDAAuD;QACvD,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,SAAsC,EAAE,EAAE;YAClF,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,0CAA0C;gBAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;gBACrE,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAEjC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBAC9C,wDAAwD;oBACxD,OAAO,CAAC,GAAG,CAAC,MAAM,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,KAAK,cAAc,EAAE,CAAC,CAAC;gBACjI,CAAC;gBAED,mBAAmB,EAAE,CAAC;YACxB,CAAC;QACH,CAAC,CAAC;QAEF,sBAAsB;QACtB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE;YACpC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,wBAAwB;QACxB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE;YACjC,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,wBAAwB;QACxB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE;YACpC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,wBAAwB;QACxB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,KAAc,EAAE,EAAE;YAC3C,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,OAAO,CAAC,KAAK,CAAC,kBAAkB,YAAY,EAAE,CAAC,CAAC;YAChD,MAAM,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,wCAAwC;QACxC,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACvB,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClC,UAAU,GAAG,IAAI,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,6DAA6D;QAC7D,wEAAwE;QACxE,eAAe,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;YACvC,yBAAyB;YACzB,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YAEtB,6BAA6B;YAC7B,IAAI,CAAC;gBACH,MAAM,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC;YAAC,MAAM,CAAC;gBACP,+BAA+B;YACjC,CAAC;YAED,sDAAsD;YACtD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBAEvC,IAAI,OAAO,CAAC,WAAW,IAAI,iBAAiB,EAAE,CAAC;oBAC7C,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC;oBAC9D,MAAM,cAAc,GAAG,iBAAiB,CAAC,SAAS,EAAE,QAAQ,IAAI,CAAC,CAAC;oBAClE,MAAM,WAAW,GAAG,YAAY,GAAG,cAAc,CAAC;oBAElD,2BAA2B;oBAC3B,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,MAAc,EAAE,EAAE,CACpE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;oBAElC,uDAAuD;oBACvD,IAAI,KAAa,CAAC;oBAClB,IAAI,OAAe,CAAC;oBAEpB,IAAI,YAAY,KAAK,CAAC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;wBAC/C,KAAK,GAAG,GAAG,CAAC;wBACZ,OAAO,GAAG,wDAAwD,CAAC;oBACrE,CAAC;yBAAM,IAAI,YAAY,KAAK,CAAC,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;wBACpD,KAAK,GAAG,IAAI,CAAC;wBACb,OAAO,GAAG,mCAAmC,cAAc,IAAI,SAAS,CAAC,cAAc,EAAE,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC;oBAC7H,CAAC;yBAAM,CAAC;wBACN,KAAK,GAAG,GAAG,CAAC;wBACZ,MAAM,KAAK,GAAa,EAAE,CAAC;wBAC3B,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;4BACrB,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,IAAI,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;wBAC9E,CAAC;wBACD,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;4BACvB,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,IAAI,SAAS,CAAC,cAAc,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;wBACtF,CAAC;wBACD,OAAO,GAAG,mCAAmC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;oBAC3E,CAAC;oBAED,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,OAAO,EAAE,CAAC,CAAC;oBAErC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;oBACrC,OAAO,CAAC,GAAG,CAAC,2BAA2B,iBAAiB,CAAC,mBAAmB,EAAE,CAAC,CAAC;oBAChF,OAAO,CAAC,GAAG,CAAC,6BAA6B,iBAAiB,CAAC,qBAAqB,EAAE,CAAC,CAAC;oBACpF,OAAO,CAAC,GAAG,CAAC,4BAA4B,iBAAiB,CAAC,aAAa,EAAE,CAAC,CAAC;oBAC3E,OAAO,CAAC,GAAG,CAAC,4BAA4B,WAAW,EAAE,CAAC,CAAC;oBAEvD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;wBACpB,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;oBAChF,CAAC;gBACH,CAAC;YACH,CAAC;YAED,qDAAqD;YACrD,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,oBAAoB,KAAK,CAAC,EAAE,CAAC;gBAC/F,IAAI,CAAC;oBACH,MAAM,uBAAuB,CAAC,WAAW,CAAC,CAAC;gBAC7C,CAAC;gBAAC,MAAM,CAAC;oBACP,+BAA+B;gBACjC,CAAC;YACH,CAAC;QACH,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,iFAAiF;QAExF,kCAAkC;QAClC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,wCAAwC;IACvE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,iCAAkC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,MAAM,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileLock.d.ts","sourceRoot":"","sources":["../../src/utils/fileLock.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"fileLock.d.ts","sourceRoot":"","sources":["../../src/utils/fileLock.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,WAAW,WAAW;IAC1B,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oFAAoF;IACpF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,uBAAuB;IACvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAoKD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,WAAgB,GACxB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAkI7B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,QAAQ,CAAC,CAAC,EAC9B,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,WAAgB,GACxB,OAAO,CAAC,CAAC,CAAC,CAYZ"}
|
package/dist/utils/fileLock.js
CHANGED
|
@@ -2,8 +2,39 @@
|
|
|
2
2
|
* Lightweight file locking utility for preventing TOCTOU race conditions
|
|
3
3
|
* Uses exclusive file creation with PID tracking for stale lock detection
|
|
4
4
|
*/
|
|
5
|
+
import { execFileSync } from 'node:child_process';
|
|
5
6
|
import { open, unlink, readFile, access } from 'node:fs/promises';
|
|
6
7
|
import { constants } from 'node:fs';
|
|
8
|
+
/**
|
|
9
|
+
* Windows: `process.kill(pid, 0)` is unreliable (libuv/permission quirks). Use tasklist for *other* processes.
|
|
10
|
+
* Never treat empty/unparseable tasklist output as "dead" — that can delete a valid lock and corrupt read-modify-write.
|
|
11
|
+
*/
|
|
12
|
+
function isWindowsProcessRunning(pid) {
|
|
13
|
+
try {
|
|
14
|
+
const out = execFileSync('tasklist', ['/FI', `PID eq ${pid}`, '/NH'], {
|
|
15
|
+
encoding: 'utf8',
|
|
16
|
+
windowsHide: true,
|
|
17
|
+
timeout: 5000,
|
|
18
|
+
});
|
|
19
|
+
const trimmed = out.trim();
|
|
20
|
+
// Reliable: localized "no tasks" banner when the PID does not exist
|
|
21
|
+
if (/^INFO:/i.test(trimmed)) {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
// Ambiguous: empty or unexpected output — do not assume the process exited (avoids stale-lock false positives)
|
|
25
|
+
if (!trimmed) {
|
|
26
|
+
return 'unknown';
|
|
27
|
+
}
|
|
28
|
+
const re = new RegExp(`(?:^|\\s)${pid}(?:\\s|$)`);
|
|
29
|
+
if (re.test(trimmed)) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
return 'unknown';
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
return 'unknown';
|
|
36
|
+
}
|
|
37
|
+
}
|
|
7
38
|
/**
|
|
8
39
|
* Check if a process is still running
|
|
9
40
|
* Returns: true = alive, false = dead, 'unknown' = can't determine (e.g., permission denied)
|
|
@@ -14,6 +45,13 @@ function isProcessAlive(pid) {
|
|
|
14
45
|
if (!Number.isInteger(pid) || pid <= 0 || pid > 4194304) {
|
|
15
46
|
return false;
|
|
16
47
|
}
|
|
48
|
+
// Same process is always alive; avoids Windows tasklist false negatives racing with our own file locks
|
|
49
|
+
if (pid === process.pid) {
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
if (process.platform === 'win32') {
|
|
53
|
+
return isWindowsProcessRunning(pid);
|
|
54
|
+
}
|
|
17
55
|
try {
|
|
18
56
|
// Signal 0 doesn't send a signal, just checks if process exists
|
|
19
57
|
process.kill(pid, 0);
|
|
@@ -86,6 +124,36 @@ async function removeStale(lockPath) {
|
|
|
86
124
|
// Ignore errors - another process may have removed it
|
|
87
125
|
}
|
|
88
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* Create lock file exclusively, write payload, and close. If open succeeded but write/close
|
|
129
|
+
* fails, remove the file so we do not leave an empty or partial lock blocking others.
|
|
130
|
+
*/
|
|
131
|
+
async function writeLockFileExclusive(lockPath, content) {
|
|
132
|
+
let handle;
|
|
133
|
+
try {
|
|
134
|
+
handle = await open(lockPath, constants.O_CREAT | constants.O_EXCL | constants.O_WRONLY);
|
|
135
|
+
await handle.writeFile(JSON.stringify(content));
|
|
136
|
+
await handle.close();
|
|
137
|
+
handle = undefined;
|
|
138
|
+
}
|
|
139
|
+
catch (e) {
|
|
140
|
+
if (handle !== undefined) {
|
|
141
|
+
try {
|
|
142
|
+
await handle.close();
|
|
143
|
+
}
|
|
144
|
+
catch {
|
|
145
|
+
// Ignore — best effort before unlink
|
|
146
|
+
}
|
|
147
|
+
try {
|
|
148
|
+
await unlink(lockPath);
|
|
149
|
+
}
|
|
150
|
+
catch {
|
|
151
|
+
// Ignore — another process may have taken over
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
throw e;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
89
157
|
/**
|
|
90
158
|
* Acquire an exclusive lock on a file
|
|
91
159
|
*
|
|
@@ -124,9 +192,7 @@ export async function acquireLock(filePath, options = {}) {
|
|
|
124
192
|
}
|
|
125
193
|
await new Promise(resolve => setTimeout(resolve, 10 + retry * 5)); // 10, 15, 20, 25, 30ms
|
|
126
194
|
try {
|
|
127
|
-
|
|
128
|
-
await handle.writeFile(JSON.stringify(lockContent));
|
|
129
|
-
await handle.close();
|
|
195
|
+
await writeLockFileExclusive(lockPath, lockContent);
|
|
130
196
|
// Successfully acquired lock!
|
|
131
197
|
return {
|
|
132
198
|
release: async () => {
|
|
@@ -156,9 +222,7 @@ export async function acquireLock(filePath, options = {}) {
|
|
|
156
222
|
while (Date.now() - startTime < timeout) {
|
|
157
223
|
try {
|
|
158
224
|
// Try to create lock file exclusively (fails if exists)
|
|
159
|
-
|
|
160
|
-
await handle.writeFile(JSON.stringify(lockContent));
|
|
161
|
-
await handle.close();
|
|
225
|
+
await writeLockFileExclusive(lockPath, lockContent);
|
|
162
226
|
// Lock acquired
|
|
163
227
|
return {
|
|
164
228
|
release: async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileLock.js","sourceRoot":"","sources":["../../src/utils/fileLock.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fileLock.js","sourceRoot":"","sources":["../../src/utils/fileLock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secretDetector.d.ts","sourceRoot":"","sources":["../../src/utils/secretDetector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;CACrC;AAyFD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"secretDetector.d.ts","sourceRoot":"","sources":["../../src/utils/secretDetector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;CACrC;AAyFD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,WAAW,EAAE,CA0Cf;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAyB1E"}
|
|
@@ -26,7 +26,7 @@ const SECRET_PATTERNS = [
|
|
|
26
26
|
pattern: (() => {
|
|
27
27
|
const part1 = 'A'.concat('K');
|
|
28
28
|
const part2 = 'I'.concat('A');
|
|
29
|
-
return new RegExp(part1 + part2 + '[0-9A-
|
|
29
|
+
return new RegExp(part1 + part2 + '[0-9A-Za-z]{16}', 'i');
|
|
30
30
|
})(),
|
|
31
31
|
severity: 'high',
|
|
32
32
|
},
|
|
@@ -43,14 +43,14 @@ const SECRET_PATTERNS = [
|
|
|
43
43
|
'g'.concat('h').concat('s_'),
|
|
44
44
|
'g'.concat('h').concat('r_'),
|
|
45
45
|
];
|
|
46
|
-
return new RegExp(prefixes.map(prefix => `${prefix}[a-zA-Z0-9]{36}`).join('|'));
|
|
46
|
+
return new RegExp(prefixes.map(prefix => `${prefix}[a-zA-Z0-9]{36}`).join('|'), 'i');
|
|
47
47
|
})(),
|
|
48
48
|
severity: 'high',
|
|
49
49
|
},
|
|
50
50
|
// Private Keys
|
|
51
51
|
{
|
|
52
52
|
name: 'Private Key',
|
|
53
|
-
pattern: /-----BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY
|
|
53
|
+
pattern: /-----BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY-----/i,
|
|
54
54
|
severity: 'high',
|
|
55
55
|
},
|
|
56
56
|
// Passwords
|
|
@@ -107,14 +107,19 @@ export function scanFileForSecrets(filePath, content) {
|
|
|
107
107
|
pattern.lastIndex = 0;
|
|
108
108
|
const match = pattern.exec(line);
|
|
109
109
|
if (match) {
|
|
110
|
+
const matchIndex = match.index;
|
|
111
|
+
const matchedText = match[0];
|
|
112
|
+
if (typeof matchIndex !== 'number' || matchIndex < 0 || !matchedText) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
110
115
|
// Extract snippet (first 100 chars around match)
|
|
111
|
-
const matchStart = Math.max(0,
|
|
112
|
-
const matchEnd = Math.min(line.length,
|
|
116
|
+
const matchStart = Math.max(0, matchIndex - 20);
|
|
117
|
+
const matchEnd = Math.min(line.length, matchIndex + matchedText.length + 20);
|
|
113
118
|
const snippet = line.slice(matchStart, matchEnd).trim();
|
|
114
119
|
matches.push({
|
|
115
120
|
file: filePath,
|
|
116
121
|
line: lineIndex + 1,
|
|
117
|
-
column:
|
|
122
|
+
column: matchIndex + 1,
|
|
118
123
|
type: name,
|
|
119
124
|
snippet,
|
|
120
125
|
severity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secretDetector.js","sourceRoot":"","sources":["../../src/utils/secretDetector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;GAIG;AACH,MAAM,eAAe,GAAG,IAAI,CAAC;AAW7B;;GAEG;AACH,MAAM,eAAe,GAIhB;IACH,WAAW;IACX;QACE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,qEAAqE;QAC9E,QAAQ,EAAE,MAAM;KACjB;IACD,kBAAkB;IAClB;QACE,IAAI,EAAE,gBAAgB;QACtB,qEAAqE;QACrE,oDAAoD;QACpD,OAAO,EAAE,CAAC,GAAG,EAAE;YACb,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9B,OAAO,IAAI,MAAM,CAAC,KAAK,GAAG,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"secretDetector.js","sourceRoot":"","sources":["../../src/utils/secretDetector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "logicstamp-context",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.5",
|
|
4
4
|
"description": "The context compiler for TypeScript. Compile your codebase into deterministic architectural contracts and dependency graphs for AI coding workflows.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|