jishushell 0.6.5 → 0.6.18

package/dist/services/app-common/paths.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Canonical path resolver for app instance directories.
+ *
+ * `~/.jishushell/apps/<id>/` is the single root for instance state. This
+ * module is the only allowed place to obtain an instance directory path;
+ * call sites must not call `join(APPS_DIR, id)` directly.
+ */
+/**
+ * Per-instance persisted file roles.
+ *
+ * These four files may repeat ids/digests for validation, but they do not own
+ * the same facts:
+ *   - definition.yaml: original AppSpec/template snapshot
+ *   - resolved-spec.yaml: install-time materialized AppSpec snapshot
+ *   - manifest.json: install resources and ownership ledger
+ *   - instance.json: current instance identity, desired/status, runtime ports,
+ *     connections, and operation/error state
+ *
+ * Do not read template snapshots as runtime facts, and do not infer ownership
+ * from instance.json.
+ */
+export declare const DEFINITION_FILENAME = "definition.yaml";
+export declare const RESOLVED_SPEC_FILENAME = "resolved-spec.yaml";
+export declare const MANIFEST_FILENAME = "manifest.json";
+export declare const INSTANCE_METADATA_FILENAME = "instance.json";
+/**
+ * Returns the canonical instance directory: `APPS_DIR/<id>/`.
+ */
+export declare function resolveAppDir(instanceId: string): string;

package/dist/services/app-common/paths.js

@@ -0,0 +1,34 @@
+/**
+ * Canonical path resolver for app instance directories.
+ *
+ * `~/.jishushell/apps/<id>/` is the single root for instance state. This
+ * module is the only allowed place to obtain an instance directory path;
+ * call sites must not call `join(APPS_DIR, id)` directly.
+ */
+import { join } from "node:path";
+import { APPS_DIR } from "../../config.js";
+/**
+ * Per-instance persisted file roles.
+ *
+ * These four files may repeat ids/digests for validation, but they do not own
+ * the same facts:
+ *   - definition.yaml: original AppSpec/template snapshot
+ *   - resolved-spec.yaml: install-time materialized AppSpec snapshot
+ *   - manifest.json: install resources and ownership ledger
+ *   - instance.json: current instance identity, desired/status, runtime ports,
+ *     connections, and operation/error state
+ *
+ * Do not read template snapshots as runtime facts, and do not infer ownership
+ * from instance.json.
+ */
+export const DEFINITION_FILENAME = "definition.yaml";
+export const RESOLVED_SPEC_FILENAME = "resolved-spec.yaml";
+export const MANIFEST_FILENAME = "manifest.json";
+export const INSTANCE_METADATA_FILENAME = "instance.json";
+/**
+ * Returns the canonical instance directory: `APPS_DIR/<id>/`.
+ */
+export function resolveAppDir(instanceId) {
+    return join(APPS_DIR, instanceId);
+}
+//# sourceMappingURL=paths.js.map

package/dist/services/app-common/paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/services/app-common/paths.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AACrD,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC3D,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AACjD,MAAM,CAAC,MAAM,0BAA0B,GAAG,eAAe,CAAC;AAE1D;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,UAAkB;IAC9C,OAAO,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AACpC,CAAC"}

package/dist/services/app-common/platform-transform.d.ts

