@karmaniverous/jeeves-meta 0.13.6 → 0.13.8

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

@@ -7146,138 +7146,6 @@ function getErrorMessage(err) {
     return err instanceof Error ? err.message : String(err);
 }
 
-/**
- * Factory for a framework-agnostic config apply HTTP handler.
- *
- * @remarks
- * Derives the config file path from the descriptor, validates patches
- * against the descriptor's Zod schema, deep-merges (or replaces),
- * writes atomically, and calls the optional `onConfigApply` callback.
- */
-/**
- * Deep-merge two plain objects. Arrays and non-objects are replaced.
- *
- * @param target - Base object.
- * @param source - Object to merge on top.
- * @returns A new merged object.
- */
-function deepMerge(target, source) {
-    const result = { ...target };
-    for (const key of Object.keys(source)) {
-        const tVal = target[key];
-        const sVal = source[key];
-        if (isPlainObject(tVal) && isPlainObject(sVal)) {
-            result[key] = deepMerge(tVal, sVal);
-        }
-        else {
-            result[key] = sVal;
-        }
-    }
-    return result;
-}
-/**
- * Check if a value is a plain object (not null, not an array).
- *
- * @param val - Value to check.
- * @returns True if the value is a plain object.
- */
-function isPlainObject(val) {
-    return typeof val === 'object' && val !== null && !Array.isArray(val);
-}
-/**
- * Read and parse a JSON config file.
- *
- * @param filePath - Absolute path to the file.
- * @returns Parsed object or empty object if not found.
- */
-function readConfigFile(filePath) {
-    if (!existsSync(filePath))
-        return {};
-    try {
-        const raw = readFileSync(filePath, 'utf-8');
-        return JSON.parse(raw);
-    }
-    catch (err) {
-        console.warn(`jeeves-core: Could not read config file ${filePath}: ${getErrorMessage(err)}`);
-        return {};
-    }
-}
-/**
- * Create a framework-agnostic config apply handler.
- *
- * @remarks
- * The handler:
- * 1. Reads existing config from `{configRoot}/jeeves-{name}/{configFileName}`
- * 2. Deep-merges the patch (or replaces if `replace: true`)
- * 3. Validates the merged result against `descriptor.configSchema`
- * 4. Writes atomically
- * 5. Calls `descriptor.onConfigApply` with the merged config (if defined)
- *
- * @param descriptor - The component descriptor.
- * @returns An async handler returning `{ status, body }`.
- */
-function createConfigApplyHandler(descriptor) {
-    return async (request) => {
-        const { patch, replace } = request;
-        // Derive config path
-        const configDir = getComponentConfigDir(descriptor.name);
-        const configPath = join(configDir, descriptor.configFileName);
-        // Read existing config
-        const existing = readConfigFile(configPath);
-        // Merge or replace
-        const mergeFn = descriptor.customMerge ?? deepMerge;
-        const merged = replace ? { ...patch } : mergeFn(existing, patch);
-        // Validate against schema
-        const schema = descriptor.configSchema;
-        const parseResult = schema.safeParse(merged);
-        if (!parseResult.success) {
-            return {
-                status: 400,
-                body: {
-                    error: 'Config validation failed',
-                    issues: parseResult.error.issues,
-                },
-            };
-        }
-        // Extract validated data (Zod returns unknown from ZodTypeAny)
-        const validatedConfig = parseResult.data;
-        // Write atomically
-        try {
-            const json = JSON.stringify(validatedConfig, null, 2) + '\n';
-            atomicWrite(configPath, json);
-        }
-        catch (err) {
-            return {
-                status: 500,
-                body: { error: `Failed to write config: ${getErrorMessage(err)}` },
-            };
-        }
-        // Call onConfigApply callback if defined
-        if (descriptor.onConfigApply) {
-            try {
-                await descriptor.onConfigApply(validatedConfig);
-            }
-            catch (err) {
-                return {
-                    status: 200,
-                    body: {
-                        applied: true,
-                        warning: `Config written but callback failed: ${getErrorMessage(err)}`,
-                        config: validatedConfig,
-                    },
-                };
-            }
-        }
-        return {
-            status: 200,
-            body: {
-                applied: true,
-                config: validatedConfig,
-            },
-        };
-    };
-}
-
 /**
  * Generic config query handler with JSONPath support.
  *
@@ -8581,8 +8449,10 @@ const serviceConfigSchema = metaConfigSchema.extend({
     port: z.number().int().min(1).max(65535).default(1938),
     /** Cron schedule for synthesis cycles (default: every 30 min). */
     schedule: z.string().default('*/30 * * * *'),
