@mininglamp-oss/octo-runtime 1.0.0 → 1.1.0

package/node_modules/@mininglamp-oss/{octo-runtime-daemon-app → octo-runtime-cli}/dist/openclaw.d.ts

@@ -1,4 +1,4 @@
-import type { ExtraRegistration } from "@mininglamp-oss/octo-runtime-daemon";
+import type { ExtraRegistration } from "@mininglamp-oss/octo-runtime-host-sdk";
 import { type OpenClawConnectionInput } from "@mininglamp-oss/octo-runtime-adapter-openclaw";
 export interface CliOpenClawInput extends OpenClawConnectionInput {
     openclawHome?: string;

package/node_modules/@mininglamp-oss/octo-runtime-cli/dist/output.d.ts

@@ -0,0 +1,20 @@
+import type { ServiceStatus } from "@mininglamp-oss/octo-runtime-cross-service";
+export interface ComponentSnapshot {
+    service: ServiceStatus;
+    runtime: unknown;
+}
+/** 展示公开状态的摘要，不为输出克隆完整 session/delivery 集合。JSON 模式保留原结果。 */
+export declare function formatStatus(name: string, snapshot: ComponentSnapshot): string;
+/** 只保留受控错误码和管理器元信息；异常正文及任意 stderr 可能含凭据，不能直出。 */
+export declare function describeError(error: unknown, fallback?: string): {
+    backend?: import("@mininglamp-oss/octo-runtime-cross-service").ServiceBackendKind | undefined;
+    command?: string | undefined;
+    exit_code?: number | undefined;
+    cause_code?: string | undefined;
+    code: string;
+    message: string;
+};
+/** 前台启动失败沿既有白名单和小时轮转落盘；不捕获任意进程 stdout/stderr。 */
+export declare function recordStartupFailure(directory: string, component: string, error: unknown): Promise<void>;
+/** 只读本次 start 后的白名单失败事件；每个轮转文件最多读取末尾 64 KiB。 */
+export declare function readStartupFailure(directory: string, component: string, since: number): Promise<Error | undefined>;

package/node_modules/@mininglamp-oss/octo-runtime-cli/dist/output.js

@@ -0,0 +1,187 @@
+import { ServiceError } from "@mininglamp-oss/octo-runtime-cross-service";
+import { RuntimeLogging } from "@mininglamp-oss/octo-runtime-adapter-sdk";
+import { open, readdir } from "node:fs/promises";
+import { join } from "node:path";
+const record = (value) => value !== null && typeof value === "object" && !Array.isArray(value)
+    ? value
+    : {};
+const text = (value) => String(value)
+    .replace(/\p{Cc}/gu, " ")
+    .slice(0, 200);
+/** 展示公开状态的摘要，不为输出克隆完整 session/delivery 集合。JSON 模式保留原结果。 */
+export function formatStatus(name, snapshot) {
+    const service = snapshot.service;
+    const runtime = record(snapshot.runtime);
+    const business = record(runtime.status);
+    const ipc = runtime.available === false ? "unavailable" : "ready";
+    const lines = [
+        `${name}  service: ${service.state}  autostart: ${service.enabled ? "on" : "off"}  IPC: ${ipc}`,
+        `  Manager: ${service.manager}${service.pid ? `  PID: ${service.pid}` : runtime.pid ? `  PID: ${text(runtime.pid)}` : ""}`
+    ];
+    if (runtime.execution_ready !== undefined)
+        lines.push(`  Worker: ${runtime.execution_ready ? "ready" : "unavailable"}`);
+    if (runtime.available === false)
+        lines.push(`  Reason: ${text(record(runtime.error).code ?? "COMPONENT_UNAVAILABLE")}`);
+    if (service.lastExitCode !== undefined && service.lastExitCode !== 0)
+        lines.push(`  Last exit: ${service.lastExitCode}`);
+    if (service.definitionPath)
+        lines.push(`  Definition: ${service.definitionPath}`);
+    if (service.state === "unknown" && service.detail && /^[A-Z][A-Z0-9_]+$/.test(service.detail))
+        lines.push(`  Manager status: ${service.detail}`);
+    const summarize = (value, depth = 0) => {
+        if (Array.isArray(value))
+            return `${value.length} entries`;
+        if (value !== null && typeof value === "object") {
+            if (depth >= 2)
+                return "...";
+            return Object.entries(value)
+                .slice(0, 8)
+                .map(([key, item]) => `${text(key)}=${summarize(item, depth + 1)}`)
+                .join(", ");
+        }
+        return text(value);
+    };
+    const fields = (value) => {
+        const parts = Object.entries(value)
+            .filter(([key]) => ![
+            "bots",
+            "pid",
+            "name",
+            "kernel_available",
+            "connection_key",
+            "botId",
+            "bot_id",
+            "bot_name"
+        ].includes(key))
+            .slice(0, 24)
+            .map(([key, value]) => `${text(key)}: ${summarize(value)}`);
+        const rows = [];
+        for (const part of parts) {
+            const last = rows.length - 1;
+            if (last >= 0 && rows[last].length + part.length < 90)
+                rows[last] += `  ${part}`;
+            else
+                rows.push(part);
+        }
+        return rows;
+    };
+    if (business.kernel_available !== undefined)
+        lines.push(`  Kernel: ${business.kernel_available ? "ready" : "unavailable (service stays running)"}`);
+    const summary = fields(business);
+    lines.push(...summary.map((row) => `  ${row}`));
+    if (Array.isArray(business.bots)) {
+        lines.push(`  Bots: ${business.bots.length}`);
+        for (const bot of business.bots.slice(0, 20)) {
+            const value = record(bot);
+            lines.push(`    ${text(value.bot_name ?? value.name ?? value.type ?? "bot")}`);
+            lines.push(...fields(value).map((row) => `      ${row}`));
+        }
+        if (business.bots.length > 20)
+            lines.push("    ...");
+    }
+    if (service.drift.length)
+        lines.push(`  Drift: ${service.drift.map(text).join(", ")}`);
+    return lines.join("\n");
+}
+/** 只保留受控错误码和管理器元信息；异常正文及任意 stderr 可能含凭据，不能直出。 */
+export function describeError(error, fallback = "COMMAND_FAILED") {
+    const stableCode = (value) => typeof value === "string" && /^[A-Z][A-Z0-9_]{1,100}$/.test(value) ? value : undefined;
+    const value = record(error);
+    const code = stableCode(value.code) ??
+        (error instanceof Error ? stableCode(error.message) : undefined) ??
+        fallback;
+    const cause = record(value.cause);
+    const causeCode = stableCode(cause.code) ?? stableCode(cause.message);
+    const hints = {
+        COMMAND_FAILED: "The command failed. Check the native manager, configuration and service logs.",
+        ENOENT: "The component endpoint or required file does not exist. Check installation and service status.",
+        ECONNREFUSED: "The component is not accepting IPC connections. Check its process and logs.",
+        KERNEL_UNAVAILABLE: "Kernel is unavailable. Check executor-kernel status; Extras can remain running.",
+        INVALID_ARGUMENTS: "Use --help to see the available commands and flags.",
+        SETUP_IN_PROGRESS: "Another component lifecycle operation is in progress. Wait for it to finish, then retry.",
+        SERVICE_NOT_INSTALLED: "Run this component's install command, then start it.",
+        NOT_INSTALLED: "Run this component's install command, then start it.",
+        EXTRA_NOT_REGISTERED: "Save this Extra's declaration with extraset before starting it.",
+        MANAGER_UNAVAILABLE: "Run doctor and check the current user's native service manager.",
+        COMPONENT_UNAVAILABLE: "Check component status and the service logs; the IPC or worker is not ready.",
+        SERVICE_PROCESS_EXITED: "The service exited unexpectedly. Check its logs and configuration.",
+        SERVICE_INITIALIZATION_FAILED: "Check the component configuration, manifest and service logs.",
+        SERVICE_DISABLED: "Enable this component with install --autostart=true, then start it."
+    };
+    return {
+        code,
+        message: hints[code] ?? "Check --help, component status and service logs for this operation.",
+        ...(causeCode ? { cause_code: causeCode } : {}),
+        ...(error instanceof ServiceError
+            ? { backend: error.backend, command: error.command, exit_code: error.exitCode }
+            : {})
+    };
+}
+/** 前台启动失败沿既有白名单和小时轮转落盘；不捕获任意进程 stdout/stderr。 */
+export async function recordStartupFailure(directory, component, error) {
+    const logging = new RuntimeLogging({ directory });
+    try {
+        const log = component === "executor-kernel" ? logging.kernel : logging.extra(component);
+        const failure = describeError(error, "SERVICE_INITIALIZATION_FAILED");
+        if (failure.cause_code)
+            log("error", "cli.initialization_cause", { code: failure.cause_code });
+        log("error", "cli.initialization_failed", { code: failure.code });
+    }
+    finally {
+        await logging.close();
+    }
+}
+/** 只读本次 start 后的白名单失败事件；每个轮转文件最多读取末尾 64 KiB。 */
+export async function readStartupFailure(directory, component, since) {
+    const root = component === "executor-kernel" ? directory : join(directory, "extras");
+    const prefix = component === "executor-kernel" ? "kernel-" : `${component}-`;
+    try {
+        const names = (await readdir(root))
+            .filter((name) => name.startsWith(prefix) && /^.+-\d{8}T\d{2}\.log$/.test(name))
+            .sort()
+            .reverse()
+            .slice(0, 3);
+        for (const name of names) {
+            const file = await open(join(root, name), "r");
+            let content;
+            try {
+                const size = (await file.stat()).size;
+                const bytes = Buffer.alloc(Math.min(size, 65536));
+                await file.read(bytes, 0, bytes.length, Math.max(0, size - bytes.length));
+                content = bytes.toString("utf8");
+            }
+            finally {
+                await file.close();
+            }
+            let cause;
+            for (const line of content.split("\n")) {
+                let row;
+                try {
+                    row = record(JSON.parse(line));
+                }
+                catch {
+                    continue;
+                }
+                if (typeof row.time !== "string" ||
+                    !Number.isFinite(Date.parse(row.time)) ||
+                    Date.parse(row.time) < since)
+                    continue;
+                if (component === "executor-kernel"
+                    ? row.source !== "kernel"
+                    : row.source !== "extra" || row.extra_type !== component)
+                    continue;
+                const code = record(row.data).code;
+                if (typeof code !== "string" || !/^[A-Z][A-Z0-9_]{1,100}$/.test(code))
+                    continue;
+                if (row.event === "cli.initialization_cause")
+                    cause = code;
+                if (row.event === "cli.initialization_failed")
+                    return new Error(code, cause ? { cause: new Error(cause) } : undefined);
+            }
+        }
+    }
+    catch {
+        /* 日志是尽力诊断；缺失或损坏时仍按真实 IPC/管理器状态等待。 */
+    }
+    return undefined;
+}

package/node_modules/@mininglamp-oss/octo-runtime-cli/dist/playboard.js

@@ -1,9 +1,13 @@
-import { defaultRuntimeHome, runtimePaths } from "./state.js";
+import { defaultRuntimeHome, runtimePaths, readJsonFile } from "./state.js";
+import { initializeCliOpenClaw } from "./openclaw.js";
+import { readAdapterConfigurations, createKernelService } from "@mininglamp-oss/octo-runtime-executor-kernel";
 import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { startTemporaryDaemon } from "./temporary-daemon.js";
-import { invokeDaemonRun } from "@mininglamp-oss/octo-runtime-daemon/runtime/run-stream";
-import { identifyInvokeInput, createInputInvoke, isHostTerminal, isTerminal } from "@mininglamp-oss/octo-runtime-protocol";
+import { componentEndpoint } from "@mininglamp-oss/octo-runtime-host-sdk";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { identifyInvokeInput, isHostTerminal, isTerminal } from "@mininglamp-oss/octo-runtime-protocol";
 import { INVOKE_REQUEST_MAX_BYTES } from "@mininglamp-oss/octo-runtime-protocol";
 export async function runPlayboard(options) {
     if (options.input.isTTY) {
@@ -59,21 +63,24 @@ export async function runPlayboard(options) {
         process.stdout.on("error", onOutputError);
     process.once("SIGINT", onInterrupt);
     process.once("SIGTERM", onTerminate);
-    let daemon;
+    let kernel;
+    const temporary = await mkdtemp(join(tmpdir(), "octo-playboard-"));
     try {
-        daemon = await startTemporaryDaemon({
-            home,
-            profile,
+        const paths = runtimePaths(home, profile);
+        await initializeCliOpenClaw(paths.profileRoot, options.env ?? process.env);
+        const configuration = await readJsonFile(paths.profileConfig);
+        kernel = createKernelService({
+            endpoint: process.platform === "win32" ? componentEndpoint(temporary) : join(temporary, "k.sock"),
+            workerEntrypoint: fileURLToPath(import.meta.resolve("@mininglamp-oss/octo-runtime-executor-kernel/runner")),
             manifest: options.manifest
                 ? resolve(options.manifest)
                 : fileURLToPath(new URL("./default_adapters.json", import.meta.url)),
             env: options.env ?? process.env,
-            signal: controller.signal
+            adapterConfigurations: readAdapterConfigurations(paths.profileRoot, configuration?.adapters)
         });
-        const socket = daemon.socket;
-        const invoke = createInputInvoke((input, environment) => invokeDaemonRun(socket, input, environment));
+        await kernel.initialize({ signal: controller.signal });
         let exitCode = 1;
-        for await (const frame of invoke(input, { signal: controller.signal })) {
+        for await (const frame of kernel.client.invoke(input, { signal: controller.signal })) {
             await output(JSON.stringify(frame));
             if (("kind" in frame &&
                 frame.kind === "control" &&
@@ -101,7 +108,8 @@ export async function runPlayboard(options) {
     }
     finally {
         try {
-            await daemon?.close();
+            await closeKernel(kernel);
+            await rm(temporary, { recursive: true, force: true });
         }
         finally {
             if (!options.output)
@@ -116,3 +124,8 @@ function writeLine(line) {
         process.stdout.write(`${line}\n`, (error) => (error ? reject(error) : resolve()));
     });
 }
+async function closeKernel(kernel) {
+    const result = await kernel?.close();
+    if (result && !result.complete)
+        throw new Error("COMPONENT_CLEANUP_INCOMPLETE");
+}

package/node_modules/@mininglamp-oss/octo-runtime-cli/dist/service-control.d.ts

@@ -1,16 +1,13 @@
 import { type ServiceBackend, type ServiceSpec } from "@mininglamp-oss/octo-runtime-cross-service";
-import type { RuntimePaths } from "./state.js";
-export declare const RUNTIME_SERVICE_ID = "cn.mininglamp.octo-runtime.daemon";
 export interface ServiceControlOptions {
     backend?: ServiceBackend;
-    daemonEntrypoint?: string;
     nodeExecutable?: string;
     systemHome?: string;
     platform?: NodeJS.Platform;
     environment?: NodeJS.ProcessEnv;
+    cliEntrypoint?: string;
 }
 export declare function resolveServiceControl(options?: ServiceControlOptions): {
     backend: ServiceBackend;
-    spec(paths: RuntimePaths, enabled?: boolean, daemonArgs?: string[]): ServiceSpec;
+    spec(home: string, component: string, enabled?: boolean, args?: string[]): ServiceSpec;
 };
-export declare function verifyServiceProgram(spec: ServiceSpec): Promise<void>;

package/node_modules/@mininglamp-oss/octo-runtime-cli/dist/service-control.js

@@ -1,49 +1,44 @@
-import { access, mkdir } from "node:fs/promises";
 import { homedir } from "node:os";
-import { dirname, resolve } from "node:path";
+import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { componentServiceId } from "@mininglamp-oss/octo-runtime-host-sdk";
 import { createServiceBackend } from "@mininglamp-oss/octo-runtime-cross-service";
-export const RUNTIME_SERVICE_ID = "cn.mininglamp.octo-runtime.daemon";
 export function resolveServiceControl(options = {}) {
-    const platform = options.platform ?? process.platform;
-    const environment = options.environment ?? process.env;
-    const daemonEntrypoint = resolve(options.daemonEntrypoint ??
-        fileURLToPath(new URL("../../daemon/dist/launcher.js", import.meta.url)));
-    const nodeExecutable = resolve(options.nodeExecutable ?? process.execPath);
     const backend = options.backend ??
         createServiceBackend({
-            platform,
+            platform: options.platform,
+            environment: options.environment,
             homeDirectory: options.systemHome ?? homedir()
         });
     return {
         backend,
-        spec(paths, enabled = true, daemonArgs = []) {
+        spec(home, component, enabled = false, args = []) {
+            const id = componentServiceId(home, component, options.platform);
             return {
-                id: RUNTIME_SERVICE_ID,
-                description: "Octo Runtime daemon",
-                command: nodeExecutable,
-                args: [daemonEntrypoint, "--home", paths.home, ...daemonArgs],
-                workingDirectory: paths.home,
-                environment: {
-                    ...(environment.PATH || environment.Path
-                        ? { PATH: environment.PATH ?? environment.Path ?? "" }
-                        : {})
-                },
+                id,
+                description: `Octo Runtime ${component}`,
+                command: resolve(options.nodeExecutable ?? process.execPath),
+                args: [
+                    resolve(options.cliEntrypoint ?? fileURLToPath(new URL("./index.js", import.meta.url))),
+                    component,
+                    "run",
+                    "--home",
+                    resolve(home),
+                    ...args
+                ],
+                workingDirectory: resolve(home),
+                ...((options.platform ?? process.platform) !== "win32"
+                    ? {
+                        environment: {
+                            PATH: (options.environment ?? process.env).PATH ?? "/usr/local/bin:/usr/bin:/bin"
+                        }
+                    }
+                    : {}),
                 enabled,
-                restart: { policy: "on-failure", delaySeconds: 5, maxBurst: 5 },
-                timeoutStopSeconds: 45,
-                names: {
-                    launchdLabel: RUNTIME_SERVICE_ID,
-                    systemdUnit: `${RUNTIME_SERVICE_ID}.service`,
-                    windowsTaskName: "\\OctoRuntime.daemon"
-                }
+                restart: { policy: "on-failure", delaySeconds: 5, maxBurst: 3 },
+                timeoutStopSeconds: 10,
+                names: { launchdLabel: id, systemdUnit: `${id}.service`, windowsTaskName: `\\${id}` }
             };
         }
     };
 }
-export async function verifyServiceProgram(spec) {
-    await Promise.all([access(spec.command), access(spec.args?.[0] ?? "")]);
-    await mkdir(spec.workingDirectory, { recursive: true, mode: 0o700 });
-    if (spec.stdoutPath)
-        await mkdir(dirname(spec.stdoutPath), { recursive: true, mode: 0o700 });
-}

package/node_modules/@mininglamp-oss/octo-runtime-cli/dist/state.d.ts

@@ -16,6 +16,7 @@ export interface ProfileConfiguration {
         execution: {
             provider_options: Record<string, string>;
             credential_ref?: string;
+            stream_limits?: Record<string, number>;
         };
     }>;
 }

package/node_modules/@mininglamp-oss/octo-runtime-cli/dist/state.js

@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { access, chmod, mkdir, open, readFile, rename, rm, rmdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
-import { runtimeControlEndpoint } from "@mininglamp-oss/octo-runtime-daemon/runtime-endpoint";
+import { componentEndpoint } from "@mininglamp-oss/octo-runtime-host-sdk";
 const PROFILE_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
 const RESERVED_PROFILE_NAMES = new Set([
     "config.json",
@@ -42,8 +42,8 @@ export function runtimePaths(home, profile, platform = process.platform) {
         credential: join(profileRoot, "credentials", "runtime-token.json"),
         openclawRoot: join(profileRoot, "adapters", "openclaw"),
         setupLock: join(absoluteHome, "run", "setup.lock"),
-        pid: join(absoluteHome, "octo-daemon.pid"),
-        socket: runtimeControlEndpoint(absoluteHome, platform),
+        pid: join(absoluteHome, "run", "executor-kernel.pid"),
+        socket: componentEndpoint(absoluteHome, "executor-kernel", platform),
         logs: join(absoluteHome, "logs")
     };
 }
@@ -252,7 +252,7 @@ async function acquireProcessLock(path) {
                 throw error;
             const owner = await readLockOwner(path);
             if (owner !== undefined && processAlive(owner)) {
-                throw new Error(`another setup process is active (pid ${owner})`, { cause: error });
+                throw new Error("SETUP_IN_PROGRESS", { cause: error });
             }
             await rm(path, { force: true });
         }

package/node_modules/@mininglamp-oss/octo-runtime-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mininglamp-oss/octo-runtime-cli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "type": "module",
   "bin": {
@@ -8,12 +8,14 @@
   },
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@mininglamp-oss/octo-runtime-daemon": "1.0.0",
-    "@mininglamp-oss/octo-runtime-adapter-openclaw": "1.0.0",
-    "@mininglamp-oss/octo-runtime-cross-service": "1.0.0",
-    "@mininglamp-oss/octo-runtime-daemon-app": "1.0.0",
-    "@mininglamp-oss/octo-runtime-protocol": "1.0.0",
-    "@mininglamp-oss/octo-runtime-adapter-host": "1.0.0",
-    "@mininglamp-oss/octo-runtime-core": "1.0.0"
+    "@mininglamp-oss/octo-runtime-adapter-sdk": "1.1.0",
+    "json5": "2.2.3",
+    "@mininglamp-oss/octo-runtime-extra-channel-gateway": "1.1.0",
+    "@mininglamp-oss/octo-runtime-host-sdk": "1.1.0",
+    "@mininglamp-oss/octo-runtime-adapter-openclaw": "1.1.0",
+    "@mininglamp-oss/octo-runtime-cross-service": "1.1.0",
+    "@mininglamp-oss/octo-runtime-protocol": "1.1.0",
+    "@mininglamp-oss/octo-runtime-executor-kernel": "1.1.0",
+    "@mininglamp-oss/octo-runtime-executor-core": "1.1.0"
   }
 }

package/node_modules/@mininglamp-oss/octo-runtime-cross-service/dist/common.d.ts

@@ -12,6 +12,8 @@ export declare function runCommand(runner: CommandRunner, backend: ServiceBacken
     env?: NodeJS.ProcessEnv;
     timeoutMs?: number;
 }): Promise<CommandResult>;
+/** 平台仅在确认原生 not-found 后忽略失败，其他结果沿同一受控错误合同传播。 */
+export declare function assertCommandSucceeded(result: CommandResult, backend: ServiceBackendKind): void;
 /** Read a UTF-8 service definition; absence is represented as `undefined`. */
 export declare function readDefinition(path: string): Promise<string | undefined>;
 /**

package/node_modules/@mininglamp-oss/octo-runtime-cross-service/dist/common.js

@@ -92,15 +92,20 @@ export async function runCommand(runner, backend, command, args, options = {}) {
             detail: cause instanceof Error ? cause.message : String(cause)
         });
     }
-    if ((options.checked ?? true) && result.exitCode !== 0) {
+    if (options.checked ?? true)
+        assertCommandSucceeded(result, backend);
+    return result;
+}
+/** 平台仅在确认原生 not-found 后忽略失败，其他结果沿同一受控错误合同传播。 */
+export function assertCommandSucceeded(result, backend) {
+    if (result.exitCode !== 0) {
         throw new ServiceError("COMMAND_FAILED", `${backend} command failed`, {
             backend,
-            command,
+            command: result.command,
             exitCode: result.exitCode,
             detail: boundedDetail(result.stderr || result.stdout)
         });
     }
-    return result;
 }
 /** Read a UTF-8 service definition; absence is represented as `undefined`. */
 export async function readDefinition(path) {

package/node_modules/@mininglamp-oss/octo-runtime-cross-service/dist/launchd.js

@@ -1,6 +1,7 @@
 /** macOS current-user service backend implemented with a LaunchAgent. */
 import { mkdir } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import { setTimeout as sleep } from "node:timers/promises";
 import { definitionDrift, escapeXml, normalizeServiceSpec, readDefinition, removeDefinition, runCommand, writeDefinition } from "./common.js";
 import { ServiceError } from "./errors.js";
 import { NodeCommandRunner } from "./runner.js";
@@ -106,7 +107,7 @@ export class LaunchdUserBackend {
         if (changed && wasLoaded) {
             // launchd does not reload changed plist bytes in place. Replace a loaded
             // job, but keep it unloaded when the desired definition is disabled.
-            await this.#bootout(label);
+            await this.#bootout(label, normalized.timeoutStopSeconds);
             if (normalized.enabled)
                 await this.#bootstrap(definitionPath);
         }
@@ -115,7 +116,7 @@ export class LaunchdUserBackend {
     async uninstall(spec) {
         const normalized = this.#normalize(spec);
         const label = launchdLabel(normalized);
-        await this.#bootout(label);
+        await this.#bootout(label, normalized.timeoutStopSeconds);
         await removeDefinition(this.#definitionPath(label));
     }
     /** Clear launchd's disabled override; this affects future activation but does not bootstrap now. */
@@ -149,7 +150,7 @@ export class LaunchdUserBackend {
     /** Finish with the job absent from the user's launchd domain; the plist remains installed. */
     async stop(spec) {
         const normalized = await this.#installed(spec);
-        await this.#bootout(launchdLabel(normalized));
+        await this.#bootout(launchdLabel(normalized), normalized.timeoutStopSeconds);
     }
     /** Finish with a newly kicked/bootstrapped process, while leaving identity and data files unchanged. */
     async restart(spec) {
@@ -203,8 +204,8 @@ export class LaunchdUserBackend {
         });
         if (result.exitCode !== 0)
             return false;
-        const match = result.stdout.match(new RegExp(`["']?${escapeRegExp(label)}["']?\\s*=>\\s*(true|false)`));
-        return match?.[1] === "true";
+        const match = result.stdout.match(new RegExp(`["']?${escapeRegExp(label)}["']?\\s*=>\\s*(true|false|enabled|disabled)`));
+        return match?.[1] === "true" || match?.[1] === "disabled";
     }
     #setEnabled(label, enabled) {
         return runCommand(this.#runner, this.kind, this.#launchctl, [enabled ? "enable" : "disable", this.#target(label)], {
@@ -216,12 +217,24 @@ export class LaunchdUserBackend {
             env: this.#environment
         });
     }
-    async #bootout(label) {
+    async #bootout(label, timeoutSeconds) {
         if ((await this.#print(label)).exitCode !== 0)
             return;
         await runCommand(this.#runner, this.kind, this.#launchctl, ["bootout", this.#target(label)], {
             env: this.#environment
         });
+        // bootout 默认异步返回；确认旧 job 消失后才能 stop 完成或 bootstrap。
+        // 有界轮询避免 --wait 无界阻塞及旧版 launchctl 的兼容问题。
+        const until = Date.now() + (timeoutSeconds + 5) * 1000;
+        while ((await this.#print(label)).exitCode === 0) {
+            if (Date.now() >= until)
+                throw new ServiceError("COMMAND_FAILED", "launchd service did not finish unloading", {
+                    backend: this.kind,
+                    command: this.#launchctl,
+                    exitCode: 124
+                });
+            await sleep(50);
+        }
     }
 }
 /** Validate and render the deterministic LaunchAgent plist for a portable spec. */

package/node_modules/@mininglamp-oss/octo-runtime-cross-service/dist/systemd.d.ts

@@ -20,7 +20,7 @@ export declare class SystemdUserBackend implements ServiceBackend {
      * A stopped unit stays stopped; a running unit restarts only when its definition changed.
      */
     install(spec: ServiceSpec): Promise<void>;
-    /** Finish with the unit stopped, disabled, removed, and forgotten by the user manager. */
+    /** 确认用户 unit 已停止再禁用、移除定义；真实管理器失败传播给调用方，保留未删定义。 */
     uninstall(spec: ServiceSpec): Promise<void>;
     /** Add the default-target link for future user-manager activation; do not start now. */
     enable(spec: ServiceSpec): Promise<void>;
@@ -28,7 +28,7 @@ export declare class SystemdUserBackend implements ServiceBackend {
     disable(spec: ServiceSpec): Promise<void>;
     /** Finish with systemd reporting the unit active/starting, then let the CLI verify daemon readiness. */
     start(spec: ServiceSpec): Promise<void>;
-    /** Finish with no active process for the installed unit; keep the unit file and enablement. */
+    /** 请求停止并有界确认 inactive/failed 且无主进程，保留定义与自启设置。 */
     stop(spec: ServiceSpec): Promise<void>;
     /** Finish with systemd having launched a replacement process; persistent Runtime data is unchanged. */
     restart(spec: ServiceSpec): Promise<void>;