@@ -0,0 +1,32 @@
+import type { AppSpec } from "../../types.js";
+/**
+ * Adapt a resolved AppSpec snapshot to the host platform before persistence.
+ *
+ * Non-darwin platforms are an identity pass-through (return the input
+ * spec by reference) — Linux/Pi/CIX install behavior must remain
+ * byte-identical to the pre-transformer code path.
+ *
+ * On darwin two spec patterns that work on Linux fail:
+ *
+ *   1. `port.host_network: "docker_bridge"`. The bridge interface lives
+ *      inside Docker Desktop's Linux VM, not on the macOS host. Nomad
+ *      enumerates host interfaces matching CIDR 172.17.0.0/16 and finds
+ *      none, so job placement fails with "no addresses available for
+ *      docker_bridge network". Strip the field — `hostNetworkForPort`
+ *      in the Nomad driver falls back to `external`, and Docker Desktop's
+ *      built-in `host.docker.internal` keeps cross-container calls
+ *      reachable.
+ *
+ *   2. `task.user: "host"`. `resolveUidGid()` falls back to
+ *      `process.getuid()` on darwin because /etc/passwd has no "host"
+ *      entry; macOS accounts run as UID 501, but PostgreSQL/Redis
+ *      container images expect their own service UIDs and crash with
+ *      "data directory has invalid permissions". Strip the field — the
+ *      image entrypoints (postgres, redis) drop privileges via
+ *      gosu/su-exec when no `--user` flag is supplied.
+ *
+ * Source `apps/*.yaml` files stay written in Linux-native form; this
+ * transform only mutates the *materialized* spec persisted at
+ * `~/.jishushell/apps/<id>/resolved-spec.yaml` on darwin hosts.
+ */
+export declare function platformTransformSpec(spec: AppSpec, platform?: NodeJS.Platform): AppSpec;

package/dist/services/app-common/platform-transform.js

@@ -0,0 +1,65 @@
+/**
+ * Adapt a resolved AppSpec snapshot to the host platform before persistence.
+ *
+ * Non-darwin platforms are an identity pass-through (return the input
+ * spec by reference) — Linux/Pi/CIX install behavior must remain
+ * byte-identical to the pre-transformer code path.
+ *
+ * On darwin two spec patterns that work on Linux fail:
+ *
+ *   1. `port.host_network: "docker_bridge"`. The bridge interface lives
+ *      inside Docker Desktop's Linux VM, not on the macOS host. Nomad
+ *      enumerates host interfaces matching CIDR 172.17.0.0/16 and finds
+ *      none, so job placement fails with "no addresses available for
+ *      docker_bridge network". Strip the field — `hostNetworkForPort`
+ *      in the Nomad driver falls back to `external`, and Docker Desktop's
+ *      built-in `host.docker.internal` keeps cross-container calls
+ *      reachable.
+ *
+ *   2. `task.user: "host"`. `resolveUidGid()` falls back to
+ *      `process.getuid()` on darwin because /etc/passwd has no "host"
+ *      entry; macOS accounts run as UID 501, but PostgreSQL/Redis
+ *      container images expect their own service UIDs and crash with
+ *      "data directory has invalid permissions". Strip the field — the
+ *      image entrypoints (postgres, redis) drop privileges via
+ *      gosu/su-exec when no `--user` flag is supplied.
+ *
+ * Source `apps/*.yaml` files stay written in Linux-native form; this
+ * transform only mutates the *materialized* spec persisted at
+ * `~/.jishushell/apps/<id>/resolved-spec.yaml` on darwin hosts.
+ */
+export function platformTransformSpec(spec, platform = process.platform) {
+    if (platform !== "darwin")
+        return spec;
+    return transformForDarwin(spec);
+}
+function transformForDarwin(spec) {
+    let anyChanged = false;
+    const tasks = spec.tasks.map((task) => {
+        let next = task;
+        let taskChanged = false;
+        if (task.user === "host") {
+            const { user: _stripped, ...rest } = task;
+            next = rest;
+            taskChanged = true;
+        }
+        if (Array.isArray(next.ports)) {
+            const needsPortRewrite = next.ports.some((port) => port.host_network === "docker_bridge");
+            if (needsPortRewrite) {
+                const ports = next.ports.map((port) => {
+                    if (port.host_network !== "docker_bridge")
+                        return port;
+                    const { host_network: _stripped, ...rest } = port;
+                    return rest;
+                });
+                next = { ...next, ports };
+                taskChanged = true;
+            }
+        }
+        if (taskChanged)
+            anyChanged = true;
+        return next;
+    });
+    return anyChanged ? { ...spec, tasks } : spec;
+}
+//# sourceMappingURL=platform-transform.js.map

