@excitedjs/dreamux 0.26.0-beta.265 → 0.26.0

package/dist/config/load.js

@@ -0,0 +1,138 @@
+import { pathExists } from '../platform/fs-errors.js';
+import { readFile } from 'node:fs/promises';
+import { loadAgentRuntimeProviders } from '../agent-runtime/external-provider.js';
+import { loadChannelProviders } from '../channel/external-channel-provider.js';
+import { parseProviderRef, ProviderRegistry } from '../registry/index.js';
+import { isPlainObject } from '@excitedjs/dreamux-utils';
+import { createLogger } from '../platform/logger.js';
+import { loadPlugins, readPluginConfigs, readPluginEntries, } from '../plugin/loader.js';
+import { assertConfigFileMode, globalConfigFile, legacyGlobalConfigFile, mergeWithDefaults, } from './config.js';
+export async function loadConfig(overrides = {}) {
+    const file = globalConfigFile();
+    const providerRegistry = overrides.providerRegistry ?? new ProviderRegistry();
+    await assertNoLegacyTomlOnly();
+    const { config, plugins } = await readConfigFile(file, providerRegistry);
+    return { config, configFile: file, providerRegistry, plugins };
+}
+/**
+ * Open, parse, and resolve `config.json`: existence and mode checks, JSON
+ * parse, one-time plugin load, then {@link resolveConfig}. Shared by the CLI
+ * read path below (`doctor`/`onboard`/`loadConfig`) and `ConfigService`'s own
+ * open sequence (`config/service.ts`'s `loadFile`), so "open the file" is
+ * written once; `ConfigService` additionally holds `raw` (the parsed object,
+ * returned here so it does not re-parse) for its `TransactionalStore`.
+ */
+export async function readConfigFile(file, providerRegistry) {
+    if (!(await pathExists(file))) {
+        throw new Error(`dreamux config is missing at ${file}.\n` +
+            'Run `dreamux onboard` to create it before starting the server.');
+    }
+    await assertConfigFileMode(file);
+    const text = await readFile(file, 'utf8');
+    let parsed;
+    try {
+        parsed = JSON.parse(text);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        throw new Error(`dreamux config parse error in ${file}: ${msg}\n` +
+            `Fix the JSON syntax in ${file}, then restart. Run \`dreamux onboard\` if you need to recreate the config.`);
+    }
+    // Plugins contribute providers config may address, so they load before
+    // provider refs are loaded and validated. A non-object top level is still
+    // reported by resolveConfig's mergeWithDefaults.
+    const entries = isPlainObject(parsed)
+        ? readPluginEntries(parsed, file)
+        : undefined;
+    const plugins = await loadPlugins({
+        registry: providerRegistry,
+        entries: entries ?? [],
+        // The serve file logger does not exist yet; contribute only registers.
+        logger: createLogger({ name: 'plugins' }),
+    });
+    const config = await resolveConfig(parsed, file, providerRegistry);
+    readPluginConfigs(plugins, file);
+    return {
+        // resolveConfig's mergeWithDefaults already rejects a non-object top
+        // level before returning, so parsed is a plain object whenever this
+        // line runs.
+        raw: parsed,
+        config: entries === undefined ? config : { ...config, plugins: entries },
+        plugins,
+    };
+}
+/**
+ * Loads the agent-runtime/channel providers `raw`'s `agents[]`/
+ * `dispatchers[].channels[]` entries reference, then validates and shapes
+ * `raw` into a `DreamuxConfig`. Deliberately excludes `plugins[]` loading
+ * (`loadPlugins`/`readPluginConfigs`): that is a one-time, process-open step
+ * — a plugin's `contribute()` registers providers and collides with itself
+ * if run twice — so callers that may resolve a config more than once per
+ * process (`ConfigService.replaceAgents`, `config/service.ts`) must not
+ * route `plugins[]` through here.
+ */
+export async function resolveConfig(raw, file, providerRegistry) {
+    await loadAgentRuntimeProviders({
+        registry: providerRegistry,
+        refs: agentProviderRefs(raw),
+    });
+    await loadChannelProviders({
+        registry: providerRegistry,
+        refs: channelProviderRefs(raw),
+    });
+    return mergeWithDefaults(raw, file, providerRegistry);
+}
+export async function assertNoLegacyTomlOnly() {
+    const jsonFile = globalConfigFile();
+    const tomlFile = legacyGlobalConfigFile();
+    if ((await pathExists(jsonFile)) || !(await pathExists(tomlFile)))
+        return;
+    throw new Error(`legacy dreamux config detected at ${tomlFile}, but ${jsonFile} does not exist.\n` +
+        'dreamux 0.x does not migrate TOML config; it will not read it or write default ' +
+        'JSON over an existing install.\n' +
+        `Recreate the config as JSON (run \`dreamux onboard\`, or write ${jsonFile} with a ` +
+        `dispatchers array), then move ${tomlFile} aside.`);
+}
+/**
+ * Every well-formed `agents[].provider` ref the loader should resolve. Malformed
+ * refs are dropped here; normal config validation reports them with context.
+ */
+function agentProviderRefs(raw) {
+    if (!isPlainObject(raw))
+        return [];
+    return providerRefsFrom(raw['agents'], (agent) => agent['provider']);
+}
+function channelProviderRefs(raw) {
+    if (!isPlainObject(raw))
+        return [];
+    const dispatchers = raw['dispatchers'];
+    if (!Array.isArray(dispatchers))
+        return [];
+    const out = [];
+    for (const dispatcher of dispatchers) {
+        if (!isPlainObject(dispatcher))
+            continue;
+        out.push(...providerRefsFrom(dispatcher['channels'], (channel) => channel['provider']));
+    }
+    return out;
+}
+function providerRefsFrom(entries, pick) {
+    if (!Array.isArray(entries))
+        return [];
+    const out = [];
+    for (const entry of entries) {
+        if (!isPlainObject(entry))
+            continue;
+        const provider = pick(entry);
+        if (typeof provider !== 'string')
+            continue;
+        try {
+            out.push(parseProviderRef(provider).raw);
+        }
+        catch {
+            // The normal config validation path reports malformed refs with context.
+        }
+    }
+    return out;
+}
+//# sourceMappingURL=load.js.map

