jishushell 0.6.5 → 0.7.3

package/dist/services/system/repair-orchestrator.js

@@ -0,0 +1,412 @@
+import { existsSync, unlinkSync } from "fs";
+import { userInfo } from "os";
+import { dirname, join } from "path";
+import { JISHUSHELL_HOME } from "../../config.js";
+import { createInvalidSudoPasswordError, isSudoAuthenticationError, isSudoNoNewPrivilegesError, runSudoAskpassCommand, } from "../../utils/sudo-askpass.js";
+import { inspectSystemDrift, reconcileSystem } from "./system-reconciler.js";
+import { executeUpgradeFinalize, getUpgradeFinalizeStatus, } from "./upgrade-finalize.js";
+import { buildSudoDisplayCommand, buildSudoJishushellCommand, getJishushellWrapper } from "./cli-command.js";
+import { getManagedStatus, restartInstance } from "../app-common/lifecycle-service.js";
+import { LEGACY_JOB_SPEC_RESTART_REPAIR_ID, markRuntimeRepairRestartApplied, repairRuntimeInstances, } from "../repair/runtime-repair.js";
+const PACKAGE_UPDATE_PENDING_FILE = join(JISHUSHELL_HOME, "package-update-pending.json");
+function isRoot() {
+    return typeof process.getuid === "function" && process.getuid() === 0;
+}
+export function hasPendingPackageUpdate() {
+    return existsSync(PACKAGE_UPDATE_PENDING_FILE);
+}
+export function clearPendingPackageUpdate() {
+    try {
+        unlinkSync(PACKAGE_UPDATE_PENDING_FILE);
+    }
+    catch { }
+}
+function getRepairWrapper() {
+    return getJishushellWrapper();
+}
+export function getRepairCommand(restartConsentGranted = false) {
+    return buildSudoJishushellCommand(["repair", ...(restartConsentGranted ? ["--restart-instances"] : [])]);
+}
+function resolveCurrentCliTarget(candidate, args) {
+    const cliPath = candidate?.trim();
+    if (!cliPath || !existsSync(cliPath))
+        return null;
+    if (cliPath.endsWith(".js")) {
+        return {
+            command: process.execPath,
+            args: [cliPath, ...args],
+            displayCommand: buildSudoDisplayCommand(process.execPath, [cliPath, ...args]),
+        };
+    }
+    return {
+        command: cliPath,
+        args,
+        displayCommand: buildSudoDisplayCommand(cliPath, args),
+    };
+}
+function resolveRepairTarget(restartConsentGranted) {
+    const args = ["repair", "--yes", ...(restartConsentGranted ? ["--restart-instances"] : [])];
+    const wrapper = getRepairWrapper();
+    if (existsSync(wrapper)) {
+        return {
+            command: wrapper,
+            args,
+            displayCommand: buildSudoDisplayCommand(wrapper, args),
+        };
+    }
+    return resolveCurrentCliTarget(process.env.JISHUSHELL_CORE_BIN, args)
+        ?? resolveCurrentCliTarget(process.argv[1], args);
+}
+function createRepairSudoError(result) {
+    const message = (result.stderr || result.stdout).trim();
+    if (isSudoAuthenticationError(message))
+        return createInvalidSudoPasswordError();
+    if (isSudoNoNewPrivilegesError(message)) {
+        const err = new Error("当前运行环境禁止 sudo 提权（no new privileges），请在系统终端执行推荐的 repair 命令。");
+        err.code = "SUDO_NO_NEW_PRIVILEGES";
+        return err;
+    }
+    if (/systemd-run.*not found|No such file or directory/i.test(message)) {
+        const err = new Error("当前系统缺少 systemd-run，无法从网页安全启动后台 repair。请在系统终端执行推荐命令。");
+        err.code = "REPAIR_SUDO_UNSUPPORTED";
+        return err;
+    }
+    if (message)
+        return new Error(message);
+    return new Error("无法启动 repair，请在系统终端执行推荐命令。");
+}
+function buildSystemdRunRepairArgs(unit, includeCollect, target) {
+    const currentUser = userInfo();
+    const sudoEnv = typeof process.getuid === "function" && process.getuid() > 0
+        ? [
+            `--setenv=SUDO_UID=${process.getuid()}`,
+            ...(typeof process.getgid === "function" ? [`--setenv=SUDO_GID=${process.getgid()}`] : []),
+            `--setenv=SUDO_USER=${currentUser.username}`,
+        ]
+        : [];
+    const args = [
+        "systemd-run",
+        "--quiet",
+        `--unit=${unit}`,
+        `--setenv=JISHUSHELL_HOME=${JISHUSHELL_HOME}`,
+        `--setenv=HOME=${dirname(JISHUSHELL_HOME)}`,
+        ...sudoEnv,
+        target.command,
+        ...target.args,
+    ];
+    if (includeCollect)
+        args.splice(2, 0, "--collect");
+    return args;
+}
+async function startPrivilegedRepair(status, sudoPassword, restartConsentGranted) {
+    if (process.platform === "darwin") {
+        return {
+            ok: false,
+            code: "execution-failed",
+            status,
+            message: "macOS 暂不支持从网页执行 sudo repair，请在系统终端执行推荐命令。",
+            command: buildSudoDisplayCommand(getRepairWrapper(), ["repair", "--yes"]),
+        };
+    }
+    const target = resolveRepairTarget(restartConsentGranted);
+    if (!target) {
+        return {
+            ok: false,
+            code: "execution-failed",
+            status,
+            message: `找不到可执行的 JishuShell repair 命令：${getRepairWrapper()}`,
+            command: buildSudoDisplayCommand(getRepairWrapper(), ["repair", "--yes"]),
+        };
+    }
+    const unit = `jishushell-repair-${process.pid}-${Date.now()}`;
+    let result = await runSudoAskpassCommand(sudoPassword, buildSystemdRunRepairArgs(unit, true, target), { timeoutMs: 20_000 });
+    if (result.code !== 0 && /(?:unrecognized|unknown|invalid) option.*collect|collect.*(?:unrecognized|unknown|invalid)/i.test(result.stderr)) {
+        result = await runSudoAskpassCommand(sudoPassword, buildSystemdRunRepairArgs(unit, false, target), { timeoutMs: 20_000 });
+    }
+    if (result.code !== 0)
+        throw createRepairSudoError(result);
+    return {
+        ok: true,
+        code: "sudo-started",
+        status: {
+            ...status,
+            phase: "applying",
+            updatedAt: new Date().toISOString(),
+            message: "JishuShell repair started with sudo.",
+        },
+        message: "JishuShell repair started with sudo.",
+        command: target.displayCommand,
+        unit,
+    };
+}
+function runtimeNeedsRepair(result) {
+    return result.status === "repaired"
+        || result.status === "needs-restart"
+        || result.status === "error";
+}
+function runtimeRestartInstanceIds(results) {
+    return Array.from(new Set(results
+        .filter((item) => item.restartRequired)
+        .map((item) => item.instanceId)
+        .filter(Boolean)));
+}
+async function runningRuntimeRestartInstanceIds(results) {
+    const ids = runtimeRestartInstanceIds(results);
+    const running = [];
+    for (const id of ids) {
+        try {
+            const status = await getManagedStatus(id);
+            if (status?.status === "running")
+                running.push(id);
+        }
+        catch {
+            // Unknown state is not presented as "will restart"; execution will
+            // re-check and skip non-running instances instead of starting them.
+        }
+    }
+    return running;
+}
+async function restartRuntimeRepairInstances(results, options) {
+    const ids = runtimeRestartInstanceIds(results);
+    const restarted = [];
+    for (const id of ids) {
+        try {
+            const status = await getManagedStatus(id);
+            if (status?.status !== "running") {
+                markRuntimeRepairRestartApplied(id, LEGACY_JOB_SPEC_RESTART_REPAIR_ID);
+                restarted.push({ id, ok: true, skipped: true, status: status?.status ?? "unknown" });
+                continue;
+            }
+            if (!options.allowRestart) {
+                restarted.push({ id, ok: false, status: status.status, error: "restart consent required" });
+                continue;
+            }
+            const result = await restartInstance(id);
+            if (result.ok) {
+                markRuntimeRepairRestartApplied(id, LEGACY_JOB_SPEC_RESTART_REPAIR_ID);
+                restarted.push({ id, ok: true });
+            }
+            else {
+                restarted.push({ id, ok: false, error: result.error || "restart failed" });
+            }
+        }
+        catch (error) {
+            restarted.push({ id, ok: false, error: error?.message ?? String(error) });
+        }
+    }
+    return restarted;
+}
+function buildBlockers(params) {
+    const blockers = [];
+    for (const item of params.legacy.blockers) {
+        blockers.push({
+            source: "legacy",
+            id: item.id,
+            message: item.unsupportedReason
+                ? `${item.unsupportedReason}: ${item.detail}`
+                : item.detail,
+        });
+    }
+    for (const item of params.system.items) {
+        if (item.status !== "error")
+            continue;
+        blockers.push({
+            source: "system",
+            id: item.id ?? item.component,
+            message: item.message,
+        });
+    }
+    for (const item of params.runtimeResults) {
+        if (item.status !== "error")
+            continue;
+        blockers.push({
+            source: "runtime",
+            id: item.instanceId,
+            message: item.error ?? "runtime repair failed",
+        });
+    }
+    return blockers;
+}
+function messageForStatus(params) {
+    if (!params.repairRequired)
+        return "JishuShell local state is already repaired.";
+    if (params.blockers.length > 0)
+        return `${params.blockers.length} blocker(s) must be resolved before repair can complete.`;
+    if (params.requirements.requiresRunningInstanceRestart) {
+        return `Repair requires restarting ${params.affectedCount} running instance(s).`;
+    }
+    return "JishuShell local state needs repair.";
+}
+export async function getRepairStatus() {
+    const [system, runtime] = await Promise.all([
+        inspectSystemDrift(),
+        repairRuntimeInstances({ dryRun: true }),
+    ]);
+    const legacy = getUpgradeFinalizeStatus();
+    const packageUpdatePending = hasPendingPackageUpdate();
+    const runtimeResults = runtime.results;
+    const runtimeRepairRequired = runtimeResults.some(runtimeNeedsRepair);
+    const legacyRunningInstancesAffected = legacy.affectedInstances
+        .filter((entry) => entry.requiresRestart)
+        .map((entry) => entry.id);
+    const runtimeRunningInstancesAffected = await runningRuntimeRestartInstanceIds(runtimeResults);
+    const runningInstancesAffected = Array.from(new Set([
+        ...legacyRunningInstancesAffected,
+        ...runtimeRunningInstancesAffected,
+    ]));
+    const requirements = {
+        requiresSudo: !isRoot() && (packageUpdatePending
+            || system.hasPendingSudoActions
+            || system.reloadRequired
+            || legacy.requiresSudo
+            || runtimeRepairRequired),
+        requiresServiceRestart: packageUpdatePending || system.reloadRequired || system.hasPendingSudoActions,
+        requiresLegacyMigration: legacy.finalizeRequired,
+        requiresRuntimeRepair: runtimeRepairRequired,
+        requiresRunningInstanceRestart: runningInstancesAffected.length > 0,
+    };
+    const repairRequired = Object.values(requirements).some(Boolean);
+    const blockers = buildBlockers({ system, legacy, runtimeResults });
+    const generatedAt = new Date().toISOString();
+    return {
+        schemaVersion: 1,
+        phase: blockers.length > 0 ? "failed" : repairRequired ? "checking" : "completed",
+        repairRequired,
+        canRepair: blockers.length === 0,
+        generatedAt,
+        updatedAt: generatedAt,
+        message: messageForStatus({
+            repairRequired,
+            blockers,
+            requirements,
+            affectedCount: runningInstancesAffected.length,
+        }),
+        command: getRepairCommand(),
+        requirements,
+        runningInstancesAffected,
+        blockers,
+        system,
+        legacy,
+        runtime: {
+            ok: runtime.ok,
+            dryRun: true,
+            results: runtimeResults,
+        },
+    };
+}
+export async function executeRepair(request = {}) {
+    const status = await getRepairStatus();
+    if (!status.repairRequired) {
+        return {
+            ok: true,
+            code: "not-required",
+            status,
+            message: status.message,
+        };
+    }
+    if (!status.canRepair) {
+        return {
+            ok: false,
+            code: "blocked",
+            status,
+            message: status.message,
+        };
+    }
+    if (status.requirements.requiresRunningInstanceRestart && request.restartConsentGranted !== true) {
+        return {
+            ok: false,
+            code: "restart-consent-required",
+            status,
+            message: "Repair requires explicit consent to restart running instances.",
+            command: getRepairCommand(),
+        };
+    }
+    if (status.requirements.requiresSudo && !isRoot()) {
+        const sudoPassword = typeof request.sudoPassword === "string" ? request.sudoPassword : "";
+        if (sudoPassword) {
+            return await startPrivilegedRepair(status, sudoPassword, request.restartConsentGranted === true);
+        }
+        return {
+            ok: false,
+            code: "sudo-required",
+            status,
+            message: "Repair requires sudo.",
+            command: getRepairCommand(),
+        };
+    }
+    const result = {
+        ok: true,
+        code: "completed",
+        status: {
+            ...status,
+            phase: "applying",
+            updatedAt: new Date().toISOString(),
+            message: "JishuShell repair is running.",
+        },
+        message: "JishuShell repair completed.",
+    };
+    try {
+        if (request.applySystem !== false && status.requirements.requiresServiceRestart) {
+            result.system = await reconcileSystem();
+        }
+        if (request.applyLegacy !== false && status.requirements.requiresLegacyMigration) {
+            result.legacy = await executeUpgradeFinalize({
+                restartConsentGranted: request.restartConsentGranted === true,
+            });
+            if (!result.legacy.ok) {
+                return {
+                    ...result,
+                    ok: false,
+                    code: result.legacy.code === "restart-consent-required"
+                        ? "restart-consent-required"
+                        : result.legacy.code === "sudo-required"
+                            ? "sudo-required"
+                            : "execution-failed",
+                    status: await getRepairStatus(),
+                    message: result.legacy.message,
+                };
+            }
+        }
+        if (request.applyRuntime !== false && status.requirements.requiresRuntimeRepair) {
+            result.runtime = await repairRuntimeInstances({ dryRun: false });
+            if (!result.runtime.ok) {
+                return {
+                    ...result,
+                    ok: false,
+                    code: "execution-failed",
+                    status: await getRepairStatus(),
+                    message: "Runtime instance repair failed.",
+                };
+            }
+            if (request.restartConsentGranted === true || !status.requirements.requiresRunningInstanceRestart) {
+                result.runtimeRestartedInstances = await restartRuntimeRepairInstances(result.runtime.results, {
+                    allowRestart: request.restartConsentGranted === true,
+                });
+                const failed = result.runtimeRestartedInstances.filter((item) => !item.ok);
+                if (failed.length > 0) {
+                    return {
+                        ...result,
+                        ok: false,
+                        code: "execution-failed",
+                        status: await getRepairStatus(),
+                        message: `Failed to restart ${failed.length} runtime instance(s).`,
+                    };
+                }
+            }
+        }
+        return {
+            ...result,
+            status: await getRepairStatus(),
+        };
+    }
+    catch (error) {
+        return {
+            ...result,
+            ok: false,
+            code: "execution-failed",
+            status: await getRepairStatus(),
+            message: error?.message ?? String(error),
+        };
+    }
+}
+//# sourceMappingURL=repair-orchestrator.js.map

