jishushell 0.5.15 → 0.6.5

package/dist/services/runtime-repair.js

@@ -0,0 +1,352 @@
+import { getAdapter } from "./runtime/index.js";
+import { resolveAgentType } from "./runtime/instance.js";
+import { resolveNomadJobId } from "./runtime/job-id.js";
+import { dirname, join } from "path";
+import { accessSync, chmodSync, constants, existsSync, statSync } from "fs";
+import { chownToServiceUser, getConfig, getInstance, getRuntimeEnvFiles, listInstances, parseEnvFile, resolveServiceUser, updateInstanceMeta, updateEnvFile, } from "./instance-manager.js";
+import { bootstrapInstanceProxy, ensureInstanceProxyToken, } from "./llm-proxy/instance-proxy.js";
+import { getDefaultLlmProvider } from "./llm-proxy/providers.js";
+export const LEGACY_JOB_SPEC_RESTART_ADVISORY_ID = "legacy-prefixed-nomad-job-spec-v1";
+function runtimeEnv(instanceId) {
+    const env = {};
+    for (const envFile of getRuntimeEnvFiles(instanceId)) {
+        Object.assign(env, parseEnvFile(envFile));
+    }
+    return env;
+}
+function configUsesProxy(config) {
+    if (!config)
+        return false;
+    if (config["x-jishushell"]?.proxy?.enabled)
+        return true;
+    const defaultModel = String(config.agents?.defaults?.model || "");
+    if (defaultModel.startsWith("jsproxy/") || defaultModel.startsWith("js-"))
+        return true;
+    const providers = config.models?.providers;
+    if (!providers || typeof providers !== "object")
+        return false;
+    return Object.values(providers).some((provider) => provider && typeof provider.baseUrl === "string" && provider.baseUrl.includes("/proxy"));
+}
+function legacyProviderKeys(env) {
+    return Object.keys(env)
+        .filter((key) => key.endsWith("_API_KEY") && key !== "JSPROXY_API_KEY")
+        .sort();
+}
+function providerEnvPath(instanceId) {
+    const envFile = getRuntimeEnvFiles(instanceId)[0];
+    return envFile ? join(dirname(envFile), "provider.env") : null;
+}
+function providerSecret(instanceId) {
+    const path = providerEnvPath(instanceId);
+    return path ? (parseEnvFile(path).UPSTREAM_API_KEY || "") : "";
+}
+function serviceUserAccessError(path) {
+    if (!existsSync(path))
+        return null;
+    const serviceUser = resolveServiceUser();
+    if (serviceUser) {
+        try {
+            const stat = statSync(path);
+            const mode = stat.mode & 0o777;
+            const ownedByServiceUser = stat.uid === serviceUser.uid && stat.gid === serviceUser.gid;
+            const readableByServiceUser = (stat.uid === serviceUser.uid && (mode & 0o400) !== 0) ||
+                (stat.gid === serviceUser.gid && (mode & 0o040) !== 0) ||
+                ((mode & 0o004) !== 0);
+            if (ownedByServiceUser && readableByServiceUser)
+                return null;
+            return `service user ${serviceUser.username} cannot safely read ${path} (uid=${stat.uid}, gid=${stat.gid}, mode=${mode.toString(8)})`;
+        }
+        catch (error) {
+            return error?.message ?? String(error);
+        }
+    }
+    try {
+        accessSync(path, constants.R_OK);
+        return null;
+    }
+    catch (error) {
+        return error?.message ?? String(error);
+    }
+}
+function repairReadableFile(path, repairId, label, options, repaired, warnings) {
+    if (!path)
+        return;
+    const before = serviceUserAccessError(path);
+    if (!before)
+        return;
+    if (options.dryRun) {
+        warnings.push(`would repair ${label} permissions: ${path}`);
+        return;
+    }
+    try {
+        chmodSync(path, 0o600);
+    }
+    catch {
+        // chown below may still recover root-owned files when repair runs with sudo.
+    }
+    chownToServiceUser(path);
+    const after = serviceUserAccessError(path);
+    if (after) {
+        warnings.push(`${label} is not readable after ownership repair: ${after}`);
+    }
+    else {
+        repaired.push(repairId);
+    }
+}
+function proxyUpstreamProviderId(instance, config) {
+    return String(config?.["x-jishushell"]?.proxy?.upstream?.providerId
+        ?? instance["x-jishushell"]?.proxy?.upstream?.providerId
+        ?? "").trim();
+}
+function adapterPrefix(agentType) {
+    try {
+        return getAdapter(agentType).nomadJobPrefix ?? "";
+    }
+    catch {
+        return "";
+    }
+}
+function appliedRuntimeRestartAdvisories(meta) {
+    const applied = meta?.["x-jishushell"]?.runtimeRestartAdvisoriesApplied;
+    return applied && typeof applied === "object" && !Array.isArray(applied) ? applied : {};
+}
+function isRuntimeRestartAdvisoryApplied(meta, advisoryId) {
+    return Boolean(appliedRuntimeRestartAdvisories(meta)[advisoryId]);
+}
+export function markRuntimeRestartAdvisoryApplied(instanceId, advisoryId = LEGACY_JOB_SPEC_RESTART_ADVISORY_ID) {
+    const meta = getInstance(instanceId);
+    if (!meta)
+        return;
+    const extension = meta["x-jishushell"] && typeof meta["x-jishushell"] === "object"
+        ? { ...meta["x-jishushell"] }
+        : {};
+    extension.runtimeRestartAdvisoriesApplied = {
+        ...appliedRuntimeRestartAdvisories(meta),
+        [advisoryId]: {
+            appliedAt: new Date().toISOString(),
+        },
+    };
+    updateInstanceMeta(instanceId, { "x-jishushell": extension });
+}
+export async function repairRuntimeInstance(instance, options = {}) {
+    const instanceId = String(instance.id || "");
+    const agentType = resolveAgentType(instance);
+    const repaired = [];
+    const warnings = [];
+    try {
+        const envFiles = getRuntimeEnvFiles(instanceId);
+        if (agentType === "openclaw" || agentType === "hermes") {
+            for (const envFile of envFiles) {
+                repairReadableFile(envFile, "runtime-env-permissions", "runtime env file", options, repaired, warnings);
+            }
+            repairReadableFile(providerEnvPath(instanceId), "provider-secret-permissions", "provider.env", options, repaired, warnings);
+        }
+        const beforeEnv = runtimeEnv(instanceId);
+        const beforeToken = beforeEnv.JSPROXY_API_KEY || "";
+        const beforeConfig = getConfig(instanceId);
+        const beforeUsesProxy = configUsesProxy(beforeConfig);
+        if (agentType === "openclaw") {
+            if (!options.dryRun) {
+                await bootstrapInstanceProxy(instanceId);
+            }
+            else if (!beforeToken || !beforeUsesProxy) {
+                warnings.push("would bootstrap proxy token and jsproxy config");
+            }
+            const afterEnv = runtimeEnv(instanceId);
+            const afterConfig = getConfig(instanceId);
+            if (!beforeToken && afterEnv.JSPROXY_API_KEY)
+                repaired.push("proxy-token");
+            if (!beforeUsesProxy && configUsesProxy(afterConfig))
+                repaired.push("jsproxy-config");
+            if (afterEnv.JSPROXY_API_KEY) {
+                if (!options.dryRun) {
+                    const { writeInstanceVariables } = await import("./nomad-manager.js");
+                    await writeInstanceVariables(instanceId);
+                    repaired.push("nomad-variables");
+                }
+                else {
+                    warnings.push("would write Nomad Variables for JSPROXY_API_KEY");
+                }
+            }
+            else {
+                warnings.push("JSPROXY_API_KEY is missing; no Nomad Variables were written");
+            }
+        }
+        else if (agentType === "hermes") {
+            if (!beforeToken) {
+                if (!options.dryRun) {
+                    ensureInstanceProxyToken(instanceId);
+                    repaired.push("proxy-token");
+                }
+                else {
+                    warnings.push("would generate proxy-token");
+                }
+            }
+            const beforeSecret = providerSecret(instanceId);
+            const upstreamProviderId = proxyUpstreamProviderId(instance, beforeConfig);
+            if (!beforeSecret && upstreamProviderId) {
+                const defaultProvider = getDefaultLlmProvider();
+                if (defaultProvider?.apiKey && defaultProvider.id === upstreamProviderId) {
+                    if (!options.dryRun) {
+                        const path = providerEnvPath(instanceId);
+                        if (path) {
+                            updateEnvFile(path, { UPSTREAM_API_KEY: defaultProvider.apiKey });
+                            repaired.push("provider-secret");
+                        }
+                        else {
+                            warnings.push("Hermes env file is missing; provider.env path cannot be resolved");
+                        }
+                    }
+                    else {
+                        warnings.push("would write Hermes provider.env UPSTREAM_API_KEY from the default provider");
+                    }
+                }
+                else {
+                    warnings.push(`Hermes provider.env is missing and cannot be auto-repaired for upstream provider '${upstreamProviderId}'`);
+                }
+            }
+        }
+        const env = runtimeEnv(instanceId);
+        const legacyKeys = legacyProviderKeys(env);
+        if (legacyKeys.length > 0) {
+            warnings.push(`note: legacy env key(s) kept for backward compatibility: ${legacyKeys.join(", ")}`);
+        }
+        const prefix = adapterPrefix(agentType);
+        const resolvedJobId = resolveNomadJobId(instanceId, prefix);
+        const hadPrefixedId = !!prefix && instanceId === resolvedJobId && instanceId.startsWith(prefix);
+        const restartRequired = (agentType === "openclaw" || agentType === "hermes")
+            && hadPrefixedId
+            && !isRuntimeRestartAdvisoryApplied(instance, LEGACY_JOB_SPEC_RESTART_ADVISORY_ID);
+        const status = restartRequired
+            ? "needs-restart"
+            : repaired.length > 0
+                ? "repaired"
+                : warnings.length > 0
+                    ? "manual"
+                    : "ok";
+        return {
+            instanceId,
+            agentType,
+            status,
+            repaired,
+            warnings,
+            restartRequired,
+            ...(restartRequired ? { reason: "Nomad job template path may have changed; restart the instance to resubmit the job" } : {}),
+        };
+    }
+    catch (error) {
+        return {
+            instanceId,
+            agentType,
+            status: "error",
+            repaired,
+            warnings,
+            restartRequired: false,
+            error: error?.message ?? String(error),
+        };
+    }
+}
+export async function repairRuntimeInstances(options = {}) {
+    const results = [];
+    for (const instance of listInstances()) {
+        const agentType = resolveAgentType(instance);
+        if (agentType !== "openclaw" && agentType !== "hermes")
+            continue;
+        results.push(await repairRuntimeInstance(instance, options));
+    }
+    return {
+        ok: results.every((result) => result.status !== "error"),
+        dryRun: options.dryRun === true,
+        results,
+    };
+}
+export function restartRequiredInstances(results) {
+    return results.filter((result) => result.restartRequired);
+}
+function advisoryActionForStatus(status) {
+    return status === "running" || status === "pending" || status === "restarting"
+        ? "restart"
+        : "start";
+}
+export async function buildRuntimeRestartAdvisories(results) {
+    const targets = restartRequiredInstances(results);
+    if (targets.length === 0)
+        return [];
+    const { getInstanceStatus } = await import("./nomad-manager.js");
+    const out = [];
+    for (const target of targets) {
+        let currentStatus = "unknown";
+        try {
+            const status = await getInstanceStatus(target.instanceId);
+            currentStatus = String(status.status || "unknown");
+        }
+        catch {
+            // Keep the advisory visible even when Nomad cannot report the status.
+        }
+        const action = advisoryActionForStatus(currentStatus);
+        out.push({
+            id: LEGACY_JOB_SPEC_RESTART_ADVISORY_ID,
+            instanceId: target.instanceId,
+            agentType: target.agentType,
+            currentStatus,
+            action,
+            command: `jishushell app ${action} ${target.instanceId}`,
+            reason: target.reason || "Restart the instance to resubmit its runtime job spec.",
+            repaired: target.repaired,
+            warnings: target.warnings,
+        });
+    }
+    return out;
+}
+export async function restartRuntimeInstances(results, options = {}) {
+    const targets = restartRequiredInstances(results);
+    const out = [];
+    if (targets.length === 0)
+        return { ok: true, results: out };
+    const { getInstanceStatus, restartNomadJobInstance } = await import("./nomad-manager.js");
+    for (const target of targets) {
+        try {
+            const before = await getInstanceStatus(target.instanceId);
+            const previousStatus = String(before.status || "unknown");
+            const shouldRestart = options.includeStopped === true || previousStatus === "running" || previousStatus === "pending";
+            if (!shouldRestart) {
+                out.push({
+                    instanceId: target.instanceId,
+                    agentType: target.agentType,
+                    status: "skipped",
+                    previousStatus,
+                    reason: "instance is not running; new Nomad job spec will apply on the next start",
+                });
+                continue;
+            }
+            const restarted = await restartNomadJobInstance(target.instanceId);
+            if (!restarted.ok) {
+                out.push({
+                    instanceId: target.instanceId,
+                    agentType: target.agentType,
+                    status: "error",
+                    previousStatus,
+                    error: restarted.error || "restart failed",
+                });
+                continue;
+            }
+            out.push({
+                instanceId: target.instanceId,
+                agentType: target.agentType,
+                status: "restarted",
+                previousStatus,
+                evalId: restarted.eval_id,
+            });
+        }
+        catch (error) {
+            out.push({
+                instanceId: target.instanceId,
+                agentType: target.agentType,
+                status: "error",
+                error: error?.message ?? String(error),
+            });
+        }
+    }
+    return { ok: out.every((result) => result.status !== "error"), results: out };
+}
+//# sourceMappingURL=runtime-repair.js.map

