jishushell 0.4.10 → 0.4.24

package/dist/services/panel-manager.js

@@ -0,0 +1,443 @@
+/**
+ * src/services/panel-manager.ts
+ *
+ * Pure panel lifecycle management — OS interaction only, no console.log.
+ * Returns typed results; callers (CLI) handle all output and formatting.
+ *
+ * Supports three run modes (auto-detected):
+ *   systemd  — /etc/systemd/system/jishushell.service exists
+ *   launchd  — ~/Library/LaunchAgents/com.jishushell.panel.plist exists (macOS)
+ *   process  — PID file fallback
+ */
+import { execSync, execFileSync, spawn } from "child_process";
+import { existsSync, readFileSync, unlinkSync, openSync, closeSync, } from "fs";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
+import { homedir } from "os";
+import * as http from "http";
+import * as https from "https";
+import { JISHUSHELL_HOME, getPanelConfig } from "../config.js";
+import { ensureDirHost, writeSecretFile } from "../utils/fs.js";
+// ── Constants ──────────────────────────────────────────────────────────────
+export const PID_FILE = join(JISHUSHELL_HOME, "jishushell.pid");
+export const LOG_FILE = join(JISHUSHELL_HOME, "jishushell.log");
+export const SYSTEMD_SERVICE = "/etc/systemd/system/jishushell.service";
+export const LAUNCHD_PLIST = join(homedir(), "Library/LaunchAgents/com.jishushell.panel.plist");
+const __filename = fileURLToPath(import.meta.url);
+// services/ is one level below the root; cli.js lives at ../cli.js
+export const CLI_PATH = join(dirname(__filename), "../cli.js");
+export function detectRunMode() {
+    if (process.platform !== "darwin") {
+        if (existsSync(SYSTEMD_SERVICE)) {
+            try {
+                execSync("systemctl --version 2>/dev/null", { stdio: "ignore", timeout: 2000 });
+                return "systemd";
+            }
+            catch { }
+        }
+    }
+    else {
+        if (existsSync(LAUNCHD_PLIST))
+            return "launchd";
+    }
+    return "process";
+}
+// ── Panel port resolution ──────────────────────────────────────────────────
+export function getPanelPort() {
+    try {
+        const cfg = getPanelConfig();
+        const p = parseInt(String(cfg.panel_port ?? ""), 10);
+        if (p > 0 && p < 65536)
+            return p;
+    }
+    catch { }
+    const env = parseInt(process.env.JISHUSHELL_PORT ?? "", 10);
+    if (env > 0 && env < 65536)
+        return env;
+    return 8090;
+}
+// ── Process state helpers ──────────────────────────────────────────────────
+export function readAlivePid() {
+    try {
+        const raw = readFileSync(PID_FILE, "utf-8").trim();
+        const pid = parseInt(raw, 10);
+        if (!Number.isInteger(pid) || pid <= 0)
+            return null;
+        process.kill(pid, 0);
+        try {
+            const cmdline = readFileSync(`/proc/${pid}/cmdline`, "utf-8");
+            if (!cmdline.includes("jishushell") && !cmdline.includes("cli.js"))
+                return null;
+        }
+        catch { /* /proc not available (macOS) */ }
+        return pid;
+    }
+    catch {
+        return null;
+    }
+}
+function writePid(pid) {
+    writeSecretFile(PID_FILE, String(pid) + "\n");
+}
+function removePidFile() {
+    try {
+        unlinkSync(PID_FILE);
+    }
+    catch { }
+}
+// ── Port detection ─────────────────────────────────────────────────────────
+export function isPortListening(port) {
+    try {
+        if (process.platform === "darwin") {
+            const out = execFileSync("lsof", ["-iTCP:" + port, "-sTCP:LISTEN", "-t"], {
+                encoding: "utf-8", timeout: 3000, stdio: ["pipe", "pipe", "pipe"],
+            });
+            return out.trim().length > 0;
+        }
+        const out = execFileSync("ss", ["-tlnp"], {
+            encoding: "utf-8", timeout: 3000, stdio: ["pipe", "pipe", "pipe"],
+        });
+        return new RegExp(`[:\\s]${port}\\s`).test(out);
+    }
+    catch {
+        return false;
+    }
+}
+export async function waitForPortFree(port, timeoutMs = 5000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        if (!isPortListening(port))
+            return;
+        await new Promise((r) => setTimeout(r, 300));
+    }
+}
+export async function waitForPortOpen(port, timeoutMs = 8000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        if (isPortListening(port))
+            return true;
+        await new Promise((r) => setTimeout(r, 400));
+    }
+    return false;
+}
+export function killPortProcess(port) {
+    try {
+        let pids = [];
+        if (process.platform === "darwin") {
+            const out = execSync(`lsof -ti:${port} 2>/dev/null`, {
+                encoding: "utf-8", timeout: 3000,
+            });
+            pids = out.trim().split("\n").filter(Boolean).map(Number).filter(n => n > 1);
+        }
+        else {
+            const out = execSync("ss -tlnp 2>/dev/null", { encoding: "utf-8", timeout: 3000 });
+            const lines = out.split("\n").filter(l => l.includes(`:${port} `));
+            for (const line of lines) {
+                for (const m of line.matchAll(/pid=(\d+)/g)) {
+                    const n = parseInt(m[1], 10);
+                    if (n > 1)
+                        pids.push(n);
+                }
+            }
+        }
+        pids = [...new Set(pids)];
+        if (pids.length === 0)
+            return false;
+        for (const pid of pids) {
+            try {
+                process.kill(pid, "SIGTERM");
+            }
+            catch { }
+        }
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// ── systemd helpers ────────────────────────────────────────────────────────
+function systemdExec(action) {
+    let useSudo = true;
+    try {
+        execSync("sudo -n true 2>/dev/null", { stdio: "ignore", timeout: 3000 });
+    }
+    catch {
+        useSudo = false;
+    }
+    if (useSudo) {
+        execFileSync("sudo", ["systemctl", action, "jishushell"], { stdio: "inherit", timeout: 15000 });
+    }
+    else {
+        execFileSync("systemctl", [action, "jishushell"], { stdio: "inherit", timeout: 15000 });
+    }
+}
+export function systemdStatus() {
+    try {
+        return execSync("systemctl is-active jishushell 2>/dev/null", {
+            encoding: "utf-8", timeout: 3000,
+        }).trim();
+    }
+    catch (e) {
+        if (e?.stdout)
+            return e.stdout.trim();
+        return "unknown";
+    }
+}
+function systemdResetFailed() {
+    try {
+        execFileSync("sudo", ["systemctl", "reset-failed", "jishushell"], { stdio: "ignore", timeout: 5000 });
+    }
+    catch {
+        try {
+            execFileSync("systemctl", ["reset-failed", "jishushell"], { stdio: "ignore", timeout: 5000 });
+        }
+        catch { }
+    }
+}
+// ── launchd helpers ────────────────────────────────────────────────────────
+function launchctlExec(action) {
+    const label = "com.jishushell.panel";
+    if (action === "start") {
+        try {
+            execFileSync("launchctl", ["load", "-w", LAUNCHD_PLIST], { stdio: "ignore", timeout: 10000 });
+        }
+        catch { }
+    }
+    execFileSync("launchctl", [action, label], { stdio: "inherit", timeout: 10000 });
+}
+// ── process mode helpers ───────────────────────────────────────────────────
+function processStart(port) {
+    ensureDirHost(dirname(LOG_FILE));
+    const logFd = openSync(LOG_FILE, "a");
+    const child = spawn(process.execPath, [CLI_PATH, "serve", "--port", String(port)], {
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        env: {
+            PATH: process.env.PATH,
+            HOME: process.env.HOME,
+            USER: process.env.USER,
+            LANG: process.env.LANG,
+            NODE_ENV: "production",
+            JISHUSHELL_HOME: process.env.JISHUSHELL_HOME || "",
+            JISHUSHELL_PORT: process.env.JISHUSHELL_PORT || "",
+            JISHUSHELL_JWT_SECRET: process.env.JISHUSHELL_JWT_SECRET || "",
+            JISHUSHELL_AES_KEY: process.env.JISHUSHELL_AES_KEY || "",
+            NOMAD_ADDR: process.env.NOMAD_ADDR || "",
+            NOMAD_TOKEN: process.env.NOMAD_TOKEN || "",
+        },
+    });
+    child.unref();
+    closeSync(logFd);
+    writePid(child.pid);
+}
+async function processStop() {
+    const pid = readAlivePid();
+    if (pid === null) {
+        removePidFile();
+        throw new Error("No running process found (PID file missing or stale).");
+    }
+    try {
+        process.kill(pid, "SIGTERM");
+    }
+    catch (e) {
+        if (e.code === "EPERM") {
+            throw new Error(`Permission denied to stop PID ${pid}. Try: sudo jishushell stop`);
+        }
+        removePidFile();
+        throw e;
+    }
+    const deadline = Date.now() + 5000;
+    while (Date.now() < deadline) {
+        await new Promise((r) => setTimeout(r, 300));
+        try {
+            process.kill(pid, 0);
+        }
+        catch {
+            removePidFile();
+            return;
+        }
+    }
+    try {
+        process.kill(pid, "SIGKILL");
+    }
+    catch { }
+    removePidFile();
+}
+export async function startPanel(port) {
+    const resolvedPort = port ?? getPanelPort();
+    const mode = detectRunMode();
+    if (isPortListening(resolvedPort)) {
+        return { mode, port: resolvedPort, alreadyRunning: true, started: true };
+    }
+    switch (mode) {
+        case "systemd":
+            systemdResetFailed();
+            systemdExec("start");
+            break;
+        case "launchd":
+            launchctlExec("start");
+            break;
+        case "process":
+            if (readAlivePid() !== null)
+                removePidFile(); // stale PID
+            processStart(resolvedPort);
+            break;
+    }
+    const listening = await waitForPortOpen(resolvedPort, 10000);
+    return {
+        mode,
+        port: resolvedPort,
+        alreadyRunning: false,
+        started: listening,
+        logFile: !listening && mode === "process" ? LOG_FILE : undefined,
+    };
+}
+export async function stopPanel() {
+    const port = getPanelPort();
+    const mode = detectRunMode();
+    switch (mode) {
+        case "systemd":
+            systemdExec("stop");
+            break;
+        case "launchd":
+            launchctlExec("stop");
+            break;
+        case "process":
+            await processStop();
+            break;
+    }
+    await waitForPortFree(port, 5000);
+    return { mode };
+}
+export async function restartPanel(port) {
+    const mode = detectRunMode();
+    const resolvedPort = port ?? getPanelPort();
+    if (mode === "systemd") {
+        systemdResetFailed();
+        systemdExec("restart");
+        const started = await waitForPortOpen(resolvedPort, 10000);
+        return { mode, port: resolvedPort, alreadyRunning: false, started };
+    }
+    // Non-systemd: explicit stop → start
+    if (mode === "launchd") {
+        try {
+            launchctlExec("stop");
+        }
+        catch { }
+    }
+    else {
+        if (readAlivePid() !== null) {
+            try {
+                await processStop();
+            }
+            catch { }
+        }
+        else {
+            removePidFile();
+        }
+    }
+    if (isPortListening(resolvedPort)) {
+        killPortProcess(resolvedPort);
+        await waitForPortFree(resolvedPort, 5000);
+    }
+    if (isPortListening(resolvedPort)) {
+        throw new Error(`Port ${resolvedPort} is still occupied after stop. Try \`jishushell stop\` first.`);
+    }
+    return startPanel(resolvedPort);
+}
+let _updateCache = null;
+const UPDATE_CACHE_TTL = 30_000;
+function getNpmRegistryUrl() {
+    const panelReg = getPanelConfig().npm_registry;
+    if (typeof panelReg === "string" && panelReg.trim())
+        return panelReg.trim().replace(/\/+$/, "");
+    try {
+        const nodeBinDir = dirname(process.execPath);
+        const npmBin = join(nodeBinDir, "npm");
+        const reg = execFileSync(npmBin, ["config", "get", "registry"], {
+            encoding: "utf-8", timeout: 5000,
+        }).trim();
+        if (reg && reg !== "undefined")
+            return reg.replace(/\/+$/, "");
+    }
+    catch { /* fall through */ }
+    return "https://registry.npmjs.org";
+}
+export async function checkUpdate() {
+    if (_updateCache && Date.now() - _updateCache.ts < UPDATE_CACHE_TTL) {
+        return _updateCache.info;
+    }
+    let currentVersion = "0.0.0";
+    try {
+        const pkgPath = join(dirname(fileURLToPath(import.meta.url)), "../../package.json");
+        currentVersion = JSON.parse(readFileSync(pkgPath, "utf-8")).version ?? "0.0.0";
+    }
+    catch { /* keep default */ }
+    let latestVersion = currentVersion;
+    let hasUpdate = false;
+    try {
+        const registryUrl = getNpmRegistryUrl();
+        const metaUrl = new URL(`/jishushell/latest`, registryUrl);
+        const transport = metaUrl.protocol === "https:" ? https : http;
+        latestVersion = await new Promise((resolve, reject) => {
+            const req = transport.get(metaUrl, { headers: { accept: "application/json" }, timeout: 8000 }, (res) => {
+                let body = "";
+                res.on("data", (d) => (body += d));
+                res.on("end", () => {
+                    try {
+                        resolve(JSON.parse(body).version ?? currentVersion);
+                    }
+                    catch {
+                        reject(new Error("parse error"));
+                    }
+                });
+            });
+            req.on("error", reject);
+            req.on("timeout", () => { req.destroy(); reject(new Error("timeout")); });
+        });
+        const parse = (v) => v.replace(/^v/, "").split(".").map(Number);
+        const [cMaj, cMin, cPat] = parse(currentVersion);
+        const [lMaj, lMin, lPat] = parse(latestVersion);
+        hasUpdate =
+            lMaj > cMaj ||
+                (lMaj === cMaj && lMin > cMin) ||
+                (lMaj === cMaj && lMin === cMin && lPat > cPat);
+    }
+    catch { /* network unavailable — return no-update */ }
+    const info = { hasUpdate, currentVersion, latestVersion };
+    _updateCache = { ts: Date.now(), info };
+    // Piggyback telemetry on update checks (fire-and-forget)
+    import("./telemetry/index.js").then(({ checkAndReport, checkAndReportHeartbeat }) => {
+        checkAndReport();
+        checkAndReportHeartbeat();
+    }).catch(() => { });
+    return info;
+}
+export async function upgradePackage() {
+    const nodeBinDir = dirname(process.execPath);
+    const npmBin = join(nodeBinDir, "npm");
+    const childEnv = {
+        ...process.env,
+        PATH: `${nodeBinDir}${process.env.PATH ? `:${process.env.PATH}` : ""}`,
+    };
+    try {
+        const out = execFileSync(npmBin, ["install", "-g", "jishushell", "--registry", getNpmRegistryUrl() + "/"], { encoding: "utf-8", timeout: 120_000, stdio: ["ignore", "pipe", "pipe"], env: childEnv });
+        _updateCache = null; // invalidate
+        return { output: out?.trim() ?? "" };
+    }
+    catch (err) {
+        const detail = err.stderr ? err.stderr.trim() : err.message;
+        throw new Error(detail || err.message);
+    }
+}
+export function scheduleRestart(delayMs = 2000) {
+    const nodeBinDir = dirname(process.execPath);
+    const childEnv = {
+        ...process.env,
+        PATH: `${nodeBinDir}${process.env.PATH ? `:${process.env.PATH}` : ""}`,
+    };
+    const delaySecs = Math.max(1, Math.round(delayMs / 1000));
+    const child = spawn("sh", ["-c", `sleep ${delaySecs} && exec ${JSON.stringify(process.execPath)} ${JSON.stringify(CLI_PATH)} restart`], { detached: true, stdio: "ignore", env: childEnv });
+    child.unref();
+}
+//# sourceMappingURL=panel-manager.js.map

package/dist/services/panel-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-manager.js","sourceRoot":"","sources":["../../src/services/panel-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,GAC1D,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEhE,8EAA8E;AAE9E,MAAM,CAAC,MAAM,QAAQ,GAAU,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AACvE,MAAM,CAAC,MAAM,QAAQ,GAAU,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AACvE,MAAM,CAAC,MAAM,eAAe,GAAG,wCAAwC,CAAC;AACxE,MAAM,CAAC,MAAM,aAAa,GAAK,IAAI,CAAC,OAAO,EAAE,EAAE,iDAAiD,CAAC,CAAC;AAElG,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,mEAAmE;AACnE,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC;AAM/D,MAAM,UAAU,aAAa;IAC3B,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,QAAQ,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChF,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,UAAU,CAAC,aAAa,CAAC;YAAE,OAAO,SAAS,CAAC;IAClD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,8EAA8E;AAE9E,MAAM,UAAU,YAAY;IAC1B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,cAAc,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK;YAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5D,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,KAAK;QAAE,OAAO,GAAG,CAAC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8EAA8E;AAE9E,MAAM,UAAU,YAAY;IAC1B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,GAAG,UAAU,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,OAAO,IAAI,CAAC;QAClF,CAAC;QAAC,MAAM,CAAC,CAAC,iCAAiC,CAAC,CAAC;QAC7C,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,aAAa;IACpB,IAAI,CAAC;QAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;AACxC,CAAC;AAED,8EAA8E;AAE9E,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,QAAQ,GAAG,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE;gBACxE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;aAClE,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE;YACxC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAClE,CAAC,CAAC;QACH,OAAO,IAAI,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,SAAS,GAAG,IAAI;IAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAAE,OAAO;QACnC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,SAAS,GAAG,IAAI;IAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,eAAe,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACvC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,IAAI,CAAC;QACH,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,QAAQ,CAAC,YAAY,IAAI,cAAc,EAAE;gBACnD,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI;aACjC,CAAC,CAAC;YACH,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,QAAQ,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACnF,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC;YACnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC5C,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC7B,IAAI,CAAC,GAAG,CAAC;wBAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,8EAA8E;AAE9E,SAAS,WAAW,CAAC,MAAc;IACjC,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC;QACH,QAAQ,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,GAAG,KAAK,CAAC;IAAC,CAAC;IAE5B,IAAI,OAAO,EAAE,CAAC;QACZ,YAAY,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAClG,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,4CAA4C,EAAE;YAC5D,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI;SACjC,CAAC,CAAC,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM;YAAE,OAAQ,CAAC,CAAC,MAAiB,CAAC,IAAI,EAAE,CAAC;QAClD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB;IACzB,IAAI,CAAC;QACH,YAAY,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACxG,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC;YAAC,YAAY,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACjH,CAAC;AACH,CAAC;AAED,8EAA8E;AAE9E,SAAS,aAAa,CAAC,MAAc;IACnC,MAAM,KAAK,GAAG,sBAAsB,CAAC;IACrC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAChG,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AACnF,CAAC;AAED,8EAA8E;AAE9E,SAAS,YAAY,CAAC,IAAY;IAChC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE;QACjF,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC;QAC/B,GAAG,EAAE;YACH,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;YACtB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;YACtB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;YACtB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;YACtB,QAAQ,EAAE,YAAY;YACtB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE;YAClD,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE;YAClD,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE;YAC9D,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE;YACxD,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE;YACxC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;SAC3C;KACF,CAAC,CAAC;IACH,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,SAAS,CAAC,KAAK,CAAC,CAAC;IACjB,QAAQ,CAAC,KAAK,CAAC,GAAI,CAAC,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,WAAW;IACxB,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;IAC3B,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,aAAa,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAK,CAA2B,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,6BAA6B,CAAC,CAAC;QACrF,CAAC;QACD,aAAa,EAAE,CAAC;QAChB,MAAM,CAAC,CAAC;IACV,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;IACnC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,aAAa,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;IAClE,CAAC;IACD,IAAI,CAAC;QAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAC9C,aAAa,EAAE,CAAC;AAClB,CAAC;AAeD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAa;IAC5C,MAAM,YAAY,GAAG,IAAI,IAAI,YAAY,EAAE,CAAC;IAC5C,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,IAAI,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3E,CAAC;IAED,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,SAAS;YACZ,kBAAkB,EAAE,CAAC;YACrB,WAAW,CAAC,OAAO,CAAC,CAAC;YACrB,MAAM;QACR,KAAK,SAAS;YACZ,aAAa,CAAC,OAAO,CAAC,CAAC;YACvB,MAAM;QACR,KAAK,SAAS;YACZ,IAAI,YAAY,EAAE,KAAK,IAAI;gBAAE,aAAa,EAAE,CAAC,CAAC,YAAY;YAC1D,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3B,MAAM;IACV,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAC7D,OAAO;QACL,IAAI;QACJ,IAAI,EAAE,YAAY;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,CAAC,SAAS,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;KACjE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,SAAS;YAAE,WAAW,CAAC,MAAM,CAAC,CAAC;YAAC,MAAM;QAC3C,KAAK,SAAS;YAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YAAC,MAAM;QAC7C,KAAK,SAAS;YAAE,MAAM,WAAW,EAAE,CAAC;YAAC,MAAM;IAC7C,CAAC;IAED,MAAM,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,OAAO,EAAE,IAAI,EAAE,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAa;IAC9C,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,IAAI,IAAI,YAAY,EAAE,CAAC;IAE5C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,kBAAkB,EAAE,CAAC;QACrB,WAAW,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IACtE,CAAC;IAED,qCAAqC;IACrC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC;YAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,IAAI,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC;gBAAC,MAAM,WAAW,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,aAAa,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;IAED,IAAI,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,eAAe,CAAC,YAAY,CAAC,CAAC;QAC9B,MAAM,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,QAAQ,YAAY,+DAA+D,CACpF,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;AAClC,CAAC;AAUD,IAAI,YAAY,GAA4C,IAAI,CAAC;AACjE,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEhC,SAAS,iBAAiB;IACxB,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,YAAY,CAAC;IAC/C,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE;QAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAChG,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE;YAC9D,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI;SACjC,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,GAAG,IAAI,GAAG,KAAK,WAAW;YAAE,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;IAC9B,OAAO,4BAA4B,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,IAAI,YAAY,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,EAAE,GAAG,gBAAgB,EAAE,CAAC;QACpE,OAAO,YAAY,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,IAAI,cAAc,GAAG,OAAO,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;QACpF,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC;IACjF,CAAC;IAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;IAE9B,IAAI,aAAa,GAAG,cAAc,CAAC;IACnC,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,iBAAiB,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/D,aAAa,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5D,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CACvB,OAAO,EACP,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAC1D,CAAC,GAAG,EAAE,EAAE;gBACN,IAAI,IAAI,GAAG,EAAE,CAAC;gBACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;gBACnC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACjB,IAAI,CAAC;wBAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,cAAc,CAAC,CAAC;oBAAC,CAAC;oBAC5D,MAAM,CAAC;wBAAC,MAAM,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;oBAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;YACL,CAAC,CACF,CAAC;YACF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxB,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QAChD,SAAS;YACP,IAAI,GAAG,IAAI;gBACX,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,GAAG,IAAI,CAAC;gBAC9B,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC,CAAC,4CAA4C,CAAC,CAAC;IAExD,MAAM,IAAI,GAAe,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;IACtE,YAAY,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC;IAExC,yDAAyD;IACzD,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,EAAE,uBAAuB,EAAE,EAAE,EAAE;QAClF,cAAc,EAAE,CAAC;QACjB,uBAAuB,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAqC,CAAC,CAAC,CAAC;IAEtD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG;QACf,GAAG,OAAO,CAAC,GAAG;QACd,IAAI,EAAE,GAAG,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;KACvE,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CACtB,MAAM,EACN,CAAC,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,EACxE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAC1F,CAAC;QACF,YAAY,GAAG,IAAI,CAAC,CAAC,aAAa;QAClC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;IACvC,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAE,GAAG,CAAC,MAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;QACxE,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAO,GAAG,IAAI;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG;QACf,GAAG,OAAO,CAAC,GAAG;QACd,IAAI,EAAE,GAAG,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;KACvE,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,KAAK,CACjB,IAAI,EACJ,CAAC,IAAI,EAAE,SAAS,SAAS,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAC5G,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CACnD,CAAC;IACF,KAAK,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC"}

package/dist/services/plugin-installer.js

@@ -4,7 +4,33 @@
  * Tracks install status per `${instanceId}:${channelId}` key.
  * Only one install runs at a time across all instances to avoid memory pressure.
  */
-import { installChannelPlugin, isChannelPluginInstalled, CHANNEL_PLUGIN_MAP } from "./instance-manager.js";
+// §32.2 / §32.8: channel plugin logic lives entirely in OpenClawAdapter.
+// This module is a scheduler queue that dispatches to the adapter — it
+// contains zero OpenClaw business knowledge.
+import { getAdapter, resolveAgentType } from "./runtime/index.js";
+import { getInstance } from "./app/app-manager.js";
+function adapterFor(instanceId) {
+    const meta = getInstance(instanceId);
+    const agentType = resolveAgentType(meta);
+    return getAdapter(agentType);
+}
+function isChannelPluginInstalled(instanceId, channelId) {
+    const adapter = adapterFor(instanceId);
+    return typeof adapter.isChannelPluginInstalled === "function"
+        ? adapter.isChannelPluginInstalled(instanceId, channelId)
+        : false;
+}
+async function installChannelPlugin(instanceId, channelId) {
+    const adapter = adapterFor(instanceId);
+    if (typeof adapter.installChannelPlugin !== "function") {
+        throw new Error(`Runtime "${adapter.agentType}" does not support plugin install`);
+    }
+    return adapter.installChannelPlugin(instanceId, channelId);
+}
+function channelPluginMapFor(instanceId) {
+    const adapter = adapterFor(instanceId);
+    return adapter.channelPluginMap || {};
+}
 /** Plugins tracked by the status API */
 const TRACKED_PLUGINS = ["feishu", "openclaw-weixin"];
 const _installing = new Map();
@@ -40,7 +66,7 @@ export function getAllPluginStatuses(instanceId) {
  * If already installed or already queued/installing, resolves immediately.
  */
 export function enqueueInstall(instanceId, channelId) {
-    if (!CHANNEL_PLUGIN_MAP[channelId]) {
+    if (!channelPluginMapFor(instanceId)[channelId]) {
         console.error(`[plugin-installer] Unknown channel: ${channelId}`);
         return;
     }

package/dist/services/plugin-installer.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-installer.js","sourceRoot":"","sources":["../../src/services/plugin-installer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-installer.js","sourceRoot":"","sources":["../../src/services/plugin-installer.ts"],"names":[],"mappings":"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"}

package/dist/services/process-manager.js

@@ -1,10 +1,32 @@
+/**
+ * process-manager.ts — LEGACY OPENCLAW-ONLY host/process driver.
+ *
+ * This module services `panel.json.service_manager = "process"` or
+ * legacy `nomad_driver = "raw_exec"` layouts, both of which apply only
+ * to OpenClaw host-mode instances. All modern agents (Hermes + any new
+ * RuntimeAdapter) MUST schedule via Nomad + docker through
+ * `nomad-manager.ts` and their adapter's `buildNomadTask()`.
+ *
+ * Do NOT extend this file to support additional agents. New agents
+ * should:
+ *   1. Implement `RuntimeAdapter.buildNomadTask()` in their adapter file.
+ *   2. Register via `registerAdapter()` in `runtime/index.ts`.
+ *   3. Run under Nomad docker driver exclusively.
+ *
+ * The OpenClaw-specific helpers here (pidfile, proc scanning, log tail,
+ * spawn with config-generation) all hardcode openclaw binary names and
+ * directory layouts. They are preserved only so existing OpenClaw
+ * `service_manager=process` deployments keep working. A future PR should
+ * migrate the remaining OpenClaw host-mode callers to Nomad raw_exec via
+ * `OpenClawAdapter.buildNomadTask()` and delete this file wholesale.
+ */
 import { execFile as execFileCb, spawn } from "child_process";
 import { promisify } from "util";
 import { existsSync, readFileSync, readdirSync, statSync, renameSync, openSync, closeSync, readSync } from "fs";
 import { readdir, readFile, writeFile, unlink } from "fs/promises";
 import os from "os";
 import { join } from "path";
-import { getOpenclawHome, getOpenclawConfigPath, getInstanceRuntime, getRuntimeEnv, getGatewayPort, findInstancesSharingOpenclawHome, findInstancesSharingGatewayPort, resolveServiceUser, } from "./instance-manager.js";
+import { getOpenclawHome, getOpenclawConfigPath, getInstanceRuntime, getRuntimeEnv, getGatewayPort, findInstancesSharingOpenclawHome, isPortInUse, reallocateGatewayPort, resolveServiceUser, } from "./instance-manager.js";
 import { ensureDirHost } from "../utils/fs.js";
 const execFileAsync = promisify(execFileCb);
 // Use OS-reported page size instead of hardcoding 4096 (ARM/RPi may use 16KB pages)
@@ -312,11 +334,20 @@ export async function startInstance(instanceId) {
             return { ok: false, error: `OPENCLAW_HOME is shared with running instance: ${otherId}` };
         }
     }
-    // Check for gateway port conflicts
-    const port = getGatewayPort(instanceId);
-    for (const otherId of findInstancesSharingGatewayPort(instanceId)) {
-        if (await findProcess(otherId) !== null) {
-            return { ok: false, error: `Gateway port ${port} is already in use by running instance: ${otherId}` };
+    // Host port probe + self-heal (matches the nomad-manager path). If the
+    // previously-assigned gateway port is held by any process on the host —
+    // another jishushell instance, a host-side openclaw, or an unrelated
+    // service — we re-pick the next free port and rewrite instance metadata.
+    // The child process is spawned below using that refreshed metadata.
+    let portAllocation = null;
+    const desiredPort = getGatewayPort(instanceId);
+    if (await isPortInUse(desiredPort)) {
+        try {
+            const re = await reallocateGatewayPort(instanceId);
+            portAllocation = { from: re.from, to: re.to, reason: "host_port_busy" };
+        }
+        catch (e) {
+            return { ok: false, error: `Gateway port ${desiredPort} is held by another process and reallocation failed: ${e?.message ?? e}` };
         }
     }
     const openclawHome = getOpenclawHome(instanceId);
@@ -383,7 +414,11 @@ export async function startInstance(instanceId) {
         if (child.pid) {
             await writePidfile(instanceId, child.pid);
         }
-        return { ok: true, pid: child.pid };
+        return {
+            ok: true,
+            pid: child.pid,
+            ...(portAllocation ? { port_allocation: portAllocation } : {}),
+        };
     }
     catch (e) {
         if (e.code === "ENOENT") {