json-object-editor 0.10.653 → 0.10.654

package/js/JsonObjectEditor.jquery.craydent.js

@@ -5351,7 +5351,7 @@ this.renderHTMLContent = function(specs){
                     '<div class="joe-uploader-preview">'+dz_message+'</div>'+
                 '</div>'+
                 '<div class="joe-uploader-message">add a file</div>'+
-            '<div class="joe-button joe-green-button joe-upload-cofirm-button hidden"  onclick="_joe.uploaderConfirm(\''+uploader_id+'\',\''+prop.name+'\');">Upload File</div>'+__clearDiv__+
+            '<div class="joe-button joe-green-button joe-upload-cofirm-button ui-helper-hidden hidden"  onclick="_joe.uploaderConfirm(\''+uploader_id+'\',\''+prop.name+'\');">Upload File</div>'+__clearDiv__+
             '</div>'
             ;
         //var idprop = prop.idprop || '_id';
@@ -5378,7 +5378,7 @@ this.renderHTMLContent = function(specs){
         var jup_template,html= '';
         var alink ="<a href='${url}${base64}' class='file-link' target='_blank'></a>";
         var delete_btn = '<joe-uploader-file-delete-btn class="svg-shadow" onclick="_joe.Fields.uploader.remove(\''+cuid+'\',\'${filename}\');">'+self.SVG.icon.close+'</joe-uploader-delete-btn>';
-        var label = '<joe-uploader-file-label>${filename}</joe-uploader-file-label>';
+        var label = '';
         
         
         files.map(function(file){
@@ -5403,6 +5403,12 @@ this.renderHTMLContent = function(specs){
             
             
             
+            // Build the label with filename and optional OpenAI file id on a new line
+            label = '<joe-uploader-file-label>'+(file.filename || '')+'</joe-uploader-file-label>';
+            if(file.openai_file_id){
+                label += '<joe-uploader-file-oaid >'+file.openai_file_id+'</joe-uploader-file-oaid>';
+            }
+
             if((file.type && file.type.contains('image')) || (!file.type && (file.url||file.base64).split('.').contains(['jpg','jpeg','png','gif','svg']))){
                 jup_template = '<joe-uploader-file class="'+(file.uploaded && 'uploaded'||'')+'" style="background-image:url(${url}${base64})">'+alink+label+filesize+delete_btn+'</joe-uploader-file>';
             }else if (docTypes.includes((file.url || file.base64).split('.').pop())) {
@@ -5414,7 +5420,16 @@ this.renderHTMLContent = function(specs){
                 '<joe-uploader-file-extension >.'+(file.type.split('/')[1] || '???')+'</joe-uploader-file-extension>'+
                 alink+label+filesize+delete_btn+'</joe-uploader-file>';
             }    
-            html += fillTemplate(jup_template,file);
+            // Build optional OpenAI retry/upload button
+            var openaiBtn = '';
+            var needRetry = (!file.openai_file_id || file.openai_status == 'error');
+            var hasUrl = !!file.url;
+            if(hasUrl && needRetry){
+                var openaiLabel = (file.openai_status == 'error') ? 'Retry OpenAI' : 'Upload to OpenAI';
+                var safeFilename = (file.filename || '').replace(/'/g,"\\'");
+                openaiBtn = '<joe-uploader-openai-btn class="joe-button" style="margin-left:6px;" onclick="_joe.SERVER.Plugins.openaiRetryFromUrl(\''+cuid+'\',\''+safeFilename+'\');">'+openaiLabel+'</joe-uploader-openai-btn>';
+            }
+            html += fillTemplate(jup_template,file) + openaiBtn;
         })
         return html+'<div class="clear"></div>';
     }
@@ -5431,7 +5446,7 @@ this.renderHTMLContent = function(specs){
                 $(joe_uploader.dropzone).find('img,div').replaceWith('<img src="' + base64 + '">')
                 //joe_uploader.dropzone.html('<img src="' + base64 + '">');
                 joe_uploader.message.html('<b>'+file.name+'</b> selected');
-                joe_uploader.confirmBtn.removeClass('hidden');
+                joe_uploader.confirmBtn.removeClass('ui-helper-hidden hidden');
             }else {
                 results.innerHTML = 'Nothing to upload.';
             }
@@ -5462,7 +5477,7 @@ this.renderHTMLContent = function(specs){
                 }
                 joe_uploader.files.push(temp_file);
                 $(joe_uploader.preview).html(_renderUploaderFilePreviews(joe_uploader.files,joe_uploader.cuid));
-                joe_uploader.confirmBtn.removeClass('hidden');
+                joe_uploader.confirmBtn.removeClass('ui-helper-hidden hidden');
             }else {
                 results.innerHTML = 'Nothing to upload.';
             }
@@ -5530,6 +5545,20 @@ this.renderHTMLContent = function(specs){
                     var fileobj = joe_uploader.files.where({filename:filename})[0];
                     fileobj.uploaded = new Date();
                     fileobj.url = url;
+                    // Apply captured OpenAI info if present
+                    var key = self.current.object._id + '/' + filename;
+                    var oi = _joe._lastOpenAI && _joe._lastOpenAI[key];
+                    fileobj.openai_purpose = 'assistants';
+                    if(oi){
+                        fileobj.openai_file_id = oi.openai_file_id || null;
+                        fileobj.openai_status = (oi.openai_file_id && 'ok') || (oi.openai_error && 'error') || 'not_uploaded';
+                        fileobj.openai_error = oi.openai_error || null;
+                        if(oi.openai_error){
+                            joe_uploader.message.append('<div>OpenAI error: '+oi.openai_error+'</div>');
+                        }
+                    }else{
+                        fileobj.openai_status = fileobj.openai_status || 'not_uploaded';
+                    }
                     delete fileobj.base64;
                 }
 
@@ -5600,6 +5629,14 @@ this.renderHTMLContent = function(specs){
             self.uploaders[id].dropzone = $(this).find('.joe-uploader-dropzone');
             self.uploaders[id].confirmBtn = $(this).find('.joe-upload-cofirm-button');
 
+			// If there are pending files (not uploaded or missing url), show the confirm button
+			var pending = (self.uploaders[id].files || []).some(function(file){
+				return $c.isObject(file) && (!file.uploaded || !file.url);
+			});
+			if(pending){
+				self.uploaders[id].confirmBtn.removeClass('ui-helper-hidden hidden');
+			}
+
         });
     };
         encapsulateFieldType('uploader',self.renderUploaderField,
@@ -9936,6 +9973,13 @@ logit(intent)
                                 url = prefix+response.Key;
                             }
                             var filename = response.Key.replace(self.current.object._id+'/','');
+                            // Stash OpenAI info for use during finalization
+                            _joe._lastOpenAI = _joe._lastOpenAI || {};
+                            _joe._lastOpenAI[response.Key] = {
+                                openai_file_id: response.openai_file_id,
+                                openai_purpose: response.openai_purpose,
+                                openai_error: response.openai_error
+                            };
                             if(field.url_field){
                                 var nprop = {};
                                 _joe.current.object[field.url_field] = url;
@@ -9960,6 +10004,53 @@ logit(intent)
                     file: { base64:data.base64, extension:data.extension, type:data.contentType, filename: (_joe.current.object._id+data.extension), name: (_joe.current.object._id+data.extension) },
                     field: data.field
                 }, callback);
