@karmaniverous/jeeves-meta 0.18.0-2 → 0.18.0

package/dist/cli/jeeves-meta/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { sleepAsync, fetchWithTimeout, createConfigQueryHandler, atomicWrite, createStatusHandler, getBindAddress, fetchJson, postJson, getServiceUrl, jeevesComponentDescriptorSchema, createServiceCli } from '@karmaniverous/jeeves';
+import { sleepAsync, fetchWithTimeout, createConfigQueryHandler, createStatusHandler, getBindAddress, fetchJson, postJson, getServiceUrl, jeevesComponentDescriptorSchema, createConfigApplyHandler, createServiceCli } from '@karmaniverous/jeeves';
 import { normalizePath, metaConfigSchema, getEndpoint, META_COMPONENT } from '@karmaniverous/jeeves-meta-core';
 import fs, { unlinkSync, writeFileSync, existsSync, readFileSync, statSync, mkdirSync, readdirSync, watchFile } from 'node:fs';
 import path, { join, dirname, relative, posix, sep, resolve } from 'node:path';
@@ -4018,24 +4018,53 @@ function registerConfigRoute(app, deps) {
 }
 
 /**
- * POST /config/apply — apply a config patch using the runtime config path.
+ * POST /config/apply — apply a config patch to the runtime config file.
  *
- * The core SDK's `createConfigApplyHandler` derives the config path from
- * `getComponentConfigDir()` which uses the npm global config root. This
- * local implementation uses the actual runtime config path instead, so
- * temp files are written alongside the active config file.
+ * Delegates the read/merge/validate/write cycle to the core SDK's
+ * `createConfigApplyHandler` (bound to the runtime config path), which
+ * merges into the raw file, validates without writing the schema's parsed
+ * output, and keeps the file mode (0600 for a new file). This route adds
+ * request validation, `restartRequired` reporting, and keeps the resolved
+ * config (which may hold secrets) out of the response.
  *
  * @module routes/configApply
  */
