wherever-dev 0.5.2 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/dist/commands/install.d.ts +15 -0
  2. package/dist/commands/install.d.ts.map +1 -0
  3. package/dist/commands/install.js +408 -0
  4. package/dist/commands/install.js.map +1 -0
  5. package/dist/index.js +121 -7
  6. package/dist/index.js.map +1 -1
  7. package/dist/protocol.d.ts +12 -2
  8. package/dist/protocol.d.ts.map +1 -1
  9. package/dist/session-pool.d.ts +27 -1
  10. package/dist/session-pool.d.ts.map +1 -1
  11. package/dist/session-pool.js +68 -7
  12. package/dist/session-pool.js.map +1 -1
  13. package/dist/session-types.d.ts +19 -0
  14. package/dist/session-types.d.ts.map +1 -1
  15. package/package.json +1 -1
  16. package/public/_app/immutable/assets/0.C2Vl85yD.css +1 -0
  17. package/public/_app/immutable/chunks/{C9hhIaEb.js → CknLe1TD.js} +2 -2
  18. package/public/_app/immutable/chunks/{C9hhIaEb.js.map → CknLe1TD.js.map} +1 -1
  19. package/public/_app/immutable/chunks/DCwWdFrO.js +2 -0
  20. package/public/_app/immutable/chunks/{-V_H8eog.js.map → DCwWdFrO.js.map} +1 -1
  21. package/public/_app/immutable/chunks/{ChI-IG5J.js → Og-aeqCF.js} +2 -2
  22. package/public/_app/immutable/chunks/{ChI-IG5J.js.map → Og-aeqCF.js.map} +1 -1
  23. package/public/_app/immutable/entry/{app.CZjVTNXF.js → app.C6EOUirZ.js} +3 -3
  24. package/public/_app/immutable/entry/{app.CZjVTNXF.js.map → app.C6EOUirZ.js.map} +1 -1
  25. package/public/_app/immutable/entry/start.CSQpAATl.js +2 -0
  26. package/public/_app/immutable/entry/start.CSQpAATl.js.map +1 -0
  27. package/public/_app/immutable/nodes/{0.YgWwbaon.js → 0.P3FLhJCy.js} +2 -2
  28. package/public/_app/immutable/nodes/{0.YgWwbaon.js.map → 0.P3FLhJCy.js.map} +1 -1
  29. package/public/_app/immutable/nodes/{1.DfOgIEfj.js → 1.BQc6rQUU.js} +2 -2
  30. package/public/_app/immutable/nodes/{1.DfOgIEfj.js.map → 1.BQc6rQUU.js.map} +1 -1
  31. package/public/_app/immutable/nodes/2.Do9j-h4_.js +87 -0
  32. package/public/_app/immutable/nodes/2.Do9j-h4_.js.map +1 -0
  33. package/public/_app/version.json +1 -1
  34. package/public/index.html +11 -11
  35. package/public/service-worker.js +1 -1
  36. package/public/_app/immutable/assets/0.BRsKOTX7.css +0 -1
  37. package/public/_app/immutable/chunks/-V_H8eog.js +0 -2
  38. package/public/_app/immutable/entry/start.Dzgtn5z3.js +0 -2
  39. package/public/_app/immutable/entry/start.Dzgtn5z3.js.map +0 -1
  40. package/public/_app/immutable/nodes/2.DA2XVN8A.js +0 -83
  41. package/public/_app/immutable/nodes/2.DA2XVN8A.js.map +0 -1
