cmdbox 0.6.2.2__py3-none-any.whl → 0.6.2.4__py3-none-any.whl

cmdbox/app/mcp.py

@@ -35,11 +35,12 @@ class Mcp:
         self.ver = ver
         self.signin = sign
 
-    def create_mcpserver(self, args:argparse.Namespace, tools:List[Any], web:Any) -> Any:
+    def create_mcpserver(self, logger:logging.Logger, args:argparse.Namespace, tools:List[Any], web:Any) -> Any:
         """
         mcpserverを作成します
 
         Args:
+            logger (logging.Logger): ロガー
             args (argparse.Namespace): 引数
             tools (List[Any]): ツールのリスト
             web (Any): Web関連のオブジェクト
@@ -60,13 +61,85 @@ class Mcp:
                 issuer=issuer,
                 audience=audience
             )
-            mcp = FastMCP(name=self.ver.__appid__, tools=tools, auth=auth)
+            mcp = FastMCP(name=self.ver.__appid__, auth=auth)
         else:
             self.logger.info(f"Using BearerAuthProvider without public key, issuer, or audience.")
-            mcp = FastMCP(name=self.ver.__appid__, tools=tools)
+            mcp = FastMCP(name=self.ver.__appid__)
         mcp.add_middleware(self.create_mw_logging(self.logger, args))
         mcp.add_middleware(self.create_mw_reqscope(self.logger, args, web))
-        mcp.add_middleware(self.create_mw_toollist(self.logger, args))
+
+        options = Options.getInstance()
+        cmd_list:feature.Feature = options.get_cmd_attr('cmd', 'list', "feature")
+        language, _ = locale.getlocale()
+        is_japan = language.find('Japan') >= 0 or language.find('ja_JP') >= 0
+        _self_mcp = self
+        from cmdbox.app.web import Web
+        from fastmcp.tools import tool, tool_manager
+        class CustomToolManager(tool_manager.ToolManager):
+            async def _load_tools(self, *, via_server: bool = False) -> dict[str, tool.Tool]:
+                if hasattr(self, '_tools') and self._tools:
+                    return self._tools
+                ret = await super()._load_tools(via_server=via_server)
+                #scope = signin.get_request_scope()
+                #web:Web = scope["web"]
+                signin_file = web.signin_file
+                #signin_data = signin.Signin.load_signin_file(signin_file)
+                #if signin.Signin._check_signin(scope["req"], scope["res"], signin_data, logger) is not None:
+                #    logger.warning("Unable to execute command because authentication information cannot be obtained")
+                #    raise Exception("Unable to execute command because authentication information cannot be obtained")
+                #groups = scope["req"].session["signin"]["groups"]
+                ret_tools = dict()
+                # システムコマンドリストのフィルタリング
+                for func in tools:
+                    mode = [t.replace('mode=', '') for t in func.tags if t.startswith('mode=')]
+                    mode = mode[0] if mode else None
+                    cmd = [t.replace('cmd=', '') for t in func.tags if t.startswith('cmd=')]
+                    cmd = cmd[0] if cmd else None
+                    if mode is None or cmd is None:
+                        logger.warning(f"Tool {func.name} does not have mode or cmd tag, skipping.")
+                        continue
+                    #if not signin.Signin._check_cmd(signin_data, groups, mode, cmd, logger):
+                    #    logger.warning(f"User does not have permission to use tool {func.name} (mode={mode}, cmd={cmd}), skipping.")
+                    #    continue
+                    ret_tools[func.name] = func
+                #　ユーザーコマンドリストの取得(すべてのコマンドを取得するためにgroupsをadminに設定)
+                args = argparse.Namespace(data=web.data, signin_file=signin_file, groups=['admin'], kwd=None,
+                                          format=False, output_json=None, output_json_append=False,)
+                st, ret, _ = cmd_list.apprun(logger, args, time.perf_counter(), [])
+                if ret is None or 'success' not in ret or not ret['success']:
+                    return ret_tools
+                for opt in ret['success']:
+                    func_name = opt['title']
+                    mode, cmd, description = opt['mode'], opt['cmd'], opt['description'] if 'description' in opt and opt['description'] else ''
+                    choices = options.get_cmd_choices(mode, cmd, False)
+                    description += '\n' + options.get_cmd_attr(mode, cmd, 'description_ja' if is_japan else 'description_en')
+                    # 関数の定義を生成
+                    func_txt  = _self_mcp._create_func_txt(func_name, mode, cmd, is_japan, options, title=opt['title'])
+                    if logger.level == logging.DEBUG:
+                        logger.debug(f"generating agent tool: {func_name}")
+                    func_ctx = []
+                    # 関数を実行してコンテキストに追加
+                    exec(func_txt,
+                        dict(time=time,List=List, Path=Path, argparse=argparse, common=common, options=options, logging=logging, signin=signin,),
+                        dict(func_ctx=func_ctx))
+                    # 関数のスキーマを生成
+                    input_schema = dict(
+                        type="object",
+                        properties={o['opt']: _self_mcp._to_schema(o, is_japan) for o in choices},
+                        required=[],
+                    )
+                    output_schema = dict(type="object", properties=dict())
+                    func_tool = tool.FunctionTool(fn=func_ctx[0], name=func_name, title=func_name.title(), description=description, 
+                                                   tags=[f"mode={mode}", f"cmd={cmd}"],
+                                                   parameters=input_schema, output_schema=output_schema,)
+                    # ツールリストに追加
+                    ret_tools[func_name] = func_tool
+                self._tools = ret_tools
+                return ret_tools
+        mcp._tool_manager = CustomToolManager(
+            duplicate_behavior=mcp._tool_manager.duplicate_behavior,
+            mask_error_details=mcp._tool_manager.mask_error_details
+        )
         return mcp
 
     def create_session_service(self, args:argparse.Namespace) -> Any:
@@ -335,6 +408,8 @@ class Mcp:
         func_txt += f'        opt_path = opt["data"] / ".cmds" / f"cmd-{title}.json"\n'
         func_txt += f'        opt.update(common.loadopt(opt_path))\n'
         func_txt += f'    scope = signin.get_request_scope()\n'
+        func_txt += f'    if logger.level == logging.DEBUG:\n'
+        func_txt +=  '        logger.debug(f"MCP Call scope={scope}")\n'
         func_txt += f'    opt["mode"] = "{mode}"\n'
         func_txt += f'    opt["cmd"] = "{cmd}"\n'
         func_txt += f'    opt["format"] = False\n'
@@ -356,6 +431,8 @@ class Mcp:
         func_txt += f'    feat = options.get_cmd_attr("{mode}", "{cmd}", "feature")\n'
         func_txt += f'    args.groups = groups\n'
         func_txt += f'    try:\n'
+        func_txt += f'        if logger.level == logging.DEBUG:\n'
+        func_txt +=  '            logger.debug(f"MCP Call {feat}#apprun, args={args}")\n'
         func_txt += f'        st, ret, _ = feat.apprun(logger, args, time.perf_counter(), [])\n'
         func_txt += f'        return ret\n'
         func_txt += f'    except Exception as e:\n'
@@ -411,87 +488,6 @@ class Mcp:
                 func_tools.append(func_tool)
         return func_tools
 
-    def create_mw_toollist(self, logger:logging.Logger, args:argparse.Namespace) -> Any:
-        """
-        ツールリストを作成するミドルウェアを作成します
-
-        Args:
-            logger (logging.Logger): ロガー
-            args (argparse.Namespace): 引数
-
-        Returns:
-            Any: ミドルウェア
-        """
-        from cmdbox.app.web import Web
-        from fastmcp.server.middleware import Middleware, MiddlewareContext, ListToolsResult
-        from fastmcp.tools import FunctionTool
-        func_tools:List[FunctionTool] = self.create_tools(logger, args)
-        options = Options.getInstance()
-        cmd_list:feature.Feature = options.get_cmd_attr('cmd', 'list', "feature")
-        language, _ = locale.getlocale()
-        is_japan = language.find('Japan') >= 0 or language.find('ja_JP') >= 0
-        mcp = self
-        class CommandListMiddleware(Middleware):
-            async def on_list_tools(self, context: MiddlewareContext, call_next):
-                # 認証情報の取得
-                scope = signin.get_request_scope()
-                web:Web = scope["web"]
-                signin_file = web.signin_file
-                signin_data = signin.Signin.load_signin_file(signin_file)
-                if signin.Signin._check_signin(scope["req"], scope["res"], signin_data, logger) is not None:
-                    logger.warning("Unable to execute command because authentication information cannot be obtained")
-                    return dict(warn="Unable to execute command because authentication information cannot be obtained")
-                groups = scope["req"].session["signin"]["groups"]
-                ret_tools = []
-                # システムコマンドリストのフィルタリング
-                for func in func_tools:
-                    mode = [t.replace('mode=', '') for t in func.tags if t.startswith('mode=')]
-                    mode = mode[0] if mode else None
-                    cmd = [t.replace('cmd=', '') for t in func.tags if t.startswith('cmd=')]
-                    cmd = cmd[0] if cmd else None
-                    if mode is None or cmd is None:
-                        logger.warning(f"Tool {func.name} does not have mode or cmd tag, skipping.")
-                        continue
-                    if not signin.Signin._check_cmd(signin_data, groups, mode, cmd, logger):
-                        logger.warning(f"User does not have permission to use tool {func.name} (mode={mode}, cmd={cmd}), skipping.")
-                        continue
-                    ret_tools.append(func)
-                #　ユーザーコマンドリストの取得
-                args = argparse.Namespace(data=web.data, signin_file=signin_file, groups=groups, kwd=None,
-                                          format=False, output_json=None, output_json_append=False,)
-                st, ret, _ = cmd_list.apprun(logger, args, time.perf_counter(), [])
-                if ret is None or 'success' not in ret or not ret['success']:
-                    return ret_tools
-                for opt in ret['success']:
-                    func_name = f"user_{opt['title']}"
-                    mode, cmd, description = opt['mode'], opt['cmd'], opt['description'] if 'description' in opt and opt['description'] else ''
-                    choices = options.get_cmd_choices(mode, cmd, False)
-                    description += '\n' + options.get_cmd_attr(mode, cmd, 'description_ja' if is_japan else 'description_en')
-                    # 関数の定義を生成
-                    func_txt  = mcp._create_func_txt(func_name, mode, cmd, is_japan, options, title=opt['title'])
-                    if logger.level == logging.DEBUG:
-                        logger.debug(f"generating agent tool: {func_name}")
-                    func_ctx = []
-                    # 関数を実行してコンテキストに追加
-                    exec(func_txt,
-                        dict(time=time,List=List, Path=Path, argparse=argparse, common=common, options=options, logging=logging, signin=signin,),
-                        dict(func_ctx=func_ctx))
-                    # 関数のスキーマを生成
-                    input_schema = dict(
-                        type="object",
-                        properties={o['opt']: mcp._to_schema(o, is_japan) for o in choices},
-                        required=[],
-                    )
-                    output_schema = dict(type="object", properties=dict())
-                    func_tool = FunctionTool(fn=func_ctx[0], name=func_name, title=func_name.title(), description=description, 
-                                            tags=[f"mode={mode}", f"cmd={cmd}"],
-                                            parameters=input_schema, output_schema=output_schema,)
-                    # ツールリストに追加
-                    ret_tools.append(func_tool)
-
-                return ret_tools
-        return CommandListMiddleware()
-
     def create_mw_logging(self, logger:logging.Logger, args:argparse.Namespace) -> Any:
         """
         ログ出力用のミドルウェアを作成します
