@the-open-engine/zeroshot 6.10.2 → 6.12.0

package/src/agent/agent-hook-executor.js

@@ -40,7 +40,12 @@ function deepMerge(target, source) {
   return result;
 }
 
+function hasCachedParsedResult(result) {
+  return result?.parsedResult !== undefined && result.parsedResult !== null;
+}
+
 async function parseResultDataForHookLogic({ agent, result }) {
+  if (hasCachedParsedResult(result)) return result.parsedResult;
   if (!result?.output) return null;
   try {
     return await agent._parseResultOutput(result.output);
@@ -178,10 +183,12 @@ function logMissingResultFields({ agent, context, accessedFields, missingFields,
 }
 
 async function parseTransformResultData({ context, agent, script, scriptUsesResult }) {
-  if (context.result?.output) {
-    let resultData = null;
+  if (hasCachedParsedResult(context.result) || context.result?.output) {
+    let resultData = context.result?.parsedResult ?? null;
     try {
-      resultData = await agent._parseResultOutput(context.result.output);
+      if (!hasCachedParsedResult(context.result)) {
+        resultData = await agent._parseResultOutput(context.result.output);
+      }
     } catch (parseError) {
       logTransformParseFailure({ agent, context, parseError });
       throw new Error(
@@ -423,7 +430,7 @@ async function substituteTemplate(params) {
           `Agent: ${agent.id}, TaskID: ${agent.currentTaskId}, Iteration: ${agent.iteration}`
       );
     }
-    if (!context.result.output) {
+    if (!context.result.output && !hasCachedParsedResult(context.result)) {
       // Log detailed context for debugging
       const taskId = context.result.taskId || agent.currentTaskId || 'UNKNOWN';
       console.error(`\n${'='.repeat(80)}`);
@@ -478,8 +485,9 @@ async function substituteTemplate(params) {
           `Task logs posted to message bus.`
       );
     }
-    // Parse result output - WILL THROW if no JSON block
-    resultData = await agent._parseResultOutput(context.result.output);
+    resultData = hasCachedParsedResult(context.result)
+      ? context.result.parsedResult
+      : await agent._parseResultOutput(context.result.output);
   }
 
   // Helper to escape a value for JSON string substitution

package/src/agent/agent-lifecycle.js

@@ -201,7 +201,8 @@ function start(agent) {
 async function stop(agent) {
   stopLivenessCheck(agent);
 
-  if (!agent.running && !agent.currentTask) {
+  const hasNestedExecutions = agent.nestedExecutions?.hasActive === true;
+  if (!agent.running && !agent.currentTask && !hasNestedExecutions) {
     return;
   }
 
@@ -213,8 +214,8 @@ async function stop(agent) {
     agent.unsubscribe = null;
   }
 
-  // Kill current task if any
-  if (agent.currentTask) {
+  // Kill parent and child executions through the shared ownership boundary.
+  if (agent.currentTask || hasNestedExecutions) {
     const termination = await agent._killTask('Task stopped by cluster shutdown');
     if (termination?.forced === false) {
       throw new Error(`Task shutdown could not confirm termination: ${termination.reason}`);
@@ -1132,7 +1133,9 @@ function startLivenessCheck(agent) {
 
   agent.livenessCheckInterval = setInterval(() => {
     const hasRecoverableTask =
-      Boolean(agent.currentTask) || Boolean(agent.isolation?.enabled && agent.currentTaskId);
+      Boolean(agent.currentTask) ||
+      Boolean(agent.isolation?.enabled && agent.currentTaskId) ||
+      agent.nestedExecutions?.hasActive === true;
     if (!hasRecoverableTask || agent.livenessTerminationStarted) {
       return;
     }
@@ -1194,11 +1197,16 @@ function startLivenessCheck(agent) {
 const MAX_LIVENESS_TERMINATION_ATTEMPTS = 3;
 
 function beginLivenessTermination(agent, settings, reason, code, eventData) {
+  const nestedTaskIds = agent.nestedExecutions?.activeTaskIds || [];
   agent.livenessTerminationContext = {
     taskId: agent.currentTaskId,
+    nestedTaskIds,
     reason,
     code,
-    eventData,
+    eventData: {
+      ...eventData,
+      ...(nestedTaskIds.length > 0 ? { nestedTaskIds } : {}),
+    },
     eventPublished: false,
   };
   agent.livenessTerminationAttempts = 0;
@@ -1249,6 +1257,7 @@ function attemptLivenessTermination(agent, settings) {
       agent.livenessTerminationStarted = false;
       agent._publishLifecycle('AGENT_TERMINATION_RETRY', {
         taskId: context.taskId,
+        nestedTaskIds: context.nestedTaskIds,
         reason: context.reason,
         code: context.code,
         error: error.message,
@@ -1272,13 +1281,17 @@ function exhaustLivenessTermination(agent, context, terminationError) {
 
   const attempts = agent.livenessTerminationAttempts;
   publishLivenessTerminationEvent(agent, context);
+  const taskIdentity =
+    context.taskId || context.nestedTaskIds.join(', ') || 'unknown provider task';
   const error = new Error(
-    `Failed to terminate isolated task ${context.taskId} after ${attempts} attempts; ` +
+    `Failed to terminate provider task ${taskIdentity} after ${attempts} attempts; ` +
       `the provider task may still be running. Manual recovery is required before resume. ` +
       `Last error: ${terminationError.message}`
   );
   error.code = 'ISOLATED_TASK_TERMINATION_EXHAUSTED';
-  error.taskId = context.taskId;
+  error.taskId = context.taskId || context.nestedTaskIds[0] || null;
+  error.parentTaskId = context.taskId;
+  error.nestedTaskIds = context.nestedTaskIds;
   error.permanent = true;
   error.restartExhausted = true;
   error.terminationExhausted = true;
@@ -1289,6 +1302,7 @@ function exhaustLivenessTermination(agent, context, terminationError) {
   agent.cluster.failureInfo = {
     agentId: agent.id,
     taskId: context.taskId,
+    nestedTaskIds: context.nestedTaskIds,
     iteration: agent.iteration,
     type: 'task_termination',
     reason: 'termination_unverified',
@@ -1298,6 +1312,7 @@ function exhaustLivenessTermination(agent, context, terminationError) {
   };
   agent._publishLifecycle('AGENT_TERMINATION_EXHAUSTED', {
     taskId: context.taskId,
+    nestedTaskIds: context.nestedTaskIds,
     reason: context.reason,
     code: error.code,
     terminationCode: context.code,
@@ -1307,10 +1322,12 @@ function exhaustLivenessTermination(agent, context, terminationError) {
     requiresManualRecovery: true,
   });
 
+  let dispatched = agent.nestedExecutions?.failClosed(error) === true;
   if (typeof agent.currentTask?.failClosed === 'function') {
     agent.currentTask.failClosed(error);
-    return;
+    dispatched = true;
   }
+  if (dispatched) return;
 
   agent._log(`[${agent.id}] ${error.message}`);
 }