@@ -0,0 +1,15 @@
1
+ export interface InstallOptions {
2
+ system: boolean;
3
+ configurePi: boolean;
4
+ port?: number;
5
+ host?: string;
6
+ token?: string;
7
+ dryRun: boolean;
8
+ }
9
+ export declare function configurePiExtension(homeDir: string, dryRun: boolean): void;
10
+ export declare function runInstall(opts: InstallOptions): void;
11
+ export declare function runUninstall(opts: InstallOptions): void;
12
+ export declare function runServiceStatus(opts: InstallOptions): void;
13
+ export declare function parseInstallOptions(args: string[]): InstallOptions;
14
+ export declare function printInstallHelp(): void;
15
+ //# sourceMappingURL=install.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IAErB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,EAAE,OAAO,CAAC;CACjB;AAuRD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CA2C3E;AAMD,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAgBrD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAWvD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAW3D;AAUD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,cAAc,CA6BlE;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAsBvC"}
@@ -0,0 +1,408 @@
1
+ import fs from 'node:fs';
2
+ import path from 'node:path';
3
+ import os from 'node:os';
4
+ import { execFileSync } from 'node:child_process';
5
+ import { fileURLToPath } from 'node:url';
6
+ /**
7
+ * `wherever install` and friends.
8
+ *
9
+ * Installs (or removes) a background service that runs the wherever server, and
10
+ * optionally wires the `@wherever-dev/pi` extension into the user's pi config so
11
+ * a running pi CLI bridges into the same server automatically.
12
+ *
13
+ * Supported platforms:
14
+ * - Linux : systemd user unit (default) or system unit (`--system`, needs root)
15
+ * - macOS : launchd LaunchAgent (per-user)
16
+ * Windows is not supported yet; the command prints the manual steps instead.
17
+ */
18
+ const SERVICE_NAME = 'wherever';
19
+ // Reverse-DNS label used by launchd (the plist Label + filename stem).
20
+ const LAUNCHD_LABEL = 'dev.wherever.server';
21
+ function resolveServiceContext(opts) {
22
+ const __filename = fileURLToPath(import.meta.url);
23
+ // dist/commands/install.js -> dist/index.js
24
+ const serverEntry = path.resolve(path.dirname(__filename), '..', 'index.js');
25
+ // The server is started via the explicit `start` verb; bare invocation prints
26
+ // help, so the service must pass `start` before any flags.
27
+ const serverArgs = ['start'];
28
+ if (opts.port !== undefined)
29
+ serverArgs.push('--port', String(opts.port));
30
+ if (opts.host !== undefined)
31
+ serverArgs.push('--host', opts.host);
32
+ if (opts.token !== undefined)
33
+ serverArgs.push('--token', opts.token);
34
+ return {
35
+ nodePath: process.execPath,
36
+ serverEntry,
37
+ serverArgs,
38
+ homeDir: os.homedir(),
39
+ };
40
+ }
41
+ /** Quote a single argument for an ExecStart / plist string array member. */
42
+ function shellQuote(arg) {
43
+ if (/^[A-Za-z0-9_./:=-]+$/.test(arg))
44
+ return arg;
45
+ return `"${arg.replace(/(["\\$`])/g, '\\$1')}"`;
46
+ }
47
+ // ---------------------------------------------------------------------------
48
+ // systemd (Linux)
49
+ // ---------------------------------------------------------------------------
50
+ function systemdUnitPath(system, homeDir) {
51
+ if (system)
52
+ return path.join('/etc/systemd/system', `${SERVICE_NAME}.service`);
53
+ return path.join(homeDir, '.config', 'systemd', 'user', `${SERVICE_NAME}.service`);
54
+ }
55
+ function renderSystemdUnit(ctx, system) {
56
+ const execStart = [ctx.nodePath, ctx.serverEntry, ...ctx.serverArgs]
57
+ .map(shellQuote)
58
+ .join(' ');
59
+ const lines = [
60
+ '[Unit]',
61
+ 'Description=Wherever server (remote control for the pi coding agent)',
62
+ 'After=network-online.target',
63
+ 'Wants=network-online.target',
64
+ '',
65
+ '[Service]',
66
+ 'Type=simple',
67
+ `ExecStart=${execStart}`,
68
+ 'Restart=on-failure',
69
+ 'RestartSec=5',
70
+ '',
71
+ '[Install]',
72
+ system ? 'WantedBy=multi-user.target' : 'WantedBy=default.target',
73
+ '',
74
+ ];
75
+ return lines.join('\n');
76
+ }
77
+ function runSystemctl(system, args) {
78
+ const base = system ? ['systemctl'] : ['systemctl', '--user'];
79
+ const cmd = base[0];
80
+ const cmdArgs = [...base.slice(1), ...args];
81
+ execFileSync(cmd, cmdArgs, { stdio: 'inherit' });
82
+ }
83
+ function installSystemd(ctx, opts) {
84
+ const unitPath = systemdUnitPath(opts.system, ctx.homeDir);
85
+ const unit = renderSystemdUnit(ctx, opts.system);
86
+ if (opts.dryRun) {
87
+ console.log(`[dry-run] would write systemd unit to: ${unitPath}`);
88
+ console.log('---');
89
+ console.log(unit);
90
+ console.log('---');
91
+ console.log(`[dry-run] would run: systemctl ${opts.system ? '' : '--user '}daemon-reload`);
92
+ console.log(`[dry-run] would run: systemctl ${opts.system ? '' : '--user '}enable --now ${SERVICE_NAME}`);
93
+ return;
94
+ }
95
+ fs.mkdirSync(path.dirname(unitPath), { recursive: true });
96
+ fs.writeFileSync(unitPath, unit, 'utf-8');
97
+ console.log(`Wrote systemd unit: ${unitPath}`);
98
+ runSystemctl(opts.system, ['daemon-reload']);
99
+ runSystemctl(opts.system, ['enable', '--now', SERVICE_NAME]);
100
+ console.log(`Service '${SERVICE_NAME}' enabled and started.`);
101
+ if (!opts.system) {
102
+ console.log('Tip: run `loginctl enable-linger $USER` so the service keeps running after you log out.');
103
+ }
104
+ }
105
+ function uninstallSystemd(opts) {
106
+ const unitPath = systemdUnitPath(opts.system, os.homedir());
107
+ if (opts.dryRun) {
108
+ console.log(`[dry-run] would run: systemctl ${opts.system ? '' : '--user '}disable --now ${SERVICE_NAME}`);
109
+ console.log(`[dry-run] would remove: ${unitPath}`);
110
+ return;
111
+ }
112
+ try {
113
+ runSystemctl(opts.system, ['disable', '--now', SERVICE_NAME]);
114
+ }
115
+ catch {
116
+ // Service may not be running/enabled; keep going and remove the unit file.
117
+ }
118
+ if (fs.existsSync(unitPath)) {
119
+ fs.rmSync(unitPath);
120
+ console.log(`Removed systemd unit: ${unitPath}`);
121
+ }
122
+ try {
123
+ runSystemctl(opts.system, ['daemon-reload']);
124
+ }
125
+ catch {
126
+ /* best effort */
127
+ }
128
+ console.log(`Service '${SERVICE_NAME}' removed.`);
129
+ }
130
+ function statusSystemd(opts) {
131
+ try {
132
+ runSystemctl(opts.system, ['status', SERVICE_NAME, '--no-pager']);
133
+ }
134
+ catch {
135
+ // systemctl status exits non-zero for inactive/failed units; that's fine,
136
+ // its output was already streamed to the console.
137
+ }
138
+ }
139
+ // ---------------------------------------------------------------------------
140
+ // launchd (macOS)
141
+ // ---------------------------------------------------------------------------
142
+ function launchdPlistPath(homeDir) {
143
+ return path.join(homeDir, 'Library', 'LaunchAgents', `${LAUNCHD_LABEL}.plist`);
144
+ }
145
+ function renderLaunchdPlist(ctx) {
146
+ const programArgs = [ctx.nodePath, ctx.serverEntry, ...ctx.serverArgs];
147
+ const argsXml = programArgs
148
+ .map((a) => ` <string>${escapeXml(a)}</string>`)
149
+ .join('\n');
150
+ const logPath = path.join(ctx.homeDir, 'Library', 'Logs', `${LAUNCHD_LABEL}.log`);
151
+ return [
152
+ '<?xml version="1.0" encoding="UTF-8"?>',
153
+ '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
154
+ '<plist version="1.0">',
155
+ '<dict>',
156
+ ' <key>Label</key>',
157
+ ` <string>${LAUNCHD_LABEL}</string>`,
158
+ ' <key>ProgramArguments</key>',
159
+ ' <array>',
160
+ argsXml,
161
+ ' </array>',
162
+ ' <key>RunAtLoad</key>',
163
+ ' <true/>',
164
+ ' <key>KeepAlive</key>',
165
+ ' <true/>',
166
+ ' <key>StandardOutPath</key>',
167
+ ` <string>${escapeXml(logPath)}</string>`,
168
+ ' <key>StandardErrorPath</key>',
169
+ ` <string>${escapeXml(logPath)}</string>`,
170
+ '</dict>',
171
+ '</plist>',
172
+ '',
173
+ ].join('\n');
174
+ }
175
+ function escapeXml(s) {
176
+ return s
177
+ .replace(/&/g, '&amp;')
178
+ .replace(/</g, '&lt;')
179
+ .replace(/>/g, '&gt;');
180
+ }
181
+ function installLaunchd(ctx, opts) {
182
+ if (opts.system) {
183
+ throw new Error('System-level (LaunchDaemon) install is not supported on macOS yet; omit --system to install a per-user LaunchAgent.');
184
+ }
185
+ const plistPath = launchdPlistPath(ctx.homeDir);
186
+ const plist = renderLaunchdPlist(ctx);
187
+ if (opts.dryRun) {
188
+ console.log(`[dry-run] would write launchd plist to: ${plistPath}`);
189
+ console.log('---');
190
+ console.log(plist);
191
+ console.log('---');
192
+ console.log(`[dry-run] would run: launchctl unload ${plistPath} (if loaded)`);
193
+ console.log(`[dry-run] would run: launchctl load ${plistPath}`);
194
+ return;
195
+ }
196
+ fs.mkdirSync(path.dirname(plistPath), { recursive: true });
197
+ fs.mkdirSync(path.join(ctx.homeDir, 'Library', 'Logs'), { recursive: true });
198
+ fs.writeFileSync(plistPath, plist, 'utf-8');
199
+ console.log(`Wrote launchd plist: ${plistPath}`);
200
+ // Reload: unload first (ignore errors) so a re-install picks up changes.
201
+ try {
202
+ execFileSync('launchctl', ['unload', plistPath], { stdio: 'ignore' });
203
+ }
204
+ catch {
205
+ /* not previously loaded */
206
+ }
207
+ execFileSync('launchctl', ['load', plistPath], { stdio: 'inherit' });
208
+ console.log(`Service '${LAUNCHD_LABEL}' loaded and started.`);
209
+ }
210
+ function uninstallLaunchd(opts) {
211
+ const plistPath = launchdPlistPath(os.homedir());
212
+ if (opts.dryRun) {
213
+ console.log(`[dry-run] would run: launchctl unload ${plistPath}`);
214
+ console.log(`[dry-run] would remove: ${plistPath}`);
215
+ return;
216
+ }
217
+ try {
218
+ execFileSync('launchctl', ['unload', plistPath], { stdio: 'ignore' });
219
+ }
220
+ catch {
221
+ /* not loaded */
222
+ }
223
+ if (fs.existsSync(plistPath)) {
224
+ fs.rmSync(plistPath);
225
+ console.log(`Removed launchd plist: ${plistPath}`);
226
+ }
227
+ console.log(`Service '${LAUNCHD_LABEL}' removed.`);
228
+ }
229
+ function statusLaunchd() {
230
+ try {
231
+ execFileSync('launchctl', ['list', LAUNCHD_LABEL], { stdio: 'inherit' });
232
+ }
233
+ catch {
234
+ console.log(`Service '${LAUNCHD_LABEL}' is not loaded.`);
235
+ }
236
+ }
237
+ // ---------------------------------------------------------------------------
238
+ // pi extension config injection
239
+ // ---------------------------------------------------------------------------
240
+ const PI_PACKAGE = 'npm:@wherever-dev/pi';
241
+ function piSettingsPath(homeDir) {
242
+ return path.join(homeDir, '.pi', 'agent', 'settings.json');
243
+ }
244
+ /**
245
+ * Substrings that identify this extension in a settings entry. `@wherever-dev/pi`
246
+ * is the npm package name; `wherever` catches a local dev path/symlink. Matching
247
+ * either avoids double-registering when it is already wired in.
248
+ */
249
+ const PI_EXTENSION_MARKERS = ['@wherever-dev/pi', 'wherever'];
250
+ function entryReferencesExtension(value) {
251
+ return PI_EXTENSION_MARKERS.some((m) => value.includes(m));
252
+ }
253
+ /** True if the extension is already referenced anywhere in the settings. */
254
+ function piExtensionConfigured(settings) {
255
+ const inPackages = Array.isArray(settings.packages) &&
256
+ settings.packages.some((p) => {
257
+ if (typeof p === 'string')
258
+ return entryReferencesExtension(p);
259
+ if (p && typeof p === 'object' && typeof p.source === 'string') {
260
+ return entryReferencesExtension(p.source);
261
+ }
262
+ return false;
263
+ });
264
+ const inExtensions = Array.isArray(settings.extensions) &&
265
+ settings.extensions.some((e) => typeof e === 'string' && entryReferencesExtension(e));
266
+ return inPackages || inExtensions;
267
+ }
268
+ export function configurePiExtension(homeDir, dryRun) {
269
+ const settingsPath = piSettingsPath(homeDir);
270
+ if (!fs.existsSync(settingsPath)) {
271
+ if (dryRun) {
272
+ console.log(`[dry-run] pi settings not found at ${settingsPath}; would create it with the wherever extension.`);
273
+ return;
274
+ }
275
+ const fresh = { packages: [PI_PACKAGE] };
276
+ fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
277
+ fs.writeFileSync(settingsPath, JSON.stringify(fresh, null, 2) + '\n', 'utf-8');
278
+ console.log(`Created pi settings and added the wherever extension: ${settingsPath}`);
279
+ return;
280
+ }
281
+ let settings;
282
+ try {
283
+ settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
284
+ }
285
+ catch (err) {
286
+ console.warn(`Could not parse ${settingsPath} (${err.message}); skipping pi extension config. ` +
287
+ `Add "${PI_PACKAGE}" to its "packages" array manually.`);
288
+ return;
289
+ }
290
+ if (piExtensionConfigured(settings)) {
291
+ console.log('pi extension already configured; leaving settings.json untouched.');
292
+ return;
293
+ }
294
+ if (dryRun) {
295
+ console.log(`[dry-run] would add "${PI_PACKAGE}" to "packages" in ${settingsPath}`);
296
+ return;
297
+ }
298
+ if (!Array.isArray(settings.packages))
299
+ settings.packages = [];
300
+ settings.packages.push(PI_PACKAGE);
301
+ // Back up before mutating, so a bad edit is always recoverable.
302
+ fs.copyFileSync(settingsPath, `${settingsPath}.bak`);
303
+ fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf-8');
304
+ console.log(`Added "${PI_PACKAGE}" to pi settings (backup at ${settingsPath}.bak).`);
305
+ }
306
+ // ---------------------------------------------------------------------------
307
+ // dispatch
308
+ // ---------------------------------------------------------------------------
309
+ export function runInstall(opts) {
310
+ const ctx = resolveServiceContext(opts);
311
+ switch (process.platform) {
312
+ case 'linux':
313
+ installSystemd(ctx, opts);
314
+ break;
315
+ case 'darwin':
316
+ installLaunchd(ctx, opts);
317
+ break;
318
+ default:
319
+ printUnsupported('install');
320
+ return;
321
+ }
322
+ if (opts.configurePi) {
323
+ configurePiExtension(ctx.homeDir, opts.dryRun);
324
+ }
325
+ }
326
+ export function runUninstall(opts) {
327
+ switch (process.platform) {
328
+ case 'linux':
329
+ uninstallSystemd(opts);
330
+ break;
331
+ case 'darwin':
332
+ uninstallLaunchd(opts);
333
+ break;
334
+ default:
335
+ printUnsupported('uninstall');
336
+ }
337
+ }
338
+ export function runServiceStatus(opts) {
339
+ switch (process.platform) {
340
+ case 'linux':
341
+ statusSystemd(opts);
342
+ break;
343
+ case 'darwin':
344
+ statusLaunchd();
345
+ break;
346
+ default:
347
+ printUnsupported('status');
348
+ }
349
+ }
350
+ function printUnsupported(verb) {
351
+ console.error(`\`wherever ${verb}\` is not supported on ${process.platform} yet (Linux and macOS only).\n` +
352
+ 'You can still run the server directly with `wherever` (no subcommand),\n' +
353
+ `and add "${PI_PACKAGE}" to the "packages" array in ~/.pi/agent/settings.json manually.`);
354
+ }
355
+ export function parseInstallOptions(args) {
356
+ const opts = {
357
+ system: false,
358
+ configurePi: true,
359
+ dryRun: false,
360
+ };
361
+ for (let i = 0; i < args.length; i++) {
362
+ switch (args[i]) {
363
+ case '--system':
364
+ opts.system = true;
365
+ break;
366
+ case '--no-pi-config':
367
+ opts.configurePi = false;
368
+ break;
369
+ case '--dry-run':
370
+ opts.dryRun = true;
371
+ break;
372
+ case '--port':
373
+ opts.port = parseInt(args[++i] || '', 10);
374
+ break;
375
+ case '--host':
376
+ opts.host = args[++i];
377
+ break;
378
+ case '--token':
379
+ opts.token = args[++i];
380
+ break;
381
+ }
382
+ }
383
+ return opts;
384
+ }
385
+ export function printInstallHelp() {
386
+ console.log(`wherever - remote control server for the pi coding agent
387
+
388
+ Usage:
389
+ wherever start [server options] Run the server
390
+ wherever install [options] Install & start a background service
391
+ wherever uninstall [options] Stop & remove the background service
392
+ wherever service-status Show the service status
393
+ wherever help Show this help
394
+
395
+ Install options:
396
+ --system Install a system-wide service (Linux only, needs root).
397
+ Default is a per-user service (no sudo).
398
+ --no-pi-config Do not touch ~/.pi/agent/settings.json.
399
+ --port <n> Port for the service to listen on.
400
+ --host <addr> Host/interface to bind.
401
+ --token <token> Auth token to bake into the service.
402
+ --dry-run Print what would happen without writing anything.
403
+
404
+ Platforms: Linux (systemd) and macOS (launchd). On install, the
405
+ '${PI_PACKAGE}' extension is added to your pi config unless --no-pi-config.
406
+ `);
407
+ }
408
+ //# sourceMappingURL=install.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC;;;;;;;;;;;GAWG;AAEH,MAAM,YAAY,GAAG,UAAU,CAAC;AAChC,uEAAuE;AACvE,MAAM,aAAa,GAAG,qBAAqB,CAAC;AAuB5C,SAAS,qBAAqB,CAAC,IAAoB;IACjD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,4CAA4C;IAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAC7E,8EAA8E;IAC9E,2DAA2D;IAC3D,MAAM,UAAU,GAAa,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;QAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;QAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAClE,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;QAAE,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACrE,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW;QACX,UAAU;QACV,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;KACtB,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,SAAS,UAAU,CAAC,GAAW;IAC7B,IAAI,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IACjD,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC;AAClD,CAAC;AAED,8EAA8E;AAC9E,kBAAkB;AAClB,8EAA8E;AAE9E,SAAS,eAAe,CAAC,MAAe,EAAE,OAAe;IACvD,IAAI,MAAM;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,YAAY,UAAU,CAAC,CAAC;IAC/E,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,UAAU,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAmB,EAAE,MAAe;IAC7D,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC;SACjE,GAAG,CAAC,UAAU,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,KAAK,GAAG;QACZ,QAAQ;QACR,sEAAsE;QACtE,6BAA6B;QAC7B,6BAA6B;QAC7B,EAAE;QACF,WAAW;QACX,aAAa;QACb,aAAa,SAAS,EAAE;QACxB,oBAAoB;QACpB,cAAc;QACd,EAAE;QACF,WAAW;QACX,MAAM,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,yBAAyB;QACjE,EAAE;KACH,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,YAAY,CAAC,MAAe,EAAE,IAAc;IACnD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IAC5C,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,cAAc,CAAC,GAAmB,EAAE,IAAoB;IAC/D,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,0CAA0C,QAAQ,EAAE,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC;QAC3F,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,gBAAgB,YAAY,EAAE,CAAC,CAAC;QAC1G,OAAO;IACT,CAAC;IAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,uBAAuB,QAAQ,EAAE,CAAC,CAAC;IAE/C,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7C,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,YAAY,YAAY,wBAAwB,CAAC,CAAC;IAC9D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CACT,yFAAyF,CAC1F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC5C,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,iBAAiB,YAAY,EAAE,CAAC,CAAC;QAC3G,OAAO,CAAC,GAAG,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAC;QACnD,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,2EAA2E;IAC7E,CAAC;IACD,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,CAAC;QACH,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,iBAAiB;IACnB,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,YAAY,YAAY,YAAY,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,aAAa,CAAC,IAAoB;IACzC,IAAI,CAAC;QACH,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,0EAA0E;QAC1E,kDAAkD;IACpD,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,kBAAkB;AAClB,8EAA8E;AAE9E,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,aAAa,QAAQ,CAAC,CAAC;AACjF,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAmB;IAC7C,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,WAAW;SACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;SAClD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,aAAa,MAAM,CAAC,CAAC;IAClF,OAAO;QACL,wCAAwC;QACxC,wGAAwG;QACxG,uBAAuB;QACvB,QAAQ;QACR,oBAAoB;QACpB,aAAa,aAAa,WAAW;QACrC,+BAA+B;QAC/B,WAAW;QACX,OAAO;QACP,YAAY;QACZ,wBAAwB;QACxB,WAAW;QACX,wBAAwB;QACxB,WAAW;QACX,8BAA8B;QAC9B,aAAa,SAAS,CAAC,OAAO,CAAC,WAAW;QAC1C,gCAAgC;QAChC,aAAa,SAAS,CAAC,OAAO,CAAC,WAAW;QAC1C,SAAS;QACT,UAAU;QACV,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CAAC,CAAS;IAC1B,OAAO,CAAC;SACL,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,cAAc,CAAC,GAAmB,EAAE,IAAoB;IAC/D,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,qHAAqH,CACtH,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,2CAA2C,SAAS,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,yCAAyC,SAAS,cAAc,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;QAChE,OAAO;IACT,CAAC;IAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7E,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,wBAAwB,SAAS,EAAE,CAAC,CAAC;IAEjD,yEAAyE;IACzE,IAAI,CAAC;QACH,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxE,CAAC;IAAC,MAAM,CAAC;QACP,2BAA2B;IAC7B,CAAC;IACD,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,YAAY,aAAa,uBAAuB,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC5C,MAAM,SAAS,GAAG,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACjD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;QACpD,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxE,CAAC;IAAC,MAAM,CAAC;QACP,gBAAgB;IAClB,CAAC;IACD,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,YAAY,aAAa,YAAY,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,aAAa;IACpB,IAAI,CAAC;QACH,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,GAAG,CAAC,YAAY,aAAa,kBAAkB,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,gCAAgC;AAChC,8EAA8E;AAE9E,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAE1C,SAAS,cAAc,CAAC,OAAe;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;AAC7D,CAAC;AAED;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;AAE9D,SAAS,wBAAwB,CAAC,KAAa;IAC7C,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,4EAA4E;AAC5E,SAAS,qBAAqB,CAAC,QAAa;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACjD,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;YAChC,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAAC;YAC9D,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/D,OAAO,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QACrD,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7F,OAAO,UAAU,IAAI,YAAY,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,MAAe;IACnE,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAE7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,sCAAsC,YAAY,gDAAgD,CAAC,CAAC;YAChH,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;QACzC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/E,OAAO,CAAC,GAAG,CAAC,yDAAyD,YAAY,EAAE,CAAC,CAAC;QACrF,OAAO;IACT,CAAC;IAED,IAAI,QAAa,CAAC;IAClB,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CACV,mBAAmB,YAAY,KAAM,GAAa,CAAC,OAAO,mCAAmC;YAC7F,QAAQ,UAAU,qCAAqC,CACxD,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;QACjF,OAAO;IACT,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,wBAAwB,UAAU,sBAAsB,YAAY,EAAE,CAAC,CAAC;QACpF,OAAO;IACT,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;IAC9D,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEnC,gEAAgE;IAChE,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IACrD,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,GAAG,CAAC,UAAU,UAAU,+BAA+B,YAAY,QAAQ,CAAC,CAAC;AACvF,CAAC;AAED,8EAA8E;AAC9E,WAAW;AACX,8EAA8E;AAE9E,MAAM,UAAU,UAAU,CAAC,IAAoB;IAC7C,MAAM,GAAG,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACxC,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzB,KAAK,OAAO;YACV,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,QAAQ;YACX,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC1B,MAAM;QACR;YACE,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC5B,OAAO;IACX,CAAC;IACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAoB;IAC/C,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzB,KAAK,OAAO;YACV,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACvB,MAAM;QACR,KAAK,QAAQ;YACX,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACvB,MAAM;QACR;YACE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAoB;IACnD,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzB,KAAK,OAAO;YACV,aAAa,CAAC,IAAI,CAAC,CAAC;YACpB,MAAM;QACR,KAAK,QAAQ;YACX,aAAa,EAAE,CAAC;YAChB,MAAM;QACR;YACE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,CAAC,KAAK,CACX,cAAc,IAAI,0BAA0B,OAAO,CAAC,QAAQ,gCAAgC;QAC5F,0EAA0E;QAC1E,YAAY,UAAU,kEAAkE,CACzF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAc;IAChD,MAAM,IAAI,GAAmB;QAC3B,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,KAAK;KACd,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAChB,KAAK,UAAU;gBACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,MAAM;YACR,KAAK,gBAAgB;gBACnB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;gBACzB,MAAM;YACR,KAAK,WAAW;gBACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC1C,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtB,MAAM;YACR,KAAK,SAAS;gBACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvB,MAAM;QACV,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;GAmBX,UAAU;CACZ,CAAC,CAAC;AACH,CAAC"}
package/dist/index.js CHANGED
@@ -9,6 +9,7 @@ import path from 'node:path';
9
9
  import { fileURLToPath } from 'node:url';