package/dist/services/app-common/platform-transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"platform-transform.js","sourceRoot":"","sources":["../../../src/services/app-common/platform-transform.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAAa,EACb,WAA4B,OAAO,CAAC,QAAQ;IAE5C,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAa;IACvC,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,IAAI,IAAI,GAAgB,IAAI,CAAC;QAC7B,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;YAC1C,IAAI,GAAG,IAAmB,CAAC;YAC3B,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,KAAK,eAAe,CAChD,CAAC;YACF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACpC,IAAI,IAAI,CAAC,YAAY,KAAK,eAAe;wBAAE,OAAO,IAAI,CAAC;oBACvD,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;oBAClD,OAAO,IAAmB,CAAC;gBAC7B,CAAC,CAAC,CAAC;gBACH,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,CAAC;gBAC1B,WAAW,GAAG,IAAI,CAAC;YACrB,CAAC;QACH,CAAC;QAED,IAAI,WAAW;YAAE,UAAU,GAAG,IAAI,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAChD,CAAC"}

package/dist/services/app-common/provide-resolver.d.ts

@@ -0,0 +1,29 @@
+/**
+ * resolveProvideEndpoint — answer the question "what host:port does this
+ * provide actually listen on?" for a given app instance (§5.5).
+ *
+ * Replaces the old ad-hoc address builder that previously assumed a single
+ * primary port per instance. The new resolver reads the instance's canonical
+ * runtime port allocation. AppSpec declared
+ * ports are template metadata only; they may help identify a named runtime
+ * port, but they must never become the hostPort returned to proxy/status/
+ * capability hot paths.
+ *
+ * Returns null for url-only provides (§5.1 boundary clause): those cannot
+ * be bound through the Connections UI in this iteration; they only show up
+ * as embedded UI links.
+ */
+import type { AppProvide, AppSpec } from "../../types.js";
+export interface ResolvedEndpoint {
+    host: string;
+    hostPort: number;
+    path?: string;
+}
+/**
+ * Resolve the provide's actual endpoint for a given instance.
+ *
+ * - Returns null for url-only provides (cannot enter capability registry,
+ *   §5.1 boundary).
+ * - Returns null when no port can be determined from spec or runtime.
+ */
+export declare function resolveProvideEndpoint(instanceId: string, spec: AppSpec, provide: AppProvide): ResolvedEndpoint | null;

package/dist/services/app-common/provide-resolver.js

