jishushell 0.6.5 → 0.7.3

package/dist/services/app-common/install-store.js

@@ -0,0 +1,261 @@
+import { existsSync, readdirSync, readFileSync, rmSync, unlinkSync, writeFileSync, } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+import * as config from "../../config.js";
+import { getRunningTasks, getTask } from "../tasks/registry.js";
+import { readCanonicalManifestFromDir, readCanonicalSpecSnapshotsFromDir, readSpecSnapshotFromDir, } from "./instance-store.js";
+import { resolveAppDir } from "./paths.js";
+function getConfigValue(name) {
+    return name in config ? config[name] : undefined;
+}
+function resolveConfigPath(value, fallback) {
+    return typeof value === "string" && value.trim() ? value : fallback;
+}
+const JISHUSHELL_HOME = resolveConfigPath(getConfigValue("JISHUSHELL_HOME"), join(process.env.HOME ?? homedir(), ".jishushell"));
+const APPS_DIR = resolveConfigPath(getConfigValue("APPS_DIR"), join(JISHUSHELL_HOME, "apps"));
+const ANSI_ESCAPE_RE = /\u001B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
+function findLegacyInstanceIdentityToken(value, path = "spec") {
+    if (typeof value === "string") {
+        if (value.includes("${app_id}"))
+            return `${path}: \${app_id}`;
+        if (value.includes("${app.id}"))
+            return `${path}: \${app.id}`;
+        return null;
+    }
+    if (Array.isArray(value)) {
+        for (let index = 0; index < value.length; index += 1) {
+            const found = findLegacyInstanceIdentityToken(value[index], `${path}[${index}]`);
+            if (found)
+                return found;
+        }
+        return null;
+    }
+    if (value && typeof value === "object") {
+        for (const [key, entry] of Object.entries(value)) {
+            const found = findLegacyInstanceIdentityToken(entry, `${path}.${key}`);
+            if (found)
+                return found;
+        }
+    }
+    return null;
+}
+function assertCurrentAppSpecIdentitySyntax(spec, boundary = "AppSpec") {
+    if (typeof spec.app_id === "string" && spec.app_id.trim()) {
+        throw new Error(`${boundary} uses legacy top-level app_id. Run upgrade/migration/import repair before normal create/start paths.`);
+    }
+    const legacyToken = findLegacyInstanceIdentityToken(spec);
+    if (legacyToken) {
+        throw new Error(`${boundary} uses legacy instance identity token at ${legacyToken}. Use \${instance.id} in current AppSpecs.`);
+    }
+}
+export const INSTALL_LOCK_FILENAME = "install.lock";
+const JISHUSHELL_SAFE_ID_RE = /^[a-z0-9][a-z0-9-]{0,62}$/;
+function installLockPathForDir(appDir) {
+    return join(appDir, INSTALL_LOCK_FILENAME);
+}
+function hasInstallLock(appDir) {
+    return existsSync(installLockPathForDir(appDir));
+}
+function readInstallLockMetadata(appDir) {
+    const lockPath = installLockPathForDir(appDir);
+    if (!existsSync(lockPath))
+        return null;
+    try {
+        const parsed = JSON.parse(readFileSync(lockPath, "utf-8"));
+        return parsed && typeof parsed === "object" ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+function installDirLooksComplete(appDir) {
+    return (readSpecSnapshotFromDir(appDir) !== null
+        && existsSync(join(appDir, "manifest.json"))
+        && existsSync(join(appDir, "instance.json")));
+}
+function isProcessAlive(pid) {
+    if (!Number.isInteger(pid) || pid <= 0)
+        return false;
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function isStaleInstallLock(appDir) {
+    if (!hasInstallLock(appDir))
+        return false;
+    const metadata = readInstallLockMetadata(appDir);
+    if (!metadata)
+        return true;
+    const taskId = typeof metadata.taskId === "string" ? metadata.taskId.trim() : "";
+    if (taskId) {
+        return getTask(taskId)?.status !== "running";
+    }
+    if (typeof metadata.pid === "number") {
+        if (isProcessAlive(metadata.pid)) {
+            const specId = typeof metadata.specId === "string" ? metadata.specId.trim() : "";
+            if (installDirLooksComplete(appDir) && (!specId || getRunningTasks(`app-install-${specId}`).length === 0)) {
+                return true;
+            }
+            return false;
+        }
+        return !isProcessAlive(metadata.pid);
+    }
+    const specId = typeof metadata.specId === "string" ? metadata.specId.trim() : "";
+    return specId ? getRunningTasks(`app-install-${specId}`).length === 0 : true;
+}
+export function cleanupStaleInstallDir(appDir) {
+    if (!isStaleInstallLock(appDir))
+        return false;
+    if (installDirLooksComplete(appDir)) {
+        process.stdout.write(`  [app-service] removing stale install lock: ${appDir}\n`);
+        removeInstallLock(appDir);
+        return false;
+    }
+    process.stdout.write(`  [app-service] removing stale install dir: ${appDir}\n`);
+    rmSync(appDir, { recursive: true, force: true });
+    return true;
+}
+export function createInstallLock(appDir, instanceId, specId, task) {
+    writeFileSync(installLockPathForDir(appDir), JSON.stringify({ instanceId, specId, started_at: new Date().toISOString(), pid: process.pid, taskId: task?.id }, null, 2) + "\n", { mode: 0o644 });
+}
+export function removeInstallLock(appDir) {
+    const lockPath = installLockPathForDir(appDir);
+    if (existsSync(lockPath)) {
+        unlinkSync(lockPath);
+    }
+}
+export function appTaskName(kind, instanceId) {
+    return `app-${kind}:${instanceId}`;
+}
+function findRunningInstallTask(appDir) {
+    const metadata = readInstallLockMetadata(appDir);
+    const taskId = typeof metadata?.taskId === "string" ? metadata.taskId.trim() : "";
+    if (!taskId)
+        return undefined;
+    const status = getTask(taskId)?.status;
+    if (status !== "running")
+        return undefined;
+    return { id: taskId, kind: "install", status };
+}
+function findRunningNamedTask(taskName, kind) {
+    const running = getRunningTasks(taskName)[0];
+    if (!running)
+        return undefined;
+    const status = getTask(running.id)?.status;
+    if (status !== "running")
+        return undefined;
+    return { id: running.id, kind, status };
+}
+export function getRunningAppTask(instanceId, appDir) {
+    const resolvedAppDir = appDir ?? resolveAppLocation(instanceId)?.dir;
+    if (resolvedAppDir && hasInstallLock(resolvedAppDir)) {
+        const installTask = findRunningInstallTask(resolvedAppDir);
+        if (installTask)
+            return installTask;
+    }
+    for (const kind of ["uninstall", "restart", "stop", "start"]) {
+        const task = findRunningNamedTask(appTaskName(kind, instanceId), kind);
+        if (task)
+            return task;
+    }
+    return undefined;
+}
+export function resolveAppLocation(instanceId) {
+    // Post Step 13: canonical `apps/<id>` only. Un-migrated installs under
+    // `instances/<id>` must go through the legacy migrator first.
+    const candidate = { dir: resolveAppDir(instanceId) };
+    cleanupStaleInstallDir(candidate.dir);
+    if (readSpecSnapshotFromDir(candidate.dir)
+        && existsSync(join(candidate.dir, "manifest.json"))) {
+        return candidate;
+    }
+    return null;
+}
+/**
+ * Check whether an app with this id has the canonical manifest and spec snapshots.
+ * Exported so the Nomad driver can use it for routing without the old prefix convention.
+ */
+export function isInstanceInstalled(instanceId) {
+    const location = resolveAppLocation(instanceId);
+    return location != null && !hasInstallLock(location.dir);
+}
+export function resolveInstalledAppDir(instanceId) {
+    return resolveAppLocation(instanceId)?.dir ?? null;
+}
+function readAppFromDir(appDir, instanceId) {
+    if (cleanupStaleInstallDir(appDir))
+        return null;
+    const snapshots = readCanonicalSpecSnapshotsFromDir(appDir);
+    if (!snapshots)
+        return null;
+    const spec = snapshots.resolved.spec;
+    try {
+        assertCurrentAppSpecIdentitySyntax(spec, `installed resolved-spec for '${instanceId}'`);
+    }
+    catch (error) {
+        console.warn(`[app-service] '${instanceId}' needs migration: ${error?.message ?? error}`);
+        return null;
+    }
+    const manifest = readCanonicalManifestFromDir(appDir, instanceId);
+    return {
+        spec,
+        manifest,
+        install_state: hasInstallLock(appDir) ? "installing" : "installed",
+        ...(getRunningAppTask(instanceId, appDir) ? { current_task: getRunningAppTask(instanceId, appDir) } : {}),
+    };
+}
+export function getInstanceInstallState(instanceId) {
+    const location = resolveAppLocation(instanceId);
+    if (!location)
+        return null;
+    return hasInstallLock(location.dir) ? "installing" : "installed";
+}
+export function listInstanceInstallRecords() {
+    const results = [];
+    // Post Step 13: canonical `apps/<id>` only. Un-migrated installs under
+    // `instances/<id>` are surfaced exclusively through
+    // `jishushell migrate legacy` and never returned from listInstanceInstallRecords.
+    const rootDir = APPS_DIR;
+    if (existsSync(rootDir)) {
+        let entries;
+        try {
+            entries = readdirSync(rootDir, { withFileTypes: true });
+        }
+        catch {
+            entries = [];
+        }
+        for (const entry of entries) {
+            if (!entry.isDirectory())
+                continue;
+            const instanceId = entry.name;
+            const appDir = join(rootDir, instanceId);
+            try {
+                const appData = readAppFromDir(appDir, instanceId);
+                if (!appData)
+                    continue;
+                results.push(appData);
+            }
+            catch (e) {
+                console.warn(`[app-service] Skipping app '${instanceId}': ${e.message}`);
+            }
+        }
+    }
+    const deduped = new Map();
+    for (const item of results) {
+        deduped.set(item.manifest.instanceId, item);
+    }
+    return [...deduped.values()];
+}
+export function getInstanceInstallRecord(id) {
+    if (!JISHUSHELL_SAFE_ID_RE.test(id))
+        return null;
+    const location = resolveAppLocation(id);
+    if (!location)
+        return null;
+    return readAppFromDir(location.dir, id);
+}
+//# sourceMappingURL=install-store.js.map

package/dist/services/app-common/install-store.js.map

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

package/dist/services/app-common/instance-store.d.ts

@@ -0,0 +1,78 @@
+import type { AppInstance, AppIntegrationRef, AppManifest, AppSpec } from "../../types.js";
+export declare const APP_INSTANCE_SCHEMA_VERSION = 3;
+export declare const APP_INSTANCE_MIGRATION_ID = "canonical-instance-v3";
+export declare const APP_MANIFEST_SCHEMA_VERSION: 1;
+type OperationType = NonNullable<AppInstance["operation"]>["type"];
+export type SpecSnapshot = {
+    path: string;
+    yaml: string;
+    spec: AppSpec;
+};
+export type CanonicalSpecSnapshots = {
+    definition: SpecSnapshot;
+    resolved: SpecSnapshot;
+};
+export declare class CanonicalManifestRequiredError extends Error {
+    readonly code = "INSTANCE_MANIFEST_NEEDS_MIGRATION";
+    constructor(instanceId: string, reason: string);
+}
+export declare class CanonicalInstanceRequiredError extends Error {
+    readonly code = "INSTANCE_METADATA_NEEDS_MIGRATION";
+    constructor(instanceId: string, reason: string);
+}
+export declare function readCanonicalSpecSnapshotsFromDir(dir: string): CanonicalSpecSnapshots | null;
+/**
+ * Return the install-time materialized snapshot used to compile workloads.
+ * Both canonical snapshots must exist; a one-file fallback is legacy input,
+ * not a valid normal-path instance.
+ */
+export declare function readSpecSnapshotFromDir(dir: string): SpecSnapshot | null;
+export declare function buildCanonicalAppInstance(params: {
+    raw?: Record<string, any> | null;
+    id: string;
+    name?: string;
+    description?: string;
+    spec?: AppSpec | null;
+    definitionDigest?: string;
+    desiredState?: AppInstance["desiredState"];
+    runtime?: Record<string, any>;
+    source?: string;
+    /** Create/install boundary only: materialize AppSpec integration refs once. */
+    materializedIntegrations?: AppIntegrationRef[];
+}): AppInstance;
+export declare function buildCanonicalManifest(params: {
+    instanceId: string;
+    spec: AppSpec;
+    definitionYaml: string;
+    resolvedSpecYaml: string;
+    installedAt?: string;
+    resources?: AppManifest["resources"];
+    ownedResources?: AppManifest["ownedResources"];
+    source?: string;
+}): AppManifest;
+export declare function readCanonicalManifestFromDir(dir: string, instanceId: string): AppManifest;
+export declare function readCanonicalInstance(instanceId: string): AppInstance | null;
+/**
+ * Resolve an instance's AppSpec from canonical on-disk snapshots only
+ * (`apps/<id>/resolved-spec.yaml`, then `definition.yaml`).
+ *
+ * Returns `null` when:
+ *   - The instance directory does not contain a usable spec snapshot.
+ *     This means the instance has not been migrated yet — runtime hot
+ *     path callers MUST treat this as "unsupported until migrator runs",
+ *     not as "use synthetic template fallback".
+ */
+export declare function readCanonicalSpecForInstance(instanceId: string): AppSpec | null;
+export declare function writeSpecSnapshots(dir: string, definitionYaml: string, resolvedSpecYaml: string): void;
+export declare function updateInstanceDesiredState(instanceId: string, desiredState: AppInstance["desiredState"]): AppInstance | null;
+export declare function updateInstanceStatus(instanceId: string, status: AppInstance["status"]): AppInstance | null;
+export declare function beginInstanceOperation(instanceId: string, type: OperationType, phase: string): AppInstance | null;
+export declare function advanceInstanceOperation(instanceId: string, phase: string): AppInstance | null;
+export declare function clearInstanceOperation(instanceId: string, options?: {
+    lastError?: {
+        message: string;
+        phase?: string;
+    };
+    status?: AppInstance["status"];
+}): AppInstance | null;
+export {};