Make IF simpler

project/blocks.txt

@@ -7,7 +7,7 @@ VALUE: make_json(inputs(KEYN: value, FIELDN: value)) // N starts at 0; you can m
 VALUE: call_api(inputs(METHOD: "GET/POST/PUT/DELETE", URL: value, HEADERS: value)) // HEADERS is optional
 
 # Logic
-STATEMENT: controls_if(inputs(IF: value, IFELSEN0: value, ELSE)) // IF is REQUIRED (the condition). IFELSEN0, IFELSEN1, etc are OPTIONAL (additional else-if conditions). ELSE is OPTIONAL (no value needed, just include the word). DO NOT use input_name with controls_if creation; specify all conditions in the inputs. After creating, use input_name to place statements: "DO0" (IF then-statements), "DO1" (first ELSE-IF then-statements), "ELSE" (final else statements)
+STATEMENT: controls_if(inputs(IF0: value, IF1: value, IF2: value, ELSE)) // IF0 is REQUIRED (the main condition). IF1, IF2, IF3, etc are OPTIONAL (additional else-if conditions). ELSE is OPTIONAL (no value needed, just include the word). DO NOT use input_name with controls_if creation; specify all conditions in the inputs. After creating, use input_name to place statements: "DO0" (IF then-statements), "DO1" (first ELSE-IF then-statements), "DO2" (second ELSE-IF then-statements), "ELSE" (final else statements)
 VALUE: logic_negate(inputs())
 VALUE: logic_boolean(inputs(BOOL: "TRUE/FALSE"))
 VALUE: logic_null(inputs())

project/chat.py

@@ -617,19 +617,21 @@ def create_gradio_interface():
     The entire IF/ELSE structure must be created in one `create_block` call.
 
     **Structure:**
-    `controls_if(inputs(IF: cond, IFELSEN0: cond2, IFELSEN1: cond3, ELSE))`
+    `controls_if(inputs(IF0: cond, IF1: cond2, IF2: cond3, ELSE))`
 
-    - `IF:` first condition (required)
-    - `IFELSEN#:` else-if conditions (optional)
+    - `IF0:` first/main condition (required)
+    - `IF1:`, `IF2:`, `IF3:`, etc. - else-if conditions (optional)
     - `ELSE` keyword (optional, no value)
 
     **Do NOT:**
     - Add ELSE or ELSE-IF later using `input_name`
     - Give ELSE a value
+    - Use `IF:` alone without a number (must be `IF0`)
 
     **Correct placement after creation:**
-    - `input_name: "DO0"`: IF branch
-    - `input_name: "DO1"`: first ELSE-IF branch
+    - `input_name: "DO0"`: Main IF branch
+    - `input_name: "DO1"`: First ELSE-IF branch
+    - `input_name: "DO2"`: Second ELSE-IF branch
     - `input_name: "ELSE"`: ELSE branch
 
     YOU CANNOT EDIT THE IF BLOCK LATER. IF YOU WILL NEED TO HAVE AN ELSE OR IFELSE LATER, YOU MUST CREATE IT WITH ALL BRANCHES FROM THE START.
@@ -731,6 +733,8 @@ def create_gradio_interface():
 
     Always build the container/assignment block FIRST, then construct the value expression INSIDE it, both in a single call.
 
+    Creating variables is not sufficient on its own. In addition to that, you MUST not forget to return the variable in the MCP block output slot.
+
     ### No Early Returns in Conditionals
 
     Blockly does not support early returns from within conditional branches. You MUST use a variable to store the result and return that variable in the MCP output:
@@ -753,6 +757,7 @@ def create_gradio_interface():
     Before creating or deleting any blocks, always begin with a *Planning Phase*:
 
     0. Acknowledge the `VALUE BLOCK CONSTRUCTION: ABSOLUTE RULE` section and how you are prohibited from doing multi step calls for value blocks, and must do it in one create block call.
+    Then also acknowledge that you are required to set values in all MCP block output slots, and cannot forget and leave them empty.
 
     1. **Analyze the user's request.** Identify all required inputs, outputs, intermediate steps, loops, and conditionals.
 
@@ -807,7 +812,7 @@ def create_gradio_interface():
                     # Throwaway parameter to get the agent to think about IF rules.
                     "if_notes": {
                         "type": "string",
-                        "description": "If you are going to make an if statement, YOU ARE REQUIRED TO USE THIS. Write the amount if IF/IFELSE/ELSE you will need.",
+                        "description": "If you are going to make an if statement, YOU ARE REQUIRED TO USE THIS. Write the amount if IF/IFELSE/ELSE you will need. You MUST use this amount in the command. If you aren't making an if, say 'N/A'.",
                     },
                     "command": {
                         "type": "string",
@@ -827,7 +832,7 @@ def create_gradio_interface():
                         "description": "ONLY for two cases: placing value blocks into MCP output slots using 'R<N>', and placing statement blocks into specific branches of controls_if (DO0, DO1, ELSE). NEVER USE THIS PARAMETER UNLESS YOU ARE DOING ONE OF THOSE TWO EXACT THINGS.",
                     },
                 },