@@ -0,0 +1,129 @@
+import { getAdvertisedHostForPort, getInstanceRuntime, CanonicalRuntimePortRequiredError, } from "../instances/manager.js";
+function isServiceTask(task) {
+    return (task.role ?? "service") === "service";
+}
+function pickTask(spec, provide) {
+    if (typeof provide.task === "string" && provide.task) {
+        return spec.tasks?.find((t) => t.name === provide.task);
+    }
+    return spec.tasks?.find(isServiceTask);
+}
+function portHintOf(p) {
+    // AppSpec port declarations only disambiguate which runtime.ports[] entry
+    // to read. This value must never be returned as the actual hostPort.
+    if (typeof p.host_port === "number" && p.host_port > 0)
+        return p.host_port;
+    if (typeof p.port === "number" && p.port > 0)
+        return p.port;
+    return undefined;
+}
+function pickPortHint(task, provide) {
+    const ports = Array.isArray(task.ports) ? task.ports : [];
+    if (ports.length === 0)
+        return undefined;
+    // 1. Explicit endpoint.portName disambiguation. endpoint currently only
+    // selects the named runtime port; protocol/path stay top-level AppSpec
+    // fields so endpoint cannot become a second partial fact source.
+    const endpoint = provide.endpoint && typeof provide.endpoint === "object" ? provide.endpoint : null;
+    const portName = endpoint?.portName ?? provide.portName;
+    if (typeof portName === "string" && portName) {
+        const named = ports.find((p) => p.name === portName);
+        return named ? portHintOf(named) : undefined;
+    }
+    // 2. Match legacy provide.port against the task port definition. This value
+    // only identifies which runtime.ports[] entry to read; it is not a hostPort
+    // fact source for status/proxy/capability hot paths.
+    if (typeof provide.port === "number") {
+        const matched = ports.find((p) => portHintOf(p) === provide.port);
+        if (matched)
+            return portHintOf(matched);
+        return undefined;
+    }
+    // 3. No provide.port — first port on the chosen task.
+    return portHintOf(ports[0]);
+}
+/**
+ * Read the actual allocated host port from the instance's canonical runtime
+ * record. This is the main status/proxy/capability path, not a migration
+ * repair path, so missing runtime.ports[].hostPort is surfaced as
+ * INSTANCE_NEEDS_MIGRATION instead of falling back to AppSpec template ports.
+ */
+function readRuntimePort(instanceId, taskName, portName, portHint) {
+    const runtime = getInstanceRuntime(instanceId);
+    if (!runtime || typeof runtime !== "object") {
+        throw new CanonicalRuntimePortRequiredError(instanceId);
+    }
+    // Scan runtime.ports[] by BOTH taskName and name (RuntimeSpec
+    // shape). Multi-service-task apps (e.g. WeKnora's `app` + `ui`, both with a
+    // port named "http") record every external port tagged with its owning
+    // taskName, so a name-only match would resolve the wrong task's host port.
+    // Require taskName === <provide task> AND name === portName so the `ui`
+    // provide can only ever resolve to the `ui` task's port.
+    const runtimePorts = Array.isArray(runtime.ports) ? runtime.ports : [];
+    if (portName) {
+        if (taskName) {
+            const exact = runtimePorts.find((p) => p?.taskName === taskName && p?.name === portName);
+            if (exact && Number.isInteger(exact.hostPort) && exact.hostPort > 0) {
+                return exact.hostPort;
+            }
+        }
+        // Legacy runtime records (pre-taskName) carry no taskName field; only then
+        // is a name-only match safe, and only when the name is unambiguous.
+        const untaggedNamed = runtimePorts.filter((p) => p?.name === portName && p?.taskName === undefined);
+        if (untaggedNamed.length === 1) {
+            const named = untaggedNamed[0];
+            if (Number.isInteger(named.hostPort) && named.hostPort > 0) {
+                return named.hostPort;
+            }
+        }
+    }
+    // Single-runtime-port fallback within canonical runtime only — runtime
+    // allocation may have reassigned the host port. This never returns the
+    // AppSpec declared port; it only uses task/port shape to choose among
+    // already-persisted runtime.ports[] entries.
+    if (typeof portHint === "number") {
+        const sameTaskPorts = taskName
+            ? runtimePorts.filter((p) => p?.taskName === taskName)
+            : runtimePorts;
+        const candidates = sameTaskPorts.length > 0 ? sameTaskPorts : runtimePorts;
+        if (candidates.length === 1
+            && Number.isInteger(candidates[0]?.hostPort)
+            && candidates[0].hostPort > 0) {
+            return candidates[0].hostPort;
+        }
+    }
+    throw new CanonicalRuntimePortRequiredError(instanceId);
+}
+/**
+ * Resolve the provide's actual endpoint for a given instance.
+ *
+ * - Returns null for url-only provides (cannot enter capability registry,
+ *   §5.1 boundary).
+ * - Returns null when no port can be determined from spec or runtime.
+ */
+export function resolveProvideEndpoint(instanceId, spec, provide) {
+    // url-only provide — out of capability registry scope (see §5.1).
+    if (typeof provide.url === "string" && provide.url.trim())
+        return null;
+    const task = pickTask(spec, provide);
+    if (!task)
+        return null;
+    const portHint = pickPortHint(task, provide);
+    if (typeof portHint !== "number" || portHint <= 0)
+        return null;
+    const endpoint = provide.endpoint && typeof provide.endpoint === "object" ? provide.endpoint : null;
+    const portName = endpoint?.portName ?? provide.portName ?? findPortName(task, portHint);
+    const actual = readRuntimePort(instanceId, task.name, portName, portHint);
+    const host = getAdvertisedHostForPort(actual);
+    return {
+        host,
+        hostPort: actual,
+        ...(provide.path ? { path: provide.path } : {}),
+    };
+}
+function findPortName(task, hostPort) {
+    const ports = Array.isArray(task.ports) ? task.ports : [];
+    const matched = ports.find((p) => portHintOf(p) === hostPort);
+    return matched?.name;
+}
+//# sourceMappingURL=provide-resolver.js.map

