json-object-editor 0.10.657 → 0.10.662

package/server/schemas/ai_assistant.js

@@ -3,7 +3,7 @@
 
 var schema = {
     title: "Ai Assistant | ${name}",
-    display: "Ai Assist",
+    display: "Ai Assistant",
     info: "An AI Assistant configuration linked to OpenAI, managed within Joe.",
     // Curated summary for agents and tools
     summary:{
@@ -42,6 +42,11 @@ var schema = {
             { name:'tags', type:'string', isArray:true, isReference:true, targetSchema:'tag' },
             { name:'status', type:'string', isReference:true, targetSchema:'status' },
             { name:'last_synced', type:'string', format:'date-time' },
+            // MCP configuration for assistants (mirrors ai_prompt / ai_response)
+            { name:'mcp_enabled', type:'boolean' },
+            { name:'mcp_toolset', type:'string' },
+            { name:'mcp_selected_tools', type:'string', isArray:true },
+            { name:'mcp_instructions_mode', type:'string' },
             { name:'joeUpdated', type:'string', format:'date-time' },
             { name:'created', type:'string', format:'date-time' }
         ]
@@ -64,6 +69,7 @@ var schema = {
         (new Set(schemas)).map(function(schema){
             subs.push({name:schema,filter:{datasets:{$in:[schema]}}})
         });
+        subs = subs.concat({name:'mcp_enabled',filter:{mcp_enabled:true}});
         return subs;
     },
     stripeColor: function(ai_assistant) {
@@ -329,6 +335,20 @@ var schema = {
             display: "File IDs (auto populated on sync)",
             comment: "Auto-managed list of OpenAI file_ids attached to this Assistant."
           },
+          {
+            name:"assistant_files",
+            type:"uploader",
+            allowmultiple:true,
+            height:"220px",
+            display:"Assistant Files (uploaded)",
+            comment:"Drag files here to upload. Files will be mirrored to OpenAI (when configured) and attached whenever this assistant is used.",
+            onConfirm:_joe.SERVER.Plugins.awsConnect,
+            file_roles:[
+              { value:"reference",   label:"Reference" },
+              { value:"instructions",label:"Instructions" },
+              { value:"example",     label:"Example", default:true }
+            ]
+          },
         { section_end: "files" },
         {section_start:'categorization',collapsed:true},
         'datasets',
@@ -339,30 +359,35 @@ var schema = {
           "itemtype",
         { section_end: "system" },
         { sidebar_start: "right", collapsed: false },
-        "tags",
-        "status",
-        { 
-            name: "last_synced",
-            type: "date",
-            display: "Last Synced",
-            locked:true,
-            comment: "Last time this Assistant was updated at OpenAI."
-        },
-        {
-            name: "sync_button",
-            type: "button",
-            display: "Sync to OpenAI",
-            method: "syncAssistantToOpenAI",
-            color: "green",
-            title: "Sync this Assistant with OpenAI"
-          },
-          {
-            name: "set_default_assistant",
-            type: "button",
-            display: "Set as Default Assistant",
-            method: "setAsDefaultAssistant",
-            color: "orange",
-            hidden:function(ai_assistant){
+          { section_start:'workflow' },
+            "status",
+            "tags",
+            "last_synced",
+            {
+              name: "sync_button",
+              type: "button",
+              display: "Sync to OpenAI",
+              method: "syncAssistantToOpenAI",
+              color: "green",
+              title: "Sync this Assistant with OpenAI"
+            },
+            {
+              name: "set_default_assistant",
+              type: "button",
+              display: "Set as Default Assistant",
+              method: "setAsDefaultAssistant",
+              color: "orange",
+              hidden:function(ai_assistant){
+                try{
+                  var settings = (_joe && _joe.Data && _joe.Data.setting) || [];
+                  var existing = settings.where({name:'DEFAULT_AI_ASSISTANT'})[0] || null;
+                  return !!(existing && existing.value === ai_assistant._id);
+                }catch(e){
+                  return false;
+                }
+              },
+            title: "Mark this assistant as the DEFAULT_AI_ASSISTANT setting.",
+            locked:function(ai_assistant){
               try{
                 var settings = (_joe && _joe.Data && _joe.Data.setting) || [];
                 var existing = settings.where({name:'DEFAULT_AI_ASSISTANT'})[0] || null;
@@ -370,27 +395,15 @@ var schema = {
               }catch(e){
                 return false;
               }
-            },
-          title: "Mark this assistant as the DEFAULT_AI_ASSISTANT setting.",
-          locked:function(ai_assistant){
-            try{
-              var settings = (_joe && _joe.Data && _joe.Data.setting) || [];
-              var existing = settings.where({name:'DEFAULT_AI_ASSISTANT'})[0] || null;
-              return !!(existing && existing.value === ai_assistant._id);
-            }catch(e){
-              return false;
             }
-          }
-          },
-        // {
-        //     name: "test_button",
-        //     type: "button",
-        //     display: "Test Button",
-        //     method: "testButtonClick",    // <- the method name you want to call
-        //     color: "orange",              // <- Joe color class (joe-orange-button)
-        //     title: "Click to test button functionality",
-        //     schema: "ai_assistant"        // <- schema to pull the method from (optional for now, we lock it anyway)
-        //   },
+            },
+          { section_end:'workflow' },
+          { section_start:'mcp', display:'MCP Tools', collapsed:true },
+            'mcp_enabled',
+            'mcp_toolset',
+            'mcp_selected_tools',
+            'mcp_instructions_mode',
+          { section_end:'mcp' },
         { sidebar_end: "right" },
 
       ];

package/server/schemas/ai_prompt.js

@@ -93,22 +93,6 @@ var schema = {
                 delete item.template_type;
             }
         });
-        // Best-effort: fetch MCP manifest once and cache tool names on this schema
-        try{
-            if (!schema._mcpToolNames && typeof fetch === 'function') {
-                fetch('/.well-known/mcp/manifest.json')
-                  .then(function(r){ if(!r.ok){ throw new Error('HTTP '+r.status); } return r.json(); })
-                  .then(function(man){
-                      try{
-                          var tools = (man && man.tools) || [];
-                          schema._mcpToolNames = tools.map(function(t){ return t && t.name; }).filter(Boolean).sort();
-                      }catch(_e){}
-                  })
-                  .catch(function(e){
-                      console.warn('ai_prompt mcp manifest load failed', e);
-                  });
-            }
-        }catch(_e){}
     },
     fields:[
        'name',
@@ -189,48 +173,10 @@ var schema = {
         {section_end:'openAi'},
 
         {section_start:'mcp', display:'MCP Tools', collapsed:true},
-          {
-            name:'mcp_enabled',
-            type:'boolean',
-            display:'Enable MCP tools',
-            default:false,
-            comment:'When true, this prompt may call JOE MCP tools (read-only by default).'
-          },
-          {
-            name:'mcp_toolset',
-            type:'select',
-            display:'MCP Toolset',
-            values:['read-only','minimal','all','custom'],
-            default:'read-only',
-            rerender:'mcp_selected_tools',
-            comment:'Choose which MCP toolset to expose when MCP tools are enabled.'
-          },
-          {
-            name:'mcp_selected_tools',
-            type:'select',
-            display:'Custom MCP tools (names)',
-            isArray:true,
-            values:function(aip){
-              try{
-                var names = (schema && schema._mcpToolNames) || [];
-                return names;
-              }catch(e){
-                return [];
-              }
-            },
-            hidden:function(aip){
-              return !aip || aip.mcp_toolset !== 'custom';
-            },
-            comment:'Multi-select from MCP manifest tool names. Only used when MCP Toolset = custom.'
-          },
-          {
-            name:'mcp_instructions_mode',
-            type:'select',
-            display:'MCP Instructions Mode',
-            values:['auto','full','none'],
-            default:'auto',
-            comment:'auto = short per-tool instructions from MCP; full = extended; none = do not add MCP instructions.'
-          },
+          'mcp_enabled',
+          'mcp_toolset',
+          'mcp_selected_tools',
+          'mcp_instructions_mode',
         {section_end:'mcp'},
 
 

package/server/schemas/ai_widget_conversation.js

@@ -31,6 +31,12 @@ var schema = {
       { name:'messages', type:'objectList' },
       { name:'last_message_at', type:'string', format:'date-time' },
       { name:'source', type:'string' },
+      // Optional scope for object-scoped chats (Start Chat on an object)
+      { name:'scope_itemtype', type:'string' },
+      { name:'scope_id', type:'string' },
+      // Optional attached OpenAI Files (ids + meta) for this conversation
+      { name:'attached_openai_file_ids', type:'string', isArray:true },
+      { name:'attached_files_meta', type:'objectList' },
       { name:'user', type:'string', isReference:true, targetSchema:'user' },
       { name:'user_name', type:'string' },
       { name:'user_color', type:'string' },
@@ -176,6 +182,31 @@ var schema = {
 
       { section_start: "meta", collapsed: true },
         "source",
+        {
+          name:"scope_itemtype",
+          type:"text",
+          display:"Scope Itemtype",
+          comment:"When set, this conversation is scoped to a specific object type (e.g., client, task)."
+        },
+        {
+          name:"scope_id",
+          type:"text",
+          display:"Scope ID",
+          comment:"When set, this conversation is scoped to a specific object _id."
+        },
+        {
+          name:"attached_openai_file_ids",
+          type:"text",
+          display:"Attached OpenAI File IDs",
+          locked:true
+        },
+        {
+          name:"attached_files_meta",
+          type:"code",
+          display:"Attached Files Meta (JSON)",
+          height:"160px",
+          comment:"Read-only meta for files attached to this conversation (itemtype, field, name, role, openai_file_id)."
+        },
         "tags",
       { section_end: "meta" },
 

package/server/schemas/include.js

@@ -24,7 +24,7 @@ var user = function(){return{
             { name:'name', type:'string', required:true },
             { name:'info', type:'string' },
             { name:'content', type:'string' },
-            { name:'filetype', type:'string', enumValues:['js','css'] },
+            { name:'filetype', type:'string', enumValues:['js','css','json'] },
             { name:'fillTemplate', type:'boolean' },
             { name:'site', type:'string', isReference:true, targetSchema:'site' },
             { name:'joeUpdated', type:'string', format:'date-time', required:true },
@@ -37,7 +37,8 @@ var user = function(){return{
     },
     subsets:[
         {name:'Scripts (.js)',filter:{filetype:'js'}},
-        {name:'Stylesheets (.css)',filter:{filetype:'css'}}
+        {name:'Stylesheets (.css)',filter:{filetype:'css'}},
+        {name:'JSON (.json)',filter:{filetype:'json'}}
     ],
     fields:[
         'name',
@@ -49,6 +50,9 @@ var user = function(){return{
                 case 'javascript':                
                     return 'javascript';
                 break;
+                case 'json':
+                    return 'json';
+                break;
                 default:
                     return item.filetype;
                 break;
@@ -73,7 +77,8 @@ var user = function(){return{
                 {name:'filetype',onchange:'_joe.TITLE.set()',type:'select',values:[
                     {name:'',value:''},
                     {name:'stylesheet',value:'css'},
-                    {name:'script',value:'js'}
+                    {name:'script',value:'js'},
+                    {name:'JSON',value:'json'}
                 ]},
                 {name:'fillTemplate',type:'boolean', display:'fill template',label:'run fillTemplate on this'},
                 'site',

package/server/schemas/page.js

@@ -29,6 +29,7 @@ var page = {
             { name:'info', type:'string' },
             { name:'site', type:'string', isReference:true, targetSchema:'site' },
             { name:'path', type:'string' },
+            { name:'form', type:'string', isReference:true, targetSchema:'form' },
             { name:'content_type', type:'string', enumValues:['wysiwyg','code','plugin','module'] },
             { name:'content', type:'string' },
             { name:'plugin', type:'string' },
@@ -191,6 +192,11 @@ var page = {
         },
         
         {section_end:'Content'},
+        {section_start:'Form',collapsed:function(page){
+            return !page.form;
+        }},
+        {name:'form',type:'select',values:'form',blank:true,comment:'Link this page to a form for dynamic form rendering'},
+        {section_end:'Form'},
          {section_label:'Blocks', section_start:'blocks_info'},
          
          {name:'syncLayoutBlocks',value:true,type:'boolean',display:'layout sync',label:'automatically keep blocks synced to layout',width:'60%'},