-                "required": ["command"],
+                "required": ["if_notes", "command"],
             }
         },
         {
@@ -1048,7 +1053,6 @@ def create_gradio_interface():
                 
                 # PROCESSING TOOL CALLS
                 if tool_calls:
-
                     # Show assistant text FIRST if it exists
                     if ai_response:
                         if accumulated_response:

project/src/index.js

@@ -691,9 +691,10 @@ const setupUnifiedStream = () => {
                 console.log('[SSE CREATE] controls_if inputs:', inputs);
 
                 // Process condition inputs and store block objects
+                // Blockly uses IF0, IF1, IF2... not IF, IFELSEN0, IFELSEN1
                 for (const [key, value] of Object.entries(inputs)) {
-                  if (key === 'IF' || key.match(/^IFELSEN\d+$/)) {
-                    // This is a condition block specification (not a value for a field)
+                  if (key.match(/^IF\d+$/)) {
+                    // This is a condition block specification (IF0, IF1, IF2, ...)
                     conditionBlocks[key] = value;
 
                     if (typeof value === 'string' && value.match(/^\w+\s*\(inputs\(/)) {
@@ -709,10 +710,10 @@ const setupUnifiedStream = () => {
                   }
                 }
 
-                // Count IFELSEN blocks
+                // Count IFELSE (else-if) blocks: IF1, IF2, IF3... (IF0 is the main if, not an else-if)
                 let elseIfCount = 0;
                 for (const key of Object.keys(conditionBlocks)) {
-                  if (key.match(/^IFELSEN\d+$/)) {
+                  if (key.match(/^IF\d+$/) && key !== 'IF0') {
                     elseIfCount++;
                   }
                 }
@@ -813,35 +814,33 @@ const setupUnifiedStream = () => {
                   const conditionBlockObjects = newBlock.pendingConditionBlockObjects_;
                   console.log('[SSE CREATE] Connecting condition blocks:', Object.keys(conditionBlockObjects));
 
-                  // Connect the IF condition
-                  if (conditionBlockObjects['IF']) {
-                    const ifBlock = conditionBlockObjects['IF'];
+                  // Connect the IF0 condition
+                  if (conditionBlockObjects['IF0']) {
+                    const ifBlock = conditionBlockObjects['IF0'];
                     const input = newBlock.getInput('IF0');
                     console.log('[SSE CREATE] IF0 input exists?', !!input);
                     if (input && input.connection && ifBlock.outputConnection) {
                       ifBlock.outputConnection.connect(input.connection);
-                      console.log('[SSE CREATE] Connected IF condition');
+                      console.log('[SSE CREATE] Connected IF0 condition');
                     } else {
-                      console.warn('[SSE CREATE] Could not connect IF - input:', !!input, 'childConnection:', !!ifBlock.outputConnection);
+                      console.warn('[SSE CREATE] Could not connect IF0 - input:', !!input, 'childConnection:', !!ifBlock.outputConnection);
                     }
                   }
 
-                  // Connect IFELSEN conditions
-                  console.log('[SSE CREATE] Processing', newBlock.pendingElseifCount_, 'IFELSEN conditions');
-                  for (let i = 0; i < newBlock.pendingElseifCount_; i++) {
-                    const key = 'IFELSEN' + i;
+                  // Connect IF1, IF2, IF3... (else-if conditions)
+                  console.log('[SSE CREATE] Processing', newBlock.pendingElseifCount_, 'else-if conditions');
+                  for (let i = 1; i <= newBlock.pendingElseifCount_; i++) {
+                    const key = 'IF' + i;
                     console.log('[SSE CREATE] Looking for key:', key, 'exists?', !!conditionBlockObjects[key]);
                     if (conditionBlockObjects[key]) {
                       const ifElseBlock = conditionBlockObjects[key];
-                      // IFELSEN blocks connect to IF1, IF2, etc.
-                      const inputName = 'IF' + (i + 1);
-                      const input = newBlock.getInput(inputName);
-                      console.log('[SSE CREATE] Input', inputName, 'exists?', !!input);
+                      const input = newBlock.getInput(key);
+                      console.log('[SSE CREATE] Input', key, 'exists?', !!input);
                       if (input && input.connection && ifElseBlock.outputConnection) {
                         ifElseBlock.outputConnection.connect(input.connection);
-                        console.log('[SSE CREATE] Connected IFELSEN' + i + ' condition to ' + inputName);
+                        console.log('[SSE CREATE] Connected', key, 'condition');
                       } else {
-                        console.warn('[SSE CREATE] Could not connect IFELSEN' + i + ' - input ' + inputName + ' exists:', !!input, 'has connection:', input ? !!input.connection : false, 'childHasOutput:', !!ifElseBlock.outputConnection);
+                        console.warn('[SSE CREATE] Could not connect', key, '- input exists:', !!input, 'has connection:', input ? !!input.connection : false, 'childHasOutput:', !!ifElseBlock.outputConnection);
                       }
                     }
                   }