@@ -563,7 +559,7 @@ class Mcp:
         session_service:BaseSessionService = self.create_session_service(args)
         from fastmcp.tools import FunctionTool
         tools:List[FunctionTool] = self.create_tools(logger, args)
-        mcp:FastMCP = self.create_mcpserver(args, tools, web)
+        mcp:FastMCP = self.create_mcpserver(logger, args, tools, web)
         root_agent = self.create_agent(logger, args, [t.fn for t in tools])
         runner = self.create_runner(logger, args, session_service, root_agent)
         if logger.level == logging.DEBUG:

cmdbox/app/options.py

@@ -843,7 +843,6 @@ class Options:
             elif isinstance(arg, feature.Feature):
                 func_feature = arg
                 opt['clmsg_src'] = func_feature.__class__.__name__
-                audited_by = arg.audited_by()
             elif isinstance(arg, Request) or isinstance(arg, WebSocket):
                 if 'signin' in arg.session and arg.session['signin'] is not None and 'name' in arg.session['signin']:
                     opt['clmsg_user'] = arg.session['signin']['name']
@@ -858,6 +857,6 @@ class Options:
             opt['clmsg_src'] = src
         if title is not None and title != "":
             opt['clmsg_title'] = title
-        if audited_by:
-            audit_write_args = argparse.Namespace(**{k:common.chopdq(v) for k,v in opt.items()})
+        audit_write_args = argparse.Namespace(**{k:common.chopdq(v) for k,v in opt.items()})
+        if func_feature is None or func_feature is not None and func_feature.audited_by(logger, audit_write_args):
             self.audit_write.apprun(logger, audit_write_args, tm=0.0, pf=[])

