From 7085dd01edcb6318a0f0444451e778ff54b6830f Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sat, 23 May 2026 01:57:57 +0400
Subject: [PATCH] Update findGlobalPluginId

---
 packages/core/src/abstract/Module.ts      | 4 ++--
 packages/core/src/plugin_manager/index.ts | 2 +-
 packages/core/src/plugin_manager/utils.ts | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/abstract/Module.ts b/packages/core/src/abstract/Module.ts
index 4d8f4d06e..7eda2262e 100644
--- a/packages/core/src/abstract/Module.ts
+++ b/packages/core/src/abstract/Module.ts
@@ -307,9 +307,9 @@ export abstract class ItemManagerModule<
 
   __onAllEvent() {}
 
-  _createId(len = 16) {
+  _createId(len = 16, increase?: number) {
     const all = this.getAll();
-    const ln = all.length + len;
+    const ln = (increase ?? all.length) + len;
     const allMap = this.getAllMap();
     let id;
 
diff --git a/packages/core/src/plugin_manager/index.ts b/packages/core/src/plugin_manager/index.ts
index 1b3aa88d0..9c46538fc 100644
--- a/packages/core/src/plugin_manager/index.ts
+++ b/packages/core/src/plugin_manager/index.ts
@@ -31,7 +31,7 @@ export default class PluginManager extends ItemManagerModule<ModuleConfig, Plugi
   }
 
   private generatePluginId() {
-    return `gjs-plugin:${this._createId(8)}`;
+    return `gjs-plugin:${this._createId(16, 0)}`;
   }
 
   private resolvePluginId(input: string | Plugin<any>, plugin: Plugin<any>, explicitId?: string) {
diff --git a/packages/core/src/plugin_manager/utils.ts b/packages/core/src/plugin_manager/utils.ts
index eb31dab51..3a92544b2 100644
--- a/packages/core/src/plugin_manager/utils.ts
+++ b/packages/core/src/plugin_manager/utils.ts
@@ -63,8 +63,12 @@ export const findGlobalPluginId = (plugin: Plugin<any>) => {
   const globalPlugins = getGlobal() as Record<string, any>;
 
   return Object.keys(globalPlugins).find((id) => {
-    const globalPlugin = globalPlugins[id];
-    return globalPlugin === plugin || globalPlugin?.default === plugin;
+    try {
+      const globalPlugin = globalPlugins[id];
+      return globalPlugin === plugin || globalPlugin?.default === plugin;
+    } catch (error) {
+      return false;
+    }
   });
 };