package/dist/services/app-common/provide-resolver.js.map

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

package/dist/services/app-common/remote-spec.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Shared remote AppSpec downloader.
+ *
+ * Remote AppSpec import is an install-source capability, not an instance
+ * creation protocol. Any route or CLI flow that accepts a remote AppSpec URL
+ * must go through this helper so SSRF protection, DNS pinning, size limits,
+ * and content checks stay identical across install entry points.
+ */
+/** Maximum accepted YAML payload — same ceiling as instances.ts remote fetch. */
+export declare const REMOTE_APP_SPEC_MAX_BYTES = 1000000;
+export declare function loadRemoteAppSpecYaml(urlText: string, opts?: {
+    providerId?: string;
+    fieldName?: string;
+}): Promise<string>;

package/dist/services/app-common/remote-spec.js

@@ -0,0 +1,58 @@
+/**
+ * Shared remote AppSpec downloader.
+ *
+ * Remote AppSpec import is an install-source capability, not an instance
+ * creation protocol. Any route or CLI flow that accepts a remote AppSpec URL
+ * must go through this helper so SSRF protection, DNS pinning, size limits,
+ * and content checks stay identical across install entry points.
+ */
+import { pinnedFetch, validateUpstreamUrl } from "../llm-proxy/ssrf.js";
+/** Maximum accepted YAML payload — same ceiling as instances.ts remote fetch. */
+export const REMOTE_APP_SPEC_MAX_BYTES = 1_000_000;
+const DEFAULT_TIMEOUT_MS = 15_000;
+export async function loadRemoteAppSpecYaml(urlText, opts = {}) {
+    const fieldName = opts.fieldName ?? "app spec URL";
+    const providerId = opts.providerId ?? "remote-app-spec";
+    let parsed;
+    try {
+        parsed = new URL(urlText);
+    }
+    catch {
+        throw new Error(`Invalid ${fieldName}`);
+    }
+    if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+        throw new Error(`${fieldName} must use http:// or https://`);
+    }
+    // SSRF: reject private / loopback / link-local and pin DNS. The synthetic
+    // providerId is NOT in LOCAL_PROVIDER_IDS so validateUpstreamUrl takes the
+    // strict "public remote" branch. AppSpec download must never reach the
+    // panel's own host services (nomad API, docker API, localhost panel).
+    let resolved;
+    try {
+        resolved = await validateUpstreamUrl(urlText, providerId);
+    }
+    catch (err) {
+        throw new Error(`${fieldName} refused: ${err?.message ?? "SSRF check failed"}`);
+    }
+    if (!resolved) {
+        throw new Error(`${fieldName} must not target localhost or private addresses`);
+    }
+    const response = await pinnedFetch(urlText, {
+        method: "GET",
+        headers: { accept: "application/yaml, text/yaml, text/plain, */*" },
+        body: "",
+        signal: AbortSignal.timeout(DEFAULT_TIMEOUT_MS),
+    }, resolved);
+    if (!response.ok) {
+        throw new Error(`Failed to download app spec: HTTP ${response.status}`);
+    }
+    const yamlText = await response.text();
+    if (!yamlText.trim()) {
+        throw new Error("Downloaded app spec is empty");
+    }
+    if (yamlText.length > REMOTE_APP_SPEC_MAX_BYTES) {
+        throw new Error("Downloaded app spec is too large");
+    }
+    return yamlText;
+}
+//# sourceMappingURL=remote-spec.js.map

package/dist/services/app-common/remote-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-spec.js","sourceRoot":"","sources":["../../../src/services/app-common/remote-spec.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAExE,iFAAiF;AACjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,SAAS,CAAC;AACnD,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAElC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAe,EACf,OAAoD,EAAE;IAEtD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,cAAc,CAAC;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAExD,IAAI,MAAW,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,WAAW,SAAS,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,GAAG,SAAS,+BAA+B,CAAC,CAAC;IAC/D,CAAC;IAED,0EAA0E;IAC1E,2EAA2E;IAC3E,uEAAuE;IACvE,sEAAsE;IACtE,IAAI,QAAmD,CAAC;IACxD,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,GAAG,SAAS,aAAa,GAAG,EAAE,OAAO,IAAI,mBAAmB,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,GAAG,SAAS,iDAAiD,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,OAAO,EACP;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,EAAE,MAAM,EAAE,8CAA8C,EAAE;QACnE,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC;KAChD,EACD,QAAQ,CACT,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,qCAAqC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACvC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,yBAAyB,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/services/app-common/runtime-builder.d.ts