-/** Register the POST /config/apply route. */
-function registerConfigApplyRoute(app, configPath) {
+/**
+ * Snapshot the effective (schema-resolved) config currently on disk.
+ *
+ * @param configPath - Runtime config file path.
+ * @returns The resolved config, the raw object when it does not validate,
+ *   or `{}` when the file is missing or unreadable.
+ */
+function readEffectiveConfig(configPath) {
+    let raw;
+    try {
+        raw = JSON.parse(readFileSync(configPath, 'utf8'));
+    }
+    catch {
+        return {};
+    }
+    const parsed = serviceConfigSchema.safeParse(raw);
+    if (parsed.success)
+        return parsed.data;
+    return typeof raw === 'object' && raw !== null && !Array.isArray(raw)
+        ? raw
+        : {};
+}
+/**
+ * Register the POST /config/apply route.
+ *
+ * @param app - Fastify instance.
+ * @param applyConfig - Core config apply handler bound to the runtime path.
+ * @param configPath - Runtime config file path (for restart detection).
+ */
+function registerConfigApplyRoute(app, applyConfig, configPath) {
     app.post(getEndpoint('configApply').path, async (request, reply) => {
-        if (!configPath) {
+        if (!applyConfig || !configPath) {
             return reply
                 .status(500)
                 .send({ error: 'No runtime config path available' });
         }
-        // Validate request body
         const body = request.body;
         if (!body || typeof body !== 'object' || Array.isArray(body)) {
             return reply
@@ -4056,64 +4085,20 @@ function registerConfigApplyRoute(app, configPath) {
                 .status(400)
                 .send({ error: '`replace` must be a boolean if provided' });
         }
-        // Read existing config from the runtime config path
-        let existing = {};
-        try {
-            existing = JSON.parse(readFileSync(configPath, 'utf8'));
-        }
-        catch (err) {
-            if (err instanceof SyntaxError ||
-                (err instanceof Error && err.message.includes('JSON'))) {
-                return reply.status(400).send({
-                    error: `Existing config file contains invalid JSON: ${err.message}`,
-                });
-            }
-            // File missing — start from empty
-        }
-        // Merge or replace
-        const merged = replace
-            ? { ...patch }
-            : { ...existing, ...patch };
-        // Validate against schema
-        const parseResult = serviceConfigSchema.safeParse(merged);
-        if (!parseResult.success) {
-            return reply.status(400).send({
-                error: 'Config validation failed',
-                issues: parseResult.error.issues,
-            });
-        }
-        const validatedConfig = parseResult.data;
-        // Write atomically — temp file lands next to the runtime config file
-        try {
-            const json = JSON.stringify(validatedConfig, null, 2) + '\n';
-            atomicWrite(configPath, json);
-        }
-        catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            return reply
-                .status(500)
-                .send({ error: `Failed to write config: ${message}` });
-        }
-        // Compute whether any restart-required fields actually changed
-        // (compares validated output against previous config, catching both
-        // explicit patch keys and implicit changes via replace + schema defaults)
-        const validatedRecord = validatedConfig;
-        const restartRequired = RESTART_REQUIRED_FIELDS.some((field) => JSON.stringify(existing[field]) !==
-            JSON.stringify(validatedRecord[field]));
-        // Apply hot-reload callback
-        try {
-            applyHotReloadedConfig(validatedConfig);
-        }
-        catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            return reply.status(200).send({
-                applied: true,
-                warning: `Config written but callback failed: ${message}`,
-                restartRequired,
-            });
+        const previous = readEffectiveConfig(configPath);
+        const result = await applyConfig({
+            patch: patch,
+            replace,
+        });
+        if (result.status !== 200) {
+            return reply.status(result.status).send(result.body);
         }
+        // Never echo the resolved config: it may hold secrets (gatewayApiKey).
+        const { config: next = {}, warning } = result.body;
+        const restartRequired = RESTART_REQUIRED_FIELDS.some((field) => JSON.stringify(previous[field]) !== JSON.stringify(next[field]));
         return reply.status(200).send({
             applied: true,
+            ...(warning ? { warning } : {}),
             restartRequired,
         });
     });
@@ -5070,7 +5055,7 @@ function registerRoutes(app, deps) {
     registerSeedRoute(app, deps);
     registerUnlockRoute(app, deps);
     registerConfigRoute(app, deps);
-    registerConfigApplyRoute(app, deps.configPath);
+    registerConfigApplyRoute(app, deps.configApply, deps.configPath);
     registerQueueRoutes(app, deps);
 }
 
@@ -5254,8 +5239,10 @@ class HttpWatcherClient {
  *
  * @param config - Validated service configuration.
  * @param configPath - Optional path to config file for hot-reload.
+ * @param configApply - Core config apply handler bound to `configPath`,
+ *   backing POST /config/apply.
  */
-async function startService(config, configPath) {
+async function startService(config, configPath, configApply) {
     const logger = createLogger({
         level: config.logging.level,
         file: config.logging.file,
@@ -5292,6 +5279,7 @@ async function startService(config, configPath) {
         ready: false,
         executor,
         configPath,
+        configApply,
     };
     registerConfigHotReloadRuntime({
         config,
@@ -5620,7 +5608,9 @@ const metaDescriptor = jeevesComponentDescriptorSchema.parse({
     },
     run: async (configPath) => {
         const config = loadServiceConfig(configPath);
-        await startService(config, configPath);
+        // Route POST /config/apply through core's handler so the raw file is
+        // merged (unknown keys kept, no defaults written, mode preserved).
+        await startService(config, configPath, createConfigApplyHandler(metaDescriptor, configPath));
     },
     startCommand: (configPath) => [
         'node',

package/package.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/karmaniverous/jeeves-meta/issues"
   },
   "dependencies": {
-    "@karmaniverous/jeeves": "0.6.0-9",
+    "@karmaniverous/jeeves": "0.6.0",
     "@karmaniverous/jeeves-meta-core": "^0.2.2",
     "commander": "^15",
     "croner": "^10",
@@ -106,5 +106,5 @@
     "typecheck": "tsc"
   },
   "type": "module",
-  "version": "0.18.0-2"
+  "version": "0.18.0"
 }