package/dist/services/runtime-repair.js.map

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

package/dist/services/setup-manager.d.ts

@@ -1,5 +1,27 @@
 import { type Task } from "./task-registry.js";
+export type ExpectedSystemFileFix = "none" | "system-reload" | "manual";
+export type ExpectedSystemInstallScope = "core" | "panel" | "nomad";
+export interface ExpectedSystemFile {
+    component: "wrapper" | "systemd" | "launchd" | "nomad";
+    id: string;
+    path: string;
+    content: string;
+    installScope: ExpectedSystemInstallScope;
+    requiresSudo: boolean;
+    reloadRequired: boolean;
+    fix: ExpectedSystemFileFix;
+}
 export declare function setServerPort(port: number): void;
+export declare function hasBundledPanel(): boolean;
+export declare function getExpectedCoreSystemFiles(port?: number): ExpectedSystemFile[];
+export declare function getExpectedPanelSystemFiles(corePort?: number, panelPort?: number): ExpectedSystemFile[];
+export declare function getExpectedNomadSystemFiles(): ExpectedSystemFile[];
+export declare function getExpectedSystemFiles(options?: {
+    corePort?: number;
+    panelPort?: number;
+    includePanel?: boolean;
+    includeNomad?: boolean;
+}): ExpectedSystemFile[];
 export { createTask, emitTask, getTask, getTaskSnapshot, getRunningTasks, subscribeTask, } from "./task-registry.js";
 export type { Task, TaskEvent, TaskSnapshot } from "./task-registry.js";
 /** Run a shell command as a spawned process, streaming output to a task */
