orcommit 1.2.17 β 1.2.19
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 +51 -4
- package/dist/cli.d.ts +4 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +51 -12
- package/dist/cli.js.map +1 -1
- package/dist/modules/api.d.ts +1 -0
- package/dist/modules/api.d.ts.map +1 -1
- package/dist/modules/api.js +5 -0
- package/dist/modules/api.js.map +1 -1
- package/dist/modules/auto-updater.d.ts +19 -17
- package/dist/modules/auto-updater.d.ts.map +1 -1
- package/dist/modules/auto-updater.js +23 -78
- package/dist/modules/auto-updater.js.map +1 -1
- package/dist/modules/cache.d.ts +10 -3
- package/dist/modules/cache.d.ts.map +1 -1
- package/dist/modules/cache.js +15 -6
- package/dist/modules/cache.js.map +1 -1
- package/dist/modules/core.d.ts +9 -4
- package/dist/modules/core.d.ts.map +1 -1
- package/dist/modules/core.js +120 -110
- package/dist/modules/core.js.map +1 -1
- package/dist/modules/doctor.d.ts +28 -0
- package/dist/modules/doctor.d.ts.map +1 -0
- package/dist/modules/doctor.js +202 -0
- package/dist/modules/doctor.js.map +1 -0
- package/dist/modules/git.d.ts +6 -0
- package/dist/modules/git.d.ts.map +1 -1
- package/dist/modules/git.js +22 -0
- package/dist/modules/git.js.map +1 -1
- package/dist/types/index.d.ts +6 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +3 -1
- package/dist/types/index.js.map +1 -1
- package/dist/utils/formatting.d.ts +14 -0
- package/dist/utils/formatting.d.ts.map +1 -1
- package/dist/utils/formatting.js +35 -0
- package/dist/utils/formatting.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -44,12 +44,19 @@ If you care about **clean history, security, and standards** β this tool is fo
|
|
|
44
44
|
|
|
45
45
|
### π€ AI Providers
|
|
46
46
|
|
|
47
|
-
*
|
|
48
|
-
*
|
|
47
|
+
* OpenRouter (200+ models β Gemini, Claude, GPT, and more)
|
|
48
|
+
* OpenAI (GPTβ4o, GPTβ4oβmini)
|
|
49
49
|
* Local models via **Ollama** (offline & private)
|
|
50
50
|
|
|
51
|
+
Sensible defaults out of the box: `google/gemini-2.0-flash-lite-001` on OpenRouter
|
|
52
|
+
(cheap, fast, great structured output) and `gpt-4o-mini` on OpenAI.
|
|
53
|
+
|
|
51
54
|
### π§ Smart Commit Generation
|
|
52
55
|
|
|
56
|
+
* **Schema-constrained output** β the model is forced to return valid structured
|
|
57
|
+
JSON (json_schema / constrained decoding), so responses don't need brittle parsing
|
|
58
|
+
* **Grounded in your diff** β messages describe only what the diff actually shows,
|
|
59
|
+
no invented or boilerplate changes
|
|
53
60
|
* Token-aware diff chunking (large repos supported)
|
|
54
61
|
* Interactive regeneration with feedback
|
|
55
62
|
* Custom prompts & project context
|
|
@@ -70,7 +77,7 @@ If you care about **clean history, security, and standards** β this tool is fo
|
|
|
70
77
|
|
|
71
78
|
### β‘ Fast & Reliable
|
|
72
79
|
|
|
73
|
-
*
|
|
80
|
+
* Per-repository memory + disk cache (no cross-project message bleed)
|
|
74
81
|
* Parallel API calls
|
|
75
82
|
* Strict TypeScript + comprehensive tests
|
|
76
83
|
|
|
@@ -88,6 +95,37 @@ orc commit
|
|
|
88
95
|
|
|
89
96
|
Thatβs it.
|
|
90
97
|
|
|
98
|
+
> **Don't use `sudo npm install -g`.** A root-owned global install creates files
|
|
99
|
+
> that break every later (non-sudo) update with `EACCES`. If `npm install -g`
|
|
100
|
+
> asks for elevated permissions, your npm prefix is system-owned β fix it once
|
|
101
|
+
> with a user-owned prefix (no sudo ever again):
|
|
102
|
+
>
|
|
103
|
+
> ```bash
|
|
104
|
+
> mkdir -p ~/.npm-global
|
|
105
|
+
> npm config set prefix ~/.npm-global
|
|
106
|
+
> echo 'export PATH="$HOME/.npm-global/bin:$PATH"' >> ~/.zshrc
|
|
107
|
+
> source ~/.zshrc
|
|
108
|
+
> ```
|
|
109
|
+
|
|
110
|
+
### Updating
|
|
111
|
+
|
|
112
|
+
```bash
|
|
113
|
+
npm install -g orcommit@latest
|
|
114
|
+
```
|
|
115
|
+
|
|
116
|
+
orc also tells you when a newer version is available. It never auto-installs and
|
|
117
|
+
never asks for sudo.
|
|
118
|
+
|
|
119
|
+
### Troubleshooting
|
|
120
|
+
|
|
121
|
+
If `orc` reports the wrong version, won't update, or you suspect duplicate
|
|
122
|
+
installs, run the built-in diagnostic β it inspects your npm prefix, every `orc`
|
|
123
|
+
on your `PATH`, and the installed-vs-latest version, then prints exact fixes:
|
|
124
|
+
|
|
125
|
+
```bash
|
|
126
|
+
orc doctor
|
|
127
|
+
```
|
|
128
|
+
|
|
91
129
|
---
|
|
92
130
|
|
|
93
131
|
## π Common Commands
|
|
@@ -99,6 +137,7 @@ orc commit --context "..." # extra context
|
|
|
99
137
|
orc commit --emoji # gitmoji
|
|
100
138
|
orc commit --breaking # breaking change
|
|
101
139
|
orc commit --dry-run # preview only
|
|
140
|
+
orc doctor # diagnose install / PATH / update issues
|
|
102
141
|
```
|
|
103
142
|
|
|
104
143
|
π [Full CLI reference](https://github.com/markolofsen/openrouter-commit/blob/main/docs/cli.md)
|
|
@@ -133,14 +172,22 @@ Config is stored at `~/.config/orcommit.json` (permissions `600`).
|
|
|
133
172
|
|
|
134
173
|
```json
|
|
135
174
|
{
|
|
175
|
+
"providers": {
|
|
176
|
+
"openrouter": {
|
|
177
|
+
"model": "google/gemini-2.0-flash-lite-001"
|
|
178
|
+
}
|
|
179
|
+
},
|
|
136
180
|
"preferences": {
|
|
137
181
|
"defaultProvider": "openrouter",
|
|
138
182
|
"commitFormat": "conventional",
|
|
139
|
-
"temperature": 0.
|
|
183
|
+
"temperature": 0.3
|
|
140
184
|
}
|
|
141
185
|
}
|
|
142
186
|
```
|
|
143
187
|
|
|
188
|
+
> A low `temperature` (default `0.3`) keeps messages grounded in the actual diff
|
|
189
|
+
> and avoids drifting into generic, memorized phrasings.
|
|
190
|
+
|
|
144
191
|
Environment variables are also supported:
|
|
145
192
|
|
|
146
193
|
```bash
|
package/dist/cli.d.ts
CHANGED
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAiBA;;GAEG;AACH,cAAM,cAAc;IAClB,OAAO,CAAC,OAAO,CAAU;;IAQzB;;OAEG;IACH,OAAO,CAAC,aAAa;IAoJrB;;OAEG;YACW,mBAAmB;IAwBjC;;OAEG;YACW,eAAe;IAgB7B;;OAEG;YACW,eAAe;IA0C7B;;OAEG;YACW,iBAAiB;IAgB/B;;OAEG;YACW,kBAAkB;IAkBhC;;OAEG;YACW,iBAAiB;IA+B/B;;OAEG;YACW,mBAAmB;IAYjC;;OAEG;YACW,eAAe;IAQ7B;;OAEG;YACW,gBAAgB;IAmB9B;;OAEG;YACW,gBAAgB;IAc9B;;OAEG;YACW,kBAAkB;IAchC;;OAEG;YACW,eAAe;IAgB7B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAOxB;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqC3B;AASD,OAAO,EAAE,cAAc,EAAE,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -5,6 +5,7 @@ import { coreOrchestrator } from './modules/core.js';
|
|
|
5
5
|
import { configManager } from './modules/config.js';
|
|
6
6
|
import { logger } from './modules/logger.js';
|
|
7
7
|
import { AutoUpdater } from './modules/auto-updater.js';
|
|
8
|
+
import { Doctor } from './modules/doctor.js';
|
|
8
9
|
// Import package.json for version and update checking
|
|
9
10
|
import { createRequire } from 'module';
|
|
10
11
|
const require = createRequire(import.meta.url);
|
|
@@ -36,7 +37,8 @@ class CliApplication {
|
|
|
36
37
|
.option('-t, --type <type>', 'Specify commit type', this.validateCommitType)
|
|
37
38
|
.option('-b, --breaking', 'Mark as breaking change', false)
|
|
38
39
|
.option('-d, --dry-run', 'Generate message without creating commit', false)
|
|
39
|
-
|
|
40
|
+
// NOTE: no -v short flag here β -v is reserved program-wide for --version.
|
|
41
|
+
.option('--verbose', 'Enable verbose logging', false)
|
|
40
42
|
.option('-w, --watch', 'Watch for changes and auto-generate commits', false)
|
|
41
43
|
.option('-p, --provider <provider>', 'Specify AI provider (openrouter|openai)', this.validateProvider)
|
|
42
44
|
// Extended formatting options
|
|
@@ -124,6 +126,12 @@ class CliApplication {
|
|
|
124
126
|
.action(async (provider) => {
|
|
125
127
|
await this.handleTestCommand(provider);
|
|
126
128
|
});
|
|
129
|
+
this.program
|
|
130
|
+
.command('doctor')
|
|
131
|
+
.description('Diagnose installation, PATH, and update issues')
|
|
132
|
+
.action(async () => {
|
|
133
|
+
await this.handleDoctorCommand();
|
|
134
|
+
});
|
|
127
135
|
// Global options
|
|
128
136
|
this.program
|
|
129
137
|
.option('--no-color', 'Disable colored output')
|
|
@@ -294,6 +302,21 @@ class CliApplication {
|
|
|
294
302
|
process.exit(1);
|
|
295
303
|
}
|
|
296
304
|
}
|
|
305
|
+
/**
|
|
306
|
+
* Diagnose installation / PATH / update issues and print fixes.
|
|
307
|
+
*/
|
|
308
|
+
async handleDoctorCommand() {
|
|
309
|
+
try {
|
|
310
|
+
const doctor = new Doctor(packageJson.version);
|
|
311
|
+
const report = await doctor.run();
|
|
312
|
+
Doctor.print(report);
|
|
313
|
+
process.exit(report.hasProblems ? 1 : 0);
|
|
314
|
+
}
|
|
315
|
+
catch (error) {
|
|
316
|
+
logger.error('Doctor failed', error);
|
|
317
|
+
process.exit(1);
|
|
318
|
+
}
|
|
319
|
+
}
|
|
297
320
|
/**
|
|
298
321
|
* Handle watch mode
|
|
299
322
|
*/
|
|
@@ -359,9 +382,9 @@ class CliApplication {
|
|
|
359
382
|
async checkForUpdates() {
|
|
360
383
|
try {
|
|
361
384
|
const autoUpdater = new AutoUpdater(packageJson);
|
|
362
|
-
//
|
|
363
|
-
//
|
|
364
|
-
autoUpdater.
|
|
385
|
+
// Notification-only (non-blocking). Never auto-installs and never
|
|
386
|
+
// suggests sudo β see AutoUpdater.notifyIfUpdateAvailable for rationale.
|
|
387
|
+
autoUpdater.notifyIfUpdateAvailable().catch(() => {
|
|
365
388
|
// Silent failure - don't interrupt user workflow
|
|
366
389
|
});
|
|
367
390
|
}
|
|
@@ -406,20 +429,36 @@ class CliApplication {
|
|
|
406
429
|
await this.program.parseAsync(process.argv);
|
|
407
430
|
}
|
|
408
431
|
catch (error) {
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
432
|
+
// With program.exitOverride(), commander throws a CommanderError instead
|
|
433
|
+
// of calling process.exit(). Several of its codes are NORMAL outcomes β
|
|
434
|
+
// printing --version or --help, or an empty invocation β and must exit 0,
|
|
435
|
+
// not be reported as a "CLI error". Previously only the help path was
|
|
436
|
+
// handled, so `orc -v` printed the version and then died with exit 1 and
|
|
437
|
+
// a spurious "β CLI error" line.
|
|
438
|
+
const commanderError = error;
|
|
439
|
+
const cleanExitCodes = new Set([
|
|
440
|
+
'commander.version',
|
|
441
|
+
'commander.helpDisplayed',
|
|
442
|
+
'commander.help',
|
|
443
|
+
'commander.missingArgument', // commander already printed a usage message
|
|
444
|
+
]);
|
|
445
|
+
if (commanderError && typeof commanderError.code === 'string') {
|
|
446
|
+
if (cleanExitCodes.has(commanderError.code)) {
|
|
447
|
+
process.exit(commanderError.exitCode ?? 0);
|
|
413
448
|
}
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
449
|
+
// Other commander.* errors (e.g. unknown option) already printed a
|
|
450
|
+
// helpful message via configureOutput; exit with its code, no stack.
|
|
451
|
+
if (commanderError.code.startsWith('commander.')) {
|
|
452
|
+
process.exit(commanderError.exitCode ?? 1);
|
|
417
453
|
}
|
|
418
454
|
}
|
|
455
|
+
if (error instanceof Error) {
|
|
456
|
+
logger.error('CLI error', error);
|
|
457
|
+
}
|
|
419
458
|
else {
|
|
420
459
|
logger.error('Unknown CLI error');
|
|
421
|
-
process.exit(1);
|
|
422
460
|
}
|
|
461
|
+
process.exit(1);
|
|
423
462
|
}
|
|
424
463
|
}
|
|
425
464
|
}
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/modules/api.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/modules/api.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAIV,gBAAgB,EAGhB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAG3B,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IACjE,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,WAAW,GAAE,MAA6C;IAWtE;;OAEG;IACH,kBAAkB,CAAC,QAAQ,EAAE,YAAY,GAAG,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IA+C3E;;OAEG;IACG,qBAAqB,CACzB,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,YAAY,GAAG,QAAQ,GAChC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAuDpC;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,MAAM,EAAE,EAChB,WAAW,EAAE;QAAE,QAAQ,EAAE,YAAY,GAAG,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/modules/api.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAIV,gBAAgB,EAGhB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAG3B,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IACjE,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,WAAW,GAAE,MAA6C;IAWtE;;OAEG;IACH,kBAAkB,CAAC,QAAQ,EAAE,YAAY,GAAG,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IA+C3E;;OAEG;IACG,qBAAqB,CACzB,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,YAAY,GAAG,QAAQ,GAChC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAuDpC;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,MAAM,EAAE,EAChB,WAAW,EAAE;QAAE,QAAQ,EAAE,YAAY,GAAG,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EACzK,QAAQ,EAAE,YAAY,GAAG,QAAQ,GAChC,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;IAmDtC;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBzE;;OAEG;IACH,cAAc,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE;IAQtE;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YASjB,WAAW;IAuEzB,OAAO,CAAC,aAAa;IAgDrB,OAAO,CAAC,oBAAoB;IAsD5B,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,qBAAqB;CAU9B;AAGD,eAAO,MAAM,UAAU,YAAmB,CAAC"}
|
package/dist/modules/api.js
CHANGED
|
@@ -117,6 +117,7 @@ export class ApiManager {
|
|
|
117
117
|
{ role: 'system', content: baseRequest.systemPrompt },
|
|
118
118
|
{ role: 'user', content: chunk }
|
|
119
119
|
],
|
|
120
|
+
responseFormat: baseRequest.responseFormat,
|
|
120
121
|
}, provider));
|
|
121
122
|
const results = await Promise.allSettled(promises);
|
|
122
123
|
const successfulResults = [];
|
|
@@ -205,6 +206,10 @@ export class ApiManager {
|
|
|
205
206
|
temperature: request.temperature,
|
|
206
207
|
stream: request.stream ?? false,
|
|
207
208
|
};
|
|
209
|
+
// Constrained decoding when a structured schema is requested.
|
|
210
|
+
if (request.responseFormat) {
|
|
211
|
+
payload.response_format = request.responseFormat;
|
|
212
|
+
}
|
|
208
213
|
const config = {
|
|
209
214
|
timeout: 60000,
|
|
210
215
|
};
|
package/dist/modules/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/modules/api.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/modules/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwD,MAAM,OAAO,CAAC;AAC7E,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,EAGL,QAAQ,EACR,YAAY,EAEZ,YAAY,EACZ,YAAY,EAEb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,OAAO,UAAU;IACJ,KAAK,CAAS;IACd,OAAO,GAA+B,IAAI,GAAG,EAAE,CAAC;IACzD,MAAM,CAAU;IAExB,YAAY,cAAsB,YAAY,CAAC,uBAAuB;QACpE,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC;YACtB,WAAW;YACX,QAAQ,EAAE,IAAI,EAAE,WAAW;YAC3B,WAAW,EAAE,WAAW,GAAG,CAAC,EAAE,uBAAuB;SACtD,CAAC,CAAC;QAEH,2BAA2B;QAC3B,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,QAAiC,EAAE,MAAc;QAClE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,6BAA6B;QACnD,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,IAAI,QAAQ,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YAC1B,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,OAAO,EAAE,cAAc,CAAC,OAAO,IAAI,KAAK;YACxC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,eAAe,EAAE,UAAU,cAAc,CAAC,MAAM,EAAE;gBAClD,YAAY,EAAE,gBAAgB;gBAC9B,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI;oBAC/B,cAAc,EAAE,kDAAkD;oBAClE,SAAS,EAAE,uBAAuB;iBACnC,CAAC;aACH;SACF,CAAC,CAAC;QAEH,wBAAwB;QACxB,UAAU,CAAC,MAAM,EAAE;YACjB,OAAO,EAAE,YAAY,CAAC,WAAW;YACjC,UAAU,EAAE,UAAU,CAAC,gBAAgB;YACvC,cAAc,EAAE,CAAC,KAAiB,EAAE,EAAE;gBACpC,OAAO,UAAU,CAAC,iCAAiC,CAAC,KAAK,CAAC;oBACnD,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG;oBAC9B,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;YAChF,CAAC;YACD,kBAAkB,EAAE,IAAI;YACxB,OAAO,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;gBAC7B,MAAM,CAAC,IAAI,CAAC,iBAAiB,UAAU,QAAQ,QAAQ,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/E,CAAC;SACF,CAAC,CAAC;QAEH,qDAAqD;QACrD,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAC9B,QAAQ,CAAC,EAAE,CAAC,QAAQ,EACpB,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAC9C,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,eAAe,QAAQ,SAAS,EAAE,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC;IACtF,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CACzB,OAAmB,EACnB,QAAiC;QAEjC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,IAAuC,EAAE;YAClE,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,IAAI,QAAQ,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAC;gBAC/D,CAAC;gBAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,QAAQ,EAAE,EAAE;oBAC7C,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;oBACrC,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC7B,CAAC,CAAC;gBAEH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACnE,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAEpE,MAAM,CAAC,KAAK,CAAC,0BAA0B,QAAQ,EAAE,EAAE;oBACjD,aAAa,EAAE,aAAa,CAAC,MAAM;oBACnC,KAAK,EAAE,QAAQ,CAAC,KAAK;iBACtB,CAAC,CAAC;gBAEH,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,aAAa;iBACpB,CAAC;YAEJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,0BAA0B,QAAQ,EAAE,EAAE,KAAc,CAAC,CAAC;gBAEnE,iDAAiD;gBACjD,MAAM,QAAQ,GAAG,KAAK,YAAY,QAAQ,IAAI,KAAK,YAAY,YAAY;oBACzE,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,IAAI,QAAQ,CACV,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,EAC5D,SAAS,EACT,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC3C,CAAC;gBAEN,IAAI,QAAQ,YAAY,QAAQ,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;oBACzD,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,QAAQ;wBACf,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC;qBAC1D,CAAC;gBACJ,CAAC;gBAED,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,QAAQ;iBAChB,CAAC;YACJ,CAAC;QACH,CAAC,CAAsC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CACjB,MAAgB,EAChB,WAAyK,EACzK,QAAiC;QAEjC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAClC,IAAI,CAAC,qBAAqB,CAAC;gBACzB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,WAAW,EAAE,WAAW,CAAC,WAAW;gBACpC,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,YAAY,EAAE;oBACrD,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE;iBACjC;gBACD,cAAc,EAAE,WAAW,CAAC,cAAc;aAC3C,EAAE,QAAQ,CAAC,CACb,CAAC;YAEF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,iBAAiB,GAAa,EAAE,CAAC;YACvC,MAAM,MAAM,GAAe,EAAE,CAAC;YAE9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBAC/E,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC5C,CAAC;qBAAM,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;oBAC/D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;gBAC3G,CAAC;qBAAM,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;oBACxC,MAAM,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,kBAAkB,EAAE,SAAS,EAAE,MAAM,CAAC,MAAe,CAAC,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;YAED,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnC,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,IAAI,QAAQ,CAAC,gCAAgC,MAAM,CAAC,MAAM,mBAAmB,CAAC;iBACtF,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,iBAAiB;aACxB,CAAC;QAEJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;oBACxE,IAAI,QAAQ,CAAC,gCAAgC,CAAC;aACtD,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,QAAiC;QACpD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,QAAQ,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAC;YAC/D,CAAC;YAED,MAAM,WAAW,GAAe;gBAC9B,QAAQ;gBACR,KAAK,EAAE,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,eAAe;gBAC3E,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC7C,SAAS,EAAE,EAAE;gBACb,WAAW,EAAE,GAAG;aACjB,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACvE,OAAO,MAAM,CAAC,OAAO,CAAC;QAExB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,8BAA8B,QAAQ,EAAE,EAAE,KAAc,CAAC,CAAC;YACvE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;YAC3B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACrB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;SAC9B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACZ,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAC/C,CAAC;IAED,kBAAkB;IAEV,KAAK,CAAC,WAAW,CACvB,MAAqB,EACrB,OAAmB,EACnB,QAAiC,EACjC,aAAqB,CAAC;QAEtB,MAAM,QAAQ,GAAG,mBAAmB,CAAC;QACrC,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,oCAAoC;QAE1D,MAAM,OAAO,GAA4B;YACvC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;SAChC,CAAC;QAEF,8DAA8D;QAC9D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;QACnD,CAAC;QAED,MAAM,MAAM,GAAuB;YACjC,OAAO,EAAE,KAAK;SACf,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE,CAAC;gBACjC,MAAM,KAAK,CAAC;YACd,CAAC;YAED,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAExC,wEAAwE;YACxE,MAAM,YAAY,GAChB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBAC1C,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YAE/C,yEAAyE;YACzE,MAAM,eAAe,GACnB,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAC1B,GAAG,CAAC,QAAQ,CAAC,yBAAyB,CAAC;gBACvC,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC;gBACnC,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC;gBACjC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAC1B,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACxB,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAE5B,IAAI,YAAY,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;gBACnC,wCAAwC;gBACxC,MAAM,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC7C,MAAM,CAAC,IAAI,CAAC,SAAS,UAAU,GAAG,CAAC,UAAU,QAAQ,KAAK,KAAK,CAAC,OAAO,KAAK,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC;gBAC9F,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;gBACzD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,eAAe,IAAI,UAAU,GAAG,UAAU,EAAE,CAAC;gBAC/C,+CAA+C;gBAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC;gBACxD,MAAM,CAAC,IAAI,CAAC,SAAS,UAAU,GAAG,CAAC,IAAI,UAAU,QAAQ,QAAQ,KAAK,KAAK,CAAC,OAAO,KAAK,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC;gBAC1G,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;gBACzD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;YACrE,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,IAAS,EAAE,QAAiC;QAChE,6BAA6B;QAC7B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;gBAC7C,CAAC,CAAC,IAAI,CAAC,KAAK;gBACZ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,mBAAmB,CAAC,CAAC;YAChD,MAAM,IAAI,QAAQ,CAAC,GAAG,QAAQ,eAAe,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,yDAAyD;QACzD,IAAI,OAA2B,CAAC;QAChC,IAAI,MAAW,CAAC;QAChB,IAAI,YAAY,GAAG,SAAS,CAAC;QAE7B,iEAAiE;QACjE,IAAI,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3E,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC;YACjD,YAAY,GAAG,MAAM,CAAC,aAAa,IAAI,SAAS,CAAC;QACnD,CAAC;QACD,oDAAoD;aAC/C,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACpD,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC;YACrD,YAAY,GAAG,IAAI,CAAC,aAAa,IAAI,UAAU,CAAC;QAClD,CAAC;QACD,qCAAqC;aAChC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,GAAG,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YACjF,YAAY,GAAG,IAAI,CAAC,aAAa,IAAI,UAAU,CAAC;QAClD,CAAC;QAED,yCAAyC;QACzC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3E,MAAM,IAAI,QAAQ,CAAC,gCAAgC,QAAQ,oBAAoB,CAAC,CAAC;QACnF,CAAC;QAED,OAAO;YACL,OAAO;YACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBAClB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC;gBAC3C,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC;gBACnD,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC;aAC1C,CAAC,CAAC,CAAC,SAAS;YACb,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;YAC9B,YAAY;SACb,CAAC;IACJ,CAAC;IAEO,oBAAoB,CAAC,QAAqB,EAAE,QAAgB;QAClE,IAAI,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAEtC,wCAAwC;QACxC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,yBAAyB;QACnE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,6BAA6B;QAC3E,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAEzB,yDAAyD;QACzD,MAAM,cAAc,GAAG;YACrB,sBAAsB;YACtB,8BAA8B;YAC9B,kCAAkC;YAClC,6BAA6B;YAC7B,wBAAwB;YACxB,cAAc;SACf,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,CAAC;YACrC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,mCAAmC;QACnC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAElD,8DAA8D;QAC9D,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAE1C,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAEzB,wBAAwB;QACxB,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,QAAQ,CAAC,2CAA2C,QAAQ,MAAM,OAAO,GAAG,CAAC,CAAC;QAC1F,CAAC;QAED,sEAAsE;QACtE,iEAAiE;QACjE,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,eAAe,CAAC;QAC3D,IAAI,SAAS,IAAI,SAAS,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YAC7D,mEAAmE;YACnE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;gBAC/B,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;YACxD,CAAC;iBAAM,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;gBACtC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;YACxD,CAAC;YACD,yBAAyB;YACzB,MAAM,CAAC,KAAK,CAAC,kCAAkC,SAAS,uCAAuC,CAAC,CAAC;QACnG,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,cAAc,CAAC,KAAiB,EAAE,QAAgB;QACxD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,sBAAsB;YACtB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAW,CAAC;YAExC,IAAI,OAAO,GAAG,GAAG,QAAQ,eAAe,MAAM,GAAG,CAAC;YAClD,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;gBACzB,OAAO,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACvC,CAAC;iBAAM,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;gBACzB,OAAO,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,CAAC;YAED,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YACzB,gBAAgB;YAChB,MAAM,IAAI,YAAY,CAAC,oCAAoC,QAAQ,KAAK,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;QAClG,CAAC;aAAM,CAAC;YACN,cAAc;YACd,MAAM,IAAI,QAAQ,CAAC,2BAA2B,QAAQ,KAAK,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAChG,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,UAAmB;QAC7C,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,4BAA4B;QAClE,CAAC;QACD,OAAO,YAAY,CAAC,UAAU,CAAC;IACjC,CAAC;IAEO,qBAAqB;QAC3B,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;YAChD,MAAM,CAAC,IAAI,CAAC,YAAY,MAAM,+BAA+B,CAAC,CAAC;YAC/D,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3D,CAAC;CACF;AAED,qBAAqB;AACrB,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC"}
|
|
@@ -16,23 +16,25 @@ export declare class AutoUpdater {
|
|
|
16
16
|
*/
|
|
17
17
|
checkForUpdates(): Promise<UpdateCheckResult>;
|
|
18
18
|
/**
|
|
19
|
-
*
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
*
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
*
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
*
|
|
19
|
+
* Check for updates and, if one exists, print a single non-intrusive
|
|
20
|
+
* notification line. NEVER installs anything automatically.
|
|
21
|
+
*
|
|
22
|
+
* Rationale: the previous implementation silently ran `npm install -g` behind
|
|
23
|
+
* the user's back when it had write access, and recommended `sudo npm i -g`
|
|
24
|
+
* when it didn't. The sudo path is actively harmful β it creates root-owned
|
|
25
|
+
* files under the global prefix that then break every future non-sudo
|
|
26
|
+
* install (exactly the EACCES trap users hit). Updating the user's binary
|
|
27
|
+
* without consent is also surprising. So this is now notification-only, and
|
|
28
|
+
* the suggested command never contains sudo.
|
|
29
|
+
*/
|
|
30
|
+
notifyIfUpdateAvailable(): Promise<boolean>;
|
|
31
|
+
/**
|
|
32
|
+
* Show update notification to user.
|
|
33
|
+
*
|
|
34
|
+
* The suggested command intentionally NEVER uses sudo: a sudo global install
|
|
35
|
+
* creates root-owned files that break later non-sudo installs. If the user's
|
|
36
|
+
* setup genuinely needs elevated rights, that's a sign the global prefix is
|
|
37
|
+
* misconfigured β `orc doctor` diagnoses and explains how to fix it properly.
|
|
36
38
|
*/
|
|
37
39
|
private showUpdateNotification;
|
|
38
40
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-updater.d.ts","sourceRoot":"","sources":["../../src/modules/auto-updater.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auto-updater.d.ts","sourceRoot":"","sources":["../../src/modules/auto-updater.ts"],"names":[],"mappings":"AAGA,OAAuB,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1D,UAAU,iBAAiB;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB;AAQD,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;IACtD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;gBAE1B,WAAW,EAAE,OAAO;IAMhC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAuDnD;;;;;;;;;;;OAWG;IACG,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC;IAuBjD;;;;;;;OAOG;IACH,OAAO,CAAC,sBAAsB;IAQ9B;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;OAEG;YACW,SAAS;IAUvB;;OAEG;YACW,SAAS;IAUvB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAOlC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { promises as fs } from 'fs';
|
|
2
2
|
import { join } from 'path';
|
|
3
3
|
import { homedir } from 'os';
|
|
4
|
-
import { execSync } from 'child_process';
|
|
5
4
|
import updateNotifier from 'update-notifier';
|
|
6
5
|
import chalk from 'chalk';
|
|
7
6
|
import { logger } from './logger.js';
|
|
@@ -67,9 +66,18 @@ export class AutoUpdater {
|
|
|
67
66
|
}
|
|
68
67
|
}
|
|
69
68
|
/**
|
|
70
|
-
*
|
|
69
|
+
* Check for updates and, if one exists, print a single non-intrusive
|
|
70
|
+
* notification line. NEVER installs anything automatically.
|
|
71
|
+
*
|
|
72
|
+
* Rationale: the previous implementation silently ran `npm install -g` behind
|
|
73
|
+
* the user's back when it had write access, and recommended `sudo npm i -g`
|
|
74
|
+
* when it didn't. The sudo path is actively harmful β it creates root-owned
|
|
75
|
+
* files under the global prefix that then break every future non-sudo
|
|
76
|
+
* install (exactly the EACCES trap users hit). Updating the user's binary
|
|
77
|
+
* without consent is also surprising. So this is now notification-only, and
|
|
78
|
+
* the suggested command never contains sudo.
|
|
71
79
|
*/
|
|
72
|
-
async
|
|
80
|
+
async notifyIfUpdateAvailable() {
|
|
73
81
|
try {
|
|
74
82
|
const checkResult = await this.checkForUpdates();
|
|
75
83
|
if (!checkResult.hasUpdate || !checkResult.latestVersion) {
|
|
@@ -78,93 +86,30 @@ export class AutoUpdater {
|
|
|
78
86
|
}
|
|
79
87
|
logger.debug('Update available', {
|
|
80
88
|
current: checkResult.currentVersion,
|
|
81
|
-
latest: checkResult.latestVersion
|
|
89
|
+
latest: checkResult.latestVersion,
|
|
82
90
|
});
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
if (canUpdateGlobally) {
|
|
86
|
-
// Update globally
|
|
87
|
-
await this.updateGlobally();
|
|
88
|
-
return true;
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
// Show update notification with instructions
|
|
92
|
-
this.showUpdateNotification(checkResult.latestVersion);
|
|
93
|
-
return false;
|
|
94
|
-
}
|
|
91
|
+
this.showUpdateNotification(checkResult.latestVersion);
|
|
92
|
+
return true;
|
|
95
93
|
}
|
|
96
94
|
catch (error) {
|
|
97
95
|
// Silent failure - don't interrupt user workflow
|
|
98
|
-
logger.debug('
|
|
99
|
-
return false;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
/**
|
|
103
|
-
* Check if current process can update globally (has write access to global node_modules)
|
|
104
|
-
*/
|
|
105
|
-
async checkGlobalUpdatePermission() {
|
|
106
|
-
try {
|
|
107
|
-
// Get global npm prefix
|
|
108
|
-
const prefix = execSync('npm config get prefix', {
|
|
109
|
-
encoding: 'utf-8',
|
|
110
|
-
stdio: ['pipe', 'pipe', 'ignore']
|
|
111
|
-
}).trim();
|
|
112
|
-
const globalModules = join(prefix, 'lib', 'node_modules');
|
|
113
|
-
// Try to access with write permission
|
|
114
|
-
await fs.access(globalModules, fs.constants.W_OK);
|
|
115
|
-
return true;
|
|
116
|
-
}
|
|
117
|
-
catch {
|
|
96
|
+
logger.debug('Update notification failed', error);
|
|
118
97
|
return false;
|
|
119
98
|
}
|
|
120
99
|
}
|
|
121
100
|
/**
|
|
122
|
-
*
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
const packageManager = await this.detectPackageManager();
|
|
129
|
-
const command = packageManager === 'pnpm'
|
|
130
|
-
? 'pnpm add -g orcommit@latest'
|
|
131
|
-
: 'npm install -g orcommit@latest';
|
|
132
|
-
execSync(command, {
|
|
133
|
-
stdio: ['ignore', 'pipe', 'pipe'],
|
|
134
|
-
encoding: 'utf-8'
|
|
135
|
-
});
|
|
136
|
-
logger.info('Successfully updated orcommit!');
|
|
137
|
-
}
|
|
138
|
-
catch (error) {
|
|
139
|
-
throw new Error(`Global update failed: ${error.message}`);
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
/**
|
|
143
|
-
* Detect package manager (npm or pnpm)
|
|
144
|
-
*/
|
|
145
|
-
async detectPackageManager() {
|
|
146
|
-
try {
|
|
147
|
-
execSync('pnpm --version', { stdio: 'ignore' });
|
|
148
|
-
return 'pnpm';
|
|
149
|
-
}
|
|
150
|
-
catch {
|
|
151
|
-
return 'npm';
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
/**
|
|
155
|
-
* Show update notification to user
|
|
101
|
+
* Show update notification to user.
|
|
102
|
+
*
|
|
103
|
+
* The suggested command intentionally NEVER uses sudo: a sudo global install
|
|
104
|
+
* creates root-owned files that break later non-sudo installs. If the user's
|
|
105
|
+
* setup genuinely needs elevated rights, that's a sign the global prefix is
|
|
106
|
+
* misconfigured β `orc doctor` diagnoses and explains how to fix it properly.
|
|
156
107
|
*/
|
|
157
108
|
showUpdateNotification(latestVersion) {
|
|
158
|
-
const canUseSudo = process.platform !== 'win32';
|
|
159
|
-
const packageManager = 'npm'; // Default to npm for instructions
|
|
160
109
|
console.log('');
|
|
161
110
|
logger.info(`Update available: ${this.packageJson.version} β ${latestVersion}`);
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
}
|
|
165
|
-
else {
|
|
166
|
-
console.log(` Run: ${chalk.cyan(`${packageManager} install -g orcommit@latest`)}`);
|
|
167
|
-
}
|
|
111
|
+
console.log(` Run: ${chalk.cyan('npm install -g orcommit@latest')}`);
|
|
112
|
+
console.log(` ${chalk.gray('Permission error? Run')} ${chalk.cyan('orc doctor')} ${chalk.gray('for a fix.')}`);
|
|
168
113
|
console.log('');
|
|
169
114
|
}
|
|
170
115
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-updater.js","sourceRoot":"","sources":["../../src/modules/auto-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"auto-updater.js","sourceRoot":"","sources":["../../src/modules/auto-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,cAA2B,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAerC,MAAM,OAAO,WAAW;IACL,QAAQ,CAAS;IACjB,SAAS,CAAS;IAClB,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW;IACjD,WAAW,CAAU;IAEtC,YAAY,WAAoB;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEvB,uCAAuC;YACvC,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrE,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE;oBACxC,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;oBACpC,aAAa,EAAE,KAAK,CAAC,aAAa;iBACnC,CAAC,CAAC;gBAEH,OAAO;oBACL,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC3G,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO;oBACxC,aAAa,EAAE,KAAK,CAAC,aAAa;oBAClC,WAAW,EAAE,KAAK,CAAC,SAAS;iBAC7B,CAAC;YACJ,CAAC;YAED,sBAAsB;YACtB,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,cAAc,CAAC;gBAC9B,GAAG,EAAE,IAAI,CAAC,WAAW;gBACrB,mBAAmB,EAAE,CAAC,EAAE,cAAc;aACvC,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC;YAChD,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAE9C,eAAe;YACf,MAAM,IAAI,CAAC,SAAS,CAAC;gBACnB,SAAS,EAAE,GAAG;gBACd,aAAa;gBACb,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;aAC3C,CAAC,CAAC;YAEH,OAAO;gBACL,SAAS;gBACT,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO;gBACxC,aAAa;gBACb,WAAW,EAAE,GAAG;aACjB,CAAC;QAEJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAc,CAAC,CAAC;YACpD,+BAA+B;YAC/B,OAAO;gBACL,SAAS,EAAE,KAAK;gBAChB,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO;gBACxC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;aACxB,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,uBAAuB;QAC3B,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAEjD,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;gBACzD,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACpC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE;gBAC/B,OAAO,EAAE,WAAW,CAAC,cAAc;gBACnC,MAAM,EAAE,WAAW,CAAC,aAAa;aAClC,CAAC,CAAC;YAEH,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iDAAiD;YACjD,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAc,CAAC,CAAC;YAC3D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACK,sBAAsB,CAAC,aAAqB;QAClD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,WAAW,CAAC,OAAO,MAAM,aAAa,EAAE,CAAC,CAAC;QAChF,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAChH,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,MAAc,EAAE,OAAe;QACpD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpE,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEtE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAE/B,IAAI,CAAC,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;QAC1B,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,SAAS,CAAC,KAAkB;QACxC,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACnD,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,2CAA2C;YAC3C,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAc,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,+BAA+B;QACjC,CAAC;IACH,CAAC;CACF"}
|
package/dist/modules/cache.d.ts
CHANGED
|
@@ -16,17 +16,24 @@ export declare class CacheManager {
|
|
|
16
16
|
private memoryCache;
|
|
17
17
|
constructor(options?: CacheOptions);
|
|
18
18
|
/**
|
|
19
|
-
* Generate cache key from diff content and request parameters
|
|
19
|
+
* Generate cache key from diff content and request parameters.
|
|
20
|
+
*
|
|
21
|
+
* `scope` MUST identify the repository (and ideally branch) the diff came
|
|
22
|
+
* from. Without it, two unrelated projects whose trimmed diffs happen to
|
|
23
|
+
* hash identically would collide and serve each other's commit messages β
|
|
24
|
+
* the root cause of "why does my unrelated repo suggest a message from
|
|
25
|
+
* another project". The scope is mixed into the hash so cross-repo
|
|
26
|
+
* collisions are impossible.
|
|
20
27
|
*/
|
|
21
28
|
private generateCacheKey;
|
|
22
29
|
/**
|
|
23
30
|
* Get cached commit message if available and valid
|
|
24
31
|
*/
|
|
25
|
-
get(content: string, model: string, provider: string, temperature: number): Promise<string | null>;
|
|
32
|
+
get(content: string, model: string, provider: string, temperature: number, scope: string): Promise<string | null>;
|
|
26
33
|
/**
|
|
27
34
|
* Store commit message in cache
|
|
28
35
|
*/
|
|
29
|
-
set(content: string, model: string, provider: string, temperature: number, commitMessage: string): Promise<void>;
|
|
36
|
+
set(content: string, model: string, provider: string, temperature: number, commitMessage: string, scope: string): Promise<void>;
|
|
30
37
|
/**
|
|
31
38
|
* Check if cache entry is still valid
|
|
32
39
|
*/
|