cmdbox/app/web.py

@@ -27,6 +27,21 @@ import webbrowser
 
 
 class Web:
+    @classmethod
+    def getInstance(cls, *args, **kwargs) -> 'Web':
+        """
+        Webクラスのインスタンスを取得する
+        Args:
+            *args: 可変長引数
+            **kwargs: キーワード引数
+
+        Returns:
+            Web: Webクラスのインスタンス
+        """
+        if not hasattr(cls, '_instance'):
+            cls._instance = cls(*args, **kwargs)
+        return cls._instance
+
     def __init__(self, logger:logging.Logger, data:Path, appcls=None, ver=None,
                  redis_host:str="localhost", redis_port:int=6379, redis_password:str=None, svname:str='server',
                  client_only:bool=False, doc_root:Path=None, gui_html:str=None, filer_html:str=None, result_html:str=None, users_html:str=None,

cmdbox/extensions/features.yml

@@ -40,21 +40,9 @@ aliases:                                # Specify the alias for the specified co
 agentrule:                              # Specifies a list of rules that determine which commands the agent can execute.
   policy: deny                          # Specify the default policy for the rule. The value can be allow or deny.
   rules:                                # Specify the rules for the commands that the agent can execute according to the group to which the user belongs.
-  - mode: audit                         # Specify the "mode" as the condition for applying the rule.
-    cmds: [search, write]               # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
+  - mode: cmd                           # Specify the "mode" as the condition for applying the rule.
+    cmds: [list, load]                  # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
     rule: allow                         # Specifies whether the specified command is allowed or not. Values are allow or deny.
-  - mode: client
-    cmds: [file_copy, file_download, file_list, file_mkdir, file_move, file_remove, file_rmdir, file_upload, server_info]
-    rule: allow
-  - mode: cmd
-    cmds: [list, load]
-    rule: allow
-  - mode: server
-    cmds: [list]
-    rule: allow
-  - mode: web
-    cmds: [gencert, genpass, group_list, user_list]
-    rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.
   write:

cmdbox/extensions/sample_project/sample/extensions/user_list.yml

@@ -78,7 +78,7 @@ pathrule:                      # List of RESTAPI rules, rules that determine whe
   - groups: [user]
     paths: [/signin, /assets, /bbforce_cmd, /copyright, /dosignin, /dosignout, /password/change,
             /gui/user_data/load, /gui/user_data/save, /gui/user_data/delete,
-            /agent, /mcp,
+            /agent, /mcpsv,
             /exec_cmd, /exec_pipe, /filer, /result, /gui, /get_server_opt, /usesignout, /versions_cmdbox, /versions_used]
     rule: allow
   - groups: [readonly]
@@ -106,6 +106,30 @@ password:                       # Password settings.
     enabled: true               # Specify whether or not to enable account lockout.
     threshold: 5                # Specify the number of failed login attempts before the account is locked.
     reset: 30                   # Specify the number of minutes after which the failed login count will be reset.
+apikey:
+  gen_cert:                         # Specify whether to generate a certificate for API key.
+    enabled: true                   # Specify whether to enable certificate generation for API key.
+    privatekey: idp_private.pem     # Specify the destination file for the generated private key.
+    certificate: idp_cert.pem       # Specify the destination file for the generated certificate.
+    publickey: idp_public.pem       # Specify the destination file for the generated public key.
+  gen_jwt:                          # Specify whether to generate JWT for API key.
+    enabled: true                   # Specify whether to enable JWT generation for API key.
+    privatekey: idp_private.pem     # Specify the private key file for JWT generation.
+    privatekey_passphrase:          # Specify the passphrase for the private key file.
+                                    # If the private key is encrypted, specify the passphrase here.
+    algorithm: RS256                # Specify the algorithm used to generate the JWT. The value can be RS256, PS256, or ES256.
+    claims:                         # Specify the claims to be included in the JWT.
+      iss: identity_provider        # Specify the issuer of the JWT. This is usually the name of the identity provider.
+      sub: app_user                 # Specify the subject of the JWT. This is usually the name of the application.
+      aud: app_organization         # Specify the audience of the JWT. This is usually the name of the organization that will use the application.
+      exp: 31536000                 # Specify the expiration time of the JWT in seconds. The default is 31536000 seconds (1 year).
+  verify_jwt:                       # Specify whether to verify JWT for API key.
+    enabled: true                   # Specify whether to enable JWT verification for API key.
+    certificate: idp_cert.pem       # Specify the certificate file for JWT verification.
+    publickey: idp_public.pem       # Specify the public key file for JWT verification. Not required if certificate exists.
+    issuer: identity_provider       # Specify the issuer of the JWT. This is usually the name of the identity provider. (If not specified, no verification)
+    audience: app_organization      # Specify the audience of the JWT. This is usually the name of the organization that will use the application. (If not specified, no verification)
+    algorithm: RS256                # Specify the algorithm used to verify the JWT. The value can be RS256, PS256, or ES256.
 oauth2:                             # OAuth2 settings.
   providers:                        # This is a per-provider setting for OAuth2.
     google:                         # Google's OAuth2 configuration.

cmdbox/version.py

@@ -1,9 +1,10 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 7, 10)
+dt_now = datetime.datetime(2025, 7, 16)
+days_ago = (datetime.datetime.now() - dt_now).days
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.2.2'
+__version__ = '0.6.2.4'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'
@@ -18,7 +19,7 @@ __logo__ = '''
  ╚═════╝╚═╝     ╚═╝╚═════╝ ╚═════╝  ╚═════╝ ╚═╝  ╚═╝'''
 __description__ = f'{__title__} {__version__}\n\n' + \
                   f'{__copyright__}\n' + \
