initial agent deploy changes

.env

@@ -1,8 +1,11 @@
 ###### Default settings, override in .env.local file that is auto-generated on install ######
 DATABASE_URL=postgresql://magick:magick_default_pw@localhost:5432/magick
 # Copy these to .env.local and fill in your own values to customize
-CLIENT_PLUGINS=github,rest,discord,twitter,loop,task,googleai,openai,search,bluesky,avatar,elevenlabs,database,anthropic,intent
-SERVER_PLUGINS=github,rest,discord,twitter,loop,task,googleai,openai,search,bluesky,elevenlabs,database,anthropic,intent
+# CLIENT_PLUGINS=github,rest,discord,twitter,loop,task,googleai,openai,search,bluesky,elevenlabs,database,anthropic,intent
+# SERVER_PLUGINS=github,rest,discord,twitter,loop,task,googleai,openai,search,bluesky,elevenlabs,database,anthropic,intent
+CLIENT_PLUGINS=discord,twitter,loop,googleai,openai,search,elevenlabs,database,anthropic,intent
+SERVER_PLUGINS=discord,twitter,loop,googleai,openai,search,elevenlabs,database,anthropic,intent
+
 
 # Memory to use for build cache
 NODE_OPTIONS="--max-old-space-size=8192"
@@ -30,8 +33,8 @@ POSTHOG_API_KEY=key
 VITE_APP_PRODUCTION=false
 PRODUCTION=false
 
-VITE_APP_STANDALONE=true
-STANDALONE=true
+VITE_APP_STANDALONE=false
+STANDALONE=false
 
 REDISCLOUD_HOST=localhost
 REDISCLOUD_URL=redis://localhost:6379
@@ -56,4 +59,5 @@ AWS_REGION=region
 AWS_BUCKET_NAME=bucket_name
 AWS_BUCKET_ENDPOINT=endpoint
 
-CLOUD_AGENT_KEY=key
+CLOUD_AGENT_KEY=key
+APT_ROOT_URL=http://0.0.0.0

.eslintrc.json

@@ -10,7 +10,7 @@
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
         "no-extra-semi": "off",
-        "@typescript-eslint/no-extra-semi": "off",
+        "@typescript-eslint/no-extra-semipackages/client/core/src/components/Drawer/Newsidebar": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/ban-types": "off"
       }

.gitignore

@@ -59,4 +59,5 @@ apps/docs/api/index.md
 data.json
 /logs
 docstore.json
-.vercel
+.vercel
+.nx/cache

.prettierignore

@@ -1,3 +1,4 @@
 # Add files here to ignore them from prettier formatting
 /dist
-/coverage
+/coverage
+/.nx/cache

.vscode/launch.json

@@ -28,6 +28,17 @@
       "request": "attach",
       "port": 7777
     },
+    {
+      "name": "CloudAgentWorker",
+      "type": "node",
+      "request": "attach",
+      "port": 8089,
+      "resolveSourceMapLocations": [
+        "${workspaceFolder}/**",
+        "!**/node_modules/**"
+      ],
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"]
+    },
     {
       "name": "Server",
       "type": "node",

apps/agent/knexfile.ts

@@ -1,4 +1,4 @@
-import { DATABASE_URL } from '@magickml/config'
+import { DATABASE_URL } from 'shared/config'
 
 const config = {
   client: 'pg',

apps/agent/package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "knex": "^2.4.2",
-    "@magickml/core": "file:../../dist/packages/shared/core",
+    "shared/core": "file:../../dist/packages/shared/core",
     "@magickml/server-core": "file:../../dist/packages/server-core"
   }
 }

apps/agent/project.json

@@ -4,9 +4,9 @@
   "sourceRoot": "apps/agent/src",
   "projectType": "application",
   "implicitDependencies": [
-    "@magickml/server-core",
-    "@magickml/core",
-    "@magickml/agents",
+    "server-core",
+    "shared-core",
+    "server-agents",
     "@magickml/plugin-*"
   ],
   "targets": {
@@ -56,7 +56,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": [
         "{options.outputFile}"
       ],
@@ -72,8 +72,7 @@
         "{workspaceRoot}/coverage/{projectRoot}"
       ],
       "options": {
-        "jestConfig": "apps/agent/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/agent/jest.config.ts"
       }
     }
   },

apps/agent/src/index.ts

@@ -5,12 +5,12 @@
  * @packageDocumentation
  */
 