10
10
  import os from 'node:os';
11
11
  import { execSync } from 'node:child_process';
12
+ import { runInstall, runUninstall, runServiceStatus, parseInstallOptions, printInstallHelp, } from './commands/install.js';
12
13
  const __filename = fileURLToPath(import.meta.url);
13
14
  const __dirname = path.dirname(__filename);
14
15
  const devStaticPath = path.resolve(__dirname, '../../web/build');
@@ -346,10 +347,19 @@ async function main() {
346
347
  msg = { type: 'tool_update', sessionId, toolName: event.toolName, delta: evt.delta || '' };
347
348
  break;
348
349
  }
349
- case 'tool_execution_end':
350
+ case 'tool_execution_end': {
350
351
  const toolResult = extractToolResult(event);
351
- msg = { type: 'tool_end', sessionId, toolName: event.toolName, isError: event.isError, result: toolResult };
352
+ const toolImages = extractToolImages(event);
353
+ msg = {
354
+ type: 'tool_end',
355
+ sessionId,
356
+ toolName: event.toolName,
357
+ isError: event.isError,
358
+ result: toolResult,
359
+ ...(toolImages.length > 0 ? { images: toolImages } : {}),
360
+ };
352
361
  break;
362
+ }
353
363
  case 'model_select': {
354
364
  const evt = event;
355
365
  const modelStr = typeof evt.model === 'string'
@@ -454,11 +464,18 @@ async function main() {
454
464
  if (searchFolder && searchFolder.startsWith('~')) {
455
465
  searchFolder = path.join(os.homedir(), searchFolder.slice(1));
456
466
  }
467
+ // Resolve the search folder's default model against that folder's settings
468
+ // (folder-local harness/pi config wins), so the search composer can seed its
469
+ // model picker with the folder default rather than the server global.
470
+ const searchDefaultModel = searchFolder
471
+ ? sessionPool.getDefaultModelFor(searchFolder)
472
+ : null;
457
473
  sendJSON(res, 200, {
458
474
  gitInitDefault: !!config.gitInitDefault,
459
475
  uploadMethod: config.uploads?.method || 'websocket',
460
476
  searchFolder: searchFolder || null,
461
- searchCreateRemote: !!config.searchCreateRemote
477
+ searchCreateRemote: !!config.searchCreateRemote,
478
+ searchDefaultModel
462
479
  });
463
480
  return;
464
481
  }
@@ -1114,6 +1131,20 @@ async function handleWSMessage(msg, client, pool, clients, broadcast, onSessions
1114
1131
  console.log(`Registered CLI Bridge for session ${msg.sessionFile} at ${msg.cwd}`);
1115
1132
  onSessionsUpdated();
1116
1133
  const sId = result.tracked.sessionId;
1134
+ // The CLI just took over a session the server was running MID-TURN, so
1135
+ // registering disposed that server-side agent and discarded the in-flight
1136
+ // turn. Tell the CLI explicitly so it can surface the takeover: its own
1137
+ // dangling-tool-call heuristic reads the persisted transcript, which
1138
+ // never captured a still-streaming (unpersisted) turn, so it cannot
1139
+ // detect the streaming-text case on its own. Symmetric with the web
1140
+ // client's session_notice below.
1141
+ if (result.interruptedTurn) {
1142
+ sendWS(client.ws, {
1143
+ type: 'cli_takeover_interrupted',
1144
+ sessionId: sId,
1145
+ toolCall: result.interruptedToolCall === true,
1146
+ });
1147
+ }
1117
1148
  const msgToWeb = {
1118
1149
  type: 'session_created',
1119
1150
  sessionId: sId,
@@ -1133,6 +1164,26 @@ async function handleWSMessage(msg, client, pool, clients, broadcast, onSessions
1133
1164
  totalCount: history.totalCount,
1134
1165
  offset: history.offset,
1135
1166
  });
1167
+ // The CLI took control of this session. If the server agent was
1168
+ // MID-TURN, disposing it above discarded that in-flight turn without
1169
+ // persisting it, so the web viewer who was watching it lost it
1170
+ // silently. Warn, tailoring the wording to what was lost: a running
1171
+ // tool call (its result never arrives) vs a streaming assistant
1172
+ // reply (the partial text is discarded).
1173
+ if (result.interruptedTurn) {
1174
+ const lost = result.interruptedToolCall
1175
+ ? 'a tool call was running. That tool call was interrupted and its result will not appear here.'
1176
+ : 'a reply was streaming. That in-progress reply was interrupted here and will not be saved.';
1177
+ const message = `A terminal (CLI) took over this session while ${lost} ` +
1178
+ 'The CLI now controls this session: anything you send from here is relayed to it. ' +
1179
+ 'The web frontend regains control only once that CLI disconnects.';
1180
+ sendWS(c.ws, {
1181
+ type: 'session_notice',
1182
+ sessionId: sId,
1183
+ level: 'warning',
1184
+ message,
1185
+ });
1186
+ }
1136
1187
  }
1137
1188
  }
