Merge pull request #1442 from Oneirocom/property-inspector

Property inspector

Author: benbot

.env

@@ -61,3 +61,5 @@ AWS_BUCKET_ENDPOINT=endpoint
 
 CLOUD_AGENT_KEY=key
 APT_ROOT_URL=http://0.0.0.0
+
+PLUGINS_DIRECTORY=./plugins

.eslintrc.json

@@ -6,6 +6,11 @@
     "@typescript-eslint/no-explicit-any": "off"
   },
   "overrides": [
+    {
+      "files": "*.json",
+      "parser": "jsonc-eslint-parser",
+      "rules": {}
+    },
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "typescript.tsserver.experimental.enableProjectDiagnostics": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
+    "source.fixAll.eslint": true
   },
   "editor.formatOnType": false,
   "editor.defaultFormatter": "esbenp.prettier-vscode",

apps/agent/src/index.ts

@@ -7,7 +7,7 @@
 
 import { AgentManager } from 'server/agents'
 import { app, initApp } from 'server/core'
-import { initLogger, getLogger } from 'shared/core'
+import { initLogger, getLogger } from 'server/logger'
 import 'regenerator-runtime/runtime'
 import pluginExports from './plugins'
 import { PRODUCTION, DONT_CRASH_ON_ERROR } from 'shared/config'

apps/client/src/main.tsx

@@ -11,26 +11,19 @@ import {
   STANDALONE,
 } from 'shared/config'
 import { PostHogProvider } from 'posthog-js/react'
-import { initLogger, getLogger } from 'shared/core'
 
 import plugins from './plugins'
 import { AppConfig } from '@magickml/providers'
 
 // We want to add this back in eventually, but it's causing some visual bugs
 //import './globals.css'
-
-initLogger({ name: 'AIDE' })
-
-const logger = getLogger()
-
-logger.info('loaded with plugins %o', plugins)
+console.info('loaded with plugins %o', plugins)
 /**
  * Initialize and render the MagickIDE component when running as a standalone editor (not inside an iframe)
  */
 if (window === window.parent) {
-  logger.info('not in iframe')
   if (STANDALONE) {
-    logger.info('standalone')
+    console.info('standalone')
     const container = document.getElementById('root') as Element
     const root = createRoot(container) // createRoot(container!) if you use TypeScript
       ; (window as any).root = root
@@ -57,7 +50,6 @@ if (window === window.parent) {
     root.render(<Root />)
   }
 } else {
-  logger.info('iframe: In iframe')
   /**
    * If the editor is loaded in an iframe, listen for messages from the parent to initialize and render the MagickIDE component
    */
@@ -77,10 +69,10 @@ if (window === window.parent) {
         event.origin !== window.location.origin &&
         !TRUSTED_PARENT_URLS.includes(event.origin)
       ) {
-        logger.error('Untrusted origin %s', event.origin);
+        console.error('Untrusted origin %s', event.origin);
         // Log the trusted origins for debugging purposes
         TRUSTED_PARENT_URLS.forEach(trustedUrl => {
-          logger.error('Trusted origin is %s', trustedUrl);
+          console.error('Trusted origin is %s', trustedUrl);
         });
 
         return;
@@ -110,15 +102,13 @@ if (window === window.parent) {
               </PostHogProvider>
             )
           } else {
-            logger.info('iframe: rendering without posthog')
             return <MagickIDE config={config} />
           }
         }
         const container = document.getElementById('root') as Element
         const root = createRoot(container) // createRoot(container!) if you use TypeScript
           ; (window as any).root = root
 
-        logger.info('iframe: rendering root')
         root.render(<Root />)
       }
     },

apps/cloud-agent-manager/src/main.ts

@@ -2,11 +2,12 @@ import {
   CloudAgentManager,
   FeathersSyncReporter,
 } from 'server/cloud-agent-manager'
-import { initLogger, getLogger } from 'shared/core'
-import { app, BullQueue, initApp } from 'server/core'
+import { initLogger, getLogger } from 'server/logger'
+import { app, initApp } from 'server/core'
 import { DONT_CRASH_ON_ERROR, PRODUCTION } from 'shared/config'
 import { initAgentCommander } from 'server/agents'
 import { getPinoTransport } from '@hyperdx/node-opentelemetry'
+import { BullQueue } from 'server/communication'
 
 if (PRODUCTION) {
   initLogger({
@@ -24,7 +25,7 @@ const logger = getLogger()
 function start() {
   logger.info('Starting cloud agent manager...')
   const manager = new CloudAgentManager({
-    newQueue: new BullQueue(),
+    newQueue: new BullQueue(app.get('redis')),
     agentStateReporter: new FeathersSyncReporter(),
     pubSub: app.get('pubsub'),
   })

apps/cloud-agent-worker/src/main.ts

@@ -1,5 +1,5 @@
 import { CloudAgentWorker } from 'server/cloud-agent-worker'
-import { initLogger, getLogger } from 'shared/core'
+import { initLogger, getLogger } from 'server/logger'
 import { initApp } from 'server/core'
 import pluginExports from './plugins'
 import { initAgentCommander } from 'server/agents'

apps/server/src/index.ts

@@ -7,7 +7,7 @@ import cors from '@koa/cors'
 import Router from '@koa/router'
 import { pluginManager } from 'shared/core'
 import { apis, initApp, app, Handler, initFileServer, Method, Middleware, Route, spells } from 'server/core'
-import { initLogger, getLogger } from 'shared/core'
+import { initLogger, getLogger } from 'server/logger'
 import { Context } from 'koa'
 import koaBody from 'koa-body'
 import compose from 'koa-compose'

docs/eventTaxonomy.md

@@ -0,0 +1,23 @@
+Agent events
+Events are a pubsub mechanism to communicate with agents and have them stream data back
+
+agent:{agentId}:event:run
+agent:{agentId}:event:spell
+agent:{agentId}:event:log
+agent:{agentId}:event:warn
+agent:{agentId}:event:error
+agent:{agentId}:event:command
+
+Agent jobs
+Jobs are a 1 to 1 relationship with agents and are used to do a thing once or on a schedule
+
+agent:{agentId}:job:run
+agent:{agentId}:job:update
+agent:{agentId}:job:delete
+
+Plugin events
+
+agent:{agentId}:{pluginName}:event
+
+agent:{agentId}:spellBook:play
+agent:{agentId}:spellBook:pause