dominds 1.3.1 → 1.4.2

package/dist/apps/manifest.js

@@ -3,12 +3,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_DOMINDS_APP_MANIFEST_REL_PATH = void 0;
+exports.makeDefaultRtwsAppManifest = makeDefaultRtwsAppManifest;
 exports.parseDomindsAppManifest = parseDomindsAppManifest;
 exports.loadDomindsAppManifest = loadDomindsAppManifest;
+exports.writeDomindsAppManifest = writeDomindsAppManifest;
+exports.writeDomindsAppManifestIfChanged = writeDomindsAppManifestIfChanged;
+exports.loadRtwsDeclaredAppDependencies = loadRtwsDeclaredAppDependencies;
+exports.hasRtwsDeclaredAppDependency = hasRtwsDeclaredAppDependency;
+exports.upsertManifestDependency = upsertManifestDependency;
+exports.removeManifestDependency = removeManifestDependency;
 exports.resolveAppContribPaths = resolveAppContribPaths;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
+exports.DEFAULT_DOMINDS_APP_MANIFEST_REL_PATH = '.minds/app.yaml';
+function makeDefaultRtwsAppManifest(id = 'rtws_root') {
+    return {
+        apiVersion: 'dominds.io/v1alpha1',
+        kind: 'DomindsApp',
+        id,
+    };
+}
+async function fileExists(filePathAbs) {
+    try {
+        await promises_1.default.access(filePathAbs);
+        return true;
+    }
+    catch (err) {
+        const isEnoent = typeof err === 'object' &&
+            err !== null &&
+            'code' in err &&
+            err.code === 'ENOENT';
+        if (isEnoent)
+            return false;
+        throw err;
+    }
+}
 function isRecord(v) {
     return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
@@ -273,6 +304,107 @@ async function loadDomindsAppManifest(params) {
     }
     return { kind: 'ok', manifest: normalized.manifest, raw, filePathAbs };
 }