1138
1189
  }
@@ -1479,6 +1530,28 @@ async function handleWSMessage(msg, client, pool, clients, broadcast, onSessions
1479
1530
  }
1480
1531
  }
1481
1532
  }
1533
+ /**
1534
+ * Extract image blocks from a tool result so the web frontend can render them
1535
+ * inline (mirroring the CLI's inline image display). The `read` tool returns
1536
+ * `{ content: [{type:'text',...},{type:'image', data, mimeType}] }` for image
1537
+ * files; `extractToolResult` keeps only text, so image blocks are pulled out
1538
+ * here and shipped separately as base64.
1539
+ */
1540
+ function extractToolImages(event) {
1541
+ const result = event?.result;
1542
+ if (!result || typeof result !== 'object')
1543
+ return [];
1544
+ const content = result.content;
1545
+ if (!Array.isArray(content))
1546
+ return [];
1547
+ const images = [];
1548
+ for (const c of content) {
1549
+ if (c && c.type === 'image' && typeof c.data === 'string' && c.data) {
1550
+ images.push({ mimeType: typeof c.mimeType === 'string' ? c.mimeType : 'image/png', data: c.data });
1551
+ }
1552
+ }
1553
+ return images;
1554
+ }
1482
1555
  function extractToolResult(event) {
1483
1556
  const result = event.result;
1484
1557
  if (!result)
@@ -1511,8 +1584,49 @@ function extractText(msg) {
1511
1584
  }
1512
1585
  return '';
1513
1586
  }