-    /** Optional channel identifier for reporting. */
+    /** Messaging channel name (e.g. 'slack'). Legacy: also used as target if reportTarget is unset. */
     reportChannel: z.string().optional(),
+    /** Channel/user ID to send progress messages to. */
+    reportTarget: z.string().optional(),
     /** Optional base URL for the service, used to construct entity links in progress reports. */
     serverBaseUrl: z.string().optional(),
     /** Interval in ms for periodic watcher health check. 0 = disabled. Default: 60000. */
@@ -9405,17 +9275,20 @@ class GatewayExecutor {
         }
     }
     /** Invoke a gateway tool via the /tools/invoke HTTP endpoint. */
-    async invoke(tool, args) {
+    async invoke(tool, args, sessionKey) {
         const headers = {
             'Content-Type': 'application/json',
         };
         if (this.apiKey) {
             headers['Authorization'] = 'Bearer ' + this.apiKey;
         }
+        const body = { tool, args };
+        if (sessionKey)
+            body.sessionKey = sessionKey;
         const res = await fetch(this.gatewayUrl + '/tools/invoke', {
             method: 'POST',
             headers,
-            body: JSON.stringify({ tool, args }),
+            body: JSON.stringify(body),
         });
         if (!res.ok) {
             const text = await res.text();
@@ -9428,12 +9301,12 @@ class GatewayExecutor {
         return data;
     }
     /** Look up totalTokens for a session via sessions_list. */
-    async getSessionTokens(sessionKey) {
+    async getSessionTokens(sessionKey, invokeSessionKey) {
         try {
             const result = await this.invoke('sessions_list', {
                 limit: 20,
                 messageLimit: 0,
-            });
+            }, invokeSessionKey);
             const sessions = (result.result?.details?.sessions ??
                 result.result?.sessions ??
                 []);
@@ -9461,6 +9334,7 @@ class GatewayExecutor {
         // Generate unique output path for file-based output
         const outputId = randomUUID();
         const outputPath = this.workspaceDir + '/output-' + outputId + '.json';
+        const invokeSessionKey = 'agent:main:meta-invoke:' + outputId;
         // Append file output instruction to the task
         const taskWithOutput = task +
             '\n\n## OUTPUT DELIVERY\n\n' +
@@ -9478,7 +9352,7 @@ class GatewayExecutor {
             runTimeoutSeconds: timeoutSeconds,
             ...(options?.thinking ? { thinking: options.thinking } : {}),
             ...(options?.model ? { model: options.model } : {}),
-        });
+        }, invokeSessionKey);
         const details = (spawnResult.result?.details ?? spawnResult.result);
         const sessionKey = details?.childSessionKey ?? details?.sessionKey;
         if (typeof sessionKey !== 'string' || !sessionKey) {
@@ -9498,7 +9372,7 @@ class GatewayExecutor {
                     sessionKey,
                     limit: 5,
                     includeTools: false,
-                });
+                }, invokeSessionKey);
                 const messages = historyResult.result?.details?.messages ??
                     historyResult.result?.messages ??
                     [];