+            },
+            // Retry uploading a specific file to OpenAI using its URL.
+            // Invoked by the uploader row action.
+            openaiRetryFromUrl:function(uploader_id, filename){
+                try{
+                    var joe_uploader = self.uploaders[uploader_id];
+                    if(!joe_uploader){ return alert('Uploader not found'); }
+                    var file = joe_uploader.files.where({filename:filename})[0];
+                    if(!file){ return alert('File not found'); }
+                    if(!file.url){ return alert('No URL to upload to OpenAI'); }
+                    var btn = $(joe_uploader.preview).find("joe-uploader-openai-btn:contains('"+filename+"')");
+                    joe_uploader.message.append('<div>Uploading to OpenAI...</div>');
+                    $.ajax({
+                        url: (location.port && '//'+__jsc.hostname+':'+__jsc.port+'/API/plugin/chatgpt/filesRetryFromUrl/') || '//'+__jsc.hostname+'/API/plugin/chatgpt/filesRetryFromUrl/',
+                        type:'POST',
+                        data:{
+                            url:file.url,
+                            filename:file.filename,
+                            contentType:file.type
+                        },
+                        success:function(resp){
+                            if(resp && resp.success && resp.openai_file_id){
+                                file.openai_file_id = resp.openai_file_id;
+                                file.openai_purpose = resp.openai_purpose || 'assistants';
+                                file.openai_status = 'ok';
+                                file.openai_error = null;
+                                joe_uploader.message.append('<div>OpenAI file attached</div>');
+                            }else{
+                                file.openai_status = 'error';
+                                file.openai_error = (resp && resp.error) || 'Upload failed';
+                                joe_uploader.message.append('<div>OpenAI error: '+(file.openai_error)+'</div>');
+                            }
+                            // Refresh preview to reflect new status/button
+                            $(joe_uploader.preview).html(_renderUploaderFilePreviews(joe_uploader.files,joe_uploader.cuid));
+                            // Save object so file metadata is persisted
+                            self.updateObject(null, null, true);
+                        },
+                        error:function(xhr,status,err){
+                            var message = (xhr && (xhr.responseJSON && (xhr.responseJSON.error || xhr.responseJSON.code) || xhr.responseText)) || err || status || 'Retry failed';
+                            file.openai_status = 'error';
+                            file.openai_error = message;
+                            joe_uploader.message.append('<div>OpenAI error: '+message+'</div>');
+                        }
+                    });
+                }catch(e){
+                    alert(e && e.message || e);
+                }
             }
         },
         ready:{

package/js/joe-ai.js

@@ -1679,26 +1679,54 @@
      * Run the Thought agent for the current schema object.
      * Used by the core `proposeThought` field.
      */
-    Ai.runProposeThought = function(scopeId, textareaId, model){
+    Ai.runProposeThought = function(btnOrScopeId, textareaIdOrModel, maybeModel){
       try{
+        // Back-compat: allow old signature (scopeId, textareaId, model)
+        var btn = (btnOrScopeId && btnOrScopeId.tagName) ? btnOrScopeId : null;
+        var scopeId = btn ? textareaIdOrModel : btnOrScopeId;
+        var textareaId = btn ? maybeModel : textareaIdOrModel;
+        var model = btn ? undefined : maybeModel;
+
+        if (btn) {
+          if (btn.dataset.running === '1') { return; }
+          btn.dataset.running = '1';
+          btn.classList.add('joe-loading');
+          btn.setAttribute('disabled','disabled');
+        }
         if (!scopeId) {
           alert('Save the item before proposing thoughts.');
+          if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
           return;
         }
         var ta = document.getElementById(textareaId);
         if (!ta) {
           alert('Prompt field not found.');
+          if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
           return;
         }
         var prompt = (ta.value || '').trim();
         if (!prompt) {
           alert('Please enter a prompt for the Thought run.');
+          if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
           return;
         }
+        // Collect selected OpenAI file ids (trim to 10)
+        var selId = 'propose_thought_files_' + scopeId;
+        var fileIds = [];
+        try{
+          var sel = document.getElementById(selId);
+          if(sel){
+            var selected = Array.prototype.slice.call(sel.selectedOptions || []);
+            fileIds = selected.map(function(o){ return o.value; }).filter(Boolean);
+            if(fileIds.length > 10){ fileIds = fileIds.slice(0,10); }
+          }
+        }catch(_e){/*noop*/}
+
         var params = {
           agent_id: 'thought_agent_default',
           scope_id: scopeId,
-          user_input: prompt
+          user_input: prompt,
+          openai_file_ids: fileIds
         };
         if (model) {
           params.model = model;
@@ -1723,12 +1751,15 @@
           } else {
             alert('Thought agent run complete. Proposed ' + count + ' thoughts.');
           }
+          if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
         }).catch(function(err){
           console.error('Ai.runProposeThought error', err);
           alert('Failed to run Thought agent: ' + (err && err.message || err));
+          if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
         });
       }catch(e){
         console.error('Ai.runProposeThought error', e);
+        try{ if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); } }catch(_e){}
       }
     };
 
