Merge branch 'add-canvas' of https://github.com/ClayPulse/pulse-editor into add-canvas

Shellishack · Shellishack · commit e20c10eb8e88 · 2025-10-04T08:39:58.000+08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,8 +26,5 @@
     },
     "devDependencies": {
         "@changesets/cli": "^2.29.4"
-    },
-    "dependencies": {
-        "@pulse-editor/shared-utils": "^0.1.1-alpha.21"
     }
 }
diff --git a/web/components/extension/extension-preview.tsx b/web/components/extension/extension-preview.tsx
@@ -75,7 +75,10 @@ export default function ExtensionPreview({
     undefined,
   );
 
-  const [isCompatible, setIsCompatible] = useState<boolean | undefined>(
+  const [isMFCompatible, setIsMFCompatible] = useState<boolean | undefined>(
+    undefined,
+  );
+  const [isLibCompatible, setIsLibCompatible] = useState<boolean | undefined>(
     undefined,
   );
 
@@ -100,21 +103,26 @@ export default function ExtensionPreview({
 
       const remoteLibVersion =
         extension.config.libVersion === "unknown"
-          ? await getRemoteLibVersion(
-              extension.remoteOrigin,
-              extension.config.id,
-              extension.config.version,
-            )
-          : extension.config.libVersion;
+          ? (
+              await getRemoteLibVersion(
+                extension.remoteOrigin,
+                extension.config.id,
+                extension.config.version,
+              )
+            ).replace("^", "")
+          : extension.config.libVersion.replace("^", "");
       setRemoteLibVersion(remoteLibVersion);
 
       const mfCompatible = await checkCompatibility(
         hostMFVersion,
-        hostLibVersion,
         remoteMFVersion,
+      );
+      const libCompatible = await checkCompatibility(
+        hostLibVersion,
         remoteLibVersion,
       );
-      setIsCompatible(mfCompatible);
+      setIsMFCompatible(mfCompatible);
+      setIsLibCompatible(libCompatible);
     }
 
     fetchVersions();
@@ -175,8 +183,9 @@ export default function ExtensionPreview({
               <EnableCheckBox isActive={isEnabled} onPress={toggleExtension} />
             )}
 
-            {isCompatible !== undefined &&
-              (!isCompatible ? (
+            {isMFCompatible !== undefined &&
+              isLibCompatible !== undefined &&
+              (!isMFCompatible || !isLibCompatible ? (
                 <Popover
                   isOpen={showMFVersionInfo}
                   onOpenChange={setShowMFVersionInfo}
@@ -196,23 +205,36 @@ export default function ExtensionPreview({
                         setShowMFVersionInfo(false);
                       }}
                     >
-                      <Icon name="warning" className="text-danger!" />
+                      {!isMFCompatible ? (
+                        <Icon name="warning" className="text-danger!" />
+                      ) : (
+                        <Icon name="warning" className="text-warning!" />
+                      )}
                     </Button>
                   </PopoverTrigger>
                   <PopoverContent>
                     <div className="max-w-xs">
-                      <p>
-                        This app is outdated and no longer a valid module
-                        federation app. Please update the app to the latest
-                        version. <br />
-                        Host MF version: {hostMFVersion}
-                        <br />
-                        Host lib version: {hostLibVersion}
-                        <br />
-                        App MF version: {remoteMFVersion}
-                        <br />
-                        App lib version: {remoteLibVersion}
-                      </p>
+                      {!isMFCompatible && (
+                        <p>
+                          This app is outdated and no longer a valid module
+                          federation app. Please update the app to the latest
+                          version. <br />
+                          Host MF version: {hostMFVersion}
+                          <br />
+                          App MF version: {remoteMFVersion}
+                        </p>
+                      )}
+                      {!isLibCompatible && (
+                        <p>
+                          This app's library version is outdated and may not
+                          work correctly. Please update the app to the latest
+                          version.
+                          <br />
+                          Host lib version: {hostLibVersion}
+                          <br />
+                          App lib version: {remoteLibVersion}
+                        </p>
+                      )}
                     </div>
                   </PopoverContent>
                 </Popover>
@@ -241,9 +263,9 @@ export default function ExtensionPreview({
                     <PopoverContent>
                       <div className="max-w-xs">
                         <p>
-                          This app's module federation version (
-                          {extension.mfVersion}) matches the host version (
-                          {hostMFVersion}). The app should work correctly.
+                          This app's module federation version ({hostMFVersion})
+                          and library version ({hostLibVersion}) match the host
+                          version. The app should work correctly.
                         </p>
                       </div>
                     </PopoverContent>
diff --git a/web/components/interface/command-viewer.tsx b/web/components/interface/command-viewer.tsx
@@ -40,17 +40,28 @@ export default function CommandViewer() {
   const [isOutputVoice, setIsOutputVoice] = useState(false);
   const [isWaitingAssistant, setIsWaitingAssistant] = useState(false);
 
+  const [args, setArgs] = useState<any>({});
+
   const historyRef = useRef<HTMLDivElement>(null);
 
   const runActionCallback = useCallback(
     async (action: ScopedAction) => {
-      const result = await runAction(action, {});
-      console.log("Command result:", result);
-      addToast({
-        color: "success",
-        title: "Command Executed",
-        description: `Executed command: ${action.action.name}`,
-      });
+      try {
+        const result = await runAction(action, args);
+
+        console.log("Command result:", result);
+        addToast({
+          color: "success",
+          title: "Command Executed",
+          description: `Executed command: ${action.action.name}`,
+        });
+      } catch (error: any) {
+        addToast({
+          color: "danger",
+          title: "Command Execution Failed",
+          description: `Failed to execute command: ${action.action.name}. Error: ${error.message}`,
+        });
+      }
     },
     [runAction],
   );
diff --git a/web/lib/hooks/use-scoped-actions.ts b/web/lib/hooks/use-scoped-actions.ts
@@ -122,7 +122,9 @@ export default function useScopedActions() {
     } else if (action.type === "app") {
       const extensions = editorContext?.persistSettings?.extensions ?? [];
       const ext = extensions.find((e) =>
-        (e.config.actions ?? []).some((act) => act.name === action.action.name),
+        (e.config.preRegisteredActions ?? []).some(
+          (act) => act.name === action.action.name,
+        ),
       );
 
       if (!ext) {
@@ -136,11 +138,12 @@ export default function useScopedActions() {
 
       if (appInView) {
         // App is already in the view, execute Action in the app's context.
-        imcContext?.polyIMC?.sendMessage(
+        const result = await imcContext?.polyIMC?.sendMessage(
           ext.config.id + "-" + appInView.viewId,
           IMCMessageTypeEnum.EditorRunAppAction,
           { name: action.action.name, args },
         );
+        return result;
       } else {
         // Create an instance of the app that provides the static Action,
         // then execute Action in the app's context.
@@ -159,11 +162,12 @@ export default function useScopedActions() {
           });
         }
 
-        return await imcContext?.polyIMC?.sendMessage(
+        const result = await imcContext?.polyIMC?.sendMessage(
           ext.config.id + "-" + viewId,
           IMCMessageTypeEnum.EditorRunAppAction,
           { name: action.action.name, args },
         );
+        return result;
       }
     }
   }
@@ -172,7 +176,7 @@ export default function useScopedActions() {
     extension: ExtensionApp,
     keyword?: string,
   ) {
-    const actions = extension.config.actions ?? [];
+    const actions = extension.config.preRegisteredActions ?? [];
     if (keyword) {
       return actions.filter((action) =>
         action.name.toLowerCase().includes(keyword.toLowerCase().trim()),
diff --git a/web/lib/module-federation/version.ts b/web/lib/module-federation/version.ts
@@ -21,9 +21,7 @@ export async function getRemoteMFVersion(
 }
 
 export async function getHostLibVersion(): Promise<string> {
-  const version = packageJson.dependencies[
-    "@pulse-editor/shared-utils"
-  ].replace("^", "");
+  const version = packageJson.dependencies["@pulse-editor/shared-utils"];
   return version;
 }
 
@@ -40,29 +38,21 @@ export async function getRemoteLibVersion(
   if (!pulseConfig) {
     throw new Error("Remote pulse.config.json  undefined");
   }
-  const libVersion = pulseConfig.libVersion.replace("^", "");
+  const libVersion = pulseConfig.libVersion;
   return libVersion;
 }
 
 export async function checkCompatibility(
-  hostMFVersion: string,
-  hostLibVersion: string,
-  remoteMFVersion: string,
-  remoteLibVersion: string,
+  hostVersion: string,
+  remoteVersion: string,
 ): Promise<boolean> {
-  if (remoteMFVersion === "unknown" || remoteLibVersion === "unknown") {
+  if (remoteVersion === "unknown") {
     console.warn("Could not determine remote versions. ");
     return false;
   }
-  if (!satisfies(remoteMFVersion, hostMFVersion)) {
+  if (!satisfies(remoteVersion, hostVersion)) {
     console.warn(
-      `Incompatible MF versions: host ${hostMFVersion}, remote ${remoteMFVersion}`,
-    );
-    return false;
-  }
-  if (!satisfies(remoteLibVersion, hostLibVersion)) {
-    console.warn(
-      `Incompatible lib versions: host ${hostLibVersion}, remote ${remoteLibVersion}`,
+      `Incompatible versions: host ${hostVersion}, remote ${remoteVersion}`,
     );
     return false;
   }
diff --git a/web/package.json b/web/package.json
@@ -27,7 +27,7 @@
       "@langchain/core": "^0.3.66",
       "@langchain/openai": "^0.6.3",
       "@pulse-editor/capacitor-plugin": "file:../capacitor-plugin",
-      "@pulse-editor/shared-utils": "^0.1.1-alpha.39",
+      "@pulse-editor/shared-utils": "^0.1.1-alpha.41",
       "@ricky0123/vad-web": "^0.0.28",
       "@vercel/analytics": "^1.5.0",
       "@xyflow/react": "^12.8.5",

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,5 @@`
`26`	`26`	`},`
`27`	`27`	`"devDependencies": {`
`28`	`28`	`"@changesets/cli": "^2.29.4"`
`29`		`- },`
`30`		`- "dependencies": {`
`31`		`- "@pulse-editor/shared-utils": "^0.1.1-alpha.21"`
`32`	`29`	`}`
`33`	`30`	`}`