@@ -0,0 +1 @@
+export { allocateCanonicalRuntimeHostPorts as allocateGenericRuntimeHostPorts, buildCanonicalRuntimeFromSpec, commitCanonicalRuntimeHostPorts as commitRuntimeHostPortAllocations, releaseCanonicalRuntimeHostPorts as releaseRuntimeHostPortAllocations, stripCanonicalRuntimeHostPortSeeds as stripRuntimeHostPortSeeds, } from "./runtime-facts.js";

package/dist/services/app-common/runtime-builder.js

@@ -0,0 +1,2 @@
+export { allocateCanonicalRuntimeHostPorts as allocateGenericRuntimeHostPorts, buildCanonicalRuntimeFromSpec, commitCanonicalRuntimeHostPorts as commitRuntimeHostPortAllocations, releaseCanonicalRuntimeHostPorts as releaseRuntimeHostPortAllocations, stripCanonicalRuntimeHostPortSeeds as stripRuntimeHostPortSeeds, } from "./runtime-facts.js";
+//# sourceMappingURL=runtime-builder.js.map

package/dist/services/app-common/runtime-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-builder.js","sourceRoot":"","sources":["../../../src/services/app-common/runtime-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,IAAI,+BAA+B,EACpE,6BAA6B,EAC7B,+BAA+B,IAAI,gCAAgC,EACnE,gCAAgC,IAAI,iCAAiC,EACrE,kCAAkC,IAAI,yBAAyB,GAChE,MAAM,oBAAoB,CAAC"}

package/dist/services/app-common/runtime-facts.d.ts

@@ -0,0 +1,19 @@
+import type { AppSpec } from "../../types.js";
+export declare function buildCanonicalRuntimeFromSpec(spec: AppSpec, instanceId: string): Record<string, any>;
+export declare function allocateCanonicalRuntimeHostPorts(instanceId: string, runtime: Record<string, any>, options?: {
+    ignoreIncompleteCanonicalInstanceIds?: ReadonlySet<string>;
+    preserveExistingHostPorts?: boolean;
+}): Promise<{
+    runtime: Record<string, any>;
+    allocations: Array<{
+        commit: () => number;
+        release: () => void;
+    }>;
+}>;
+export declare function commitCanonicalRuntimeHostPorts(allocations: Array<{
+    commit: () => number;
+}>): void;
+export declare function releaseCanonicalRuntimeHostPorts(allocations: Array<{
+    release: () => void;
+}>): void;
+export declare function stripCanonicalRuntimeHostPortSeeds(runtime: Record<string, any>): Record<string, any>;

package/dist/services/app-common/runtime-facts.js