package/dist/config/load.js.map

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

package/dist/config/service.js

@@ -0,0 +1,196 @@
+/**
+ * The Config Service: `config.json`'s single in-process authority.
+ *
+ * One process opens one `ConfigService` (`cli/server.ts`, at the point
+ * `loadConfig` ran before this existed) and every long-lived object that
+ * needs the current config holds this instead of a `DreamuxConfig` value it
+ * captured once — see {@link ConfigReader}. A `TransactionalStore` backs it,
+ * so every read sees the same committed value and every write goes through
+ * the store's own serialized read-decide-replace: no second reservation,
+ * file-open, or validation path beside the one `readConfigFile`/
+ * `resolveConfig` (`./load.js`) already gives the file-read path
+ * `doctor`/`onboard`/`loadConfig` use.
+ *
+ * The store's value pairs the parsed file (`raw`) with its resolved shape
+ * (`config`). `raw` is what gets written back out — a hand-written
+ * `dispatchers` block, `~` paths, and every other value survive a
+ * `config.agents.replace` untouched, because only `raw.agents` is ever
+ * replaced and the rest of `raw` travels through unchanged; a
+ * `config.agents.replace` write does re-serialize the whole file at
+ * two-space indentation (`encode`, below), so whitespace/indentation is not
+ * preserved byte-for-byte, only values and key order. `config` is never
+ * serialized; it exists so `current()` never has to re-run `resolveConfig`
+ * on every read.
+ */
+import { isPlainObject, isSecretKeyName, redactSecretKeyValues, TransactionalStore, } from '@excitedjs/dreamux-utils';
+import { throwCallerMistake } from '../command/errors.js';
+import { globalConfigFile } from './config.js';
+import { assertNoLegacyTomlOnly, readConfigFile, resolveConfig, } from './load.js';
+export class ConfigService {
+    file;
+    providerRegistry;
+    store;
+    loadedPlugins = [];
+    constructor(file, providerRegistry) {
+        this.file = file;
+        this.providerRegistry = providerRegistry;
+        this.store = new TransactionalStore({
+            path: file,
+            load: () => this.loadFile(),
+            encode: (value) => `${JSON.stringify(value.raw, null, 2)}\n`,
+        });
+    }
+    /**
+     * Open `config.json`, running today's checks in today's order with
+     * today's messages (legacy TOML, missing file, file mode, parse), then
+     * loading it. A failure rejects here — `dreamux serve` still stops before
+     * a `ConfigService` exists. Loading before returning means `current()` and
+     * {@link plugins} are never observably pre-load.
+     */
+    static async open(options) {
+        const service = new ConfigService(globalConfigFile(), options.providerRegistry);
+        await service.store.load();
+        return service;
+    }
+    current() {
+        return this.store.current.config;
+    }
+    /** Loaded and contributed, with configs read; populated by the one `open()` load. */
+    get plugins() {
+        return this.loadedPlugins;
+    }
+    /**
+     * The current `agents[]` in file shape, every secret-named value emptied.
+     * A deep copy: the caller may do anything with it without touching the
+     * store's committed value.
+     */
+    readAgents() {
+        const rawAgents = this.store.current.raw['agents'];
+        const copy = structuredClone(Array.isArray(rawAgents) ? rawAgents : []);
+        redactSecretKeyValues(copy, '');
+        return copy;
+    }
+    /**
+     * Replace the whole `agents[]` section and return the redacted projection
+     * of what committed.
+     *
+     * One store `update`: merge `candidateAgents` onto the committed
+     * `agents[]` by `id` (restoring a committed secret under a submitted `''`,
+     * {@link mergeAgentEntries}), splice the result into the committed `raw`,
+     * then run it through `resolveConfig` — the identical loader/validator a
+     * fresh `dreamux serve` uses, so a write this rejects is a write the next
+     * start would also reject. Every validator on that path raises a
+     * `RuleViolation` for a value it checked and refused: `config.ts`'s
+     * `mergeWithDefaults`, the shared readers in `@excitedjs/dreamux-utils`, each
+     * provider's own `config.read`, and the loader's refusal of an unregistered
+     * `builtin:` ref. {@link throwCallerMistake} re-types exactly that into the
+     * caller's mistake, so `config.agents.replace` reports `BAD_REQUEST` instead
+     * of `INTERNAL` for a bad payload. A dynamic import, a file read, or a
+     * provider's own `TypeError` is not a refused value and keeps its own code.
+     * Either way this call rejects with file and memory unchanged, by
+     * `TransactionalStore.update`'s own contract (nothing is written or swapped
+     * before `change` returns).
+     */
+    async replaceAgents(candidateAgents) {
+        await this.store.update(async (committed) => {
+            const committedAgents = committed.raw['agents'];
+            const mergedAgents = mergeAgentEntries(candidateAgents, Array.isArray(committedAgents) ? committedAgents : []);
+            const candidateRaw = { ...committed.raw, agents: mergedAgents };
+            let config;
+            try {
+                config = await resolveConfig(candidateRaw, this.file, this.providerRegistry);
+            }
+            catch (err) {
+                throwCallerMistake(err);
+            }
+            // resolveConfig (mergeWithDefaults) never sets `config.plugins` — that
+            // field is loadFile's own addition, carrying the raw plugins[] entries
+            // only so stringifyConfig can round-trip them (./config.js). A replace
+            // never touches plugins[] (design decision 1), so the committed value
+            // is still exactly right; without this, current().plugins would flip
+            // to undefined on the first replace even though raw.plugins is unchanged.
+            return {
+                raw: candidateRaw,
+                config: committed.config.plugins === undefined
+                    ? config
+                    : { ...config, plugins: committed.config.plugins },
+            };
+        });
+        return this.readAgents();
+    }
+    /**
+     * The store's `load()` callback — the whole open sequence, including
+     * one-time plugin loading. Delegates the "open the file" sequence to
+     * `readConfigFile` (`./load.js`), the same function the CLI read path
+     * (`doctor`/`onboard`/`loadConfig`) uses, so today's checks, order, and
+     * messages (legacy TOML, missing file, file mode, parse) stay one
+     * implementation. `TransactionalStore.load()` guarantees this runs at most
+     * once per store, which is what makes assigning `this.loadedPlugins` here
+     * safe: a plugin's `contribute()` registers providers and collides with
+     * itself if run twice, so this must never re-run for the life of this
+     * `ConfigService`.
+     */
+    async loadFile() {
+        await assertNoLegacyTomlOnly();
+        const { raw, config, plugins } = await readConfigFile(this.file, this.providerRegistry);
+        // Runs once per this store (see this method's own doc comment); a future
+        // change to TransactionalStore's "load() runs at most once" guarantee
+        // would make this reassign on every read instead of the one open.
+        this.loadedPlugins = plugins;
+        return { raw, config };
+    }
+}
+/**
+ * The whole-entry-replace merge {@link ConfigService.replaceAgents} performs
+ * on every submitted `agents[]` entry, matched to a committed entry by `id`.
+ * A submitted value survives at every depth except one override: a
+ * secret-named key submitted as `''` is restored to the committed value at
+ * that same JSON path, but only when the committed entry (same `id`)
+ * actually has a value there — a new `id`, or a key the committed entry never
+ * had, keeps the submitted `''`, since there is nothing to fall back to. An
+ * `id` present only in `committedAgents` is dropped: this replaces the whole
+ * section, not one entry in it.
+ *
+ * `id` is trusted to be a non-empty string here: `config/commands.ts`'s
+ * `parse()`, the only caller of `replaceAgents`, already narrowed the payload
+ * to that shape before this runs.
+ */
+function mergeAgentEntries(candidateAgents, committedAgents) {
+    const committedById = new Map();
+    for (const entry of committedAgents) {
+        if (isPlainObject(entry) && typeof entry['id'] === 'string') {
+            committedById.set(entry['id'], entry);
+        }
+    }
+    return candidateAgents.map((candidate) => {
+        const committed = committedById.get(candidate['id']);
+        return restoreCommittedSecrets(candidate, committed);
+    });
+}
+/**
+ * Walk `submitted`, restoring `committed`'s value wherever a secret-named
+ * key's submitted value is `''` and `committed` has a value at that same
+ * path; every other value — known key or not, at any depth — passes through
+ * as submitted. Arrays walk by index, mirroring `redactSecretKeyValues`'s own
+ * walk (`@excitedjs/dreamux-utils/src/redaction.ts`).
+ */
+function restoreCommittedSecrets(submitted, committed) {
+    if (Array.isArray(submitted)) {
+        const committedArray = Array.isArray(committed) ? committed : undefined;
+        return submitted.map((item, index) => restoreCommittedSecrets(item, committedArray?.[index]));
+    }
+    if (!isPlainObject(submitted))
+        return submitted;
+    const committedObject = isPlainObject(committed) ? committed : undefined;
+    const out = {};
+    for (const [key, value] of Object.entries(submitted)) {
+        const committedValue = committedObject?.[key];
+        if (isSecretKeyName(key) && value === '' && committedValue !== undefined) {
+            out[key] = committedValue;
+            continue;
+        }
+        out[key] = restoreCommittedSecrets(value, committedValue);
+    }
+    return out;
+}
+//# sourceMappingURL=service.js.map

