1 files changed, 6 insertions, 1 deletions
diff --git a/packages/cli/src/nonInteractiveCli.ts b/packages/cli/src/nonInteractiveCli.ts
index 95a9c51c..64a87162 100644
--- a/packages/cli/src/nonInteractiveCli.ts
+++ b/packages/cli/src/nonInteractiveCli.ts
@@ -110,10 +110,15 @@ export async function runNonInteractive(
           );
 
           if (toolResponse.error) {
+            const isToolNotFound = toolResponse.error.message.includes(
+              'not found in registry',
+            );
             console.error(
               `Error executing tool ${fc.name}: ${toolResponse.resultDisplay || toolResponse.error.message}`,
             );
-            process.exit(1);
+            if (!isToolNotFound) {
+              process.exit(1);
+            }
           }
 
           if (toolResponse.responseParts) {