npm - json-object-editor - Versions diffs - 0.10.624 → 0.10.632 - Mend

json-object-editor 0.10.624 → 0.10.632

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/CHANGELOG.md +15 -0
package/_www/ai-widget-test.html +367 -0
package/_www/mcp-export.html +5 -5
package/_www/mcp-prompt.html +1 -1
package/_www/mcp-test.html +14 -5
package/css/joe-styles.css +11 -3
package/css/joe.css +12 -4
package/css/joe.min.css +1 -1
package/docs/joe_agent_custom_gpt_instructions_v_3.md +132 -0
package/dummy +10 -0
package/img/svgs/ai_assistant.svg +1 -0
package/img/svgs/ai_assistant_white.svg +1 -0
package/js/JsonObjectEditor.jquery.craydent.js +34 -3
package/js/joe-ai.js +784 -52
package/js/joe.js +35 -4
package/js/joe.min.js +1 -1
package/package.json +1 -1
package/readme.md +17 -10
package/server/apps/aihub.js +97 -0
package/server/fields/core.js +4 -1
package/server/modules/MCP.js +263 -26
package/server/modules/Server.js +1 -46
package/server/plugins/auth.js +34 -30
package/server/plugins/chatgpt-assistants.js +70 -35
package/server/plugins/chatgpt.js +560 -44
package/server/schemas/ai_assistant.js +149 -1
package/server/schemas/ai_conversation.js +14 -1
package/server/schemas/ai_widget_conversation.js +133 -14
package/server/schemas/project.js +27 -3
package/server/schemas/task.js +1 -0

package/server/modules/Server.js CHANGED Viewed