@@ -9511,7 +9385,7 @@ class GatewayExecutor {
                         lastMsg.stopReason !== 'toolUse' &&
                         lastMsg.stopReason !== 'error') {
                         // Fetch token usage from session metadata
-                        const tokens = await this.getSessionTokens(sessionKey);
+                        const tokens = await this.getSessionTokens(sessionKey, invokeSessionKey);
                         // Read output from file (sub-agent wrote it via Write tool)
                         if (existsSync(outputPath)) {
                             try {
@@ -10964,6 +10838,11 @@ async function orchestrate(config, executor, watcher, targetPath, onProgress, lo
 function formatNumber(n) {
     return n.toLocaleString('en-US');
 }
+function formatTokens(tokens) {
+    return tokens !== undefined
+        ? formatNumber(tokens) + ' tokens'
+        : 'unknown tokens';
+}
 function formatSeconds(durationMs) {
     const seconds = durationMs / 1000;
     return Math.round(seconds).toString() + 's';
@@ -11014,17 +10893,17 @@ function formatProgressEvent(event, serverBaseUrl) {
         }
         case 'phase_complete': {
             const phase = event.phase ? titleCasePhase(event.phase) : 'Phase';
-            const tokens = event.tokens ?? 0;
+            const tokenStr = formatTokens(event.tokens);
             const duration = event.durationMs !== undefined ? formatSeconds(event.durationMs) : '0s';
-            return `  ✅ ${phase} complete (${formatNumber(tokens)} tokens / ${duration})`;
+            return `  ✅ ${phase} complete (${tokenStr} / ${duration})`;
         }
         case 'synthesis_complete': {
             const metaLink = buildMetaJsonLink(event.path, serverBaseUrl);
-            const tokens = event.tokens ?? 0;
+            const tokenStr = formatTokens(event.tokens);
             const duration = event.durationMs !== undefined
                 ? formatSeconds(event.durationMs)
                 : '0.0s';
-            return `✅ Completed: ${metaLink} (${formatNumber(tokens)} tokens / ${duration})`;
+            return `✅ Completed: ${metaLink} (${tokenStr} / ${duration})`;
         }
         case 'error': {
             const dirLink = buildDirectoryLink(event.path, serverBaseUrl);
@@ -11045,19 +10924,23 @@ class ProgressReporter {
         this.logger = logger;
     }
     async report(event) {
-        const target = this.config.reportChannel;
+        // Multi-channel mode: reportTarget is the destination, reportChannel is the platform.
+        // Legacy mode: reportChannel alone acts as the target (backward compatible).
+        const target = this.config.reportTarget ?? this.config.reportChannel;
         if (!target)
             return;
         const message = formatProgressEvent(event, this.config.serverBaseUrl);
         const url = new URL('/tools/invoke', this.config.gatewayUrl);
-        const payload = {
-            tool: 'message',
-            args: {
-                action: 'send',
-                target,
-                message,
-            },
+        const args = {
+            action: 'send',
+            target,
+            message,
         };
+        // Include channel field only in multi-channel mode (reportTarget is set)
+        if (this.config.reportTarget && this.config.reportChannel) {
+            args.channel = this.config.reportChannel;
+        }
+        const payload = { tool: 'message', args };
         try {
             const res = await fetch(url, {
                 method: 'POST',
@@ -11662,14 +11545,19 @@ function metaExists(ownerPath) {
  * Walk returns file paths; we need the unique set of immediate parent
  * directories that could be owners.
  */
-function extractDirectories(filePaths) {
+function extractDirectories(filePaths, logger) {
     const dirs = new Set();
     for (const fp of filePaths) {
-        const dir = posix.dirname(fp);
+        // Normalize backslash paths (Windows) to forward slashes before posix.dirname
+        const normalized = normalizePath(fp);
+        const dir = posix.dirname(normalized);
         if (dir !== '.' && dir !== '/') {
             dirs.add(dir);
         }
     }
+    if (filePaths.length > 0 && dirs.size === 0) {
+        logger?.warn({ fileCount: filePaths.length }, 'extractDirectories returned zero results despite non-empty input');
+    }
     return [...dirs];
 }
 /**
@@ -11687,7 +11575,7 @@ async function autoSeedPass(rules, watcher, logger) {
     const candidates = new Map();
     for (const rule of rules) {
         const files = await watcher.walk([rule.match]);
-        const dirs = extractDirectories(files);
+        const dirs = extractDirectories(files, logger);
         for (const dir of dirs) {
             candidates.set(dir, {
                 steer: rule.steer,
@@ -11905,16 +11793,97 @@ function registerConfigRoute(app, deps) {
 }
 
 /**
- * POST /config/apply — apply a config patch via the core SDK handler.
+ * POST /config/apply — apply a config patch using the runtime config path.
+ *
+ * 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.
  *
  * @module routes/configApply
  */
 /** Register the POST /config/apply route. */
-function registerConfigApplyRoute(app) {
-    const handler = createConfigApplyHandler(metaDescriptor);
+function registerConfigApplyRoute(app, configPath) {
     app.post('/config/apply', async (request, reply) => {
-        const result = await handler(request.body);
-        return reply.status(result.status).send(result.body);
+        if (!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
+                .status(400)
+                .send({ error: 'Request body must be a JSON object' });
+        }
+        const { patch, replace } = body;
+        if (patch === null ||
+            patch === undefined ||
+            typeof patch !== 'object' ||
+            Array.isArray(patch)) {
+            return reply
+                .status(400)
+                .send({ error: '`patch` must be a non-null object' });
+        }
+        if (replace !== undefined && typeof replace !== 'boolean') {
+            return reply
+                .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}` });
+        }
+        // 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: RESTART_REQUIRED_FIELDS,
+            });
+        }
+        return reply.status(200).send({
+            applied: true,
+        });
     });
 }
 
@@ -12348,6 +12317,16 @@ async function checkWatcher(url) {
         return { url, status: 'unreachable', checkedAt };
     }
 }
+/** Derive service-specific state from current activity and lifecycle. */
+function deriveServiceState(deps) {
+    if (deps.shuttingDown)
+        return 'stopping';
+    if (deps.queue.current)
+        return 'synthesizing';
+    if (deps.queue.depth > 0)
+        return 'waiting';
+    return 'idle';
+}
 function registerStatusRoute(app, deps) {
     const statusHandler = createStatusHandler({
         name: SERVICE_NAME,
@@ -12360,6 +12339,7 @@ function registerStatusRoute(app, deps) {
                 checkDependency(config.gatewayUrl, '/status'),
             ]);
             return {
+                serviceState: deriveServiceState(deps),
                 currentTarget: queue.current?.path ?? null,
                 queue: queue.getState(),
                 stats: {
@@ -12503,7 +12483,7 @@ function registerRoutes(app, deps) {
     registerSeedRoute(app, deps);
     registerUnlockRoute(app, deps);
     registerConfigRoute(app, deps);
-    registerConfigApplyRoute(app);
+    registerConfigApplyRoute(app, deps.configPath);
     registerQueueRoutes(app, deps);
 }
 
@@ -12707,6 +12687,7 @@ async function startService(config, configPath) {
         scheduler,
         stats,
         executor,
+        configPath,
     };
     registerConfigHotReloadRuntime({
         config,
@@ -12742,9 +12723,17 @@ async function startService(config, configPath) {
         try {
             const results = await orchestrate(config, executor, watcher, path, async (evt) => {
                 // Track token stats from phase completions
-                if (evt.type === 'phase_complete' && evt.tokens) {
-                    stats.totalTokens += evt.tokens;
-                    cycleTokens += evt.tokens;
+                if (evt.type === 'phase_complete') {
+                    if (evt.tokens !== undefined) {
+                        stats.totalTokens += evt.tokens;
+                        if (cycleTokens !== undefined) {
+                            cycleTokens += evt.tokens;
+                        }
+                    }
+                    else {
+                        cycleTokens = undefined;
+                        logger.warn({ path: ownerPath, phase: evt.phase }, 'Token count unavailable (session lookup may have timed out)');
+                    }
                 }
                 await progress.report(evt);
             }, logger);

package/dist/index.d.ts

@@ -239,6 +239,7 @@ declare const serviceConfigSchema: z.ZodObject<{
     port: z.ZodDefault<z.ZodNumber>;
     schedule: z.ZodDefault<z.ZodString>;
     reportChannel: z.ZodOptional<z.ZodString>;
+    reportTarget: z.ZodOptional<z.ZodString>;
     serverBaseUrl: z.ZodOptional<z.ZodString>;
     watcherHealthIntervalMs: z.ZodDefault<z.ZodNumber>;
     logging: z.ZodDefault<z.ZodObject<{
@@ -1248,8 +1249,15 @@ type ProgressEvent = {
 type ProgressReporterConfig = {
     gatewayUrl: string;
     gatewayApiKey?: string;
-    /** Gateway channel target (platform-agnostic). If unset, reporting is disabled. */
+    /**
+     * Messaging channel name (e.g. 'slack'). When set alongside reportTarget,
+     * included in the gateway message payload as `channel`.
+     * Legacy: if reportTarget is unset, reportChannel is used as the target
+     * (single-channel mode, backward compatible).
+     */
     reportChannel?: string;
+    /** Channel/user ID to send messages to. Takes priority over reportChannel as target. */
+    reportTarget?: string;
     /** Optional base URL for the service, used to construct entity links. */
     serverBaseUrl?: string;
 };
@@ -1429,6 +1437,8 @@ interface RouteDeps {
     executor?: Pick<GatewayExecutor, 'abort'>;
     /** Set to true during graceful shutdown. */
     shuttingDown?: boolean;
+    /** Runtime config file path for config-apply. */
+    configPath?: string;
 }
 /** Register all HTTP routes on the Fastify instance. */
 declare function registerRoutes(app: FastifyInstance, deps: RouteDeps): void;

package/dist/index.js

@@ -7345,138 +7345,6 @@ function getErrorMessage(err) {
     return err instanceof Error ? err.message : String(err);
 }
 
-/**
- * Factory for a framework-agnostic config apply HTTP handler.
- *
- * @remarks
- * Derives the config file path from the descriptor, validates patches
- * against the descriptor's Zod schema, deep-merges (or replaces),
- * writes atomically, and calls the optional `onConfigApply` callback.
- */
-/**
- * Deep-merge two plain objects. Arrays and non-objects are replaced.
- *
- * @param target - Base object.
- * @param source - Object to merge on top.
- * @returns A new merged object.
- */
-function deepMerge(target, source) {
-    const result = { ...target };
-    for (const key of Object.keys(source)) {
-        const tVal = target[key];
-        const sVal = source[key];
-        if (isPlainObject(tVal) && isPlainObject(sVal)) {
-            result[key] = deepMerge(tVal, sVal);
-        }
-        else {
-            result[key] = sVal;
-        }
-    }
-    return result;
-}
-/**
- * Check if a value is a plain object (not null, not an array).
- *
- * @param val - Value to check.
- * @returns True if the value is a plain object.
- */
-function isPlainObject(val) {
-    return typeof val === 'object' && val !== null && !Array.isArray(val);
-}
-/**
- * Read and parse a JSON config file.
- *
- * @param filePath - Absolute path to the file.
- * @returns Parsed object or empty object if not found.
- */
-function readConfigFile(filePath) {
-    if (!existsSync(filePath))
-        return {};
-    try {
-        const raw = readFileSync(filePath, 'utf-8');
-        return JSON.parse(raw);
-    }
-    catch (err) {
-        console.warn(`jeeves-core: Could not read config file ${filePath}: ${getErrorMessage(err)}`);
-        return {};
-    }
-}
-/**
- * Create a framework-agnostic config apply handler.
- *
- * @remarks
- * The handler:
- * 1. Reads existing config from `{configRoot}/jeeves-{name}/{configFileName}`
- * 2. Deep-merges the patch (or replaces if `replace: true`)
- * 3. Validates the merged result against `descriptor.configSchema`
- * 4. Writes atomically
- * 5. Calls `descriptor.onConfigApply` with the merged config (if defined)
- *
- * @param descriptor - The component descriptor.
- * @returns An async handler returning `{ status, body }`.
- */
-function createConfigApplyHandler(descriptor) {
-    return async (request) => {
-        const { patch, replace } = request;
-        // Derive config path
-        const configDir = getComponentConfigDir(descriptor.name);
-        const configPath = join(configDir, descriptor.configFileName);
-        // Read existing config
-        const existing = readConfigFile(configPath);
-        // Merge or replace
-        const mergeFn = descriptor.customMerge ?? deepMerge;
-        const merged = replace ? { ...patch } : mergeFn(existing, patch);
-        // Validate against schema
-        const schema = descriptor.configSchema;
-        const parseResult = schema.safeParse(merged);
-        if (!parseResult.success) {
-            return {
-                status: 400,
-                body: {
-                    error: 'Config validation failed',
-                    issues: parseResult.error.issues,
-                },
-            };
-        }
-        // Extract validated data (Zod returns unknown from ZodTypeAny)
-        const validatedConfig = parseResult.data;
-        // Write atomically
-        try {
-            const json = JSON.stringify(validatedConfig, null, 2) + '\n';
-            atomicWrite(configPath, json);
-        }
-        catch (err) {
-            return {
-                status: 500,
-                body: { error: `Failed to write config: ${getErrorMessage(err)}` },
-            };
-        }
-        // Call onConfigApply callback if defined
-        if (descriptor.onConfigApply) {
-            try {
-                await descriptor.onConfigApply(validatedConfig);
-            }
-            catch (err) {
-                return {
-                    status: 200,
-                    body: {
-                        applied: true,
-                        warning: `Config written but callback failed: ${getErrorMessage(err)}`,
-                        config: validatedConfig,
-                    },
-                };
-            }
-        }
-        return {
-            status: 200,
-            body: {
-                applied: true,
-                config: validatedConfig,
-            },
-        };
-    };
-}
-
 /**
  * Generic config query handler with JSONPath support.
  *
@@ -8274,8 +8142,10 @@ const serviceConfigSchema = metaConfigSchema.extend({
     port: z.number().int().min(1).max(65535).default(1938),
     /** Cron schedule for synthesis cycles (default: every 30 min). */
     schedule: z.string().default('*/30 * * * *'),
-    /** Optional channel identifier for reporting. */
+    /** Messaging channel name (e.g. 'slack'). Legacy: also used as target if reportTarget is unset. */
     reportChannel: z.string().optional(),
+    /** Channel/user ID to send progress messages to. */
+    reportTarget: z.string().optional(),
     /** Optional base URL for the service, used to construct entity links in progress reports. */
     serverBaseUrl: z.string().optional(),
     /** Interval in ms for periodic watcher health check. 0 = disabled. Default: 60000. */
@@ -9124,17 +8994,20 @@ class GatewayExecutor {
         }
     }
     /** Invoke a gateway tool via the /tools/invoke HTTP endpoint. */
-    async invoke(tool, args) {
+    async invoke(tool, args, sessionKey) {
         const headers = {
             'Content-Type': 'application/json',
         };
         if (this.apiKey) {
             headers['Authorization'] = 'Bearer ' + this.apiKey;
         }
+        const body = { tool, args };
+        if (sessionKey)
+            body.sessionKey = sessionKey;
         const res = await fetch(this.gatewayUrl + '/tools/invoke', {
             method: 'POST',
             headers,
-            body: JSON.stringify({ tool, args }),
+            body: JSON.stringify(body),
         });
         if (!res.ok) {
             const text = await res.text();
@@ -9147,12 +9020,12 @@ class GatewayExecutor {
         return data;
     }
     /** Look up totalTokens for a session via sessions_list. */
-    async getSessionTokens(sessionKey) {
+    async getSessionTokens(sessionKey, invokeSessionKey) {
         try {
             const result = await this.invoke('sessions_list', {
                 limit: 20,
                 messageLimit: 0,
-            });
+            }, invokeSessionKey);
             const sessions = (result.result?.details?.sessions ??
                 result.result?.sessions ??
                 []);
@@ -9180,6 +9053,7 @@ class GatewayExecutor {
         // Generate unique output path for file-based output
         const outputId = randomUUID();
         const outputPath = this.workspaceDir + '/output-' + outputId + '.json';
+        const invokeSessionKey = 'agent:main:meta-invoke:' + outputId;
         // Append file output instruction to the task
         const taskWithOutput = task +
             '\n\n## OUTPUT DELIVERY\n\n' +
@@ -9197,7 +9071,7 @@ class GatewayExecutor {
             runTimeoutSeconds: timeoutSeconds,
             ...(options?.thinking ? { thinking: options.thinking } : {}),
             ...(options?.model ? { model: options.model } : {}),
-        });
+        }, invokeSessionKey);
         const details = (spawnResult.result?.details ?? spawnResult.result);
         const sessionKey = details?.childSessionKey ?? details?.sessionKey;
         if (typeof sessionKey !== 'string' || !sessionKey) {
@@ -9217,7 +9091,7 @@ class GatewayExecutor {
                     sessionKey,
                     limit: 5,
                     includeTools: false,
-                });
+                }, invokeSessionKey);
                 const messages = historyResult.result?.details?.messages ??
                     historyResult.result?.messages ??
                     [];
@@ -9230,7 +9104,7 @@ class GatewayExecutor {
                         lastMsg.stopReason !== 'toolUse' &&
                         lastMsg.stopReason !== 'error') {
                         // Fetch token usage from session metadata
-                        const tokens = await this.getSessionTokens(sessionKey);
+                        const tokens = await this.getSessionTokens(sessionKey, invokeSessionKey);
                         // Read output from file (sub-agent wrote it via Write tool)
                         if (existsSync(outputPath)) {
                             try {
@@ -10495,6 +10369,11 @@ async function orchestrate(config, executor, watcher, targetPath, onProgress, lo
 function formatNumber(n) {
     return n.toLocaleString('en-US');
 }
+function formatTokens(tokens) {
+    return tokens !== undefined
+        ? formatNumber(tokens) + ' tokens'
+        : 'unknown tokens';
+}
 function formatSeconds(durationMs) {
     const seconds = durationMs / 1000;
     return Math.round(seconds).toString() + 's';
@@ -10545,17 +10424,17 @@ function formatProgressEvent(event, serverBaseUrl) {
         }
         case 'phase_complete': {
             const phase = event.phase ? titleCasePhase(event.phase) : 'Phase';
-            const tokens = event.tokens ?? 0;
+            const tokenStr = formatTokens(event.tokens);
             const duration = event.durationMs !== undefined ? formatSeconds(event.durationMs) : '0s';
-            return `  ✅ ${phase} complete (${formatNumber(tokens)} tokens / ${duration})`;
+            return `  ✅ ${phase} complete (${tokenStr} / ${duration})`;
         }
         case 'synthesis_complete': {
             const metaLink = buildMetaJsonLink(event.path, serverBaseUrl);
-            const tokens = event.tokens ?? 0;
+            const tokenStr = formatTokens(event.tokens);
             const duration = event.durationMs !== undefined
                 ? formatSeconds(event.durationMs)
                 : '0.0s';
-            return `✅ Completed: ${metaLink} (${formatNumber(tokens)} tokens / ${duration})`;
+            return `✅ Completed: ${metaLink} (${tokenStr} / ${duration})`;
         }
         case 'error': {
             const dirLink = buildDirectoryLink(event.path, serverBaseUrl);
@@ -10576,19 +10455,23 @@ class ProgressReporter {
         this.logger = logger;
     }
     async report(event) {
-        const target = this.config.reportChannel;
+        // Multi-channel mode: reportTarget is the destination, reportChannel is the platform.
+        // Legacy mode: reportChannel alone acts as the target (backward compatible).
+        const target = this.config.reportTarget ?? this.config.reportChannel;
         if (!target)
             return;
         const message = formatProgressEvent(event, this.config.serverBaseUrl);
         const url = new URL('/tools/invoke', this.config.gatewayUrl);
-        const payload = {
-            tool: 'message',
-            args: {
-                action: 'send',
-                target,
-                message,
-            },
+        const args = {
+            action: 'send',
+            target,
+            message,
         };
+        // Include channel field only in multi-channel mode (reportTarget is set)
+        if (this.config.reportTarget && this.config.reportChannel) {
+            args.channel = this.config.reportChannel;
+        }
+        const payload = { tool: 'message', args };
         try {
             const res = await fetch(url, {
                 method: 'POST',
@@ -11193,14 +11076,19 @@ function metaExists(ownerPath) {
  * Walk returns file paths; we need the unique set of immediate parent
  * directories that could be owners.
  */
-function extractDirectories(filePaths) {
+function extractDirectories(filePaths, logger) {
     const dirs = new Set();
     for (const fp of filePaths) {
-        const dir = posix.dirname(fp);
+        // Normalize backslash paths (Windows) to forward slashes before posix.dirname
+        const normalized = normalizePath(fp);
+        const dir = posix.dirname(normalized);
         if (dir !== '.' && dir !== '/') {
             dirs.add(dir);
         }
     }
+    if (filePaths.length > 0 && dirs.size === 0) {
+        logger?.warn({ fileCount: filePaths.length }, 'extractDirectories returned zero results despite non-empty input');
+    }
     return [...dirs];
 }
 /**
@@ -11218,7 +11106,7 @@ async function autoSeedPass(rules, watcher, logger) {
     const candidates = new Map();
     for (const rule of rules) {
         const files = await watcher.walk([rule.match]);
-        const dirs = extractDirectories(files);
+        const dirs = extractDirectories(files, logger);
         for (const dir of dirs) {
             candidates.set(dir, {
                 steer: rule.steer,
@@ -11436,16 +11324,97 @@ function registerConfigRoute(app, deps) {
 }
 
 /**
- * POST /config/apply — apply a config patch via the core SDK handler.
+ * POST /config/apply — apply a config patch using the runtime config path.
+ *
+ * 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.
  *
  * @module routes/configApply
  */
 /** Register the POST /config/apply route. */
-function registerConfigApplyRoute(app) {
-    const handler = createConfigApplyHandler(metaDescriptor);
+function registerConfigApplyRoute(app, configPath) {
     app.post('/config/apply', async (request, reply) => {
-        const result = await handler(request.body);
-        return reply.status(result.status).send(result.body);
+        if (!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
+                .status(400)
+                .send({ error: 'Request body must be a JSON object' });
+        }
+        const { patch, replace } = body;
+        if (patch === null ||
+            patch === undefined ||
+            typeof patch !== 'object' ||
+            Array.isArray(patch)) {
+            return reply
+                .status(400)
+                .send({ error: '`patch` must be a non-null object' });
+        }
+        if (replace !== undefined && typeof replace !== 'boolean') {
+            return reply
+                .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}` });
+        }
+        // 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: RESTART_REQUIRED_FIELDS,
+            });
+        }
+        return reply.status(200).send({
+            applied: true,
+        });
     });
 }
 
@@ -11851,6 +11820,16 @@ async function checkWatcher(url) {
         return { url, status: 'unreachable', checkedAt };
     }
 }
+/** Derive service-specific state from current activity and lifecycle. */
+function deriveServiceState(deps) {
+    if (deps.shuttingDown)
+        return 'stopping';
+    if (deps.queue.current)
+        return 'synthesizing';
+    if (deps.queue.depth > 0)
+        return 'waiting';
+    return 'idle';
+}
 function registerStatusRoute(app, deps) {
     const statusHandler = createStatusHandler({
         name: SERVICE_NAME,
@@ -11863,6 +11842,7 @@ function registerStatusRoute(app, deps) {
                 checkDependency(config.gatewayUrl, '/status'),
             ]);
             return {
+                serviceState: deriveServiceState(deps),
                 currentTarget: queue.current?.path ?? null,
                 queue: queue.getState(),
                 stats: {
@@ -12006,7 +11986,7 @@ function registerRoutes(app, deps) {
     registerSeedRoute(app, deps);
     registerUnlockRoute(app, deps);
     registerConfigRoute(app, deps);
-    registerConfigApplyRoute(app);
+    registerConfigApplyRoute(app, deps.configPath);
     registerQueueRoutes(app, deps);
 }
 
@@ -12210,6 +12190,7 @@ async function startService(config, configPath) {
         scheduler,
         stats,
         executor,
+        configPath,
     };
     registerConfigHotReloadRuntime({
         config,
@@ -12245,9 +12226,17 @@ async function startService(config, configPath) {
         try {
             const results = await orchestrate(config, executor, watcher, path, async (evt) => {
                 // Track token stats from phase completions
-                if (evt.type === 'phase_complete' && evt.tokens) {
-                    stats.totalTokens += evt.tokens;
-                    cycleTokens += evt.tokens;
+                if (evt.type === 'phase_complete') {
+                    if (evt.tokens !== undefined) {
+                        stats.totalTokens += evt.tokens;
+                        if (cycleTokens !== undefined) {
+                            cycleTokens += evt.tokens;
+                        }
+                    }
+                    else {
+                        cycleTokens = undefined;
+                        logger.warn({ path: ownerPath, phase: evt.phase }, 'Token count unavailable (session lookup may have timed out)');
+                    }
                 }
                 await progress.report(evt);
             }, logger);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/jeeves-meta",
-  "version": "0.13.6",
+  "version": "0.13.8",
   "author": "Jason Williscroft",
   "description": "Fastify HTTP service for the Jeeves Meta synthesis engine",
   "license": "BSD-3-Clause",