tweaks

Author: jahooma

cli/src/utils/implementor-helpers.ts

@@ -35,7 +35,7 @@ export const getImplementorDisplayName = (
   ) {
     baseName = 'Opus'
   } else if (agentType.includes('editor-implementor2-gpt-5')) {
-    baseName = 'GPT-5'
+    baseName = 'GPT-5.2'
   } else if (agentType.includes('editor-implementor2-sonnet')) {
     baseName = 'Sonnet'
     // Then check editor-implementor-* patterns (less specific)
@@ -44,7 +44,7 @@ export const getImplementorDisplayName = (
   } else if (agentType.includes('editor-implementor-gemini')) {
     baseName = 'Gemini'
   } else if (agentType.includes('editor-implementor-gpt-5')) {
-    baseName = 'GPT-5.2'
+    baseName = 'GPT-5'
   } else if (agentType.includes('editor-implementor')) {
     baseName = 'Sonnet'
   }

packages/agent-runtime/src/tools/tool-executor.ts

@@ -401,27 +401,11 @@ export async function executeCustomToolCall(
     },
     autoInsertEndStepParam,
   })
-  if ('error' in toolCall) {
-    const toolResult: ToolMessage = {
-      role: 'tool',
-      toolName,
-      toolCallId: toolCall.toolCallId,
-      content: jsonToolResult({
-        errorMessage: toolCall.error,
-      }),
-    }
-    toolResults.push(cloneDeep(toolResult))
-    toolResultsToAddAfterStream.push(cloneDeep(toolResult))
-    logger.debug(
-      { toolCall, error: toolCall.error },
-      `${toolName} error: ${toolCall.error}`,
-    )
-    return previousToolCallFinished
-  }
 
   // Filter out restricted tools - emit error instead of tool call/result
   // This prevents the CLI from showing tool calls that the agent doesn't have permission to use
   if (
+    toolCall.toolName &&
     !(agentTemplate.toolNames as string[]).includes(toolCall.toolName) &&
     !fromHandleSteps &&
     !(
@@ -438,6 +422,24 @@ export async function executeCustomToolCall(
     return previousToolCallFinished
   }
 
+  if ('error' in toolCall) {
+    const toolResult: ToolMessage = {
+      role: 'tool',
+      toolName,
+      toolCallId: toolCall.toolCallId,
+      content: jsonToolResult({
+        errorMessage: toolCall.error,
+      }),
+    }
+    toolResults.push(cloneDeep(toolResult))
+    toolResultsToAddAfterStream.push(cloneDeep(toolResult))
+    logger.debug(
+      { toolCall, error: toolCall.error },
+      `${toolName} error: ${toolCall.error}`,
+    )
+    return previousToolCallFinished
+  }
+
   // Only emit tool_call event after permission check passes
   onResponseChunk({
     type: 'tool_call',