@@ -0,0 +1,126 @@
+import { homedir } from "os";
+import * as instanceServices from "../instances/manager.js";
+import { compileTaskRuntime } from "./app-compiler.js";
+const JISHUSHELL_HOME = process.env.JISHUSHELL_HOME?.trim()
+    || `${process.env.HOME ?? homedir()}/.jishushell`;
+function expandPath(p) {
+    if (/^~\/\.jishushell(?:\/|$)/.test(p)) {
+        return p.replace(/^~\/\.jishushell(?=\/|$)/, JISHUSHELL_HOME);
+    }
+    return p.replace(/^~(?=\/|$)/, process.env.HOME ?? homedir());
+}
+export function buildCanonicalRuntimeFromSpec(spec, instanceId) {
+    const serviceTask = spec.tasks.find((task) => (task.role ?? "service") === "service");
+    if (!serviceTask)
+        return {};
+    const runtime = compileTaskRuntime(serviceTask, instanceId);
+    const orderedTasks = [serviceTask, ...spec.tasks.filter((task) => task !== serviceTask)];
+    const allPorts = orderedTasks.flatMap((task) => (task.ports ?? [])
+        .filter((port) => (port.visibility ?? "external") !== "internal")
+        .map((port) => ({
+        taskName: task.name,
+        name: port.name,
+        containerPort: port.container_port ?? port.port,
+        // Temporary allocator seed only; callers must strip it before
+        // persisting runtime facts.
+        hostPortSeed: port.host_port ?? port.port,
+        visibility: port.visibility ?? "external",
+        ...(port.host_network ? { host_network: port.host_network } : {}),
+    })));
+    if (allPorts.length > 0) {
+        runtime.ports = allPorts;
+    }
+    if (serviceTask.health?.http) {
+        const healthPortEntry = serviceTask.ports?.find((port) => port.port === serviceTask.health?.http?.port
+            || port.host_port === serviceTask.health?.http?.port
+            || port.container_port === serviceTask.health?.http?.port);
+        runtime.health = {
+            type: "http",
+            path: serviceTask.health.http.path,
+            port: healthPortEntry?.container_port ?? healthPortEntry?.port ?? serviceTask.health.http.port,
+            interval: serviceTask.health.interval,
+            timeout: serviceTask.health.timeout,
+            retries: serviceTask.health.retries,
+            start_period: serviceTask.health.start_period,
+        };
+    }
+    if (Array.isArray(serviceTask.volumes)) {
+        runtime.volumes = serviceTask.volumes.map((volume) => ({
+            hostPath: expandPath(String(volume.source ?? "")),
+            containerPath: String(volume.target ?? ""),
+            mode: volume.readonly ? "ro" : "rw",
+        }));
+    }
+    return runtime;
+}
+export async function allocateCanonicalRuntimeHostPorts(instanceId, runtime, options = {}) {
+    const ports = Array.isArray(runtime.ports) ? runtime.ports : [];
+    if (ports.length === 0)
+        return { runtime, allocations: [] };
+    const allocations = [];
+    const nextPorts = [...ports];
+    try {
+        for (const [index, port] of ports.entries()) {
+            if ((port?.visibility ?? "external") === "internal")
+                continue;
+            if (options.preserveExistingHostPorts === true
+                && Number.isInteger(port?.hostPort)
+                && port.hostPort > 0) {
+                const { hostPortSeed: _hostPortSeed, ...persistedPort } = port;
+                nextPorts[index] = persistedPort;
+                continue;
+            }
+            const seed = Number.isInteger(port?.hostPortSeed) && port.hostPortSeed > 0
+                ? port.hostPortSeed
+                : Number.isInteger(port?.hostPort) && port.hostPort > 0
+                    ? port.hostPort
+                    : Number.isInteger(port?.containerPort) && port.containerPort > 0
+                        ? port.containerPort
+                        : null;
+            if (seed == null) {
+                throw new Error(`Instance '${instanceId}' has an invalid runtime port seed for ${port?.taskName ?? "task"}/${port?.name ?? "port"}`);
+            }
+            const allocation = await instanceServices.allocateHostPort(instanceId, seed, undefined, options);
+            allocations.push(allocation);
+            const { hostPortSeed: _hostPortSeed, ...persistedPort } = port;
+            nextPorts[index] = {
+                ...persistedPort,
+                hostPort: allocation.port,
+            };
+        }
+    }
+    catch (error) {
+        for (const allocation of allocations)
+            allocation.release();
+        throw error;
+    }
+    return {
+        runtime: {
+            ...runtime,
+            ports: nextPorts,
+        },
+        allocations,
+    };
+}
+export function commitCanonicalRuntimeHostPorts(allocations) {
+    for (const allocation of allocations)
+        allocation.commit();
+}
+export function releaseCanonicalRuntimeHostPorts(allocations) {
+    for (const allocation of allocations)
+        allocation.release();
+}
+export function stripCanonicalRuntimeHostPortSeeds(runtime) {
+    if (!Array.isArray(runtime.ports))
+        return runtime;
+    return {
+        ...runtime,
+        ports: runtime.ports.map((port) => {
+            if (!port || typeof port !== "object")
+                return port;
+            const { hostPortSeed: _hostPortSeed, ...persistedPort } = port;
+            return persistedPort;
+        }),
+    };
+}
+//# sourceMappingURL=runtime-facts.js.map

