Fix lots of merge issues and errors

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/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.

package.json

@@ -19,18 +19,18 @@
     "migrate": "nx run @magickml/server:migrate",
     "lint": "npx nx run-many --all --target=lint --max-warnings=0",
     "lint-fix": "npx nx run-many --all --target=lint --fix --max-warnings=0",
-    "lint:engine": "npx nx lint @magickml/core --fix",
+    "lint:engine": "npx nx lint shared/core --fix",
     "lint:editor": "npx nx lint @magickml/editor --fix",
     "lint:server-core": "npx nx lint @magickml/server-core",
-    "build": "npx nx lint @magickml/core && npx nx run-many --target=build --projects=@magickml/server,@magickml/cloud-agent-worker-app,@magickml/cloud-agent-manager-app",
+    "build": "npx nx lint shared/core && npx nx run-many --target=build --projects=@magickml/server,@magickml/cloud-agent-worker-app,@magickml/cloud-agent-manager-app",
     "build-client": "npx nx build @magickml/client",
     "heroku-prebuild": "npm i -g @nrwl/cli",
     "build-server": "npx nx build @magickml/server",
     "build-agent": "npx nx build @magickml/agent",
     "build-docs": "npx nx build @magickml/docs",
-    "build-engine": "npx nx build @magickml/core",
+    "build-engine": "npx nx build shared/core",
     "test": "npx nx test",
-    "test:core": "npx nx test @magickml/core",
+    "test:core": "npx nx test shared/core",
     "nukefromorbit": "rimraf ./packages/**/node_modules && rimraf ./node_modules && rimraf ./apps/**/node_modules",
     "remove": "npx nx generate @nx/workspace:remove",
     "sortPackage": "npx sort-package-json",

packages/client/editor/src/components/Workspace.tsx