1514
- main().catch((err) => {
1515
- console.error('Fatal server startup error:', err);
1516
- process.exit(1);
1517
- });
1587
+ /**
1588
+ * Subcommand dispatch. Every action is an explicit verb:
1589
+ * - `wherever start [server flags]` runs the server
1590
+ * - `wherever install|uninstall|service-status` manage the background service
1591
+ * - bare `wherever` (or `help`) prints usage
1592
+ * Server flags after `start` are consumed by parseArgs() (which reads
1593
+ * process.argv), so `start` is stripped from argv before main() runs.
1594
+ */
1595
+ function dispatch() {
1596
+ const argv = process.argv.slice(2);
1597
+ const verb = argv[0];
1598
+ const rest = argv.slice(1);
1599
+ switch (verb) {
1600
+ case 'start':
1601
+ // Drop the `start` verb so the existing flag parser sees only server
1602
+ // flags (it reads process.argv directly).
1603
+ process.argv.splice(2, 1);
1604
+ main().catch((err) => {
1605
+ console.error('Fatal server startup error:', err);
1606
+ process.exit(1);
1607
+ });
1608
+ return;
1609
+ case 'install':
1610
+ runInstall(parseInstallOptions(rest));
1611
+ return;
1612
+ case 'uninstall':
1613
+ runUninstall(parseInstallOptions(rest));
1614
+ return;
1615
+ case 'service-status':
1616
+ case 'status':
1617
+ runServiceStatus(parseInstallOptions(rest));
1618
+ return;
1619
+ case undefined:
1620
+ case 'help':
1621
+ case '--help':
1622
+ case '-h':
1623
+ printInstallHelp();
1624
+ return;
1625
+ default:
1626
+ console.error(`Unknown command: ${verb}\n`);
1627
+ printInstallHelp();
1628
+ process.exit(1);
1629
+ }
1630
+ }
1631
+ dispatch();
1518
1632
  //# sourceMappingURL=index.js.map