package/dist/services/app-common/runtime-facts.js.map

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

package/dist/services/app-common/service.d.ts

@@ -0,0 +1,9 @@
+export { onConfigChange, notifyConfigChange, instanceDir, instanceMetaPath, defaultModelEnvFile, normalizePath, extractPrimaryHostPort, isPortInUse, allocateHostPort, releasePendingPort, resolveServiceUser, chownToServiceUser, parseEnvFile, updateEnvFile, inferProviderApiKeyEnvName, listInstances, getInstance, updateInstanceMeta, deleteInstance, getConfig, getStoredConfig, saveConfig, isChannelPluginInstalled, saveFeishuCredentials, saveWeixinCredentials, getWeixinAccounts, getInstanceRuntime, getRuntimeEnvFiles, getPrimaryHostPort, getPrimaryHostForInstance, isCanonicalRuntimePortRequiredError, getListeningHostForPort, getHostForAppPort, urlHost, findInstancesSharingIntegrationHome, reallocatePrimaryHostPort, reallocateRuntimeHostPort, findInstancesSharingPrimaryHostPort, getRuntimeEnv, } from "../instances/manager.js";
+export * from "./catalog-service.js";
+export * from "./capability-service.js";
+export * from "./create-pipeline.js";
+export * from "./delete-service.js";
+export * from "./execution-service.js";
+export * from "./install-store.js";
+export * from "./lifecycle-scripts.js";
+export * from "./task-service.js";

package/dist/services/app-common/service.js

@@ -0,0 +1,10 @@
+export { onConfigChange, notifyConfigChange, instanceDir, instanceMetaPath, defaultModelEnvFile, normalizePath, extractPrimaryHostPort, isPortInUse, allocateHostPort, releasePendingPort, resolveServiceUser, chownToServiceUser, parseEnvFile, updateEnvFile, inferProviderApiKeyEnvName, listInstances, getInstance, updateInstanceMeta, deleteInstance, getConfig, getStoredConfig, saveConfig, isChannelPluginInstalled, saveFeishuCredentials, saveWeixinCredentials, getWeixinAccounts, getInstanceRuntime, getRuntimeEnvFiles, getPrimaryHostPort, getPrimaryHostForInstance, isCanonicalRuntimePortRequiredError, getListeningHostForPort, getHostForAppPort, urlHost, findInstancesSharingIntegrationHome, reallocatePrimaryHostPort, reallocateRuntimeHostPort, findInstancesSharingPrimaryHostPort, getRuntimeEnv, } from "../instances/manager.js";
+export * from "./catalog-service.js";
+export * from "./capability-service.js";
+export * from "./create-pipeline.js";
+export * from "./delete-service.js";
+export * from "./execution-service.js";
+export * from "./install-store.js";
+export * from "./lifecycle-scripts.js";
+export * from "./task-service.js";
+//# sourceMappingURL=service.js.map

package/dist/services/app-common/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/services/app-common/service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACb,0BAA0B,EAC1B,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,eAAe,EACf,UAAU,EACV,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,mCAAmC,EACnC,uBAAuB,EACvB,iBAAiB,EACjB,OAAO,EACP,mCAAmC,EACnC,yBAAyB,EACzB,yBAAyB,EACzB,mCAAmC,EACnC,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC"}

package/dist/services/app-common/spec-materializer.d.ts

@@ -0,0 +1,9 @@
+import type { AppSpec } from "../../types.js";
+export declare function normalizeAppSpec(spec: AppSpec): AppSpec;
+export declare function collectDeclaredPorts(spec: AppSpec): number[];
+export declare function materializeAppSpecForInstance(spec: AppSpec, instanceId: string): AppSpec;
+export declare function resolveInstallTarget(spec: AppSpec, requestedInstanceId?: string): Promise<{
+    instanceId: string;
+    installedSpec: AppSpec;
+    installedSpecYaml: string;
+}>;