@karmaniverous/jeeves-meta 0.13.7 → 0.13.9

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

@@ -9275,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();
@@ -9298,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 ??
                 []);
@@ -9331,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' +
@@ -9348,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) {
@@ -9368,7 +9372,7 @@ class GatewayExecutor {
                     sessionKey,
                     limit: 5,
                     includeTools: false,
-                });
+                }, invokeSessionKey);
                 const messages = historyResult.result?.details?.messages ??
                     historyResult.result?.messages ??
                     [];
@@ -9381,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 {
@@ -9848,6 +9852,8 @@ function appendSharedSections(sections, ctx, options) {
  */
 function buildArchitectTask(ctx, meta, config) {
     const sections = [
+        `# jeeves-meta · ARCHITECT · ${ctx.path}`,
+        '',
         meta._architect ?? config.defaultArchitect ?? DEFAULT_ARCHITECT_PROMPT,
         '',
         '## SCOPE',
@@ -9878,6 +9884,8 @@ function buildArchitectTask(ctx, meta, config) {
  */
 function buildBuilderTask(ctx, meta, config) {
     const sections = [
+        `# jeeves-meta · BUILDER · ${ctx.path}`,
+        '',
         '## TASK BRIEF (from Architect)',
         meta._builder ?? '(No architect brief available)',
         '',
@@ -9906,6 +9914,8 @@ function buildBuilderTask(ctx, meta, config) {
  */
 function buildCriticTask(ctx, meta, config) {
     const sections = [
+        `# jeeves-meta · CRITIC · ${ctx.path}`,
+        '',
         meta._critic ?? config.defaultCritic ?? DEFAULT_CRITIC_PROMPT,
         '',
         '## SYNTHESIS TO EVALUATE',
@@ -10578,6 +10588,7 @@ async function synthesizeNode(node, currentMeta, config, executor, watcher, onPr
             const architectResult = await executor.spawn(architectTask, {
                 thinking: config.thinking,
                 timeout: config.architectTimeout,
+                label: 'meta-architect',
             });
             builderBrief = parseArchitectOutput(architectResult.output);
             architectTokens = architectResult.tokens;
@@ -10626,6 +10637,7 @@ async function synthesizeNode(node, currentMeta, config, executor, watcher, onPr
         const builderResult = await executor.spawn(builderTask, {
             thinking: config.thinking,
             timeout: config.builderTimeout,
+            label: 'meta-builder',
         });
         builderOutput = parseBuilderOutput(builderResult.output);
         builderTokens = builderResult.tokens;
@@ -10680,6 +10692,7 @@ async function synthesizeNode(node, currentMeta, config, executor, watcher, onPr
         const criticResult = await executor.spawn(criticTask, {
             thinking: config.thinking,
             timeout: config.criticTimeout,
+            label: 'meta-critic',
         });
         feedback = parseCriticOutput(criticResult.output);
         criticTokens = criticResult.tokens;

package/dist/index.js

@@ -8994,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();
@@ -9017,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 ??
                 []);
@@ -9050,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' +
@@ -9067,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) {
@@ -9087,7 +9091,7 @@ class GatewayExecutor {
                     sessionKey,
                     limit: 5,
                     includeTools: false,
-                });
+                }, invokeSessionKey);
                 const messages = historyResult.result?.details?.messages ??
                     historyResult.result?.messages ??
                     [];
@@ -9100,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 {
@@ -9379,6 +9383,8 @@ function appendSharedSections(sections, ctx, options) {
  */
 function buildArchitectTask(ctx, meta, config) {
     const sections = [
+        `# jeeves-meta · ARCHITECT · ${ctx.path}`,
+        '',
         meta._architect ?? config.defaultArchitect ?? DEFAULT_ARCHITECT_PROMPT,
         '',
         '## SCOPE',
@@ -9409,6 +9415,8 @@ function buildArchitectTask(ctx, meta, config) {
  */
 function buildBuilderTask(ctx, meta, config) {
     const sections = [
+        `# jeeves-meta · BUILDER · ${ctx.path}`,
+        '',
         '## TASK BRIEF (from Architect)',
         meta._builder ?? '(No architect brief available)',
         '',
@@ -9437,6 +9445,8 @@ function buildBuilderTask(ctx, meta, config) {
  */
 function buildCriticTask(ctx, meta, config) {
     const sections = [
+        `# jeeves-meta · CRITIC · ${ctx.path}`,
+        '',
         meta._critic ?? config.defaultCritic ?? DEFAULT_CRITIC_PROMPT,
         '',
         '## SYNTHESIS TO EVALUATE',
@@ -10109,6 +10119,7 @@ async function synthesizeNode(node, currentMeta, config, executor, watcher, onPr
             const architectResult = await executor.spawn(architectTask, {
                 thinking: config.thinking,
                 timeout: config.architectTimeout,
+                label: 'meta-architect',
             });
             builderBrief = parseArchitectOutput(architectResult.output);
             architectTokens = architectResult.tokens;
@@ -10157,6 +10168,7 @@ async function synthesizeNode(node, currentMeta, config, executor, watcher, onPr
         const builderResult = await executor.spawn(builderTask, {
             thinking: config.thinking,
             timeout: config.builderTimeout,
+            label: 'meta-builder',
         });
         builderOutput = parseBuilderOutput(builderResult.output);
         builderTokens = builderResult.tokens;
@@ -10211,6 +10223,7 @@ async function synthesizeNode(node, currentMeta, config, executor, watcher, onPr
         const criticResult = await executor.spawn(criticTask, {
             thinking: config.thinking,
             timeout: config.criticTimeout,
+            label: 'meta-critic',
         });
         feedback = parseCriticOutput(criticResult.output);
         criticTokens = criticResult.tokens;

package/package.json

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