@0xmaxma/claude-gateway 1.8.3 → 1.8.4

package/dist/logger.js

@@ -33,16 +33,201 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.LOGS_DEFAULTS = void 0;
+exports.isLogLevel = isLogLevel;
+exports.configureLogging = configureLogging;
+exports.loggingConfig = loggingConfig;
+exports.resetLoggingForTests = resetLoggingForTests;
 exports.createLogger = createLogger;
+exports.sweepOldLogs = sweepOldLogs;
+exports.startLogRetentionSweep = startLogRetentionSweep;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+/** Ordering for the level gate. Only the relative order matters. */
+const LEVEL_RANK = { debug: 10, info: 20, warn: 30, error: 40 };
+function isLogLevel(value) {
+    return typeof value === 'string' && value in LEVEL_RANK;
+}
+/**
+ * Defaults applied when `gateway.logs` is absent or partial.
+ *
+ * `level: 'info'` is the load-bearing one. Session processes log every stream
+ * event at debug (src/session/process.ts), which on a live host measured as
+ * 19,995 debug lines to 5 info lines in a single 217 MB file — so `debug`
+ * on-by-default was, in practice, the whole log directory. Rotation alone would
+ * not have helped: it bounds what is *kept*, not what is *written*.
+ */
+exports.LOGS_DEFAULTS = {
+    level: 'info',
+    maxFileBytes: 16 * 1024 * 1024,
+    maxFiles: 3,
+    retentionDays: 14,
+};
+let active = { ...exports.LOGS_DEFAULTS };
+/**
+ * Install the process-wide logging policy. Called once at boot, before the
+ * first logger exists.
+ *
+ * Policy is module state rather than a per-logger argument because there is one
+ * of it per process, and `createLogger()` has 13 call sites — several of which
+ * (routers, the session process) have no access to the gateway config. Threading
+ * an options bag through all of them would put the same value in 13 places and
+ * let them drift.
+ */
+function configureLogging(cfg) {
+    const level = isLogLevel(cfg?.level) ? cfg.level : exports.LOGS_DEFAULTS.level;
+    active = {
+        level,
+        maxFileBytes: positiveOrDefault(cfg?.maxFileBytes, exports.LOGS_DEFAULTS.maxFileBytes),
+        maxFiles: nonNegativeOrDefault(cfg?.maxFiles, exports.LOGS_DEFAULTS.maxFiles),
+        retentionDays: nonNegativeOrDefault(cfg?.retentionDays, exports.LOGS_DEFAULTS.retentionDays),
+    };
+    return { ...active };
+}
+/** The policy currently in force (a copy — callers must not mutate it). */
+function loggingConfig() {
+    return { ...active };
+}
+/** Test hook: restore defaults and forget per-file state. */
+function resetLoggingForTests() {
+    active = { ...exports.LOGS_DEFAULTS };
+    fileSizes.clear();
+    writeFailureReported = false;
+}
+/** 0 is meaningful for `maxFiles`/`retentionDays` (= disabled) but not for a
+ *  size threshold, where it would rotate on every line. */
+function positiveOrDefault(value, fallback) {
+    return typeof value === 'number' && Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
+}
+function nonNegativeOrDefault(value, fallback) {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0 ? Math.floor(value) : fallback;
+}
+/**
+ * Live size per log file, keyed by absolute path.
+ *
+ * Kept at module scope rather than on the instance because one file can have
+ * several loggers writing to it — `createLogger(agentConfig.id, …)` is called
+ * from both the boot path and the runner constructor. Per-instance counters
+ * would each see only their own share of the file and rotate late. Seeded from
+ * `statSync` once per file, then maintained by arithmetic so the common path
+ * costs no syscall.
+ *
+ * One entry per log file, and session logs create a new file each. The
+ * retention sweep deletes its entry along with the file, which bounds the map
+ * for any configuration that keeps retention on; with `retentionDays: 0` it
+ * grows with the session count, at roughly a path string per session. That is
+ * small enough not to be worth a second eviction mechanism whose only job would
+ * be to duplicate the sweep.
+ */
+const fileSizes = new Map();
+/**
+ * A failed append is latched and reported once per process.
+ *
+ * This used to be a bare `catch {}` — a full disk or a permission change
+ * silently stopped all file logging, which is precisely the failure that makes
+ * the next incident undiagnosable. Reporting every occurrence would be its own
+ * denial of service (the failing call is in the logger), so it is reported once
+ * and then suppressed.
+ */
+let writeFailureReported = false;
+function reportWriteFailure(file, err) {
+    if (writeFailureReported)
+        return;
+    writeFailureReported = true;
+    const reason = err?.code ?? err?.message ?? String(err);
+    process.stderr.write(`[logger] cannot write to ${file} (${reason}) — file logging is degraded for the rest of this process. ` +
+        'Further write failures will not be reported.\n');
+}
+/**
+ * Remove every rotated generation at or above `maxFiles`.
+ *
+ * Deleting only `<file>.<maxFiles>` would be dead code: `renameSync` clobbers
+ * its destination, so the top generation is overwritten by the shift below
+ * anyway — but only while `maxFiles` stays where it was. Lower it in the config
+ * (5 → 2) and generations 2..5 are orphaned: nothing renames onto them, and the
+ * age sweep is the only thing that would ever collect them. A rotation happens
+ * once per `maxFileBytes`, so it can afford one readdir to stay bounded.
+ */
+function pruneGenerations(file, maxFiles) {
+    const dir = path.dirname(file);
+    const prefix = `${path.basename(file)}.`;
+    let names;
+    try {
+        names = fs.readdirSync(dir);
+    }
+    catch {
+        return; // best-effort
+    }
+    for (const name of names) {
+        if (!name.startsWith(prefix))
+            continue;
+        const gen = Number(name.slice(prefix.length));
+        if (!Number.isInteger(gen) || gen < maxFiles)
+            continue;
+        try {
+            fs.rmSync(path.join(dir, name), { force: true });
+        }
+        catch {
+            /* best-effort */
+        }
+    }
+}
+/** `<name>.log` → `<name>.log.1`, dropping generations past `maxFiles`.
+ *
+ *  Synchronous and best-effort by design: it runs inside a logging call, so it
+ *  must neither block on I/O the caller did not ask for nor throw into code
+ *  that was only trying to log. A rotation that fails leaves the live file in
+ *  place and logging simply continues into it. */
+function rotate(file, maxFiles) {
+    if (maxFiles <= 0) {
+        // No generations kept: the live file is the only file, so start it over.
+        try {
+            fs.unlinkSync(file);
+        }
+        catch {
+            /* best-effort */
+        }
+        return;
+    }
+    pruneGenerations(file, maxFiles);
+    for (let gen = maxFiles - 1; gen >= 1; gen--) {
+        try {
+            fs.renameSync(`${file}.${gen}`, `${file}.${gen + 1}`);
+        }
+        catch {
+            /* a generation that does not exist yet is the normal case */
+        }
+    }
+    try {
+        fs.renameSync(file, `${file}.1`);
+    }
+    catch {
+        /* best-effort */
+    }
+}
 class AgentLogger {
     constructor(agentId, logDir) {
         this.agentId = agentId;
         fs.mkdirSync(logDir, { recursive: true });
         this.logFilePath = path.join(logDir, `${agentId}.log`);
     }
+    currentSize() {
+        const known = fileSizes.get(this.logFilePath);
+        if (known !== undefined)
+            return known;
+        let size = 0;
+        try {
+            size = fs.statSync(this.logFilePath).size;
+        }
+        catch {
+            size = 0; // not created yet
+        }
+        fileSizes.set(this.logFilePath, size);
+        return size;
+    }
     log(level, message, data) {
+        if (LEVEL_RANK[level] < LEVEL_RANK[active.level])
+            return;
         const entry = {
             ts: new Date().toISOString(),
             agentId: this.agentId,
@@ -55,11 +240,18 @@ class AgentLogger {
         // Write to stdout (pretty-printed for readability)
         process.stdout.write(pretty + '\n');
         // Write to log file (compact, one entry per line)
+        const bytes = Buffer.byteLength(line, 'utf-8') + 1;
         try {
+            if (active.maxFileBytes > 0 && this.currentSize() + bytes > active.maxFileBytes) {
+                rotate(this.logFilePath, active.maxFiles);
+                fileSizes.set(this.logFilePath, 0);
+            }
             fs.appendFileSync(this.logFilePath, line + '\n', 'utf-8');
+            fileSizes.set(this.logFilePath, this.currentSize() + bytes);
         }
-        catch {
-            // If we can't write to the log file, just continue
+        catch (err) {
+            // Logging must never throw into a caller, but it must not vanish either.
+            reportWriteFailure(this.logFilePath, err);
         }
     }
     info(message, data) {
@@ -78,4 +270,74 @@ class AgentLogger {
 function createLogger(agentId, logDir) {
     return new AgentLogger(agentId, logDir);
 }
+/**
+ * Delete log files (live and rotated generations) last modified more than
+ * `retentionDays` ago. Returns the paths removed.
+ *
+ * Age, not count, is what bounds a directory of *session* logs: each session
+ * gets its own `<agent>:session:<uuid>.log` that is never written again once the
+ * session ends, so `maxFiles` — which only prunes generations of one stream —
+ * never touches them.
+ */
+function sweepOldLogs(logDir, retentionDays, now = Date.now()) {
+    const removed = [];
+    if (!(retentionDays > 0))
+        return removed; // 0 = keep forever
+    const cutoff = now - retentionDays * 24 * 60 * 60 * 1000;
+    let names;
+    try {
+        names = fs.readdirSync(logDir);
+    }
+    catch {
+        return removed; // no directory yet, or unreadable — nothing to sweep
+    }
+    for (const name of names) {
+        // `.log` and its rotated generations (`.log.1`), and nothing else: the
+        // directory is not exclusively ours to delete from.
+        if (!/\.log(\.\d+)?$/.test(name))
+            continue;
+        const full = path.join(logDir, name);
+        try {
+            if (fs.statSync(full).mtimeMs >= cutoff)
+                continue;
+            fs.rmSync(full, { force: true });
+            fileSizes.delete(full);
+            removed.push(full);
+        }
+        catch {
+            /* best-effort — a file that vanished or cannot be read is not fatal */
+        }
+    }
+    return removed;
+}
+/**
+ * Sweep now, then once a day. Returns a stop function.
+ *
+ * Modelled on `AppInstaller.startBackupCleanup()`: the timer is unref'd so it
+ * never keeps the process alive, and a failing sweep is swallowed rather than
+ * escalated — retention is housekeeping, not a reason to take the gateway down.
+ *
+ * The timer is created unconditionally, including when retention is currently
+ * off. `retentionDays` is read on each run rather than captured, so a policy
+ * reloaded from `gateway.logs` takes effect at the next sweep — and a timer
+ * that was never started because retention happened to be 0 at boot could not
+ * do that. A disabled sweep costs one no-op call a day.
+ */
+function startLogRetentionSweep(logDir, onSwept) {
+    const run = () => {
+        try {
+            const removed = sweepOldLogs(logDir, active.retentionDays);
+            if (removed.length > 0)
+                onSwept?.(removed);
+        }
+        catch {
+            /* best-effort */
+        }
+    };
+    run();
+    const timer = setInterval(run, 24 * 60 * 60 * 1000);
+    if (typeof timer.unref === 'function')
+        timer.unref();
+    return () => clearInterval(timer);
+}
 //# sourceMappingURL=logger.js.map

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgEA,oCAEC;AAlED,uCAAyB;AACzB,2CAA6B;AAa7B,MAAM,WAAW;IAIf,YAAY,OAAe,EAAE,MAAc;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,MAAM,CAAC,CAAC;IACzD,CAAC;IAEO,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,IAA8B;QAC1E,MAAM,KAAK,GAAa;YACtB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK;YACL,OAAO;YACP,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxC,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAE9C,mDAAmD;QACnD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QAEpC,kDAAkD;QAClD,IAAI,CAAC;YACH,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC;QAAC,MAAM,CAAC;YACP,mDAAmD;QACrD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,IAA8B;QAClD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,IAA8B;QAClD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,IAA8B;QACnD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,IAA8B;QACnD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;CACF;AAED,SAAgB,YAAY,CAAC,OAAe,EAAE,MAAc;IAC1D,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}

package/dist/shell/bypass-dialog.d.ts

@@ -26,9 +26,10 @@
  * reordering must not send us to "No, exit"), and anything unparseable or
  * ambiguous produces no keystroke at all.
  *
- * This module is the pure decision — kept free of node-pty / screen imports so
- * it is cheap to unit-test in isolation, same pattern as menu-probe.ts's
- * decideProbeAttempt and menu-cancel.ts's decideMenuCancel. See
+ * This module is the pure detection + decision — kept free of node-pty / screen
+ * imports so it is cheap to unit-test in isolation, same pattern as
+ * menu-probe.ts's decideProbeAttempt and menu-cancel.ts's decideMenuCancel.
+ * ScreenModel.detectDialog() calls isBypassDialogOnScreen() below; see
  * Driver.maybeHandleDialog() in claude-pty-shell.ts for where it is wired in.
  */
 /**
@@ -40,6 +41,40 @@
  */
 export declare const BYPASS_ACCEPT_LABEL = "Yes, I accept";
 export declare const BYPASS_DECLINE_LABEL = "No, exit";
+/**
+ * The dialog's own confirm affordance, rendered a line or two below the option
+ * rows ("Enter to confirm · Esc to cancel"). Only the stable prefix is matched.
+ *
+ * Required by {@link isBypassDialogOnScreen} for the same reason
+ * TUI_REQUEST_TOO_LARGE_DISMISS is required by detectRequestTooLarge(): the
+ * labels alone appear in ordinary prose (this very dialog's warning text, a
+ * chat reply explaining it, re-injected history quoting it), whereas the
+ * footer is the affordance the live overlay renders — and it is exactly the
+ * affordance the accepting keystroke relies on, so gating on it keeps
+ * detection and the action consistent.
+ */
+export declare const BYPASS_CONFIRM_FOOTER = "Enter to confirm";
+/**
+ * The dialog's heading — the same string screen.ts lists first in
+ * TUI_BYPASS_PERMS, repeated here for the dependency-free reason above, with a
+ * unit test asserting the two never drift apart.
+ *
+ * Required by {@link isBypassDialogOnScreen} so that predicate is the COMPLETE
+ * rule rather than half of one split across two files. See the note there.
+ */
+export declare const BYPASS_HEADING = "Bypass Permissions mode";
+/**
+ * How far apart the dialog's own rows may sit before they stop being one block.
+ *
+ * The real capture has the two options on adjacent rows and the footer two rows
+ * below them (one blank row between). These bounds allow a little repaint slack
+ * while still requiring the elements to be visually together: without them the
+ * "structure" was only an ordering, so an option row, a second option row 15
+ * lines further down and any sentence containing "Enter to confirm" below that
+ * satisfied it — on a screen of ordinary conversation (review round 2, M3).
+ */
+export declare const BYPASS_MAX_ROW_GAP = 2;
+export declare const BYPASS_MAX_FOOTER_GAP = 3;
 /** Arrow keystrokes used to walk the caret onto the accept row. */
 export declare const BYPASS_KEY_DOWN = "\u001B[B";
 export declare const BYPASS_KEY_UP = "\u001B[A";
@@ -73,12 +108,12 @@ export declare const BYPASS_MAX_KEYS = 60;
  * Consecutive rounds with no dialog on screen before the keystroke ceiling is
  * considered spent on a dialog that is gone.
  *
- * Not 1: detection needs both TUI_BYPASS_PERMS markers inside the same bottom
- * region (screen.ts DIALOG_REGION_ROWS), so a repaint that shifts the box by a
- * row drops the header out of that window for a single read. Resetting on one
- * miss would zero the counter mid-dialog — precisely the case the ceiling
- * exists for. Requiring sustained absence costs the next dialog one extra
- * cooldown round at most.
+ * Not 1: detection is structural (see isBypassDialogOnScreen), so a mid-repaint
+ * frame — the option rows drawn but the footer not yet, or the caret momentarily
+ * on neither row — reads as "no dialog" for a single round while the dialog is
+ * still very much up. Resetting on one miss would zero the counter mid-dialog —
+ * precisely the case the ceiling exists for. Requiring sustained absence costs
+ * the next dialog one extra cooldown round at most.
  */
 export declare const BYPASS_RESET_AFTER_MISSES = 2;
 export type BypassDialogAction = 
@@ -117,17 +152,74 @@ export interface BypassDialogState {
  * Record a round in which no dialog was detected, clearing the keystroke count
  * once the dialog has been absent for BYPASS_RESET_AFTER_MISSES consecutive
  * rounds so the next dialog starts with a full allowance. Tolerating a single
- * miss keeps a one-round detection flicker (a repaint shifting the header out
- * of the detection window) from silently refilling the allowance mid-dialog.
+ * miss keeps a one-round detection flicker (a repaint catching the dialog
+ * half-drawn) from silently refilling the allowance mid-dialog.
  */
 export declare function noteDialogAbsent(state: BypassDialogState): void;
 /** Record a round in which the dialog *was* detected, restarting the miss run. */
 export declare function noteDialogPresent(state: BypassDialogState): void;
 /** Exported only so a unit test can prove the escaping above. */
 export declare function rowPattern(label: string): RegExp;
+/**
+ * Is a live, drivable bypass-permissions dialog on this screen?
+ *
+ * This replaced a positional test — "both marker substrings inside the bottom
+ * 20 rows" — which assumed a modal is always anchored to the bottom. This
+ * dialog is not: it renders at boot, before there is any conversation to push
+ * it down, so on a clean start it sits at the TOP of the screen with the rest
+ * blank. Both markers then fall outside the window, detection returns null,
+ * nothing is pressed, and the session dies at the 120 s startup timeout and
+ * respawns into the same dialog (issue #436). Whether a given boot emitted
+ * enough output to push the dialog into the window is what made the wedge look
+ * random.
+ *
+ * The window was never really about position, though — it was a cheap proxy for
+ * "this is the live modal, not text that quotes it". Quoted text is a genuine
+ * hazard: an agent explaining this dialog, or re-injected conversation history,
+ * puts the same characters on the same screen, and a mis-aimed Enter can land on
+ * "No, exit" and kill Claude Code unrecoverably. So the proxy is replaced with
+ * the thing it was proxying for — structural properties, all position-
+ * independent, all read off a verbatim capture of the real dialog:
+ *
+ *   1. The dialog's heading is somewhere on screen. Cheap substring reject.
+ *   2. Both option labels occupy a WHOLE row (findRow's anchored patterns), so
+ *      prose that mentions them mid-sentence never qualifies.
+ *   3. Exactly ONE of those two rows carries the ❯ caret. Zero means the frame
+ *      is still rendering (or is not a live select); two is a shape we do not
+ *      understand.
+ *   4. The rows and the footer form one BLOCK — the options within
+ *      BYPASS_MAX_ROW_GAP rows of each other, the footer within
+ *      BYPASS_MAX_FOOTER_GAP below them. Without this the three elements only
+ *      had to appear in order, so an option row, an unrelated option row 15
+ *      lines later and a sentence containing "Enter to confirm" further down
+ *      still qualified (review round 2, finding M3).
+ *   5. The dialog's own confirm footer renders BELOW the option rows.
+ *   6. Nothing but blank rows renders below that footer.
+ *
+ * (6) is the load-bearing one, and it is what the old bottom-region test was
+ * actually encoding: a live modal owns the screen. Quoted text never can — the
+ * input box, its border and the status bar always render underneath it — so
+ * scrollback, a pasted dialog, and re-injected history all fail (6) no matter
+ * where on the screen they land.
+ *
+ * (6) is deliberately ZERO-tolerance: not even a box border may follow the
+ * footer. A future Claude Code that draws this dialog inside a box, or paints a
+ * status line beneath it, would therefore stop being detected. That is the
+ * intended direction of the trade — a miss is fail-safe (the operator sees the
+ * dialog, and maybeHandleDialog() now logs a warning naming this exact case),
+ * whereas relaxing (6) to tolerate border rows would admit a quoted dialog
+ * sitting above an EMPTY input box, whose rows are themselves nothing but
+ * border characters. Given "No, exit" is unrecoverable and a visible dialog is
+ * not, a miss beats a false accept (review round 2, finding M2 — accepted as
+ * accurate, resolved this way rather than by relaxing the rule).
+ *
+ * Fail-safe in the same direction as before: anything unrecognised reads as "no
+ * dialog", which means no keystroke and an operator who simply sees the dialog.
+ */
+export declare function isBypassDialogOnScreen(screenText: string): boolean;
 /**
  * Decide the single keystroke to send at a bypass-permissions dialog, given
- * the screen region the dialog was detected in.
+ * the screen text the dialog was detected on.
  *
  * Callers send at most one key per call and re-read the screen before the
  * next one (the DIALOG_ACTION_COOLDOWN_MS re-entry in maybeHandleDialog()),

package/dist/shell/bypass-dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bypass-dialog.d.ts","sourceRoot":"","sources":["../../src/shell/bypass-dialog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AACnD,eAAO,MAAM,oBAAoB,aAAa,CAAC;AAE/C,mEAAmE;AACnE,eAAO,MAAM,eAAe,aAAW,CAAC;AACxC,eAAO,MAAM,aAAa,aAAW,CAAC;AACtC,qFAAqF;AACrF,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAErC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,MAAM,MAAM,kBAAkB;AAC5B,kFAAkF;AAChF;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AAChC;;;;GAIG;GACD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AAC/B,oDAAoD;GAClD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AAClC,8DAA8D;GAC5D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErC,yEAAyE;AACzE,MAAM,WAAW,iBAAiB;IAChC,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAG/D;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAEhE;AAmCD,iEAAiE;AACjE,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIhD;AAkBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,iBAAiB,GACvB,kBAAkB,CA+CpB"}
+{"version":3,"file":"bypass-dialog.d.ts","sourceRoot":"","sources":["../../src/shell/bypass-dialog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AACnD,eAAO,MAAM,oBAAoB,aAAa,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AAExD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,4BAA4B,CAAC;AAExD;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,mEAAmE;AACnE,eAAO,MAAM,eAAe,aAAW,CAAC;AACxC,eAAO,MAAM,aAAa,aAAW,CAAC;AACtC,qFAAqF;AACrF,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAErC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,MAAM,MAAM,kBAAkB;AAC5B,kFAAkF;AAChF;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AAChC;;;;GAIG;GACD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AAC/B,oDAAoD;GAClD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AAClC,8DAA8D;GAC5D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErC,yEAAyE;AACzE,MAAM,WAAW,iBAAiB;IAChC,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAG/D;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAEhE;AAmCD,iEAAiE;AACjE,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIhD;AAkBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAuBlE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,iBAAiB,GACvB,kBAAkB,CA4DpB"}