@@ -94,6 +94,7 @@ const Workspace = ({ tab, pubSub }) => {
       const props = {
         tab,
         node,
+        spellId: ''
       }
       const component = node.getComponent()
       switch (component) {
@@ -117,7 +118,7 @@ const Workspace = ({ tab, pubSub }) => {
 
   return (
     <>
-      <EventHandler tab={tab} pubSub={pubSub} />
+      <EventHandler tab={tab} pubSub={pubSub} spellId="" />
       <Layout json={tab.layoutJson} factory={factory(tab)} tab={tab} />
     </>
   )

packages/client/editor/src/screens/DocumentWindow/DocumentTable.tsx

@@ -123,7 +123,6 @@ function DocumentTable({ documents }) {
   ): DocumentData => {
     return {
       row,
-      fileName,
       content,
       type,
       projectId,

packages/client/feathers-redux-toolkit/tsconfig.json

@@ -5,7 +5,7 @@
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
+    "noPropertyAccessFromIndexSignature": false,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
     "types": ["vitest"]

packages/core/server/src/services/spell-runner/spell-runner.class.ts

@@ -1,5 +1,5 @@
 // DOCUMENTED
-import { SpellInterface } from '@magickml/core'
+import { SpellInterface } from 'shared/core'
 import otJson0 from 'ot-json0'
 import { app } from '../../app'
 import { Params } from '@feathersjs/feathers'

packages/plugins/anthropic/server/src/index.ts

@@ -1,6 +1,6 @@
 // UNDOCUMENTED
 /**
- * A plugin for the @magickml/core that adds anthropic completion functionality
+ * A plugin for the shared/core that adds anthropic completion functionality
  *
  * @remarks
  * The plugin uses handlers for text, chat and text embedding which are defined in the 'makeTextCompletion',
@@ -28,7 +28,7 @@ const completionHandlers = {
 }
 
 /**
- * A server plugin for the @magickml/core that adds anthropic completion functionality
+ * A server plugin for the shared/core that adds anthropic completion functionality
  */
 const anthropicPlugin = new ServerPlugin({
   name: 'anthropicPlugin',

packages/plugins/avatar/client/src/index.ts

@@ -4,7 +4,7 @@ import App from './App'
 
 /**
  * This module provides an AvatarPlugin to be used
- * with the @magickml/core client-side library.
+ * with the shared/core client-side library.
  * @module AvatarPlugin
  */
 

packages/plugins/database/server/src/index.ts

@@ -1,6 +1,6 @@
 // DOCUMENTED
 /**
- * A plugin for the @magickml/core that adds OpenAI completion functionality
+ * A plugin for the shared/core that adds OpenAI completion functionality
  *
  * @remarks
  * The plugin uses handlers for text, chat and text embedding which are defined in the 'makeTextCompletion',
@@ -32,7 +32,7 @@ const completionHandlers = {
 }
 
 /**
- * A server plugin for the @magickml/core that adds OpenAI completion functionality
+ * A server plugin for the shared/core that adds OpenAI completion functionality
  */
 const databasePlugin = new ServerPlugin({
   name: 'databasePlugin',

packages/plugins/elevenlabs/server/src/index.ts

@@ -1,6 +1,6 @@
 // DOCUMENTED
 /**
- * A plugin for the @magickml/core that adds elevenlabs completion functionality
+ * A plugin for the shared/core that adds elevenlabs completion functionality
  *
  * @remarks
  * The plugin uses handlers for text, chat and text embedding which are defined in the 'makeTextCompletion',
@@ -28,7 +28,7 @@ const completionHandlers = {
 }
 
 /**
- * A server plugin for the @magickml/core that adds elevenlabs completion functionality
+ * A server plugin for the shared/core that adds elevenlabs completion functionality
  */
 const elevenlabsPlugin = new ServerPlugin({
   name: 'elevenlabsPlugin',

packages/plugins/ethereum/shared/src/nodes/GetRecentTxsFromWallet.ts

@@ -34,7 +34,7 @@ type InputReturn =
  * It belongs to the Ethereum family according to the specification in the constructor.
  *
  * @remarks
- * This component extends the MagickComponent class from the @magickml/core module and has an async worker method.
+ * This component extends the MagickComponent class from the shared/core module and has an async worker method.
  *
  * @returns a promise with a custom InputReturn type
  */
@@ -96,9 +96,9 @@ export class GetRecentTxsFromWallet extends MagickComponent<
    * @remarks
    * As shown before, the component expects a custom return of the InputReturn type.
    *
-   * @param node - Required by the worker and uses the WorkerData type from the @magickml/core module.
-   * @param inputs - Required by the worker and uses the MagickWorkerInputs type from the @magickml/core module.
-   * @param outputs - Required by the worker and uses the MagickWorkerOutputs type from the @magickml/core module.
+   * @param node - Required by the worker and uses the WorkerData type from the shared/core module.
+   * @param inputs - Required by the worker and uses the MagickWorkerInputs type from the shared/core module.
+   * @param outputs - Required by the worker and uses the MagickWorkerOutputs type from the shared/core module.
    * @param data - A property of the worker method which defines the wallet address.
    *
    * @returns a promise with a custom InputReturn type

packages/plugins/googleai/server/src/functions/makeChatCompletion.ts

@@ -3,7 +3,7 @@ import { CompletionHandlerInputData, saveRequest } from 'shared/core'
 import { GOOGLEAI_ENDPOINT } from '../constants'
 import { trackGoogleAIUsage } from 'server/core'
 import { wordCount } from './shared'
-import { DEFAULT_GOOGLEAI_API_KEY } from '@magickml/config'
+import { DEFAULT_GOOGLEAI_API_KEY } from 'shared/config'
 
 type ChatMessage = {
   author?: string

packages/plugins/googleai/server/src/functions/makeTextCompletion.ts

@@ -3,7 +3,7 @@ import { CompletionHandlerInputData, saveRequest } from 'shared/core'
 import { GOOGLEAI_ENDPOINT } from '../constants'
 import { trackGoogleAIUsage } from 'server/core'
 import { wordCount } from './shared'
-import { DEFAULT_GOOGLEAI_API_KEY } from '@magickml/config'
+import { DEFAULT_GOOGLEAI_API_KEY } from 'shared/config'
 
 /**
  * Makes an API request to an AI text completion service.

packages/plugins/googleai/server/src/functions/makeTextEmbedding.ts

@@ -7,7 +7,7 @@ import {
 import { GOOGLEAI_ENDPOINT } from '../constants'
 import { trackGoogleAIUsage } from 'server/core'
 import { wordCount } from './shared'
-import { DEFAULT_GOOGLEAI_API_KEY } from '@magickml/config'
+import { DEFAULT_GOOGLEAI_API_KEY } from 'shared/config'
 
 /**
  * A function that makes a request to create a text embedding using GoogleAI's

packages/plugins/googleai/server/src/index.ts

@@ -1,6 +1,6 @@
 // DOCUMENTED
 /**
- * A plugin for the @magickml/core that adds GoogleAI completion functionality
+ * A plugin for the shared/core that adds GoogleAI completion functionality
  *
  * @remarks
  * The plugin uses handlers for text, chat and text embedding which are defined in the 'makeTextCompletion',
@@ -34,7 +34,7 @@ const completionHandlers = {
 }
 
 /**
- * A server plugin for the @magickml/core that adds GoogleAI completion functionality
+ * A server plugin for the shared/core that adds GoogleAI completion functionality
  */
 const GoogleAIPlugin = new ServerPlugin({
   name: 'GoogleAIPlugin',

packages/plugins/localmodel/server/src/index.ts

@@ -1,6 +1,6 @@
 // DOCUMENTED
 /**
- * A plugin for the @magickml/core that adds LocalModel completion functionality
+ * A plugin for the shared/core that adds LocalModel completion functionality
  *
  * @remarks
  * The plugin uses handlers for text, chat and text embedding which are defined in the 'makeTextCompletion',
@@ -34,7 +34,7 @@ const completionHandlers = {
 }
 
 /**
- * A server plugin for the @magickml/core that adds local completion functionality
+ * A server plugin for the shared/core that adds local completion functionality
  */
 const LocalModelPlugin = new ServerPlugin({
   name: 'LocalModelPlugin',

packages/plugins/openai/server/src/index.ts

@@ -1,6 +1,6 @@
 // DOCUMENTED
 /**
- * A plugin for the @magickml/core that adds OpenAI completion functionality
+ * A plugin for the shared/core that adds OpenAI completion functionality
  *
  * @remarks
  * The plugin uses handlers for text, chat and text embedding which are defined in the 'makeTextCompletion',
@@ -36,7 +36,7 @@ const completionHandlers = {
 }
 
 /**
- * A server plugin for the @magickml/core that adds OpenAI completion functionality
+ * A server plugin for the shared/core that adds OpenAI completion functionality
  */
 const OpenAIPlugin = new ServerPlugin({
   name: 'OpenAIPlugin',

packages/server/core/src/auth/cloudAuthentication.ts

@@ -34,7 +34,7 @@ export class CloudJwtService extends AuthenticationService {
    * @param params - The parameters required for authentication
    * @returns payload with permissions if exists
    */
-  async getPayload(authResult, params) {
+  override async getPayload(authResult, params) {
     // Call original `getPayload` first
     const payload = await super.getPayload(authResult, params)
     const { user } = authResult
@@ -54,7 +54,7 @@ export class CloudJwtService extends AuthenticationService {
    * @param secretOverride - Override the secret used for encryption
    * @returns decrypted token payload
    */
-  async verifyAccessToken(
+  override async verifyAccessToken(
     token: string,
     _optsOverride,
     secretOverride?: string
@@ -86,7 +86,7 @@ export class CloudJwtService extends AuthenticationService {
    * @param allowed - Allowed authentication strategies
    * @returns Authentication result
    */
-  async authenticate(
+  override async authenticate(
     authentication: AuthenticationRequest,
     params: AuthenticationParams,
     ...allowed: string[]

packages/server/core/src/communication/PubSub/Redis.ts

@@ -1,7 +1,7 @@
 import { RedisPubSub } from 'server/redis-pubsub'
 import { PubSub } from './PubSub'
 
-import { app } from '../../app';
+import { app } from '../../app'
 
 export class RedisPubSubWrapper extends PubSub {
   pubsub: RedisPubSub
@@ -11,15 +11,18 @@ export class RedisPubSubWrapper extends PubSub {
     this.pubsub = app.get('pubsub')
   }
 
-  async publish(channel: string, message: string): Promise<void> {
+  override async publish(channel: string, message: string): Promise<void> {
     return await this.pubsub.publish(channel, message)
   }
 
-  async subscribe(channel: string, callback: Function): Promise<void> {
+  override async subscribe(channel: string, callback: Function): Promise<void> {
     return await this.pubsub.subscribe(channel, callback)
   }
 
-  async patternSubscribe(pattern: string, callback: Function): Promise<void> {
+  override async patternSubscribe(
+    pattern: string,
+    callback: Function
+  ): Promise<void> {
     return await this.pubsub.patternSubscribe(pattern, callback)
   }
 }

packages/server/core/src/communication/Workers/BullMQ.ts

@@ -9,7 +9,7 @@ export class BullMQWorker extends Worker {
     super()
   }
 
-  initialize(
+  override initialize(
     queueName: string,
     callback: (job: Job<any>) => Promise<any>
   ): void {

packages/server/core/src/config/types.ts

@@ -1,5 +1,5 @@
 // DOCUMENTED
-// Import the required types from '@magickml/core' and rename them to avoid naming conflicts.
+// Import the required types from 'shared/core' and rename them to avoid naming conflicts.
 import {
   Route as MagickRoute,
   Middleware as MagickMiddleware,
@@ -8,21 +8,21 @@ import {
 } from 'shared/core'
 
 /**
- * Type alias for Middleware imported from '@magickml/core'.
+ * Type alias for Middleware imported from 'shared/core'.
  */
 export type Middleware = MagickMiddleware
 
 /**
- * Type alias for Method imported from '@magickml/core'.
+ * Type alias for Method imported from 'shared/core'.
  */
 export type Method = MagickMethod
 
 /**
- * Type alias for Handler imported from '@magickml/core'.
+ * Type alias for Handler imported from 'shared/core'.
  */
 export type Handler = MagickHandler
 
 /**
- * Type alias for Route imported from '@magickml/core'.
+ * Type alias for Route imported from 'shared/core'.
  */
 export type Route = MagickRoute