package/dist/config/service.js.map

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

package/dist/daemon/{service-control.js → control.js}

@@ -14,43 +14,42 @@
  * launchd's KeepAlive=true relaunches a plain `kill`, so a stop that *stays*
  * stopped is a `bootout`; start/restart then re-bootstrap when needed.
  */
-import { homedir } from 'node:os';
-import { LAUNCHD_LABEL, serviceUnitPath, SYSTEMD_UNIT } from '../onboard/service.js';
+import { createServiceHost } from './host.js';
+import { launchdTarget, serviceUnitPath, SYSTEMD_UNIT, } from './unit.js';
 export async function controlUserService(verb, options) {
-    const homeDir = options.homeDir ?? homedir();
-    const unit = serviceUnitPath(options.platform, homeDir);
+    const host = createServiceHost(options);
+    const unit = serviceUnitPath(host.platform, host.homeDir);
     const dryRun = options.dryRun ?? false;
     const commands = [];
     if (unit.platform === 'systemd') {
         const args = ['--user', verb, SYSTEMD_UNIT];
-        await options.runner.run('systemctl', args, { dryRun });
+        await host.runner.run('systemctl', args, { dryRun });
         commands.push({ command: 'systemctl', args });
         return { platform: 'systemd', verb, commands };
     }
-    const uid = options.uid ?? process.getuid?.();
-    if (uid === undefined) {
-        throw new Error('launchd user service control requires a numeric uid');
-    }
-    const target = `gui/${uid}/${LAUNCHD_LABEL}`;
-    const loaded = await options.runner.check('launchctl', ['print', target], { dryRun });
+    const target = launchdTarget(host.uid);
+    const domain = `gui/${host.uid}`;
+    const loaded = await host.runner.check('launchctl', ['print', target], {
+        dryRun,
+    });
     if (verb === 'stop') {
         if (loaded) {
             const args = ['bootout', target];
-            await options.runner.run('launchctl', args, { dryRun });
+            await host.runner.run('launchctl', args, { dryRun });
             commands.push({ command: 'launchctl', args });
         }
         return { platform: 'launchd', verb, commands };
     }
     if (!loaded) {
-        const args = ['bootstrap', `gui/${uid}`, unit.path];
-        await options.runner.run('launchctl', args, { dryRun });
+        const args = ['bootstrap', domain, unit.path];
+        await host.runner.run('launchctl', args, { dryRun });
         commands.push({ command: 'launchctl', args });
         if (verb === 'start')
             return { platform: 'launchd', verb, commands };
     }
     const args = verb === 'restart' ? ['kickstart', '-k', target] : ['kickstart', target];
-    await options.runner.run('launchctl', args, { dryRun });
+    await host.runner.run('launchctl', args, { dryRun });
     commands.push({ command: 'launchctl', args });
     return { platform: 'launchd', verb, commands };
 }
-//# sourceMappingURL=service-control.js.map
+//# sourceMappingURL=control.js.map

package/dist/daemon/control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"control.js","sourceRoot":"","sources":["../../src/daemon/control.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EACL,aAAa,EACb,eAAe,EACf,YAAY,GAEb,MAAM,WAAW,CAAC;AAmBnB,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAgB,EAChB,OAA8B;IAE9B,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;IACvC,MAAM,QAAQ,GAA+C,EAAE,CAAC;IAEhE,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACrD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjD,CAAC;IAED,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;QACrE,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YACrD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACrD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAI,IAAI,KAAK,OAAO;YAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACvE,CAAC;IACD,MAAM,IAAI,GACR,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC3E,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AACjD,CAAC"}