-                  f'Build Date: {dt_now.strftime("%Y-%m-%d")}\n' + \
+                  (f'Build Date: {dt_now.strftime("%Y-%m-%d")}\n' if days_ago < 60 else '') + \
                   f'Web Site: PyPi <{__pypiurl__}>\n' + \
                   f'Web Site: SorceCode <{__srcurl__}>\n' + \
                   f'Web Site: Document <{__docurl__}>\n' + \

cmdbox/web/assets/cmdbox/agent.js

@@ -253,6 +253,7 @@ agent.create_history = (histories, session_id, msg) => {
         e.preventDefault();
         e.stopPropagation();
         agent.delete_session(session_id).then((res) => {
+            const messages = $('#messages');
             if (res['success']) {
                 history.remove();
                 const sid = messages.attr('data-session_id');

cmdbox/web/assets/cmdbox/common.js

@@ -238,6 +238,7 @@ cmdbox.editapikey = async () => {
         }
         cmdbox.message(await res.json());
         editapikey_modal.modal('hide');
+        cmdbox.editapikey();
     });
     const delapikey_btn = $(`<button type="button" class="btn btn-warning">Del apikey</button>`).appendTo(footer);
     delapikey_btn.off('click').on('click', async (event) => {
@@ -254,6 +255,7 @@ cmdbox.editapikey = async () => {
         }
         cmdbox.message(await res.json());
         editapikey_modal.modal('hide');
+        cmdbox.editapikey();
     });
     const close_btn = $('<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>').appendTo(footer);
     editapikey_modal.appendTo('body');

cmdbox/web/assets/cmdbox/filer_modal.js

@@ -143,11 +143,13 @@ fmodal.list_tree_server = async (current_path) => {
         opt['capture_stdout'] = true;
         opt['svpath'] = current_path;
         const res = await cmdbox.sv_exec_cmd(opt);
-        if(!res[0] || !res[0]['success']) {
+        let success = res && res['success'];
+        success = !success ? res[0] && res[0]['success'] : success;
+        if(!success) {
             cmdbox.message(res);
             return {};
         }
-        const data = Object.entries(res[0]['success']).sort();
+        const data = Object.entries(success).sort();
         const ret = {};
         for (let i = 0; i < data.length; i++) {
             const [key, value] = data[i];

{cmdbox-0.6.2.2.dist-info → cmdbox-0.6.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.2.2
+Version: 0.6.2.4
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox

{cmdbox-0.6.2.2.dist-info → cmdbox-0.6.2.4.dist-info}/RECORD

@@ -10,36 +10,36 @@ cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
 cmdbox/logconf_mcp.yml,sha256=pED0i1iKP8UoyXE0amFMA5kjV7Qc6_eJCUDVen3L4AU,1069
 cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
 cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
-cmdbox/version.py,sha256=Lt2VTw6A_Uk9DynzH9QCA0V20lI2YyR3x581-Rx171M,2032
+cmdbox/version.py,sha256=2I5z4VF4ED9igCeuCmhKyPU5-3gvPHt2KZu7raSGBZ0,2110
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=_UJqSTs3LStGSu3vLMTqOKmpL4x7NQAQb2hUMbEFcg4,9639
 cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
-cmdbox/app/common.py,sha256=0QVDEQDXksDuN5lHuJCD2fTYutSknPFP6hlKp4gr00k,27255
+cmdbox/app/common.py,sha256=MQQab5rboKS2oNDAWbKR8LYoSXW_i1vgD1rFAwBMExU,27712
 cmdbox/app/edge.py,sha256=2Aav7n4skhP0FUvG6_3JKijHHozA-WcwALgEwNB0DUI,41439
 cmdbox/app/edge_tool.py,sha256=HXxr4Or8QaZ5ueYIN3huv8GnXSnV28RZCmZBUEfiIk0,8062
-cmdbox/app/feature.py,sha256=2qwYdOqMjKNC7vjPQkPSgmdIfHtNWSzOvAuDrmlIRUo,10159
+cmdbox/app/feature.py,sha256=fK7JP1fc8b9k1zhSNOkWq02ad8i-_wuAX5kyyK2TZdE,10391
 cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
-cmdbox/app/mcp.py,sha256=eLPGd_fWohPalW4ss7UApAfSys40bWknkjdvSI0zyGo,30001
-cmdbox/app/options.py,sha256=nNNDJiVYmn7GPyG1aZaLAByk4wfuWj5DxQpQZnOd4FE,46179
+cmdbox/app/mcp.py,sha256=M40PcDDgNywq0PPvW7KvvbHSRpgOJsOc4zW-Dd8KBnc,30230
+cmdbox/app/options.py,sha256=Wz2GYnuhwBieFbA3zHl2WIXsKANVWvX8Bw3MK408xPs,46220
 cmdbox/app/server.py,sha256=woOmIk901ONn5a_2yz_b3I1JpLYIF8g42uQRd0_MRuQ,10417
-cmdbox/app/web.py,sha256=5eUtb60Vb_6RK62IWbJDPFNvAVsf1THw7knp3uGmMGg,53559
+cmdbox/app/web.py,sha256=rwoSZaTJVCECtMZ8MaJrie9K0xRBqis2BrtY0lFmgEg,54007
 cmdbox/app/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/auth/azure_signin.py,sha256=jJlIZJIGLZCngnJgoxBajaD2s8nM7QoszuN6-FT-5h8,1953
 cmdbox/app/auth/azure_signin_saml.py,sha256=oM2buGTK4t6-OsUuiUXTlZk0YXZL01khuPYVB84dMDU,472
 cmdbox/app/auth/github_signin.py,sha256=dg_3eu7iikTfp9mxYQscQXtFspmJIuasGZ43icCeC3k,1510
 cmdbox/app/auth/google_signin.py,sha256=LErFkKniumKgfE5jlY9_lAneKlqD6BfLHxg2lZgv_zE,1382
-cmdbox/app/auth/signin.py,sha256=dYkDQ7D3Gr346tA1PHeaD1vq69VAAbPGGQPhiMLBvD0,59939
+cmdbox/app/auth/signin.py,sha256=wBnZMmi7i4BehlfJtXg4owr5HDLOzQCS6Lc2UO-2dPQ,60022
 cmdbox/app/auth/signin_saml.py,sha256=MUM_hqCEjT-8xXNMHa-iH2j24SdBls4SU3k4BopRd48,2457
 cmdbox/app/commons/convert.py,sha256=mkXPNQtX_pEH4L5DzonOY6Dh38SzJ5JQma_EY7UDBqU,7078
 cmdbox/app/commons/loghandler.py,sha256=bcKTDqSlUcVpO-6vYGijZcLdJlXn7ewx9MT_N7RhgAY,6323
 cmdbox/app/commons/module.py,sha256=w63zqz5c6gLy-BZJ9dh4Q4C5PZyqM2Iqat5Zr9swJCI,4993
 cmdbox/app/commons/redis_client.py,sha256=cOHshqAGI3CRWLcc2IMhk6MtXsVKlQq6HwcdqYsoA-0,14821
-cmdbox/app/features/cli/agent_base.py,sha256=alXnkpMKrTX9KK5YBJeKQ3ISMmGedYevW7mMb_3ZCp8,7669
+cmdbox/app/features/cli/agent_base.py,sha256=FShwbXWCfU-pXNTRaWfV_9z5FKeczxWsxidDmXeaQI0,7682
 cmdbox/app/features/cli/audit_base.py,sha256=X_FvKsN_j8uVg96yifzmtXuAqGIPklihlfmhb_FvOgM,9405
 cmdbox/app/features/cli/cmdbox_audit_createdb.py,sha256=S-rE9bUOKQLg8GizVQCKhqf0fr3JapcrqNCzoSzmNLc,12133
 cmdbox/app/features/cli/cmdbox_audit_delete.py,sha256=OVPu0uIHgkJpeALILPY4lzL-gy61uywMN3KIP7lst8g,18922
-cmdbox/app/features/cli/cmdbox_audit_search.py,sha256=hVFjmGQoPGlcKG3XS-_-i4Q3sg6kxaWelFbEC03R6xY,28930
-cmdbox/app/features/cli/cmdbox_audit_write.py,sha256=WEJXKbRAopWPZ_1NTTtNqoYEB5E3LPsDMFleVf_-fyU,15281
+cmdbox/app/features/cli/cmdbox_audit_search.py,sha256=sSwdjaCWGiRkD_WHM4YFZFxv7kO1aY4693DnZHFvK8Y,31400
+cmdbox/app/features/cli/cmdbox_audit_write.py,sha256=Yv8SwY4nfSE0BsMJ5lz_AfiI0K_wjg6RdIK6L0kwcfU,15541
 cmdbox/app/features/cli/cmdbox_client_file_copy.py,sha256=wwth8zHslc-mm5iPGJOMXhTqeZ_tZcRSo1LIk_7v53o,13093
 cmdbox/app/features/cli/cmdbox_client_file_download.py,sha256=YzoqJPvBlg8Kwos-3RjFrPjpVVV5qjNPSB_npofdSL8,13239
 cmdbox/app/features/cli/cmdbox_client_file_list.py,sha256=9xyILNufyJBV_clQ-SG5v-H2bK7FanFAfU9_BxcZGyo,12100
@@ -49,30 +49,31 @@ cmdbox/app/features/cli/cmdbox_client_file_remove.py,sha256=oupYP04CbAZ-x7MaODjS
 cmdbox/app/features/cli/cmdbox_client_file_rmdir.py,sha256=E32Av7_0g-Rlesr9onc4iu-HZGtjfgaM_frLW2jMF7Y,11530
 cmdbox/app/features/cli/cmdbox_client_file_upload.py,sha256=-sAqQiIpqH4wWfv_IAN2EYafHzNjFnOOfuLjyjHPwLc,13407
 cmdbox/app/features/cli/cmdbox_client_server_info.py,sha256=tBGOfFxUQojkVu_o8Jv-VR2QSMnxSLN6EBtHZy5NU6k,9575
-cmdbox/app/features/cli/cmdbox_cmd_list.py,sha256=lNikjS-bYZG2-8keatIdNLeHk3nGWvy9v4uyHjkIIHg,6670
-cmdbox/app/features/cli/cmdbox_cmd_load.py,sha256=J0EwV8qyvg4owPNYqlHfD3dB8NcGsCVTAqb5iqogjrA,6735
-cmdbox/app/features/cli/cmdbox_edge_config.py,sha256=cfOH-NPRRhF1dnQrKHzOVHhJSCzN7V-lmGbDJNnvNg8,9460
-cmdbox/app/features/cli/cmdbox_edge_start.py,sha256=xWYrGo_TAQgWfiCGKC9YzZnPun3KsjhdrxSwkrRHNlc,3824
+cmdbox/app/features/cli/cmdbox_cmd_list.py,sha256=SUieS8cEH3lNHeFxer1m-e8XBTd8_fE2-mrPfcnHw2A,6682
+cmdbox/app/features/cli/cmdbox_cmd_load.py,sha256=U1NWnJ_bjGOMCp9mtaqt4ujaDtPkhGnybupX-h15Tuw,6747
+cmdbox/app/features/cli/cmdbox_edge_config.py,sha256=2fppuJ5yAiepq5i4Qj_1w3ciSXhy1sFDK6FFOw5sB68,9472
+cmdbox/app/features/cli/cmdbox_edge_start.py,sha256=PVkvRBaepxqdjswUp1JzQqfzD5xdiPaZYXy72P0rlDE,3823
 cmdbox/app/features/cli/cmdbox_gui_start.py,sha256=zFxSx-Dk8ahji65RJxvuMP9mrJRBP9UrCcIFmeAhTgI,1390
 cmdbox/app/features/cli/cmdbox_gui_stop.py,sha256=WEVB0VamIi5MhYtu5dshHmG2fmPiTuf_5NTHFi-D_vk,841
-cmdbox/app/features/cli/cmdbox_mcp_proxy.py,sha256=2rkaWDJ5UqQkoAK1V6WwWO40uan1LMk4NgEJa4f9Ick,4629
+cmdbox/app/features/cli/cmdbox_mcp_client.py,sha256=g83tF3CZa5EqkBA67TXcUZcbVj8lm4qsfu-8HeM9jeQ,12065
+cmdbox/app/features/cli/cmdbox_mcp_proxy.py,sha256=xQ3832CdeUZ1WVRQcpoE2Yw4TQ5uR5X7Q08fwr2CE9Q,4720
 cmdbox/app/features/cli/cmdbox_server_list.py,sha256=J9FLVq3B5hlEBK88rT867Ey32-bHAHpZy_X9VqjZLvI,5777
-cmdbox/app/features/cli/cmdbox_server_start.py,sha256=krinj34HE_g188pTQBNVnH7KFrqh8xlJrDfjuHgAC_k,7280
+cmdbox/app/features/cli/cmdbox_server_start.py,sha256=ci9vo1G9LtazQo9XYI4-_OdfHHhU_r8gFp-meWeE2vM,7279
 cmdbox/app/features/cli/cmdbox_server_stop.py,sha256=eSdo0vW0PYAU1VIC0-wWsGKNlmZ1J8SOfN18fL_AVrI,8644
-cmdbox/app/features/cli/cmdbox_web_apikey_add.py,sha256=AmFieTVm4yTj-pPixkl2rL3U9pYElOMndAieVLGHDoY,7139
-cmdbox/app/features/cli/cmdbox_web_apikey_del.py,sha256=w5dOj7m4lzMIdytEBezaagmQOb5k1M1Ne6wYnv99noc,7117
-cmdbox/app/features/cli/cmdbox_web_gencert.py,sha256=QIRvQG4slJhljnFDl6M5RXo08siweZs6rw_IBH4aPgk,11354
+cmdbox/app/features/cli/cmdbox_web_apikey_add.py,sha256=RrmGWUoK5aqRnUu-CSVe0y5-FenjF0E3yYED8RJefhM,7151
+cmdbox/app/features/cli/cmdbox_web_apikey_del.py,sha256=EHZ5PND4lWM3ZKkBMXC2fT-tLnnBSVMLih-mxR8ztLk,7129
+cmdbox/app/features/cli/cmdbox_web_gencert.py,sha256=tFqP4dBXeBYCFfNKcdKN49-waJrUCxa_zDcOV9yrIsA,11396
 cmdbox/app/features/cli/cmdbox_web_genpass.py,sha256=f450z1PxofpbrPsJccnHEjkXF975ZsLbBii8RkCgVCM,9541
-cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=xApYxLjvX-w4tejbH5XfCOtY9YseQTpTRw7kuAFW-EM,7407
-cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=gEpmkSFT1WXyrYruGBhYFhuuQhBlzbav9StJUauh_lY,6617
-cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=oQM2qRE4mysoco8XZwgBLX4eH6qNiPvr4O-jIt6Kse0,7346
-cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=a3bbaOKwuHkcFEHnuU1DoORtykgSpp1Rjf4uGHI4UAg,6712
-cmdbox/app/features/cli/cmdbox_web_start.py,sha256=qI7rcIODAq2vSacF7DneLfOzb5ULsiYvG8uXHyVwhlk,17707
-cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=RBJMxslXM5aRAW7_GOpA9NbZMwftXQ_W7h_DKYLtSAc,3568
-cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=X5C3wFjtFOUwW4QaaxSE9bPytPzrjhC_2dqMPp64Ync,8599
-cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=7R7BpVV9cFh8ZgAh6ZyB10A8PXz22FVbLjiafRGWd64,6580
-cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=Pzm2WzZJT9KZFsCRvlpjo-oxMaGSR2dZLzE2XVYUdUs,8507
-cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=QTDNYHNXTWsytArptO163dRvs_52Hzk9aj9xB_NImr0,6700
+cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=p4VdIUv-hh0eXqV5ITyBFRUxGBeQxImHXEPv7s7SUv4,7419
+cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=qssAhZmY0wKfkpQ6UycT7G-_qQpyyE_T7w_hupgsajE,6629
+cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=04U741NeIGqeuId8m2oSOFgSguQuTK0_Krt0nSMATrw,7358
+cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=4oITsdUEkPW4jZQOTiDQkgawJTUfxEyn1YFxDuf9SVk,6724
+cmdbox/app/features/cli/cmdbox_web_start.py,sha256=uNFXWpmrhMY6AEzYgf5RXlkc7yzHJIIJZs5dJ_7TZNU,17848
+cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=5ja4IiWRSpfRrWfoRncMRmofEYj8MDfIFUcWfDtIOQ4,3567
+cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=WsuW1rt27dhxIY7aD_xyZblyEhBqq4Z_doE4Gd75O68,8611
+cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=t5CpPO4J9Wl2paBqSY_rA9vEYLXSxrYFB999Cvd-ZMU,6592
+cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=jzwkjCNxW7vX0Nc4FIHn4hDO6PmBoVpPcmzr5P3W4rQ,8519
+cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=EGOcWMmRLZ_QHlb1twIZJ5xWSjSvDZZRTkYv9emANKI,6712
 cmdbox/app/features/web/cmdbox_web_agent.py,sha256=yBbPszQAkw3yfukJJ-xnQNoOsTsi32lm3WxR4iAMhJ4,14542
 cmdbox/app/features/web/cmdbox_web_assets.py,sha256=D1dYNrvC7xBAVAAHX6PkoB6RFehEofET4hkHeCFYq7s,1931
 cmdbox/app/features/web/cmdbox_web_audit.py,sha256=-flyijdnh3hN-BKnw0GI3gSiduLP0vQFg_AiYCLXRBY,3359
@@ -109,7 +110,7 @@ cmdbox/app/features/web/cmdbox_web_users.py,sha256=LZ3BUudBF21wqGO5EWwKvyLMxK_gE
 cmdbox/app/features/web/cmdbox_web_usesignout.py,sha256=lBjBj8M8e69uXhdv7H92wZfRRWD2j6kmC_WekSCw5yo,682
 cmdbox/app/features/web/cmdbox_web_versions_cmdbox.py,sha256=hG4ikQc0Qr6He8AhYu8kK1GD5TNjezr-VpmCSAFL7Nk,818
 cmdbox/app/features/web/cmdbox_web_versions_used.py,sha256=xA368ASudYFIrJjWOC1MGmsaAE3Mdd5i-Y8sZBWL7p4,1322
-cmdbox/extensions/features.yml,sha256=J7DYAOY3XEhMEfXvDinVbolpsvI3OSwMM0HbVhjdEeE,7039
+cmdbox/extensions/features.yml,sha256=j8j3YIy34w0sprI1A1pwklZGH9KN80UdWuCpKcqVkfc,6699
 cmdbox/extensions/user_list.yml,sha256=P_KdBu9VmNDEh9rEQ4QGKObpeXb34wMF4__uOShLh44,13098
 cmdbox/extensions/sample_project/requirements.txt,sha256=z_gUanGVrPeYUExYeU5_gHiOTy8RKZkaJSeKxOM4mqY,18
 cmdbox/extensions/sample_project/.vscode/launch.json,sha256=Bj_FO1P0lPMfuwZxvyLfwQa0f7Gk276dvcVRjj2aem4,1348
@@ -123,7 +124,7 @@ cmdbox/extensions/sample_project/sample/app/features/cli/sample_client_time.py,s
 cmdbox/extensions/sample_project/sample/app/features/cli/sample_server_time.py,sha256=vpMBd-7gymFP9qcpFf9uvPp8dxn5qQv6VcoFw4lSZuo,7444
 cmdbox/extensions/sample_project/sample/app/features/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/extensions/sample_project/sample/extensions/features.yml,sha256=Jn7kZVH95VU0bF6p2K2Wzv7V8u4AkUqi-_Fco5AwLoU,7374
-cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=ES9XHqBmD05-PtdCdxnD_0NazJfPR1ZmlL3DHlg-cxk,10577
+cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=P_KdBu9VmNDEh9rEQ4QGKObpeXb34wMF4__uOShLh44,13098
 cmdbox/extensions/sample_project/sample/web/assets/sample/favicon.ico,sha256=z-jwmfktVBIsYjhUfCOj7ZNiq55GH-uXtbbDRzk7DHQ,9662
 cmdbox/extensions/sample_project/sample/web/assets/sample/icon.png,sha256=8WmOhepVHG46KG8Sjs4OjZht16dTcgpsNIs972PiVWU,327723
 cmdbox/licenses/LICENSE_Authlib_1_6_0_BSD_License.txt,sha256=jYKqOj5UKtBY_y34_upU28Iok0WYyCO-8x-80yVPgd4,1543
@@ -317,12 +318,12 @@ cmdbox/web/assets/apexcharts/apexcharts.css,sha256=l-xkqykcV8a22g04B-Vpt4JFWcHlw
 cmdbox/web/assets/apexcharts/apexcharts.min.js,sha256=zceUTsCKa8Y2SqjqZjLjifXQDnqsvKRTmT8fTIUix_4,570304
 cmdbox/web/assets/bootstrap/bootstrap.bundle.min.5.3.0.js,sha256=qlPVgvl-tZTCpcxYJFdHB_m6mDe84wRr-l81VoYPTgQ,80421
 cmdbox/web/assets/bootstrap/bootstrap.min.5.3.0.css,sha256=fx038NkLY4U1TCrBDiu5FWPEa9eiZu01EiLryshJbCo,232914
-cmdbox/web/assets/cmdbox/agent.js,sha256=NJwNfnIzTP23qGsuQr7ov-u4Mo9ibU7h3FN66-yTEpA,15763
+cmdbox/web/assets/cmdbox/agent.js,sha256=IsvuprldT7iySd_3FHx63_Rj30f0pKfW51l3s2wzt8I,15808
 cmdbox/web/assets/cmdbox/audit.js,sha256=YDPQaThJSH-iBHvVK16JO4pyGZBoo-rCZou00D8x3yU,19346
 cmdbox/web/assets/cmdbox/color_mode.css,sha256=U4UGBnWiBMcrSEEusgT-_o-pt4MP3myoA9Lgnn1g6qE,19803
-cmdbox/web/assets/cmdbox/common.js,sha256=5O1FkBkZqzUQool_TAzTbh8QOK0QuYTrPhHD-BRt-Uo,69615
+cmdbox/web/assets/cmdbox/common.js,sha256=Aoq7CB9FRxpL_x-7-2a92nUSied9SoDd8B-hG--1qeU,69673
 cmdbox/web/assets/cmdbox/favicon.ico,sha256=2U4MhqzJklRksOQwnK-MZigZCubxCHqKG_AuNJnvYtA,34494
-cmdbox/web/assets/cmdbox/filer_modal.js,sha256=iKhNN9urjUm22na4vHYWhbj__2De9iAuDJE7TvBWtQ0,8566
+cmdbox/web/assets/cmdbox/filer_modal.js,sha256=HWJCVVSviZUBg1oiwgiFtXisAqO-S3D-rcc1E6uNzNY,8650
 cmdbox/web/assets/cmdbox/icon.png,sha256=xdEwDdCS8CoPQk7brW-1mV8FIGYtUeSMBRlY9Oh-3nE,296172
 cmdbox/web/assets/cmdbox/list_cmd.js,sha256=WHnDlVus1My8-tTATnj_xU5q_LIhM72Vd0WjGIf-wAE,21437
 cmdbox/web/assets/cmdbox/list_pipe.js,sha256=2rPkauw9VHRMXl76qRgqy81Y815Y8B1tnVKOSKKfRwc,11315
@@ -377,9 +378,9 @@ cmdbox/web/assets/tree-menu/image/file.png,sha256=Uw4zYkHyuoZ_kSVkesHAeSeA_g9_LP
 cmdbox/web/assets/tree-menu/image/folder-close.png,sha256=TcgsKTBBF2ejgzekOEDBFBxsJf-Z5u0x9IZVi4GBR-I,284
 cmdbox/web/assets/tree-menu/image/folder-open.png,sha256=DT7y1GRK4oXJkFvqTN_oSGM5ZYARzPvjoCGL6wqkoo0,301
 cmdbox/web/assets/tree-menu/js/tree-menu.js,sha256=-GkZxI7xzHuXXHYQBHAVTcuKX4TtoiMuyIms6Xc3pxk,1029
-cmdbox-0.6.2.2.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.6.2.2.dist-info/METADATA,sha256=njzL1orul6e60KFNIzqFUluYUZWqnxBgME9AmyOxksk,33524
-cmdbox-0.6.2.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.6.2.2.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
-cmdbox-0.6.2.2.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.6.2.2.dist-info/RECORD,,
+cmdbox-0.6.2.4.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.6.2.4.dist-info/METADATA,sha256=EVszY_f7dL1y3yBUVRvE0HzR8SdegDA9dK7rS5Oo63c,33524
+cmdbox-0.6.2.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.6.2.4.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
+cmdbox-0.6.2.4.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.6.2.4.dist-info/RECORD,,