-import { AgentManager } from '@magickml/agents'
-import { app, initApp } from '@magickml/server-core'
-import { initLogger, getLogger } from '@magickml/core'
+import { AgentManager } from 'server/agents'
+import { app, initApp } from 'server/core'
+import { initLogger, getLogger } from 'shared/core'
 import 'regenerator-runtime/runtime'
 import pluginExports from './plugins'
-import { PRODUCTION, DONT_CRASH_ON_ERROR } from '@magickml/config'
+import { PRODUCTION, DONT_CRASH_ON_ERROR } from 'shared/config'
 
 /**
  * Asynchronously loads the application's plugins and logs their names.

apps/agent/test/app.test.ts

@@ -1,7 +1,7 @@
 // For more information about this file see https://dove.feathersjs.com/guides/cli/app.test.html
 import assert from 'assert'
 import axios from 'axios'
-import { app } from '@magickml/server-core'
+import { app } from 'server/core'
 
 const port = app.get('port')
 const appUrl = `http://${app.get('host')}:${port}`
@@ -16,7 +16,7 @@ describe('Feathers application tests', () => {
   it('shows a 404 JSON error', async () => {
     try {
       await axios.get(`${appUrl}/path/to/nowhere`, {
-        responseType: 'json',
+        responseType: 'json'
       })
       assert.fail('should never get here')
     } catch (error: any) {

apps/client/project.json

@@ -3,7 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/client/src",
   "projectType": "application",
-  "implicitDependencies": ["@magickml/editor", "@magickml/core"],
+  "implicitDependencies": ["client-editor", "shared-core"],
   "targets": {
     "build": {
       "executor": "@nx/vite:build",
@@ -57,7 +57,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/client/**/*.{ts,tsx,js,jsx}"]
@@ -67,8 +67,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/client"],
       "options": {
-        "jestConfig": "apps/client/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/client/jest.config.ts"
       }
     }
   },

apps/client/src/main.tsx

@@ -1,7 +1,6 @@
 // DOCUMENTED
 import { createRoot } from 'react-dom/client'
-import { MagickIDE } from '@magickml/editor'
-import { AppConfig } from '@magickml/client-core'
+import { MagickIDE } from 'client/editor'
 import {
   DEFAULT_PROJECT_ID,
   API_ROOT_URL,
@@ -10,16 +9,17 @@ import {
   POSTHOG_ENABLED,
   DEFAULT_USER_TOKEN,
   STANDALONE,
-} from '@magickml/config'
+} from 'shared/config'
 import { PostHogProvider } from 'posthog-js/react'
-import { initLogger, getLogger } from '@magickml/core'
+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" })
+initLogger({ name: 'AIDE' })
 
 const logger = getLogger()
 