+function canonicalizeManifest(manifest) {
+    const dependencies = (() => {
+        if (!manifest.dependencies)
+            return undefined;
+        const byId = new Map();
+        for (const dep of manifest.dependencies) {
+            const id = dep.id.trim();
+            if (id === '')
+                continue;
+            byId.set(id, { id, optional: dep.optional === true ? true : undefined });
+        }
+        const normalized = [...byId.values()].sort((a, b) => a.id.localeCompare(b.id));
+        return normalized.length > 0 ? normalized : undefined;
+    })();
+    return {
+        apiVersion: manifest.apiVersion,
+        kind: manifest.kind,
+        id: manifest.id,
+        dependencies: dependencies && dependencies.length > 0 ? dependencies : undefined,
+        name: manifest.name,
+        description: manifest.description,
+        contributes: manifest.contributes,
+    };
+}
+async function writeDomindsAppManifest(params) {
+    const filePathAbs = path_1.default.resolve(params.packageRootAbs, params.manifestRelPath);
+    await promises_1.default.mkdir(path_1.default.dirname(filePathAbs), { recursive: true });
+    const yamlText = yaml_1.default.stringify(canonicalizeManifest(params.manifest));
+    await promises_1.default.writeFile(filePathAbs, yamlText, 'utf-8');
+}
+async function writeDomindsAppManifestIfChanged(params) {
+    const filePathAbs = path_1.default.resolve(params.packageRootAbs, params.manifestRelPath);
+    await promises_1.default.mkdir(path_1.default.dirname(filePathAbs), { recursive: true });
+    const yamlText = yaml_1.default.stringify(canonicalizeManifest(params.manifest));
+    try {
+        const prev = await promises_1.default.readFile(filePathAbs, 'utf-8');
+        if (prev === yamlText)
+            return;
+    }
+    catch (err) {
+        const isEnoent = typeof err === 'object' &&
+            err !== null &&
+            'code' in err &&
+            err.code === 'ENOENT';
+        if (!isEnoent)
+            throw err;
+    }
+    await promises_1.default.writeFile(filePathAbs, yamlText, 'utf-8');
+}
+async function loadRtwsDeclaredAppDependencies(params) {
+    const filePathAbs = path_1.default.resolve(params.rtwsRootAbs, exports.DEFAULT_DOMINDS_APP_MANIFEST_REL_PATH);
+    if (!(await fileExists(filePathAbs)))
+        return [];
+    const loaded = await loadDomindsAppManifest({
+        packageRootAbs: params.rtwsRootAbs,
+        manifestRelPath: exports.DEFAULT_DOMINDS_APP_MANIFEST_REL_PATH,
+    });
+    if (loaded.kind === 'error') {
+        throw new Error(`Failed to load rtws app manifest: ${loaded.errorText} (${loaded.filePathAbs})`);
+    }
+    return loaded.manifest.dependencies ?? [];
+}
+async function hasRtwsDeclaredAppDependency(params) {
+    const appId = params.appId.trim();
+    if (appId === '')
+        return false;
+    const deps = await loadRtwsDeclaredAppDependencies({ rtwsRootAbs: params.rtwsRootAbs });
+    return deps.some((dep) => dep.id === appId);
+}
+function upsertManifestDependency(params) {
+    const nextDep = {
+        id: params.dependency.id.trim(),
+        optional: params.dependency.optional === true ? true : undefined,
+    };
+    if (nextDep.id === '')
+        return params.manifest;
+    const deps = [...(params.manifest.dependencies ?? [])];
+    const idx = deps.findIndex((dep) => dep.id === nextDep.id);
+    if (idx >= 0) {
+        const prev = deps[idx];
+        if (prev && prev.optional === nextDep.optional)
+            return params.manifest;
+        deps[idx] = nextDep;
+    }
+    else {
+        deps.push(nextDep);
+    }
+    return canonicalizeManifest({ ...params.manifest, dependencies: deps });
+}
+function removeManifestDependency(params) {
+    const dependencyId = params.dependencyId.trim();
+    if (dependencyId === '')
+        return params.manifest;
+    const prevDeps = params.manifest.dependencies ?? [];
+    if (!prevDeps.some((dep) => dep.id === dependencyId))
+        return params.manifest;
+    return canonicalizeManifest({
+        ...params.manifest,
+        dependencies: prevDeps.filter((dep) => dep.id !== dependencyId),
+    });
+}
 function resolveAppContribPaths(params) {
     const c = params.manifest.contributes;
     const webStaticDirAbs = c?.web?.staticDir

package/dist/apps/resolution-file.js

@@ -3,26 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APPS_RESOLUTION_REL_PATH = exports.DEFAULT_APPS_RESOLUTION_STRATEGY = void 0;
+exports.APPS_RESOLUTION_REL_PATH = void 0;
 exports.loadAppsResolutionFile = loadAppsResolutionFile;
 exports.writeAppsResolutionFile = writeAppsResolutionFile;
 exports.writeAppsResolutionFileIfChanged = writeAppsResolutionFileIfChanged;
 exports.findResolvedApp = findResolvedApp;
 exports.upsertResolvedApp = upsertResolvedApp;
 exports.removeResolvedApp = removeResolvedApp;
-exports.setResolvedAppUserEnabled = setResolvedAppUserEnabled;
+exports.setResolvedAppEnabled = setResolvedAppEnabled;
 exports.setResolvedAppAssignedPort = setResolvedAppAssignedPort;
-exports.applyEffectiveEnabledToResolvedApps = applyEffectiveEnabledToResolvedApps;
-exports.applyAssignedPortToResolvedApps = applyAssignedPortToResolvedApps;
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
 const yaml_1 = __importDefault(require("yaml"));
 const app_json_1 = require("./app-json");
-exports.DEFAULT_APPS_RESOLUTION_STRATEGY = {
-    order: ['local'],
-    localRoots: ['dominds-apps'],
-};
-exports.APPS_RESOLUTION_REL_PATH = path_1.default.join('.apps', 'resolution.yaml');
+exports.APPS_RESOLUTION_REL_PATH = node_path_1.default.join('.apps', 'resolution.yaml');
 function isRecord(v) {
     return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
@@ -39,73 +33,6 @@ function asNullableNumber(v) {
         return v;
     return null;
 }
-function parseResolutionStrategy(v, at) {
-    if (!isRecord(v))
-        return { ok: false, errorText: `Invalid ${at}: expected object` };
-    const keys = Object.keys(v);
-    for (const k of keys) {
-        if (k !== 'order' && k !== 'localRoots') {
-            return { ok: false, errorText: `Invalid ${at}: unknown key '${k}'` };
-        }
-    }
-    const orderRaw = v['order'];
-    const order = (() => {
-        if (orderRaw === undefined)
-            return undefined;
-        if (!Array.isArray(orderRaw)) {
-            return { ok: false, errorText: `Invalid ${at}.order: expected array` };
-        }
-        const out = [];
-        for (let i = 0; i < orderRaw.length; i += 1) {
-            const item = orderRaw[i];
-            if (item !== 'local' && item !== 'npx') {
-                return {
-                    ok: false,
-                    errorText: `Invalid ${at}.order[${i}]: expected 'local'|'npx'`,
-                };
-            }
-            out.push(item);
-        }
-        if (out.length === 0) {
-            return { ok: false, errorText: `Invalid ${at}.order: must not be empty` };
-        }
-        return { ok: true, value: out };
-    })();
-    if (order && !order.ok)
-        return order;
-    const localRootsRaw = v['localRoots'];
-    const localRoots = (() => {
-        if (localRootsRaw === undefined)
-            return undefined;
-        if (!Array.isArray(localRootsRaw)) {
-            return { ok: false, errorText: `Invalid ${at}.localRoots: expected array` };
-        }
-        const out = [];
-        for (let i = 0; i < localRootsRaw.length; i += 1) {
-            const item = localRootsRaw[i];
-            if (typeof item !== 'string' || item.trim() === '') {
-                return {
-                    ok: false,
-                    errorText: `Invalid ${at}.localRoots[${i}]: expected non-empty string`,
-                };
-            }
-            out.push(item.trim());
-        }
-        if (out.length === 0) {
-            return { ok: false, errorText: `Invalid ${at}.localRoots: must not be empty` };
-        }
-        return { ok: true, value: out };
-    })();
-    if (localRoots && !localRoots.ok)
-        return localRoots;
-    return {
-        ok: true,
-        strategy: {
-            order: order ? order.value : undefined,
-            localRoots: localRoots ? localRoots.value : undefined,
-        },
-    };
-}
 function parseSource(v, at) {
     if (!isRecord(v))
         return { ok: false, errorText: `Invalid ${at}: expected object` };
@@ -115,13 +42,15 @@ function parseSource(v, at) {
     }
     if (kind === 'npx') {
         const spec = asString(v['spec']);
-        if (!spec || spec.trim() === '')
+        if (!spec || spec.trim() === '') {
             return { ok: false, errorText: `Invalid ${at}.spec: required` };
+        }
         return { ok: true, source: { kind, spec } };
     }
     const pathAbs = asString(v['pathAbs']);
-    if (!pathAbs || pathAbs.trim() === '')
+    if (!pathAbs || pathAbs.trim() === '') {
         return { ok: false, errorText: `Invalid ${at}.pathAbs: required` };
+    }
     return { ok: true, source: { kind, pathAbs } };
 }
 function parseEntry(v, at) {
@@ -133,11 +62,6 @@ function parseEntry(v, at) {
     const enabled = asBool(v['enabled']);
     if (enabled === null)
         return { ok: false, errorText: `Invalid ${at}.enabled: boolean required` };
-    const userEnabledRaw = v['userEnabled'];
-    const userEnabled = userEnabledRaw === undefined ? enabled : asBool(userEnabledRaw);
-    if (userEnabled === null) {
-        return { ok: false, errorText: `Invalid ${at}.userEnabled: expected boolean` };
-    }
     const assignedPortRaw = v['assignedPort'] ?? null;
     const assignedPort = asNullableNumber(assignedPortRaw);
     if (assignedPort === null) {
@@ -145,33 +69,42 @@ function parseEntry(v, at) {
             return { ok: false, errorText: `Invalid ${at}.assignedPort: expected number|null` };
         }
     }
-    else {
-        if (!Number.isInteger(assignedPort) || assignedPort <= 0) {
-            return { ok: false, errorText: `Invalid ${at}.assignedPort: expected positive integer|null` };
-        }
+    else if (!Number.isInteger(assignedPort) || assignedPort <= 0) {
+        return { ok: false, errorText: `Invalid ${at}.assignedPort: expected positive integer|null` };
     }
     const sourceParsed = parseSource(v['source'], `${at}.source`);
     if (!sourceParsed.ok)
         return sourceParsed;
-    const installJsonRaw = v['installJson'];
-    const installJsonParsed = (0, app_json_1.parseDomindsAppInstallJson)(installJsonRaw);
+    const installJsonParsed = (0, app_json_1.parseDomindsAppInstallJson)(v['installJson']);
     if (!installJsonParsed.ok) {
         return { ok: false, errorText: `Invalid ${at}.installJson: ${installJsonParsed.errorText}` };
     }
     return {
         ok: true,
         entry: {
-            id,
+            id: id.trim(),
             enabled,
-            userEnabled,
             source: sourceParsed.source,
             assignedPort,
             installJson: installJsonParsed.json,
         },
     };
 }
+function canonicalizeResolutionFile(file) {
+    const byId = new Map();
+    for (const entry of file.apps) {
+        if (byId.has(entry.id)) {
+            throw new Error(`Invalid ${exports.APPS_RESOLUTION_REL_PATH}: duplicate app id '${entry.id}'`);
+        }
+        byId.set(entry.id, entry);
+    }
+    return {
+        schemaVersion: 1,
+        apps: [...byId.values()].sort((a, b) => a.id.localeCompare(b.id)),
+    };
+}
 async function loadAppsResolutionFile(params) {
-    const filePathAbs = path_1.default.resolve(params.rtwsRootAbs, exports.APPS_RESOLUTION_REL_PATH);
+    const filePathAbs = node_path_1.default.resolve(params.rtwsRootAbs, exports.APPS_RESOLUTION_REL_PATH);
     let raw;
     try {
         raw = await promises_1.default.readFile(filePathAbs, 'utf-8');
@@ -182,7 +115,7 @@ async function loadAppsResolutionFile(params) {
             'code' in err &&
             err.code === 'ENOENT';
         if (isEnoent) {
-            return { kind: 'ok', filePathAbs, file: { schemaVersion: 1, apps: [] } };
+            return { kind: 'ok', filePathAbs, exists: false, file: { schemaVersion: 1, apps: [] } };
         }
         return {
             kind: 'error',
@@ -204,6 +137,16 @@ async function loadAppsResolutionFile(params) {
     if (!isRecord(parsed)) {
         return { kind: 'error', filePathAbs, errorText: 'Invalid resolution.yaml: expected object' };
     }
+    const keys = Object.keys(parsed);
+    for (const key of keys) {
+        if (key !== 'schemaVersion' && key !== 'apps') {
+            return {
+                kind: 'error',
+                filePathAbs,
+                errorText: `Invalid resolution.yaml: unknown key '${key}'`,
+            };
+        }
+    }
     const schemaVersion = parsed['schemaVersion'];
     if (schemaVersion !== 1) {
         return {
@@ -222,44 +165,39 @@ async function loadAppsResolutionFile(params) {
     }
     const apps = [];
     for (let i = 0; i < appsRaw.length; i += 1) {
-        const e = parseEntry(appsRaw[i], `apps[${i}]`);
-        if (!e.ok)
-            return { kind: 'error', filePathAbs, errorText: e.errorText };
-        apps.push(e.entry);
+        const entryParsed = parseEntry(appsRaw[i], `apps[${i}]`);
+        if (!entryParsed.ok)
+            return { kind: 'error', filePathAbs, errorText: entryParsed.errorText };
+        apps.push(entryParsed.entry);
     }
-    const strategyRaw = parsed['resolutionStrategy'];
-    const resolutionStrategy = (() => {
-        if (strategyRaw === undefined)
-            return undefined;
-        const parsedStrategy = parseResolutionStrategy(strategyRaw, 'resolutionStrategy');
-        if (!parsedStrategy.ok)
-            return parsedStrategy;
-        return { ok: true, value: parsedStrategy.strategy };
-    })();
-    if (resolutionStrategy && !resolutionStrategy.ok) {
-        return { kind: 'error', filePathAbs, errorText: resolutionStrategy.errorText };
+    try {
+        return {
+            kind: 'ok',
+            filePathAbs,
+            exists: true,
+            file: canonicalizeResolutionFile({ schemaVersion: 1, apps }),
+        };
+    }
+    catch (err) {
+        return {
+            kind: 'error',
+            filePathAbs,
+            errorText: err instanceof Error ? err.message : String(err),
+        };
     }
-    const file = resolutionStrategy
-        ? {
-            schemaVersion: 1,
-            resolutionStrategy: resolutionStrategy.value,
-            apps,
-        }
-        : { schemaVersion: 1, apps };
-    return { kind: 'ok', filePathAbs, file };
 }
 async function writeAppsResolutionFile(params) {
-    const dirAbs = path_1.default.resolve(params.rtwsRootAbs, '.apps');
+    const dirAbs = node_path_1.default.resolve(params.rtwsRootAbs, '.apps');
     await promises_1.default.mkdir(dirAbs, { recursive: true });
-    const filePathAbs = path_1.default.resolve(params.rtwsRootAbs, exports.APPS_RESOLUTION_REL_PATH);
-    const yamlText = yaml_1.default.stringify(params.file);
+    const filePathAbs = node_path_1.default.resolve(params.rtwsRootAbs, exports.APPS_RESOLUTION_REL_PATH);
+    const yamlText = yaml_1.default.stringify(canonicalizeResolutionFile(params.file));
     await promises_1.default.writeFile(filePathAbs, yamlText, 'utf-8');
 }
 async function writeAppsResolutionFileIfChanged(params) {
-    const dirAbs = path_1.default.resolve(params.rtwsRootAbs, '.apps');
+    const dirAbs = node_path_1.default.resolve(params.rtwsRootAbs, '.apps');
     await promises_1.default.mkdir(dirAbs, { recursive: true });
-    const filePathAbs = path_1.default.resolve(params.rtwsRootAbs, exports.APPS_RESOLUTION_REL_PATH);
-    const yamlText = yaml_1.default.stringify(params.file);
+    const filePathAbs = node_path_1.default.resolve(params.rtwsRootAbs, exports.APPS_RESOLUTION_REL_PATH);
+    const yamlText = yaml_1.default.stringify(canonicalizeResolutionFile(params.file));
     try {
         const prev = await promises_1.default.readFile(filePathAbs, 'utf-8');
         if (prev === yamlText)
@@ -276,43 +214,33 @@ async function writeAppsResolutionFileIfChanged(params) {
     await promises_1.default.writeFile(filePathAbs, yamlText, 'utf-8');
 }
 function findResolvedApp(file, appId) {
-    const found = file.apps.find((a) => a.id === appId);
-    return found ?? null;
+    return file.apps.find((app) => app.id === appId) ?? null;
 }
 function upsertResolvedApp(params) {
     const apps = [...params.existing.apps];
-    const idx = apps.findIndex((a) => a.id === params.next.id);
+    const idx = apps.findIndex((app) => app.id === params.next.id);
     if (idx >= 0)
         apps[idx] = params.next;
     else
         apps.push(params.next);
-    const resolutionStrategy = params.existing.resolutionStrategy;
-    return resolutionStrategy !== undefined
-        ? { schemaVersion: 1, resolutionStrategy, apps }
-        : { schemaVersion: 1, apps };
+    return canonicalizeResolutionFile({ schemaVersion: 1, apps });
 }
 function removeResolvedApp(params) {
-    if (!params.existing.apps.some((a) => a.id === params.appId))
+    if (!params.existing.apps.some((app) => app.id === params.appId))
         return params.existing;
-    const apps = params.existing.apps.filter((a) => a.id !== params.appId);
-    const resolutionStrategy = params.existing.resolutionStrategy;
-    return resolutionStrategy !== undefined
-        ? { schemaVersion: 1, resolutionStrategy, apps }
-        : { schemaVersion: 1, apps };
+    return canonicalizeResolutionFile({
+        schemaVersion: 1,
+        apps: params.existing.apps.filter((app) => app.id !== params.appId),
+    });
 }
-function setResolvedAppUserEnabled(params) {
+function setResolvedAppEnabled(params) {
     const existingApp = findResolvedApp(params.existing, params.appId);
-    if (!existingApp)
+    if (!existingApp || existingApp.enabled === params.enabled)
         return params.existing;
-    if (existingApp.userEnabled === params.userEnabled && existingApp.enabled === params.userEnabled)
-        return params.existing;
-    const apps = params.existing.apps.map((a) => a.id === params.appId
-        ? { ...a, userEnabled: params.userEnabled, enabled: params.userEnabled }
-        : a);
-    const resolutionStrategy = params.existing.resolutionStrategy;
-    return resolutionStrategy !== undefined
-        ? { schemaVersion: 1, resolutionStrategy, apps }
-        : { schemaVersion: 1, apps };
+    return canonicalizeResolutionFile({
+        schemaVersion: 1,
+        apps: params.existing.apps.map((app) => app.id === params.appId ? { ...app, enabled: params.enabled } : app),
+    });
 }
 function setResolvedAppAssignedPort(params) {
     if (params.assignedPort !== null) {
@@ -321,50 +249,10 @@ function setResolvedAppAssignedPort(params) {
         }
     }
     const existingApp = findResolvedApp(params.existing, params.appId);
-    if (!existingApp)
-        return params.existing;
-    if (existingApp.assignedPort === params.assignedPort)
+    if (!existingApp || existingApp.assignedPort === params.assignedPort)
         return params.existing;
-    const apps = params.existing.apps.map((a) => a.id === params.appId ? { ...a, assignedPort: params.assignedPort } : a);
-    const resolutionStrategy = params.existing.resolutionStrategy;
-    return resolutionStrategy !== undefined
-        ? { schemaVersion: 1, resolutionStrategy, apps }
-        : { schemaVersion: 1, apps };
-}
-function applyEffectiveEnabledToResolvedApps(params) {
-    let changed = false;
-    const apps = params.existing.apps.map((a) => {
-        const effectiveEnabled = params.effectiveEnabledById.get(a.id);
-        if (effectiveEnabled === undefined || effectiveEnabled === a.enabled)
-            return a;
-        changed = true;
-        return { ...a, enabled: effectiveEnabled };
-    });
-    if (!changed)
-        return params.existing;
-    const resolutionStrategy = params.existing.resolutionStrategy;
-    return resolutionStrategy !== undefined
-        ? { schemaVersion: 1, resolutionStrategy, apps }
-        : { schemaVersion: 1, apps };
-}
-function applyAssignedPortToResolvedApps(params) {
-    let changed = false;
-    const apps = params.existing.apps.map((a) => {
-        const assignedPort = params.assignedPortById.get(a.id);
-        if (assignedPort === undefined || assignedPort === a.assignedPort)
-            return a;
-        if (assignedPort !== null) {
-            if (!Number.isInteger(assignedPort) || assignedPort <= 0) {
-                throw new Error(`Invalid assignedPort writeback for '${a.id}': ${String(assignedPort)}`);
-            }
-        }
-        changed = true;
-        return { ...a, assignedPort };
+    return canonicalizeResolutionFile({
+        schemaVersion: 1,
+        apps: params.existing.apps.map((app) => app.id === params.appId ? { ...app, assignedPort: params.assignedPort } : app),
     });
-    if (!changed)
-        return params.existing;
-    const resolutionStrategy = params.existing.resolutionStrategy;
-    return resolutionStrategy !== undefined
-        ? { schemaVersion: 1, resolutionStrategy, apps }
-        : { schemaVersion: 1, apps };
 }

package/dist/apps/workspace-app-state.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshAppsDerivedState = refreshAppsDerivedState;
+const enabled_apps_1 = require("./enabled-apps");
+async function refreshAppsDerivedState(params) {
+    const resolved = await (0, enabled_apps_1.materializeAppsResolution)({ rtwsRootAbs: params.rtwsRootAbs });
+    return resolved.resolutionFile;
+}

package/dist/cli/disable.js

@@ -1,14 +1,10 @@
 #!/usr/bin/env node
 "use strict";
-/**
- * disable subcommand for dominds CLI (Apps)
- *
- * Usage:
- *   dominds disable <appId>
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = main;
-const resolution_file_1 = require("../apps/resolution-file");
+const configuration_file_1 = require("../apps/configuration-file");
+const manifest_1 = require("../apps/manifest");
+const workspace_app_state_1 = require("../apps/workspace-app-state");
 function printHelp() {
     console.log(`Usage:
   dominds disable <appId>
@@ -16,14 +12,14 @@ function printHelp() {
 }
 function parseArgs(argv) {
     const positional = [];
-    for (const a of argv) {
-        if (a === '--help' || a === '-h') {
+    for (const arg of argv) {
+        if (arg === '--help' || arg === '-h') {
             printHelp();
             process.exit(0);
         }
-        if (a.startsWith('-'))
-            throw new Error(`Unknown option: ${a}`);
-        positional.push(a);
+        if (arg.startsWith('-'))
+            throw new Error(`Unknown option: ${arg}`);
+        positional.push(arg);
     }
     if (positional.length !== 1)
         throw new Error('disable requires exactly one <appId>');
@@ -41,24 +37,24 @@ async function main() {
         return;
     }
     const rtwsRootAbs = process.cwd();
-    const loaded = await (0, resolution_file_1.loadAppsResolutionFile)({ rtwsRootAbs });
-    if (loaded.kind === 'error') {
-        console.error(`Error: failed to read ${resolution_file_1.APPS_RESOLUTION_REL_PATH}: ${loaded.errorText}`);
+    if (!(await (0, manifest_1.hasRtwsDeclaredAppDependency)({ rtwsRootAbs, appId: args.appId }))) {
+        console.error(`Error: app '${args.appId}' is not declared in .minds/app.yaml dependencies`);
         process.exit(1);
         return;
     }
-    const found = (0, resolution_file_1.findResolvedApp)(loaded.file, args.appId);
-    if (!found) {
-        console.error(`Error: app '${args.appId}' not installed`);
+    const loadedConfig = await (0, configuration_file_1.loadAppsConfigurationFile)({ rtwsRootAbs });
+    if (loadedConfig.kind === 'error') {
+        console.error(`Error: failed to read .apps/configuration.yaml: ${loadedConfig.errorText}`);
         process.exit(1);
         return;
     }
-    const next = (0, resolution_file_1.setResolvedAppUserEnabled)({
-        existing: loaded.file,
+    const nextConfig = (0, configuration_file_1.setAppDisabledInConfiguration)({
+        existing: loadedConfig.file,
         appId: args.appId,
-        userEnabled: false,
+        disabled: true,
     });
-    await (0, resolution_file_1.writeAppsResolutionFile)({ rtwsRootAbs, file: next });
+    await (0, configuration_file_1.writeAppsConfigurationFileIfChanged)({ rtwsRootAbs, file: nextConfig });
+    await (0, workspace_app_state_1.refreshAppsDerivedState)({ rtwsRootAbs });
     console.log(`Disabled app '${args.appId}'`);
 }
 if (require.main === module) {