@@ -31,7 +53,7 @@ export interface SetupStatus {
     openclaw: DependencyStatus;
     ready: boolean;
     providerConfigured: boolean;
-    dockerImageReady: boolean;
+    runtimeImageReady: boolean;
     hasSudo: boolean;
     /** True when cgroup memory was just enabled and a reboot is needed for Docker memory stats */
     needsReboot?: boolean;
@@ -43,9 +65,7 @@ export interface SetupStatus {
     /**
      * Per-runtime install status, keyed by agentType. Populated by iterating
      * over `listRegisteredAdapters()` and calling each adapter's
-     * `getInstallStatus()`. OpenClaw is **also** reported at the top level
-     * (`openclaw` field + `dockerImageReady`) for backward compat with older
-     * frontends — new frontend code should read `runtimes[agentType]`.
+     * `getInstallStatus()`.
      */
     runtimes?: Record<string, {
         installed: boolean;
@@ -75,12 +95,14 @@ export declare function upgradeNode(targetMajor?: number): Promise<InstallResult
 export declare function installDocker(): Promise<InstallResult>;
 export declare function startInstallDocker(): InstallResult;
 export declare function installNomad(): Promise<InstallResult>;
+export declare function buildExpectedNomadConfigContent(): string;
 export declare function loadNomadToken(): void;
 export declare function ensureNomadMemoryOversubscriptionEnabled(): Promise<void>;
 export declare function startNomad(): Promise<InstallResult>;
 export declare function stopNomad(): Promise<InstallResult>;
 export declare function installNomadSystemd(): InstallResult;
-export declare function installJishushellSystemd(port?: number): InstallResult;
+export declare function installJishushellSystemd(port?: number, startNow?: boolean): InstallResult;
+export declare function installJishushellPanelSystemd(corePort?: number, panelPort?: number, startNow?: boolean): InstallResult;
 /**
  * Install OpenClaw runtime — thin dispatch wrapper.
  *