package/dist/services/system/repair-orchestrator.js.map

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

package/dist/services/system/runtime-ownership.d.ts

@@ -0,0 +1,36 @@
+export interface OwnershipRepairResult {
+    ok: boolean;
+    repaired: string[];
+    skipped: string[];
+    errors: string[];
+}
+export interface OwnershipDriftItem {
+    path: string;
+    expectedUid: number;
+    expectedGid: number;
+    actualUid?: number;
+    actualGid?: number;
+    missing?: boolean;
+    symlink?: boolean;
+    error?: string;
+}
+export declare function ensureUserOwned(path: string, options?: {
+    recursive?: boolean;
+    mode?: number;
+    dirMode?: number;
+    fileMode?: number;
+    skip?: (path: string) => boolean;
+    result?: OwnershipRepairResult;
+}): OwnershipRepairResult;
+export declare function repairCoreRuntimeOwnership(options?: {
+    includeApps?: boolean;
+}): OwnershipRepairResult;
+export declare function repairNomadConfigOwnership(): OwnershipRepairResult;
+export declare function repairInstanceWorkspaceOwnership(instanceId: string): OwnershipRepairResult;
+export declare function inspectRuntimeOwnership(options?: {
+    includeApps?: boolean;
+}): OwnershipDriftItem[];
+export declare const RUNTIME_OWNERSHIP_PATHS: {
+    NOMAD_DIR: string;
+    NOMAD_DATA_DIR: string;
+};