@@ -1813,7 +1844,203 @@
         return false;
       }
     };
+
+  // --------------------------------------------------
+  // File helpers for AI integrations
+  // --------------------------------------------------
+  Ai.getFilesForObject = function(options = {}){
+    try{
+      var onlyWithOpenAI = options.onlyWithOpenAI === true;
+      var includeNested = options.includeNested === true; // not used in v1
+      var obj = (_joe && _joe.current && _joe.current.object) || {};
+      var schema = (_joe && _joe.current && _joe.current.schema) || {};
+      // Prefer the live, constructed field defs; fall back to schema.fields
+      var liveFieldDefs = (_joe && _joe.current && Array.isArray(_joe.current.fields) && _joe.current.fields) || [];
+      var schemaFields = (schema && schema.fields) || [];
+      var fieldNames = [];
+      // collect from live constructed defs
+      liveFieldDefs.forEach(function(fd){
+        if(fd && fd.name && fd.type === 'uploader'){ fieldNames.push(fd.name); }
+      });
+      // also collect from raw schema (string or object), dedupe
+      schemaFields.forEach(function(f){
+        var fname = (typeof f === 'string') ? f : (f && (f.name || f.field || f.prop));
+        if(!fname){ return; }
+        try{
+          var fd = _joe.getField(fname);
+          if(fd && fd.type === 'uploader' && fieldNames.indexOf(fname) === -1){
+            fieldNames.push(fname);
+          }
+        }catch(_e){ /* ignore */ }
+      });
+
+      var out = [];
+      fieldNames.forEach(function(fname){
+        var val = obj[fname];
+        if(!val){ return; }
+        var list = Array.isArray(val) ? val : [val];
+        list.forEach(function(file){
+          if(!file || typeof file !== 'object'){ return; }
+          var item = {
+            fieldName: fname,
+            filename: file.filename || (file.url && String(file.url).split('/').pop()) || '',
+            url: file.url || null,
+            openai_file_id: file.openai_file_id || null,
+            openai_status: file.openai_status || null,
+            size: file.size || null,
+            type: file.type || null,
+            path: fname
+          };
+          if(onlyWithOpenAI && !item.openai_file_id){ return; }
+          out.push(item);
+        });
+      });
+      return out;
+    }catch(e){
+      console.warn('Ai.getFilesForObject error', e);
+      return [];
+    }
+  };
+
+  Ai.renderFilesSelector = function(selectId, opts = {}){
+    try{
+      var cap = typeof opts.cap === 'number' ? opts.cap : 10;
+      var disableWithoutOpenAI = opts.disableWithoutOpenAI !== false; // default true
+      var onlyWithOpenAI = false; // show all; disable those missing ids
+      var files = Ai.getFilesForObject({ onlyWithOpenAI, includeNested:false });
+      // Fallback: scan top-level arrays for file-shaped objects if nothing found
+      if(!files || !files.length){
+        try{
+          var obj = (_joe && _joe.current && _joe.current.object) || {};
+          Object.keys(obj || {}).forEach(function(k){
+            var v = obj[k];
+            if(Array.isArray(v)){
+              v.forEach(function(it){
+                if(it && typeof it === 'object' && (it.filename || it.url)){
+                  files.push({
+                    fieldName: k,
+                    filename: it.filename || (it.url && String(it.url).split('/').pop()) || '',
+                    url: it.url || null,
+                    openai_file_id: it.openai_file_id || null,
+                    openai_status: it.openai_status || null,
+                    size: it.size || null,
+                    type: it.type || null,
+                    path: k
+                  });
+                }
+              });
+            }
+          });
+        }catch(_e){ /* noop */ }
+      }
+      var sel = document.getElementById(selectId);
+      if(!sel){ return; }
+      sel.innerHTML = '';
+      files.forEach(function(f){
+        var opt = document.createElement('option');
+        opt.value = f.openai_file_id || ''; // empty when missing
+        opt.textContent = f.filename || f.openai_file_id || '(unnamed file)';
+        if(disableWithoutOpenAI && !f.openai_file_id){
+          opt.disabled = true;
+          opt.textContent += ' (not uploaded to OpenAI)';
+        }
+        sel.appendChild(opt);
+      });
+      // Enforce cap on submit: caller will trim again before sending
+      // If still empty, retry shortly in case the panel hasn't fully constructed fields yet
+      if(!files.length){
+        setTimeout(function(){ try{ Ai.renderFilesSelector(selectId, opts); }catch(_e){} }, 200);
+      }
+    }catch(e){
+      console.warn('Ai.renderFilesSelector error', e);
+    }
+  };
   
