infinicode 2.8.43 → 2.8.45

package/dist/kernel/federation/dashboard-html.js

@@ -1319,40 +1319,67 @@ button.act:disabled{opacity:0.5;cursor:default;}
       return r.json();
     });
   }
-  function mergeSchedulerRobots(nodes){
-    return Promise.all([getJson('/robopark/api/robots'), getJson('/robopark/api/devices')]).then(function(data){
-      var rows = data[0], devices = data[1];
-      var deviceById = {}, deviceByName = {};
-      (Array.isArray(devices)?devices:[]).forEach(function(device){ deviceById[device.id] = device; if(device.name) deviceByName[device.name] = device; });
-      schedulerDevicesById = deviceById;
-      schedulerDevicesByName = deviceByName;
-      var merged = (nodes||[]).slice();
-      (Array.isArray(rows)?rows:[]).forEach(function(row){
-        var id = row.id || row.robot_id;
-        if(!id) return;
-        var name = row.name || id;
-        var duplicate = merged.some(function(n){
-          return n.schedulerRobotId===id || n.displayName===name || n.nodeId===id;
-        });
-        if(duplicate) return;
-        var device = deviceById[id] || {};
-        var status = String(device.status || row.status || '').toLowerCase();
-        var connected = ['online','detecting','connecting','running'].indexOf(status)>=0;
-        var keys = [String(id).toLowerCase(), String(name).toLowerCase()];
-        merged.push({
-          nodeId: 'scheduler-robot-'+id,
-          schedulerRobotId: id,
-          displayName: name,
+  function mergeSchedulerRobots(nodes){
+    return Promise.all([getJson('/robopark/api/robots'), getJson('/robopark/api/devices')]).then(function(data){
+      var rows = data[0], devices = data[1];
+      var deviceById = {}, deviceByName = {};
+      function norm(v){ return String(v||'').trim().toLowerCase(); }
+      (Array.isArray(devices)?devices:[]).forEach(function(device){
+        deviceById[device.id] = device;
+        if(device.name) deviceByName[norm(device.name)] = device;
+      });
+      schedulerDevicesById = deviceById;
+      schedulerDevicesByName = deviceByName;
+      var merged = (nodes||[]).slice();
+      var candidates = (Array.isArray(rows)?rows:[]).slice();
+      // Enrollment creates a devices row first; include it even when the
+      // legacy robots table has not been populated for that device yet.
+      (Array.isArray(devices)?devices:[]).forEach(function(device){
+        var already = candidates.some(function(row){
+          return norm(row.id||row.robot_id)===norm(device.id) || norm(row.name)===norm(device.name);
+        });
+        if(!already) candidates.push({id:device.id, name:device.name});
+      });
+      candidates.forEach(function(row){
+        var id = row.id || row.robot_id;
+        if(!id) return;
+        var name = row.name || id;
+        var device = deviceById[id] || deviceByName[norm(name)] || {};
+        var status = String(device.status || row.status || '').toLowerCase();
+        var heartbeat = device.last_heartbeat || row.last_heartbeat;
+        var heartbeatAt = heartbeat ? Date.parse(heartbeat) : NaN;
+        var heartbeatFresh = Number.isFinite(heartbeatAt) && (Date.now()-heartbeatAt) < 45_000;
+        var connected = heartbeatFresh || ['online','detecting','connecting','running'].indexOf(status)>=0;
+        var keys = [String(id).toLowerCase(), String(name).toLowerCase()];
+        var existing = merged.find(function(n){
+          return norm(n.schedulerRobotId)===norm(id)
+            || norm(n.nodeId)===norm(id)
+            || norm(n.displayName)===norm(name);
+        });
+        if(existing){
+          existing.schedulerRobotId = id;
+          existing.schedulerDeviceId = device.id || id;
+          existing.displayName = existing.displayName || name;
+          existing.connected = !!existing.connected || connected;
+          existing.lastSeenAt = heartbeatAt && Number.isFinite(heartbeatAt) ? heartbeatAt : existing.lastSeenAt;
+          existing.telemKeys = (existing.telemKeys||[]).concat(keys).filter(function(v,i,a){return a.indexOf(v)===i;});
+          return;
+        }
+        merged.push({
+          nodeId: 'scheduler-robot-'+id,
+          schedulerRobotId: id,
+          schedulerDeviceId: device.id || id,
+          displayName: name,
           role: 'robot',
           platform: 'RoboPark robot',
           version: 'scheduler',
           capabilities: ['camera','microphone','voice'],
           connected: connected,
           load: 0,
-          lastSeenAt: device.last_heartbeat ? Date.parse(device.last_heartbeat) : (row.last_heartbeat ? Date.parse(row.last_heartbeat) : null),
-          telemKeys: keys,
-        });
-      });
+          lastSeenAt: heartbeatAt && Number.isFinite(heartbeatAt) ? heartbeatAt : null,
+          telemKeys: keys,
+        });
+      });
       return merged;
     }).catch(function(){ return nodes||[]; });
   }
@@ -2005,7 +2032,7 @@ button.act:disabled{opacity:0.5;cursor:default;}
       var grid = $('rp-grid'), totals = $('rp-totals');
       // stash per-robot rows so the Park drawer can show live session stats
       roboparkByName = {};
-      robotsFrom(d).forEach(function(x){ roboparkByName[robotName(x)] = x; if(x.name) roboparkByName[x.name] = x; });
+      robotsFrom(d).forEach(function(x){ roboparkByName[String(robotName(x)).toLowerCase()] = x; if(x.name) roboparkByName[String(x.name).toLowerCase()] = x; });
       // C4: also feed lastRobots for the Incidents sub-tab
       lastRobots = robotsFrom(d) || [];
       // push the same map into the Park so the canvas can color robots
@@ -3553,7 +3580,9 @@ button.act:disabled{opacity:0.5;cursor:default;}
           connected: match?!!match.connected:false,
           load: (match&&match.load!=null)?match.load:0,
           platform: match?(match.platform||''):'', version: match?(match.version||'?'):'—',
-          site: match?(match.site||''):'', caps: match?(match.capabilities||[]):[],
+          site: match?(match.site||''):'', caps: match?(match.capabilities||[]):[],
+          schedulerRobotId: match?(match.schedulerRobotId||match.schedulerDeviceId||''):'',
+          schedulerDeviceId: match?(match.schedulerDeviceId||match.schedulerRobotId||''):'',
           telemKeys: [slot.label.toLowerCase()].concat(slot.keys||[]).concat(match?[(match.displayName||'').toLowerCase()]:[]),
           wx:wx, wy:wy, _hit:prevHit(id)
         };
@@ -5285,7 +5314,7 @@ button.act:disabled{opacity:0.5;cursor:default;}
     // enrolled device's id is a generated dev_xxxx, distinct from its name).
     // Falls back to n.name if telemetry hasn't matched a row yet.
     function schedRow(n){
-      var row=roboparkByName[n.name], exact=row, keys=(n.telemKeys||[]).concat([String(n.name||'').toLowerCase()]);
+      var row=roboparkByName[String(n.name||'').toLowerCase()] || roboparkByName[n.name], exact=row, keys=(n.telemKeys||[]).concat([String(n.name||'').toLowerCase()]);
       var seen={}, candidates=[];
       for(var rk in roboparkByName){
         var candidate=roboparkByName[rk], cid=candidate&&(candidate.robot_id||candidate.id);
@@ -5309,7 +5338,7 @@ button.act:disabled{opacity:0.5;cursor:default;}
     function schedId(n){
       var row=schedRow(n); if(row&&(row.id||row.robot_id)) return row.id||row.robot_id;
       if(n.schedulerRobotId) return n.schedulerRobotId;
-      var byName=schedulerDevicesByName[n.name]; if(byName&&byName.id) return byName.id;
+      var byName=schedulerDevicesByName[String(n.name||'').toLowerCase()]; if(byName&&byName.id) return byName.id;
       return n.name;
     }
     function closeDrawer(){
@@ -5439,13 +5468,13 @@ button.act:disabled{opacity:0.5;cursor:default;}
     function pollRoboparkQuiet(){
       fetch('/robopark/api/telemetry'+QS,{cache:'no-store'}).then(function(r){return r.json();}).then(function(d){
         var list=(Array.isArray(d)?d:(d&&d.robots)||[]); roboparkByName={};
-        list.forEach(function(x){ roboparkByName[x.robot_id||x.id||x.name||'robot']=x; if(x.name) roboparkByName[x.name]=x; });
+        list.forEach(function(x){ roboparkByName[String(x.robot_id||x.id||x.name||'robot').toLowerCase()]=x; if(x.name) roboparkByName[String(x.name).toLowerCase()]=x; });
         refreshDrawer();
       }).catch(function(){});
     }
     function schedulerDevice(n){
       var row=schedRow(n), id=row&&(row.robot_id||row.id);
-      return (id&&schedulerDevicesById[id]) || schedulerDevicesById[n.schedulerRobotId] || schedulerDevicesByName[n.name] || schedulerDevicesById[n.name] || null;
+      return (id&&schedulerDevicesById[id]) || schedulerDevicesById[n.schedulerDeviceId] || schedulerDevicesById[n.schedulerRobotId] || schedulerDevicesByName[String(n.name||'').toLowerCase()] || schedulerDevicesById[n.name] || null;
     }
     function deviceList(inv, key, fallback){
       var list=inv&&Array.isArray(inv[key])?inv[key]:[];
@@ -5592,7 +5621,7 @@ button.act:disabled{opacity:0.5;cursor:default;}
     // available services from the supervisor_status report (if any),
     // otherwise shows a placeholder.
     function buildShellSection(robotId){
-      var device = robotId ? schedulerDeviceByName[robotName({name:robotId, id:robotId})] || null : null;
+      var device = robotId ? schedulerDevicesByName[String(robotName({name:robotId, id:robotId})||'').toLowerCase()] || null : null;
       // Try to read the device row by id directly
       try{
         for(var k in schedulerDevicesById){

package/dist/robopark/stop-all.js

@@ -18,6 +18,9 @@ const PATTERNS = [
     'cli.js serve', // source/dev invocation: `node dist/cli.js serve ...`
     'robopark serve',
     'robopark-cli.js serve',
+    // `robopark serve` detaches this child, so the Node launcher is gone while
+    // the Python scheduler remains. Match both Windows and POSIX separators.
+    'scheduler.{0,3}main\\.py',
     'preview_agent.py',
     'app_pi_clean.py',
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "infinicode",
-  "version": "2.8.43",
+  "version": "2.8.45",
   "description": "OpenKernel — provider-agnostic AI execution kernel. Native coding agent + mission-driven execution runtime.",
   "type": "module",
   "main": "./dist/kernel/index.js",

package/packages/robopark/scheduler/main.py

@@ -4166,6 +4166,8 @@ async def dashboard():
                     const showDevices = ref(true);
                     const showCommands = ref(false);
                     const commandNetwork = ref('lan');
+                    const commandHubLan = ref('http://192.168.1.12:47913');
+                    const commandHubTailscale = ref('http://100.84.147.24:47913');
                     const commandRobotId = ref('');
                     const newDevice = ref({ name: '', tailscale_ip: '', lan_ip: '', motor_server_url: '', character_id: '', livekit_url: '', video_device: 'auto', audio_device: 'default', notes: '' });
                     const rotatedToken = ref(null);
@@ -4527,11 +4529,9 @@ async def dashboard():
                     const dismissRotatedToken = () => { rotatedToken.value = null; };
                     const enrollmentCommand = (token) => {
                         if (!token) return '';
-                        const schedulerPort = window.location.port || '8080';
                         const networkFlag = enrollmentNetwork.value === 'tailscale' ? '--tailscale' : '--lan';
-                        const hubProtocol = window.location.protocol === 'https:' ? 'https://' : 'http://';
-                        const hubUrl = `${hubProtocol}${window.location.hostname}:47913`;
-                        return `robopark setup --robot --name "${token.name || token.device_id}" --hub-url ${hubUrl} --scheduler-port ${schedulerPort} ${networkFlag} --enrollment-token ${token.token} --start --auto-start`;
+                        const hubUrl = enrollmentNetwork.value === 'tailscale' ? commandHubTailscale.value : commandHubLan.value;
+                        return `robopark setup --robot --name "${token.name || token.device_id}" --hub-url ${hubUrl} --scheduler-port 8080 ${networkFlag} --enrollment-token ${token.token} --start --auto-start`;
                     };
 
                     const joinConversation = async (device) => {
@@ -4732,7 +4732,10 @@ async def dashboard():
                     const stackName = (id) => voiceStacks.value.find(s => s.id === id)?.name || '—';
                     const characterName = (id) => characterPresets.value.find(c => c.id === id)?.name || '—';
 
-                    const schedulerBase = () => window.location.origin;
+                    const schedulerBase = () => {
+                        const hub = commandNetwork.value === 'tailscale' ? commandHubTailscale.value : commandHubLan.value;
+                        return hub.replace(/:\\d+\\/?$/, ':8080').replace(/\\/$/, '');
+                    };
                     const selectedCommandRobot = computed(() => devices.value.find(d => d.id === commandRobotId.value) || devices.value[0] || null);
                     const commandRows = computed(() => {
                         const base = schedulerBase();
@@ -4741,10 +4744,11 @@ async def dashboard():
                         const robotName = robot?.name || '<ROBOT_NAME>';
                         const networkFlag = commandNetwork.value === 'tailscale' ? '--tailscale' : '--lan';
                         const tokenPlaceholder = '<ENROLLMENT_TOKEN_FROM_ADD_DEVICE>';
+                        const hub = commandNetwork.value === 'tailscale' ? commandHubTailscale.value : commandHubLan.value;
                         return [
                             { group: 'Scheduler', name: 'Health check', description: 'Confirm the control center API is reachable.', command: `curl -s ${base}/api/settings` },
                             { group: 'Scheduler', name: 'Start scheduler', description: 'Start the RoboPark scheduler and dashboard on port 8080.', command: 'robopark serve --port 8080' },
-                            { group: 'Robot', name: 'Enroll robot', description: `Generated for ${robotName} over ${commandNetwork.value}. Paste the one-time token from the Add Device dialog.`, command: `robopark setup --robot --name "${robotName}" --hub-url ${base.replace(/:\\d+$/, '')}:47913 --scheduler-port ${window.location.port || '8080'} ${networkFlag} --enrollment-token ${tokenPlaceholder} --start --auto-start` },
+                            { group: 'Robot', name: 'Enroll robot', description: `Generated for ${robotName} over ${commandNetwork.value}. Paste the one-time token from the Add Device dialog.`, command: `robopark setup --robot --name "${robotName}" --hub-url ${hub} --scheduler-port 8080 ${networkFlag} --enrollment-token ${tokenPlaceholder} --start --auto-start` },
                             { group: 'Robot', name: 'Simulate motion', description: 'Queue a full production trigger for the selected robot.', command: `curl -s -X POST ${base}/api/robots/${robotId}/simulate-trigger` },
                             { group: 'Robot', name: 'Stop conversation', description: 'Stop the active conversation and clear queued trigger state.', command: `curl -s -X POST ${base}/api/robots/${robotId}/simulate-stop` },
                             { group: 'Robot', name: 'Recover stale state', description: 'Release a robot stuck in connecting/running after a failed teardown.', command: `curl -s -X POST ${base}/api/robots/${robotId}/recover` },
@@ -4761,7 +4765,7 @@ async def dashboard():
 
                     return {
                         robots, servers, sessions, stats, connected, serverMetrics,
-                        devices, settings, livekit, showAddDevice, showDevices, showCommands, commandNetwork, commandRobotId, selectedCommandRobot, commandRows, copyCommand, newDevice, rotatedToken, enrollmentNetwork, enrollmentCommand, simulation,
+                        devices, settings, livekit, showAddDevice, showDevices, showCommands, commandNetwork, commandHubLan, commandHubTailscale, commandRobotId, selectedCommandRobot, commandRows, copyCommand, newDevice, rotatedToken, enrollmentNetwork, enrollmentCommand, simulation,
                         showLiveKitConfig, livekitForm, preview, deviceInventory,
                         voiceStacks, characterPresets, showVoiceStackForm, showCharacterForm,
                         editingVoiceStack, editingCharacter, voiceStackForm, characterForm,
@@ -4830,6 +4834,14 @@ async def dashboard():
                                     <button @click="commandNetwork = 'tailscale'" :class="commandNetwork === 'tailscale' ? 'bg-cyan-600' : 'bg-gray-700'" class="px-3 py-2 rounded text-sm">Tailscale</button>
                                 </div>
                             </div>
+                            <div class="grid md:grid-cols-2 gap-3 mb-4">
+                                <label class="text-xs text-gray-400">LAN hub URL
+                                    <input v-model="commandHubLan" class="block w-full mt-1 bg-gray-700 rounded px-3 py-2 text-sm text-white" placeholder="http://192.168.x.x:47913">
+                                </label>
+                                <label class="text-xs text-gray-400">Tailscale hub URL
+                                    <input v-model="commandHubTailscale" class="block w-full mt-1 bg-gray-700 rounded px-3 py-2 text-sm text-white" placeholder="http://100.x.x.x:47913">
+                                </label>
+                            </div>
                             <div class="grid md:grid-cols-2 gap-3">
                                 <div v-for="cmd in commandRows" :key="cmd.group + cmd.name" class="bg-gray-900 rounded p-3">
                                     <div class="flex items-start justify-between gap-2">