@@ -171,52 +171,7 @@ server.get(JOE.webconfig.joepath+'_www/mcp-schemas.html',auth,function(req,res){
 // AI Widget test page (Responses + assistants) – auth protected
 server.get(['/ai-widget-test.html', JOE.webconfig.joepath + 'ai-widget-test.html'], auth, function(req,res){
-    var assistantId = (req.query.assistant_id || req.query.assistant || '').trim();
-    if (!assistantId && JOE && JOE.Utils && JOE.Utils.Settings) {
-        try {
-            var settingObj = JOE.Utils.Settings('DEFAULT_AI_ASSISTANT', { object: true });
-            assistantId = (settingObj && settingObj.value) || '';
-        } catch(e) {
-            console.log('[ai-widget-test] error reading DEFAULT_AI_ASSISTANT:', e && e.message);
-        }
-    }
-    var joePath = (JOE && JOE.webconfig && JOE.webconfig.joepath) || '/JsonObjectEditor/';
-    var assistantAttr = assistantId ? ' ai_assistant_id="'+assistantId.replace(/"/g,'&quot;')+'"' : '';
-    res.send(`<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>JOE AI Widget Test</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style>
-    body{font-family:system-ui,-apple-system,Segoe UI,Roboto,Ubuntu,Cantarell,Noto Sans,sans-serif;margin:20px;background:#f3f4f6;}
-    h1{margin-top:0;}
-    .small{font-size:13px;color:#6b7280;margin-bottom:16px;}
-    .container{max-width:480px;margin:0 auto;background:#fff;border-radius:12px;box-shadow:0 4px 14px rgba(0,0,0,0.06);padding:16px;}
-    .meta{font-size:12px;color:#6b7280;margin-bottom:8px;}
-    code{background:#e5e7eb;border-radius:4px;padding:2px 4px;font-size:12px;}
-  </style>
-</head>
-<body>
-  <div id="mcp-nav"></div>
-  <script src="${joePath}_www/mcp-nav.js"></script>
-  <div class="container">
-    <h1>AI Widget Test</h1>
-    <div class="small">
-      This page mounts <code>&lt;joe-ai-widget&gt;</code> and sends messages through
-      <code>/API/plugin/chatgpt/widget*</code> using the OpenAI Responses API.
-      ${assistantId ? `Using <code>DEFAULT_AI_ASSISTANT</code> (ai_assistant_id=${assistantId}).` : 'No DEFAULT_AI_ASSISTANT is set; widget will use model defaults.'}
-      You can override the assistant via <code>?assistant_id=&lt;ai_assistant _id&gt;</code>.
-    </div>
-    <joe-ai-widget id="widget" title="JOE AI Assistant"${assistantAttr}></joe-ai-widget>
-  </div>
-  <script src="${joePath}js/joe-ai.js"></script>
-</body>
-</html>`);
+    res.sendFile(path.join(JOE.joedir,'_www','ai-widget-test.html'));
 });
 server.use(JOE.webconfig.joepath,express.static(JOE.joedir));

package/server/plugins/auth.js CHANGED Viewed

@@ -22,50 +22,46 @@ function Auth(){
     };
     this.login = async function(data,req,res){
-        const got = await import('got');
-        //make post request
+        // Use got to exchange the Google authorization_code for tokens.
+        // We POST form-encoded params to the current Google OAuth token endpoint.
+        const gotMod = await import('got');
+        const got = gotMod.default || gotMod;
         var originalUrl = data.state||'';
         console.log(originalUrl);
-        var options = {
+        const tokenUrl = 'https://oauth2.googleapis.com/token';
+        const options = {
             method: 'POST',
-            url: 'https://www.googleapis.com/oauth2/v4/token',
-            searchParams: {
+            // Google expects application/x-www-form-urlencoded body, not querystring.
+            form: {
                 grant_type: 'authorization_code',
                 code: data.code,
                 redirect_uri: `${JOE.webconfig.authorization.host}/API/plugin/auth/login`,
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'client_id':JOE.webconfig.authorization.client_id,
-                'client_secret':JOE.webconfig.authorization.client_secret
+                client_id: JOE.webconfig.authorization.client_id,
+                client_secret: JOE.webconfig.authorization.client_secret
             },
-            headers:
-            {
+            headers: {
                 'cache-control': 'no-cache',
-                Authorization: JOE.webconfig.authorization.header,
-                Accept: 'application/json',
+                Accept: 'application/json'
             },
             responseType: 'json',
             https: {
               rejectUnauthorized: false
             }
-            // rejectUnauthorized:false,
-            // json: true
         };
-       // request(options, function (error, response, body) {
-        got.default(options)
-        .catch(error => {
-            res.send(error);
-        })
+        got(tokenUrl, options)
         .then(response => {
-            const body = response.body;
+            const body = response.body || {};
             // if (error){
             //     res.send(error);
             //     return;
             // }
             if (body.error){
-                res.send(body.error);
+                // Bubble up Google's error payload so it's easier to diagnose
+                console.error('[auth.login] Google token error payload:', body);
+                res.status(400).send(body);
                 return;
             }
             //res.send(body);
@@ -91,17 +87,25 @@ function Auth(){
                 res.redirect(finalUrl);
                 return;
             }
-        //redirect to home or gotoUrl
+            //redirect to home or gotoUrl
             res.redirect(originalUrl || `/JOE/${User.apps[0]}`);
-            //res.send(body);
+        })
+        .catch(error => {
+            // Log structured info so we can see status + body from Google
+            const status = error.response && error.response.statusCode;
+            const body = error.response && error.response.body;
+            console.error('[auth.login] HTTPError from Google token endpoint:', {
+                status,
+                body,
+                message: error.message
+            });
+            res.status(status || 500).send(body || {
+                error: 'oauth_token_error',
+                message: error.message
+            });
         });
-        //return(data);
-        return({use_callback:true})
+        return({use_callback:true});
     }
     this.html = function(data,req,res){

package/server/plugins/chatgpt-assistants.js CHANGED Viewed

@@ -205,18 +205,13 @@ function ChatGPTAssistants() {
         resave = true;
       }
+      // Ensure we have a thread_id; create one if missing
       if (!convo.thread_id) {
         const thread = await openai.beta.threads.create();
         convo.thread_id = thread.id;
         resave = true;
-        // await new Promise((resolve, reject) => {
-        //   JOE.Storage.save(convo, 'ai_conversation', function(err, saved) {
-        //     if (err) return reject(err);
-        //     resolve(saved);
-        //   });
-        // });
       }
       if(resave){
         await new Promise((resolve, reject) => {
           JOE.Storage.save(convo, 'ai_conversation', function(err, saved) {
@@ -224,49 +219,89 @@ function ChatGPTAssistants() {
             resolve(saved);
           });
         });
+      }
+      /**
+       * Helper to start a run on the current thread for the correct assistant.
+       */
+      async function startRunForConversation(convo, data){
+        let runObj = null;
+        // Prefer assistants array if present
+        if (convo.assistants && convo.assistants.length > 0) {
+          const assistant_id = data.assistant_id || convo.assistants?.[0]?.openai_id || convo.assistants?.[0];
+          const assistant = JOE.Data.ai_assistant.find(a => a._id === assistant_id) || $J.get(assistant_id);
+          if (assistant && assistant.assistant_id) {
+            runObj = await openai.beta.threads.runs.create(convo.thread_id, {
+              assistant_id: assistant.assistant_id
+            });
+            coloredLog(`Assistant run started: ${runObj.id}`);
+          }
+        } else if (convo.assistant) {
+          const assistant = $J.get(convo.assistant);
+          if (assistant && assistant.assistant_id) {
+            runObj = await openai.beta.threads.runs.create(convo.thread_id, {
+              assistant_id: assistant.assistant_id
+            });
+            coloredLog(`Assistant run started: ${runObj.id}`);
+          }
+        }
+        return runObj;
       }
-      await openai.beta.threads.messages.create(convo.thread_id, {
-        role: "user",
-        content: content
-      });
-      var runObj = null;
-      // NOW ➔ trigger assistant reply if assistant is selected
-      if (convo.assistants && convo.assistants.length > 0) {
-        // const assistant_id = convo.assistants[0]; // Assuming you store OpenAI assistant ID here
-        //get assistant object by id
-        const assistant_id = data.assistant_id || convo.assistants?.[0]?.openai_id;
-        const assistant = JOE.Data.ai_assistant.find(a => a._id === assistant_id);
-        if (assistant.assistant_id) {
-          runObj = await openai.beta.threads.runs.create(convo.thread_id, {
-            assistant_id: assistant.assistant_id
+      let runObj = null;
+      try {
+        // Normal path: append user message to existing thread
+        await openai.beta.threads.messages.create(convo.thread_id, {
+          role: "user",
+          content: content
+        });
+        runObj = await startRunForConversation(convo, data);
+      } catch (err) {
+        // If a previous run is still active on this thread, OpenAI returns 400:
+        // "Can't add messages to <thread> while a run <run_x> is active."
+        const msg = err && err.message ? String(err.message) : '';
+        if (err && err.status === 400 && msg.indexOf("Can't add messages to") !== -1 && msg.indexOf("while a run") !== -1) {
+          coloredLog("⚠️ Active run detected for conversation " + convo._id + " on thread " + convo.thread_id);
+          return({
+            error: "active_run",
+            message: "This conversation has an active assistant run on its thread. Please wait for it to complete or start a new conversation.",
+            thread_id: convo.thread_id
           });
-          console.log(`Assistant run started: ${runObj.id}`);
-          // You could optionally poll for completion here
         }
-      }else if(convo.assistant){
-        const assistant = $J.get(convo.assistant);
-        runObj = await openai.beta.threads.runs.create(convo.thread_id, {
-          assistant_id: assistant.assistant_id // Assuming you store OpenAI assistant ID here
-        });
-        coloredLog(`Assistant run started: ${runObj.id}`);
+        // Unknown error – rethrow to outer catch
+        throw err;
       }
-      return({ success: true,runObj });
+      return({
+        success: true,
+        runObj,
+        run_id: runObj && runObj.id,
+        thread_id: convo.thread_id
+      });
     } catch (err) {
       console.error('❌ addMessage error:', err);
-      return({ error: "Failed to send message.", message: err.message });
+      const msg = err && err.message ? String(err.message) : 'Unknown error';
+      return({ error: "Failed to send message.", message: msg });
     }
   };
   this.getRunStatus = async function(data, req, res) {
     try {
+      // Debug: log raw data coming into getRunStatus to diagnose bad IDs
+      try {
+        coloredLog("🔍 getRunStatus called with data:", JSON.stringify(data));
+      } catch(_e) {
+        console.log("[chatgpt-assistants] getRunStatus data (fallback log):", data);
+      }
       const run_id = data.run_id;
       const thread_id = data.thread_id;
       var errors = [];
-      if (!run_id) errors.push("Missing run ID.");
-      if(!thread_id) errors.push("Missing thread ID.");
+      if (!run_id || run_id === 'undefined' || run_id === 'null') {
+        errors.push("Missing run ID.");
+      }
+      if (!thread_id || thread_id === 'undefined' || thread_id === 'null') {
+        errors.push("Missing thread ID.");
+      }
       if (errors.length) {
         return { error: errors.join(" ") };