jishushell 0.4.17 → 0.4.24-beta.2

package/dist/services/{app-compiler.js → app/app-compiler.js}

@@ -62,20 +62,23 @@ export function compilePorts(ports) {
         return [];
     return ports.map((p) => ({
         Label: p.name,
-        Value: p.port,
-        To: p.port,
+        Value: p.host_port ?? p.port,
+        To: p.container_port ?? p.port,
     }));
 }
 /** Compile AppTask health → Nomad service check */
-export function compileHealthCheck(health, taskName) {
+export function compileHealthCheck(health, taskName, ports) {
     if (!health)
         return null;
     if (health.http) {
+        const portEntry = ports?.find((port) => port.port === health.http?.port
+            || port.host_port === health.http?.port
+            || port.container_port === health.http?.port);
         return {
             Name: `${taskName || "service"}-health`,
             Type: "http",
             Path: health.http.path,
-            PortLabel: String(health.http.port),
+            PortLabel: portEntry?.name ?? String(health.http.port),
             Interval: parseIntervalNs(health.interval || "10s"),
             Timeout: parseIntervalNs(health.timeout || "2s"),
         };
@@ -118,7 +121,7 @@ export function compileAppToNomadTasks(spec, instanceId) {
     const tasks = [];
     // Sort tasks by role precedence: init → sidecar → service → cleanup
     const roleOrder = { init: 0, sidecar: 1, service: 2, cleanup: 3 };
-    const sorted = [...spec.tasks].sort((a, b) => (roleOrder[a.role] ?? 2) - (roleOrder[b.role] ?? 2));
+    const sorted = [...spec.tasks].sort((a, b) => (roleOrder[a.role ?? "service"] ?? 2) - (roleOrder[b.role ?? "service"] ?? 2));
     for (const task of sorted) {
         const compiled = {
             Name: task.name,
@@ -150,11 +153,11 @@ export function compileAppToNomadTasks(spec, instanceId) {
                 compiled.Config.args = task.args;
         }
         // Lifecycle for non-service tasks
-        const lifecycle = compileLifecycle(task.role);
+        const lifecycle = compileLifecycle(task.role ?? "service");
         if (lifecycle)
             compiled.Lifecycle = lifecycle;
         // Health check → Nomad service block
-        const check = compileHealthCheck(task.health, task.name);
+        const check = compileHealthCheck(task.health, task.name, task.ports);
         if (check) {
             compiled.Services = [{
                     Name: `${instanceId}-${task.name}`,

package/dist/services/app/app-compiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-compiler.js","sourceRoot":"","sources":["../../../src/services/app/app-compiler.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IACrB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,KAAK,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAe;IAC7C,IAAI,CAAC,MAAM;QAAE,OAAO,GAAG,CAAC;IACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,IAAI,CAAC;IAClB,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;QAClE,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,IAAI,CAAC;IAClB,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;QAClE,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;IAClE,OAAO,CAAC,CAAC;AACX,CAAC;AAED,4EAA4E;AAC5E,SAAS,eAAe,CAAC,CAAU;IACjC,IAAI,CAAC,CAAC;QAAE,OAAO,cAAc,CAAC,CAAC,cAAc;IAC7C,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IACrD,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC;IACxD,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC;IACzD,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC;AACrC,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,YAAY,CAAC,KAAqB;IAChD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,CAAC,CAAC,IAAI;QACb,KAAK,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI;QAC5B,EAAE,EAAE,CAAC,CAAC,cAAc,IAAI,CAAC,CAAC,IAAI;KAC/B,CAAC,CAAC,CAAC;AACN,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,kBAAkB,CAAC,MAAsB,EAAE,QAAiB,EAAE,KAAqB;IACjG,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACrC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI;eAC5B,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI;eACpC,IAAI,CAAC,cAAc,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAC7C,CAAC;QACF,OAAO;YACL,IAAI,EAAE,GAAG,QAAQ,IAAI,SAAS,SAAS;YACvC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,SAAS,EAAE,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YACtD,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC;YACnD,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC;SACjD,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,MAAM;YACT,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC9C,KAAK,SAAS;YACZ,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC7C,KAAK,SAAS;YACZ,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC9C,SAAS,2CAA2C;YAClD,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAa,EAAE,UAAkB;IAClE,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,mBAAmB;QAC5C,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;QACrB,GAAG,EAAE,GAAG;QACR,IAAI,EAAE,MAAM;QACZ,SAAS,EAAE,EAAE;QACb,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI;QACzB,SAAS,EAAE;YACT,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;YACvC,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;SAClD;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAa,EAAE,UAAkB;IACtE,MAAM,KAAK,GAA0B,EAAE,CAAC;IAExC,oEAAoE;IACpE,MAAM,SAAS,GAA2B,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAC1F,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CACxF,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAwB;YACpC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;YAC5D,MAAM,EAAE,EAAE;YACV,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE;YACpB,SAAS,EAAE;gBACT,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;gBACvC,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;aAClD;SACF,CAAC;QAEF,yBAAyB;QACzB,IAAI,IAAI,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;YACjC,QAAQ,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACnC,IAAI,IAAI,CAAC,OAAO;gBAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACzD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM;gBAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACxD,2BAA2B;YAC3B,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,QAAQ,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,6BAA6B;YAC7B,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,mBAAmB,CAAC;YAC9D,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM;gBAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1D,CAAC;QAED,kCAAkC;QAClC,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC;QAC3D,IAAI,SAAS;YAAE,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;QAE9C,qCAAqC;QACrC,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACrE,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,CAAC,QAAQ,GAAG,CAAC;oBACnB,IAAI,EAAE,GAAG,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE;oBAClC,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,MAAM,EAAE,CAAC,KAAK,CAAC;iBAChB,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

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

@@ -0,0 +1,142 @@
+import type { AppManifest, AppSpec, AppTerminalConfig } from "../../types.js";
+import type { AppJobStatus } from "../nomad-manager.js";
+import { type Task } from "../task-registry.js";
+export interface BuiltinAppSpecTemplate {
+    id: string;
+    fileName: string;
+    name: string;
+    description: string;
+    serviceRuntime: string | null;
+    instanceCompatible: boolean;
+    suggestedAppType: "ollama" | "custom";
+    yaml: string;
+}
+export declare function listBuiltinAppSpecs(): BuiltinAppSpecTemplate[];
+export declare function updateInstance(instanceId: string, name?: string, description?: string): Record<string, any> | null;
+type LifecycleExecOptions = {
+    sudoPassword?: string;
+};
+export declare function validateSudoPassword(sudoPassword: string): Promise<void>;
+export type AppTaskKind = "install" | "uninstall" | "start" | "stop" | "restart";
+export interface AppCurrentTask {
+    id: string;
+    kind: AppTaskKind;
+    status: "running" | "done" | "error";
+}
+export interface AppTaskStartResult {
+    ok: boolean;
+    taskId?: string;
+    reused?: boolean;
+    error?: string;
+    kind?: Exclude<AppTaskKind, "install">;
+}
+export type AppInstallState = "installing" | "installed";
+export interface InstalledAppRecord {
+    spec: AppSpec;
+    manifest: AppManifest;
+    install_state: AppInstallState;
+    current_task?: AppCurrentTask;
+}
+export interface InstallAppOptions {
+    preferInstanceDir?: boolean;
+    task?: Task;
+    exec?: LifecycleExecOptions;
+    bootstrap?: {
+        name?: string;
+        description?: string;
+        cloneFrom?: string;
+        agentHome?: string;
+        cloneOptions?: {
+            include_sessions?: boolean;
+            include_memory?: boolean;
+        };
+    };
+}
+export declare function getRunningAppTask(appId: string, appDir?: string): AppCurrentTask | undefined;
+/**
+ * Check whether an app with this id is installed (has manifest.json + app-spec.yaml).
+ * Exported so nomad-manager can use it for routing without the old prefix convention.
+ */
+export declare function isAppInstalled(appId: string): boolean;
+export declare function getAppInstallState(appId: string): AppInstallState | null;
+export interface AppProvidedCapabilitySummary {
+    appId: string;
+    capability: string;
+    port?: number;
+    path?: string;
+    url?: string;
+    protocol: string;
+    visibility?: string;
+    description?: string;
+    address?: string;
+    registered: boolean;
+    registeredAddress?: string;
+    providerInstanceId?: string;
+    terminal?: AppTerminalConfig;
+}
+export interface AppEmbeddedUiHint {
+    capability: string;
+    protocol: "http" | "https";
+    port?: number;
+    url: string;
+}
+export declare function listProvidedCapabilities(): AppProvidedCapabilitySummary[];
+export declare function getProvidedCapabilitiesForApp(appId: string): AppProvidedCapabilitySummary[];
+export declare function getEmbeddedUiHintForApp(appId: string): AppEmbeddedUiHint | null;
+export declare function installApp(specYaml: string, requestedAppId?: string, options?: InstallAppOptions): Promise<{
+    spec: AppSpec;
+    manifest: AppManifest;
+}>;
+export declare function listApps(): InstalledAppRecord[];
+export declare function getApp(id: string): InstalledAppRecord | null;
+export declare function uninstallApp(id: string, options?: {
+    exec?: LifecycleExecOptions;
+}): Promise<void>;
+export declare function uninstallAppTask(id: string, exec?: LifecycleExecOptions): AppTaskStartResult;
+export declare function runPostStartSteps(spec: AppSpec): Promise<void>;
+export declare function registerCapabilities(instanceId: string, spec: AppSpec, portOverride?: number): void;
+export declare function unregisterCapabilities(instanceId: string): void;
+export declare function resolveRequires(spec: AppSpec): Record<string, string>;
+export declare function startApp(appId: string): Promise<{
+    ok: boolean;
+    error?: string;
+    eval_id?: string;
+}>;
+export declare function startAppTask(appId: string): AppTaskStartResult;
+export declare function stopApp(appId: string, purge?: boolean): Promise<{
+    ok: boolean;
+    error?: string;
+}>;
+export declare function stopAppTask(appId: string, purge?: boolean): AppTaskStartResult;
+export declare function restartApp(appId: string): Promise<{
+    ok: boolean;
+    error?: string;
+    eval_id?: string;
+}>;
+export declare function restartAppTask(appId: string): AppTaskStartResult;
+export declare function getAppRuntimeStatus(appId: string): Promise<{
+    status: string;
+    uptime?: number;
+    memory_mb?: number;
+    tasks?: Record<string, {
+        state: string;
+        restarts: number;
+    }>;
+    error?: string;
+}>;
+export declare function getAppStatus(appId: string): Promise<AppJobStatus>;
+export declare function getAppLogs(appId: string, taskName: string, lines?: number, logType?: string): Promise<string[]>;
+export declare function execInApp(appId: string, command: string[], timeoutMs?: number): Promise<import("../../types.js").ExecResult>;
+export interface AppExecStreamHandlers {
+    onStdout?: (text: string) => void;
+    onStderr?: (text: string) => void;
+}
+export declare function streamExecInApp(appId: string, command: string[], handlers: AppExecStreamHandlers, options?: {
+    timeoutMs?: number;
+    taskName?: string;
+}): Promise<import("../../types.js").ExecResult>;
+export declare function copyApp(sourceId: string): Promise<{
+    spec: AppSpec;
+    manifest: AppManifest;
+}>;
+export { onConfigChange, notifyConfigChange, instanceDir, instanceMetaPath, defaultModelEnvFile, normalizePath, extractGatewayPort, isPortInUse, allocateGatewayPort, releasePendingPort, getResolvedOpenclawBin, resolveServiceUser, chownToServiceUser, parseEnvFile, updateEnvFile, inferProviderApiKeyEnvName, listInstances, getInstance, updateInstanceMeta, deleteInstance, getConfig, getStoredConfig, saveConfig, CHANNEL_PLUGIN_MAP, isChannelPluginInstalled, createInstance, getOpenclawHome, saveFeishuCredentials, saveWeixinCredentials, getWeixinAccounts, getOpenclawConfigPath, getLegacyOpenclawConfigPath, getInstanceRuntime, getRuntimeEnvFiles, getGatewayPort, getGatewayHost, getListeningHostForPort, urlHost, findInstancesSharingOpenclawHome, reallocateGatewayPort, findInstancesSharingGatewayPort, getRuntimeEnv, defaultGatewayPort, releasePort, } from "../instance-manager.js";