@@ -28,9 +28,9 @@ logger.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")
+  logger.info('not in iframe')
   if (STANDALONE) {
-    logger.info("standalone")
+    logger.info('standalone')
     const container = document.getElementById('root') as Element
     const root = createRoot(container) // createRoot(container!) if you use TypeScript
       ; (window as any).root = root
@@ -56,11 +56,15 @@ if (window === window.parent) {
     root.render(<Root />)
   }
 } else {
-  logger.info("iframe: In iframe")
+  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
    */
-  const TRUSTED_PARENT_URLS = [TRUSTED_PARENT_URL, 'https://www.magickml.com', 'https://beta.magickml.com'].map(url => url.replace(/\/+$/, ''));
+  const TRUSTED_PARENT_URLS = [
+    TRUSTED_PARENT_URL,
+    'https://www.magickml.com',
+    'https://beta.magickml.com']
+    .map(url => url.replace(/\/+$/, ''));
 
   window.addEventListener(
     'message',

apps/cloud-agent-manager/project.json

@@ -39,7 +39,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/cloud-agent-manager/**/*.ts"]

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

@@ -1,23 +1,24 @@
-import { CloudAgentManager, FeathersSyncReporter } from "@magickml/cloud-agent-manager"
-import { initLogger, getLogger } from "@magickml/core"
-import { app, BullQueue, initApp } from "@magickml/server-core"
-import { DONT_CRASH_ON_ERROR, PRODUCTION } from "@magickml/config"
-import { initAgentCommander } from "@magickml/agents"
+import {
+  CloudAgentManager,
+  FeathersSyncReporter,
+} from 'server/cloud-agent-manager'
+import { initLogger, getLogger } from 'shared/core'
+import { app, BullQueue, initApp } from 'server/core'
+import { DONT_CRASH_ON_ERROR, PRODUCTION } from 'shared/config'
+import { initAgentCommander } from 'server/agents'
 import { getPinoTransport } from '@hyperdx/node-opentelemetry'
 
 if (PRODUCTION) {
-	initLogger({
-		name: 'cloud-agent-manager',
-		transport: {
-			targets: [
-				getPinoTransport('info')
-			]
-		},
-		level: 'info',
-	})
+  initLogger({
+    name: 'cloud-agent-manager',
+    transport: {
+      targets: [getPinoTransport('info')],
+    },
+    level: 'info',
+  })
 } else {
-	initLogger({ name: 'cloud-agent-manager' })
-}	
+  initLogger({ name: 'cloud-agent-manager' })
+}
 const logger = getLogger()
 
 function start() {

apps/cloud-agent-worker/project.json

@@ -41,7 +41,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/cloud-agent-worker/**/*.ts"]

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

@@ -1,9 +1,9 @@
-import { CloudAgentWorker } from '@magickml/cloud-agent-worker'
-import { initLogger, getLogger } from '@magickml/core'
-import { initApp } from '@magickml/server-core'
+import { CloudAgentWorker } from 'server/cloud-agent-worker'
+import { initLogger, getLogger } from 'shared/core'
+import { initApp } from 'server/core'
 import pluginExports from './plugins'
-import { initAgentCommander } from '@magickml/agents'
-import { DONT_CRASH_ON_ERROR, PRODUCTION } from '@magickml/config'
+import { initAgentCommander } from 'server/agents'
+import { DONT_CRASH_ON_ERROR, PRODUCTION } from 'shared/config'
 import { getPinoTransport } from '@hyperdx/node-opentelemetry'
 
 if (PRODUCTION) {
@@ -34,11 +34,11 @@ async function loadPlugins(): Promise<void> {
 
 if (PRODUCTION || DONT_CRASH_ON_ERROR) {
   process.on('uncaughtException', (e: any) => {
-    logger.error('Uncaught exception: %s\n From: %o', e, e.stack)
+    logger.error(e, 'Uncaught exception: %s\n From: %o', e)
   })
 
   process.on('unhandledRejection', (e: any) => {
-    logger.error('Unhandled rejection: %s\n From: %o', e, e.stack)
+    logger.error(e, 'Unhandled rejection: %s\n From: %o', e)
   })
 }
 

apps/docs/docs/developer-guides/Package Overview.md

@@ -8,37 +8,49 @@ sidebar_position: 1
 # Package Overview
 
 ## Apps
+
 ### Client
+
 @magickml/client (./apps/client)
 Frontend application. Everything the user sees in Magick IDE is exposed through the client, although most of the code lives in client-core and editor packages, as well as engine. Thin, mostly contains build settings and entrypoint.
 
 ### Server
+
 @magickml/server (./apps/server)
 Backend server application. Depends on server-core and engine. Thin, mostly contains startup code and configuration for the server. Provides an API which the client talks to, and runs preview spells for clients.
 
 ### Agent
+
 @magickml/agent (./apps/agent)
 Backend agent application. Depends on server-core and engine. Thin, startups the AgentManager and manages agents from the database. Talks directly to the database, not to the server.
 
 ### Docs
+
 @magickml/docs (./apps/docs)
 Documentation server build on Docusaurus.
 
 ## Shared Packages
+
 ### Engine
-@magickml/core (./packages/core/shared)
-Core runtime code for Magick. Contains all of the spell and spell running code, common interfaces and nodes. Available for install via [npm](https://www.npmjs.com/package/@magickml/core)
+
+shared/core (./packages/core/shared)
+Core runtime code for Magick. Contains all of the spell and spell running code, common interfaces and nodes. Available for install via [npm](https://www.npmjs.com/package/shared/core)
 
 ## Front End Packages
+
 ### Client Core
+
 @magickml/client-core (./packages/core/client)
 Frontend UI components and common code.
 
 ### Editor
+
 @magickml/editor
 Application code for the IDE, including windows, providers and state. Used in the client. Exports the entire Magick editor as components which can be imported whole or individually for custom routing (for example, in a Next.js frontend). Available for install via [npm](https://www.npmjs.com/package/@magickml/editor)
 
 ## Server Packages
+
 ### Server Core
+
 @magickml/server-core (./packages/core/server)
-Contains all of the server code, imported by the server and agent apps.
+Contains all of the server code, imported by the server and agent apps.