+  Ai.runPromptSelection = function(btnOrObjectId, selectId, filesSelectId){
+    try{
+      // Back-compat: allow old signature (objectId, selectId, filesSelectId)
+      var btn = (btnOrObjectId && btnOrObjectId.tagName) ? btnOrObjectId : null;
+      var objectId = btn ? selectId : btnOrObjectId;
+      var realSelectId = btn ? filesSelectId : selectId;
+      var realFilesSelectId = btn ? arguments[3] : filesSelectId; // handle both signatures
+
+      if (btn) {
+        if (btn.dataset.running === '1') { return; }
+        btn.dataset.running = '1';
+        btn.classList.add('joe-loading');
+        btn.setAttribute('disabled','disabled');
+      }
+
+      var sel = document.getElementById(realSelectId);
+      if(!sel || !sel.value){
+        alert('Select a prompt first.');
+        if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
+        return;
+      }
+      var promptId = sel.value;
+      // Collect selected OpenAI file ids (trim to 10)
+      var fileIds = [];
+      try{
+        var fsel = document.getElementById(realFilesSelectId);
+        if(fsel){
+          var selected = Array.prototype.slice.call(fsel.selectedOptions || []);
+          fileIds = selected.map(function(o){ return o.value; }).filter(Boolean);
+          if(fileIds.length > 10){ fileIds = fileIds.slice(0,10); }
+        }
+      }catch(_e){}
+
+      // Build references for this object when the prompt expects the current itemtype
+      var obj = (_joe && _joe.current && _joe.current.object) || {};
+      var prompt = $J.get(promptId,'ai_prompt');
+      var params = {};
+      try{
+        (prompt && prompt.content_items || []).forEach(function(ci){
+          if(ci && ci.itemtype === obj.itemtype && ci.reference){
+            params[ci.reference] = obj._id;
+          }
+        });
+      }catch(_e){}
+
+      $.ajax('/API/plugin/chatgpt/executeJOEAiPrompt',{
+        method:'POST',
+        data:{
+          ai_prompt: promptId,
+          params: params,
+          openai_file_ids: fileIds
+        },
+        success:function(resp){
+          try{
+            // Try to apply a patch if the response contains one
+            var text = (resp && resp.response) || '';
+            if(text){
+              try{
+                var parsed = JSON.parse(text);
+                if(parsed && parsed.patch){
+                  _joe.Ai.applyAutofillPatch(parsed.patch);
+                }
+              }catch(_e){ /* ignore parse errors */ }
+            }
+          }catch(_e){}
+          // Refresh AI responses field
+          try{ _joe.Fields.rerender && _joe.Fields.rerender('ai_responses'); }catch(_e){}
+          if(_joe.toast){
+            _joe.toast('AI prompt run complete.');
+          }
+          if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
+        },
+        error:function(xhr,status,err){
+          var message = (xhr && (xhr.responseJSON && (xhr.responseJSON.error || xhr.responseJSON.code) || xhr.responseText)) || err || status || 'Prompt run failed';
+          alert(message);
+          if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); }
+        }
+      });
+    }catch(e){
+      console.warn('runPromptSelection error', e);
+      alert('Failed to run prompt.');
+      try{ if (btn) { btn.dataset.running=''; btn.classList.remove('joe-loading'); btn.removeAttribute('disabled'); } }catch(_e){}
+    }
+  };
+
     
     // Attach AI to _joe
     if (window._joe) {

package/js/joe.js

@@ -1,6 +1,6 @@
 /* --------------------------------------------------------
  *
- *  json-object-editor - v0.10.653
+ *  json-object-editor - v0.10.654
  *  Created by: Corey Hadden
  *
  * -------------------------------------------------------- */
@@ -5357,7 +5357,7 @@ this.renderHTMLContent = function(specs){
                     '<div class="joe-uploader-preview">'+dz_message+'</div>'+
                 '</div>'+
                 '<div class="joe-uploader-message">add a file</div>'+
-            '<div class="joe-button joe-green-button joe-upload-cofirm-button hidden"  onclick="_joe.uploaderConfirm(\''+uploader_id+'\',\''+prop.name+'\');">Upload File</div>'+__clearDiv__+
+            '<div class="joe-button joe-green-button joe-upload-cofirm-button ui-helper-hidden hidden"  onclick="_joe.uploaderConfirm(\''+uploader_id+'\',\''+prop.name+'\');">Upload File</div>'+__clearDiv__+
             '</div>'
             ;
         //var idprop = prop.idprop || '_id';
@@ -5384,7 +5384,7 @@ this.renderHTMLContent = function(specs){
         var jup_template,html= '';
         var alink ="<a href='${url}${base64}' class='file-link' target='_blank'></a>";
         var delete_btn = '<joe-uploader-file-delete-btn class="svg-shadow" onclick="_joe.Fields.uploader.remove(\''+cuid+'\',\'${filename}\');">'+self.SVG.icon.close+'</joe-uploader-delete-btn>';
-        var label = '<joe-uploader-file-label>${filename}</joe-uploader-file-label>';
+        var label = '';
         
         
         files.map(function(file){
@@ -5409,6 +5409,12 @@ this.renderHTMLContent = function(specs){
             
             
             
+            // Build the label with filename and optional OpenAI file id on a new line
+            label = '<joe-uploader-file-label>'+(file.filename || '')+'</joe-uploader-file-label>';
+            if(file.openai_file_id){
+                label += '<joe-uploader-file-oaid >'+file.openai_file_id+'</joe-uploader-file-oaid>';
+            }
+
             if((file.type && file.type.contains('image')) || (!file.type && (file.url||file.base64).split('.').contains(['jpg','jpeg','png','gif','svg']))){
                 jup_template = '<joe-uploader-file class="'+(file.uploaded && 'uploaded'||'')+'" style="background-image:url(${url}${base64})">'+alink+label+filesize+delete_btn+'</joe-uploader-file>';
             }else if (docTypes.includes((file.url || file.base64).split('.').pop())) {
@@ -5420,7 +5426,16 @@ this.renderHTMLContent = function(specs){
                 '<joe-uploader-file-extension >.'+(file.type.split('/')[1] || '???')+'</joe-uploader-file-extension>'+
                 alink+label+filesize+delete_btn+'</joe-uploader-file>';
             }    
-            html += fillTemplate(jup_template,file);
+            // Build optional OpenAI retry/upload button
+            var openaiBtn = '';
+            var needRetry = (!file.openai_file_id || file.openai_status == 'error');
+            var hasUrl = !!file.url;
+            if(hasUrl && needRetry){
+                var openaiLabel = (file.openai_status == 'error') ? 'Retry OpenAI' : 'Upload to OpenAI';
+                var safeFilename = (file.filename || '').replace(/'/g,"\\'");
+                openaiBtn = '<joe-uploader-openai-btn class="joe-button" style="margin-left:6px;" onclick="_joe.SERVER.Plugins.openaiRetryFromUrl(\''+cuid+'\',\''+safeFilename+'\');">'+openaiLabel+'</joe-uploader-openai-btn>';
+            }
+            html += fillTemplate(jup_template,file) + openaiBtn;
         })
         return html+'<div class="clear"></div>';
     }
@@ -5437,7 +5452,7 @@ this.renderHTMLContent = function(specs){
                 $(joe_uploader.dropzone).find('img,div').replaceWith('<img src="' + base64 + '">')
                 //joe_uploader.dropzone.html('<img src="' + base64 + '">');
                 joe_uploader.message.html('<b>'+file.name+'</b> selected');
-                joe_uploader.confirmBtn.removeClass('hidden');
+                joe_uploader.confirmBtn.removeClass('ui-helper-hidden hidden');
             }else {
                 results.innerHTML = 'Nothing to upload.';
             }
@@ -5468,7 +5483,7 @@ this.renderHTMLContent = function(specs){
                 }
                 joe_uploader.files.push(temp_file);
                 $(joe_uploader.preview).html(_renderUploaderFilePreviews(joe_uploader.files,joe_uploader.cuid));
-                joe_uploader.confirmBtn.removeClass('hidden');
+                joe_uploader.confirmBtn.removeClass('ui-helper-hidden hidden');
             }else {
                 results.innerHTML = 'Nothing to upload.';
             }
@@ -5536,6 +5551,20 @@ this.renderHTMLContent = function(specs){
                     var fileobj = joe_uploader.files.where({filename:filename})[0];
                     fileobj.uploaded = new Date();
                     fileobj.url = url;
+                    // Apply captured OpenAI info if present
+                    var key = self.current.object._id + '/' + filename;
+                    var oi = _joe._lastOpenAI && _joe._lastOpenAI[key];
+                    fileobj.openai_purpose = 'assistants';
+                    if(oi){
+                        fileobj.openai_file_id = oi.openai_file_id || null;
+                        fileobj.openai_status = (oi.openai_file_id && 'ok') || (oi.openai_error && 'error') || 'not_uploaded';
+                        fileobj.openai_error = oi.openai_error || null;
+                        if(oi.openai_error){
+                            joe_uploader.message.append('<div>OpenAI error: '+oi.openai_error+'</div>');
+                        }
+                    }else{
+                        fileobj.openai_status = fileobj.openai_status || 'not_uploaded';
+                    }
                     delete fileobj.base64;
                 }
 
@@ -5606,6 +5635,14 @@ this.renderHTMLContent = function(specs){
             self.uploaders[id].dropzone = $(this).find('.joe-uploader-dropzone');
             self.uploaders[id].confirmBtn = $(this).find('.joe-upload-cofirm-button');
 
+			// If there are pending files (not uploaded or missing url), show the confirm button
+			var pending = (self.uploaders[id].files || []).some(function(file){
+				return $c.isObject(file) && (!file.uploaded || !file.url);
+			});
+			if(pending){
+				self.uploaders[id].confirmBtn.removeClass('ui-helper-hidden hidden');
+			}
+
         });
     };
         encapsulateFieldType('uploader',self.renderUploaderField,
@@ -9942,6 +9979,13 @@ logit(intent)
                                 url = prefix+response.Key;
                             }
                             var filename = response.Key.replace(self.current.object._id+'/','');
+                            // Stash OpenAI info for use during finalization
+                            _joe._lastOpenAI = _joe._lastOpenAI || {};
+                            _joe._lastOpenAI[response.Key] = {
+                                openai_file_id: response.openai_file_id,
+                                openai_purpose: response.openai_purpose,
+                                openai_error: response.openai_error
+                            };
                             if(field.url_field){
                                 var nprop = {};
                                 _joe.current.object[field.url_field] = url;
@@ -9966,6 +10010,53 @@ logit(intent)
                     file: { base64:data.base64, extension:data.extension, type:data.contentType, filename: (_joe.current.object._id+data.extension), name: (_joe.current.object._id+data.extension) },
                     field: data.field
                 }, callback);
+            },
+            // Retry uploading a specific file to OpenAI using its URL.
+            // Invoked by the uploader row action.
+            openaiRetryFromUrl:function(uploader_id, filename){
+                try{
+                    var joe_uploader = self.uploaders[uploader_id];
+                    if(!joe_uploader){ return alert('Uploader not found'); }
+                    var file = joe_uploader.files.where({filename:filename})[0];
+                    if(!file){ return alert('File not found'); }
+                    if(!file.url){ return alert('No URL to upload to OpenAI'); }
+                    var btn = $(joe_uploader.preview).find("joe-uploader-openai-btn:contains('"+filename+"')");
+                    joe_uploader.message.append('<div>Uploading to OpenAI...</div>');
+                    $.ajax({
+                        url: (location.port && '//'+__jsc.hostname+':'+__jsc.port+'/API/plugin/chatgpt/filesRetryFromUrl/') || '//'+__jsc.hostname+'/API/plugin/chatgpt/filesRetryFromUrl/',
+                        type:'POST',
+                        data:{
+                            url:file.url,
+                            filename:file.filename,
+                            contentType:file.type
+                        },
+                        success:function(resp){
+                            if(resp && resp.success && resp.openai_file_id){
+                                file.openai_file_id = resp.openai_file_id;
+                                file.openai_purpose = resp.openai_purpose || 'assistants';
+                                file.openai_status = 'ok';
+                                file.openai_error = null;
+                                joe_uploader.message.append('<div>OpenAI file attached</div>');
+                            }else{
+                                file.openai_status = 'error';
+                                file.openai_error = (resp && resp.error) || 'Upload failed';
+                                joe_uploader.message.append('<div>OpenAI error: '+(file.openai_error)+'</div>');
+                            }
+                            // Refresh preview to reflect new status/button
+                            $(joe_uploader.preview).html(_renderUploaderFilePreviews(joe_uploader.files,joe_uploader.cuid));
+                            // Save object so file metadata is persisted
+                            self.updateObject(null, null, true);
+                        },
+                        error:function(xhr,status,err){
+                            var message = (xhr && (xhr.responseJSON && (xhr.responseJSON.error || xhr.responseJSON.code) || xhr.responseText)) || err || status || 'Retry failed';
+                            file.openai_status = 'error';
+                            file.openai_error = message;
+                            joe_uploader.message.append('<div>OpenAI error: '+message+'</div>');
+                        }
+                    });
+                }catch(e){
+                    alert(e && e.message || e);
+                }
             }
         },
         ready:{