@evalops/maestro 0.10.40 → 0.10.41

package/dist/cli.js

@@ -73409,16 +73409,37 @@ function cloneToolResultForCache(message) {
     content: message.content.map((item) => ({ ...item }))
   };
 }
-function cloneToolOutcomeForCall(outcome, toolCall, timestamp3) {
+function localToolExecutionIdForCall(toolCall) {
+  return `local-tool-exec-${toolCall.id}`;
+}
+function attachToolExecutionMetadata(message, metadata, options = {}) {
+  const details = message.details && typeof message.details === "object" ? { ...message.details } : {};
+  if (metadata.toolExecutionId) {
+    details.toolExecutionId = metadata.toolExecutionId;
+  }
+  if (metadata.approvalRequestId) {
+    details.approvalRequestId = metadata.approvalRequestId;
+  } else if (options.replaceApprovalRequestId) {
+    delete details.approvalRequestId;
+  }
   return {
-    message: {
+    ...message,
+    details
+  };
+}
+function cloneToolOutcomeForCall(outcome, toolCall, timestamp3, metadata = {}) {
+  const toolExecutionId = localToolExecutionIdForCall(toolCall);
+  return {
+    message: attachToolExecutionMetadata({
       ...outcome.message,
       toolCallId: toolCall.id,
       toolName: toolCall.name,
       content: outcome.message.content.map((item) => ({ ...item })),
       timestamp: timestamp3
-    },
-    isError: outcome.isError
+    }, { toolExecutionId, approvalRequestId: metadata.approvalRequestId }, { replaceApprovalRequestId: true }),
+    isError: outcome.isError,
+    toolExecutionId,
+    ...metadata.approvalRequestId ? { approvalRequestId: metadata.approvalRequestId } : {}
   };
 }
 function resolvePlatformToolExecutionBridge(option) {
@@ -73439,9 +73460,11 @@ async function recordReusableToolExecutionBridgeOutput({
   }
   const observed = plan.kind === "observe" ? await bridge.recordObservation(plan, outcome.message, signal) : void 0;
   const governedOutput = plan.kind === "governed" ? await bridge.recordGovernedOutput(plan, outcome.message, durationMs, signal) : void 0;
+  const metadata = buildObservedResultMetadata(plan, observed ?? governedOutput);
   return {
     ...outcome,
-    ...buildObservedResultMetadata(plan, observed ?? governedOutput)
+    ...metadata,
+    message: attachToolExecutionMetadata(outcome.message, metadata)
   };
 }
 function hasReusableToolResultState(cacheKey, cache4, pending, policyCheckedKeys, pendingSafetyChecks) {
@@ -82771,6 +82794,7 @@ function createToolExecutionPromise(ctx) {
   const autoMaxAttempts = isClientTool ? 1 : toolHasRetryConfig ? (tool.maxRetries ?? resolvedRetryConfig.maxAutoRetries) + 1 : allowAutoRetries ? resolvedRetryConfig.maxAutoRetries + 1 : 1;
   const retryDelay = toolHasRetryConfig ? tool.retryDelayMs ?? resolvedRetryConfig.initialDelayMs : resolvedRetryConfig.initialDelayMs;
   const shouldRetryFn = tool.shouldRetry ?? isRetryableToolError;
+  const fallbackToolExecutionId = `local-tool-exec-${toolCall.id}`;
   const context2 = cfg.sandbox ? { sandbox: cfg.sandbox } : void 0;
   const onUpdate = (partialResult) => {
     toolUpdateQueue.push({
@@ -82798,20 +82822,25 @@ function createToolExecutionPromise(ctx) {
     }
     return runWithMcpClientToolService(clientToolService2, () => tool.execute(toolCall.id, validatedArgs, signal, context2, onUpdate));
   };
-  const attachApprovalRequestId = (message) => {
-    if (!approvalRequestId) {
-      return;
-    }
-    const details = message.details && typeof message.details === "object" ? { ...message.details } : {};
-    if (typeof details.approvalRequestId !== "string") {
-      details.approvalRequestId = approvalRequestId;
-    }
-    message.details = details;
+  const toolExecutionIdFromMessage = (message) => {
+    const details = message.details && typeof message.details === "object" ? message.details : {};
+    return typeof details.toolExecutionId === "string" && details.toolExecutionId.length > 0 ? details.toolExecutionId : void 0;
   };
-  const withLocalApprovalMetadata = (metadata) => ({
+  const withLocalExecutionMetadata = (metadata, message) => ({
     ...metadata,
+    toolExecutionId: metadata.toolExecutionId ?? (message ? toolExecutionIdFromMessage(message) : void 0) ?? fallbackToolExecutionId,
     ...approvalRequestId && !metadata.approvalRequestId ? { approvalRequestId } : {}
   });
+  const attachToolResultLinkage = (message, metadata) => {
+    const resolvedMetadata = withLocalExecutionMetadata(metadata, message);
+    const details = message.details && typeof message.details === "object" ? { ...message.details } : {};
+    details.toolExecutionId = resolvedMetadata.toolExecutionId;
+    if (resolvedMetadata.approvalRequestId && typeof details.approvalRequestId !== "string") {
+      details.approvalRequestId = resolvedMetadata.approvalRequestId;
+    }
+    message.details = details;
+    return resolvedMetadata;
+  };
   const executeWithRetry = async () => {
     let totalAttempts = 0;
     let userRetryRounds = 0;
@@ -82905,7 +82934,10 @@ function createToolExecutionPromise(ctx) {
         isError: result2.isError || false,
         timestamp: clock.now()
       };
-      attachApprovalRequestId(toolResultMsg);
+      attachToolResultLinkage(toolResultMsg, {
+        toolExecutionId: result2.toolExecutionId ?? toolExecutionBridgePlan?.metadata.toolExecutionId,
+        approvalRequestId: result2.approvalRequestId ?? toolExecutionBridgePlan?.metadata.approvalRequestId
+      });
       if (hookService && !result2.isError) {
         const postHookResult = await hookService.runPostToolUseHooks(effectiveToolCall, toolResultMsg, signal);
         if (postHookResult.additionalContext) {
@@ -82978,10 +83010,11 @@ function createToolExecutionPromise(ctx) {
       }
       const observed = toolExecutionBridge && toolExecutionBridgePlan?.kind === "observe" ? await toolExecutionBridge.recordObservation(toolExecutionBridgePlan, toolResultMsg, signal) : void 0;
       const governedOutput = toolExecutionBridge && toolExecutionBridgePlan?.kind === "governed" ? await toolExecutionBridge.recordGovernedOutput(toolExecutionBridgePlan, toolResultMsg, clock.now() - startTime, signal) : void 0;
+      const linkageMetadata = attachToolResultLinkage(toolResultMsg, buildObservedResultMetadata(toolExecutionBridgePlan, observed ?? governedOutput));
       return {
         message: toolResultMsg,
         isError: toolResultMsg.isError,
-        ...withLocalApprovalMetadata(buildObservedResultMetadata(toolExecutionBridgePlan, observed ?? governedOutput))
+        ...linkageMetadata
       };
     } catch (error) {
       if (error instanceof Error && error.name === "AbortError") {
@@ -83006,7 +83039,10 @@ function createToolExecutionPromise(ctx) {
         isError: true,
         timestamp: clock.now()
       };
-      attachApprovalRequestId(toolResultMsg);
+      attachToolResultLinkage(toolResultMsg, {
+        toolExecutionId: toolExecutionBridgePlan?.metadata.toolExecutionId,
+        approvalRequestId: toolExecutionBridgePlan?.metadata.approvalRequestId
+      });
       if (hookService) {
         const failureHookResult = await hookService.runPostToolUseFailureHooks(effectiveToolCall, baseErrorMessage, signal);
         if (failureHookResult.additionalContext) {
@@ -83022,10 +83058,11 @@ function createToolExecutionPromise(ctx) {
       }
       const observed = toolExecutionBridge && toolExecutionBridgePlan?.kind === "observe" ? await toolExecutionBridge.recordObservation(toolExecutionBridgePlan, toolResultMsg, signal) : void 0;
       const governedOutput = toolExecutionBridge && toolExecutionBridgePlan?.kind === "governed" ? await toolExecutionBridge.recordGovernedOutput(toolExecutionBridgePlan, toolResultMsg, clock.now() - startTime, signal) : void 0;
+      const linkageMetadata = attachToolResultLinkage(toolResultMsg, buildObservedResultMetadata(toolExecutionBridgePlan, observed ?? governedOutput));
       return {
         message: toolResultMsg,
         isError: true,
-        ...withLocalApprovalMetadata(buildObservedResultMetadata(toolExecutionBridgePlan, observed ?? governedOutput))
+        ...linkageMetadata
       };
     }
   })();
@@ -84240,18 +84277,7 @@ var ProviderTransport = class _ProviderTransport {
             const cachedOutcome = await recordReusableToolExecutionBridgeOutput({
               bridge: platformToolExecutionBridge,
               plan: safetyVerdict.toolExecutionBridgePlan,
-              outcome: {
-                message: {
-                  ...cachedEntry.message,
-                  toolCallId: toolCall.id,
-                  toolName: toolCall.name,
-                  content: cachedEntry.message.content.map((item) => ({
-                    ...item
-                  })),
-                  timestamp: this.clock.now()
-                },
-                isError: false
-              },
+              outcome: cloneToolOutcomeForCall({ message: cachedEntry.message, isError: false }, toolCall, this.clock.now(), { approvalRequestId: safetyVerdict.approvalRequestId }),
               durationMs: this.clock.now() - cacheHitStart,
               signal
             });
@@ -84267,7 +84293,7 @@ var ProviderTransport = class _ProviderTransport {
             const cachedOutcome = await recordReusableToolExecutionBridgeOutput({
               bridge: platformToolExecutionBridge,
               plan: safetyVerdict.toolExecutionBridgePlan,
-              outcome: cloneToolOutcomeForCall(await pendingReusable, toolCall, this.clock.now()),
+              outcome: cloneToolOutcomeForCall(await pendingReusable, toolCall, this.clock.now(), { approvalRequestId: safetyVerdict.approvalRequestId }),
               durationMs: this.clock.now() - cacheHitStart,
               signal
             });
@@ -85189,18 +85215,7 @@ var ProviderTransport = class _ProviderTransport {
               const cachedOutcome = await recordReusableToolExecutionBridgeOutput({
                 bridge: platformToolExecutionBridge,
                 plan: safetyVerdict.toolExecutionBridgePlan,
-                outcome: {
-                  message: {
-                    ...cachedEntry.message,
-                    toolCallId: toolCall.id,
-                    toolName: toolCall.name,
-                    content: cachedEntry.message.content.map((item) => ({
-                      ...item
-                    })),
-                    timestamp: this.clock.now()
-                  },
-                  isError: false
-                },
+                outcome: cloneToolOutcomeForCall({ message: cachedEntry.message, isError: false }, toolCall, this.clock.now(), { approvalRequestId: safetyVerdict.approvalRequestId }),
                 durationMs: this.clock.now() - cacheHitStart,
                 signal
               });
@@ -85254,7 +85269,9 @@ var ProviderTransport = class _ProviderTransport {
                   return recordReusableToolExecutionBridgeOutput({
                     bridge: platformToolExecutionBridge,
                     plan: safetyVerdict.toolExecutionBridgePlan,
-                    outcome: cloneToolOutcomeForCall(await pendingReusable, toolCall, this.clock.now()),
+                    outcome: cloneToolOutcomeForCall(await pendingReusable, toolCall, this.clock.now(), {
+                      approvalRequestId: safetyVerdict.approvalRequestId
+                    }),
                     durationMs: this.clock.now() - cacheHitStart,
                     signal
                   });

package/dist/node_modules/@evalops/contracts/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evalops/contracts",
-	"version": "0.10.40",
+	"version": "0.10.41",
 	"description": "Shared Maestro contracts for frontend/backend integration",
 	"type": "module",
 	"main": "./dist/index.js",

package/dist/node_modules/@evalops/tui/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evalops/tui",
-	"version": "0.10.40",
+	"version": "0.10.41",
 	"description": "Terminal UI library with differential rendering for Maestro",
 	"type": "module",
 	"main": "./dist/index.js",

package/dist/version.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.10.40",
-  "notes": "Maestro by EvalOps - Deterministic coding agent with TUI/CLI and Web UI for AI-assisted development v0.10.40 is now available."
+  "version": "0.10.41",
+  "notes": "Maestro by EvalOps - Deterministic coding agent with TUI/CLI and Web UI for AI-assisted development v0.10.41 is now available."
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@evalops/maestro",
   "description": "Maestro by EvalOps - Deterministic coding agent with TUI/CLI and Web UI for AI-assisted development",
-  "version": "0.10.40",
+  "version": "0.10.41",
   "private": false,
   "type": "module",
   "workspaces": [