add subcommands

Author: liqul

AGENTS.md

@@ -69,6 +69,12 @@ flake8 --config=.linters/tox.ini taskweaver/
 # CLI mode
 python -m taskweaver -p ./project/
 
+# Start CES server explicitly
+python -m taskweaver -p ./project/ server --port 8000
+
+# In another terminal, connect to running server
+python -m taskweaver -p ./project/ chat --server-url http://localhost:8000
+
 # As a module
 python -m taskweaver
 ```

taskweaver/ces/AGENTS.md

@@ -176,6 +176,22 @@ Connect to pre-started server. API key required.
 
 ## Usage
 
+### CLI Integration
+
+The Code Execution Service can be started as a standalone server via the TaskWeaver CLI. This is the recommended way to run CES for remote or containerized deployments. The implementation resides in `taskweaver/cli/server.py`.
+
+```bash
+# Start CES server via CLI
+python -m taskweaver -p ./project server \
+    --host 0.0.0.0 \
+    --port 8000 \
+    --api-key "secret" \
+    --log-level info \
+    --reload
+```
+
+The server command wraps `taskweaver.ces.server.app:app` and runs it using `uvicorn`. Note that when using `--server-url` with the `chat` command, `server_auto_start` is automatically disabled to connect to the existing instance.
+
 ### Starting the Server Manually
 
 ```bash

taskweaver/chat/console/chat.py

@@ -529,15 +529,19 @@ def format_status_message(limit: int):
 
 
 class TaskWeaverChatApp(SessionEventHandlerBase):
-    def __init__(self, app_dir: Optional[str] = None):
+    def __init__(self, app_dir: Optional[str] = None, server_url: Optional[str] = None):
         from taskweaver.app.app import TaskWeaverApp, _cleanup_existing_servers
 
-        # Check and kill any existing server before starting
-        cleanup_result = _cleanup_existing_servers()
-        if cleanup_result:
-            click.secho(f"[Startup] Killed existing server (PID: {cleanup_result}) on port 8000", fg="yellow")
+        config = {}
+        if server_url:
+            config["execution_service.server.url"] = server_url
+            config["execution_service.server.auto_start"] = False
+        else:
+            cleanup_result = _cleanup_existing_servers()
+            if cleanup_result:
+                click.secho(f"[Startup] Killed existing server (PID: {cleanup_result}) on port 8000", fg="yellow")
 
-        self.app = TaskWeaverApp(app_dir=app_dir)
+        self.app = TaskWeaverApp(app_dir=app_dir, config=config)
         self.session = self.app.get_session()
         self.pending_files: List[Dict[Literal["name", "path", "content"], Any]] = []
         atexit.register(self.app.stop)
@@ -650,8 +654,8 @@ def _assistant_message(self, message: str) -> None:
         click.secho(click.style(f"▶  {message}", fg="yellow"))
 
 
-def chat_taskweaver(app_dir: Optional[str] = None):
-    TaskWeaverChatApp(app_dir=app_dir).run()
+def chat_taskweaver(app_dir: Optional[str] = None, server_url: Optional[str] = None):
+    TaskWeaverChatApp(app_dir=app_dir, server_url=server_url).run()
 
 
 if __name__ == "__main__":

taskweaver/cli/chat.py

@@ -6,14 +6,20 @@
 @click.command()
 @require_workspace()
 @click.pass_context
-def chat(ctx: click.Context):
-    """
-    Chat with TaskWeaver in command line
-    """
-
+@click.option(
+    "--server-url",
+    help="URL of the Code Execution Server (overrides --server-url from parent command)",
+    type=str,
+    required=False,
+    default=None,
+)
+def chat(ctx: click.Context, server_url: str):
+    """Chat with TaskWeaver in command line."""
     ctx_obj: CliContext = ctx.obj
 
     from taskweaver.chat.console import chat_taskweaver
 
+    effective_server_url = server_url or ctx_obj.server_url
+
     click.echo(get_ascii_banner())
-    chat_taskweaver(ctx_obj.workspace)
+    chat_taskweaver(ctx_obj.workspace, server_url=effective_server_url)

taskweaver/cli/cli.py

@@ -2,14 +2,15 @@
 
 from .chat import chat
 from .init import init
+from .server import server
 from .util import CliContext, get_ascii_banner
 
 
 @click.group(
     name="taskweaver",
     help=f"\b\n{get_ascii_banner(center=False)}\nTaskWeaver",
     invoke_without_command=True,
-    commands=[init, chat],
+    commands=[init, chat, server],
 )
 @click.pass_context
 @click.version_option(package_name="taskweaver")
@@ -25,18 +26,25 @@
     required=False,
     default=None,
 )
-def taskweaver(ctx: click.Context, project: str):
+@click.option(
+    "--server-url",
+    help="URL of the Code Execution Server (e.g., http://localhost:8000). "
+    "If provided, disables auto-start and connects to existing server.",
+    type=str,
+    required=False,
+    default=None,
+)
+def taskweaver(ctx: click.Context, project: str, server_url: str):
     from taskweaver.utils.app_utils import discover_app_dir
 
     workspace_base, is_valid, is_empty = discover_app_dir(project)
 
-    # subcommand_target = ctx.invoked_subcommand if ctx.invoked_subcommand is not None else "chat"
-
     ctx.obj = CliContext(
         workspace=workspace_base,
         workspace_param=project,
         is_workspace_valid=is_valid,
         is_workspace_empty=is_empty,
+        server_url=server_url,
     )
     if not ctx.invoked_subcommand:
         ctx.invoke(chat)

taskweaver/cli/server.py

@@ -0,0 +1,134 @@
+"""Server subcommand for starting the Code Execution Server."""
+
+import os
+
+import click
+
+from taskweaver.cli.util import CliContext, require_workspace
+
+
+@click.command()
+@require_workspace()
+@click.pass_context
+@click.option(
+    "--host",
+    type=str,
+    default=None,
+    help="Host to bind to (default: localhost)",
+)
+@click.option(
+    "--port",
+    type=int,
+    default=None,
+    help="Port to bind to (default: 8000)",
+)
+@click.option(
+    "--api-key",
+    type=str,
+    default=None,
+    help="API key for authentication (optional for localhost)",
+)
+@click.option(
+    "--log-level",
+    type=click.Choice(["debug", "info", "warning", "error", "critical"]),
+    default="info",
+    help="Log level (default: info)",
+)
+@click.option(
+    "--reload",
+    is_flag=True,
+    default=False,
+    help="Enable auto-reload for development",
+)
+def server(
+    ctx: click.Context,
+    host: str,
+    port: int,
+    api_key: str,
+    log_level: str,
+    reload: bool,
+):
+    """Start the Code Execution Server.
+
+    The server handles code execution requests from TaskWeaver sessions.
+    Start this server first, then run 'taskweaver chat' in another terminal.
+
+    \b
+    Example:
+        taskweaver -p ./project server --port 8000
+        taskweaver -p ./project chat --server-url http://localhost:8000
+    """
+    ctx_obj: CliContext = ctx.obj
+    workspace = ctx_obj.workspace
+    assert workspace is not None
+
+    from taskweaver.config.config_mgt import AppConfigSource
+
+    app_config_file = os.path.join(workspace, "taskweaver_config.json")
+    config_src = AppConfigSource(
+        config_file_path=app_config_file if os.path.exists(app_config_file) else None,
+        config={},
+        app_base_path=workspace,
+    )
+
+    def get_config(key: str, default):
+        return config_src.json_file_store.get(key, default)
+
+    effective_host = host or get_config("execution_service.server.host", "localhost")
+    effective_port = port or get_config("execution_service.server.port", 8000)
+    effective_api_key = api_key or get_config("execution_service.server.api_key", None)
+    work_dir = get_config(
+        "execution_service.env_dir",
+        os.path.join(workspace, "env"),
+    )
+
+    os.makedirs(work_dir, exist_ok=True)
+
+    os.environ["TASKWEAVER_SERVER_HOST"] = effective_host
+    os.environ["TASKWEAVER_SERVER_PORT"] = str(effective_port)
+    os.environ["TASKWEAVER_SERVER_WORK_DIR"] = work_dir
+    if effective_api_key:
+        os.environ["TASKWEAVER_SERVER_API_KEY"] = effective_api_key
+
+    click.echo()
+    click.echo("=" * 60)
+    click.echo("  TaskWeaver Code Execution Server")
+    click.echo("=" * 60)
+    click.echo(f"  Project:   {ctx_obj.workspace}")
+    click.echo(f"  Host:      {effective_host}")
+    click.echo(f"  Port:      {effective_port}")
+    click.echo(f"  URL:       http://{effective_host}:{effective_port}")
+    click.echo(f"  Health:    http://{effective_host}:{effective_port}/api/v1/health")
+    click.echo(f"  Work Dir:  {work_dir}")
+    click.echo(f"  API Key:   {'configured' if effective_api_key else 'not required (localhost)'}")
+    click.echo("=" * 60)
+    click.echo()
+    click.echo("To connect a chat session, run in another terminal:")
+    click.echo(f"  taskweaver -p {ctx_obj.workspace} chat --server-url http://{effective_host}:{effective_port}")
+    click.echo()
+
+    try:
+        import uvicorn
+    except ImportError:
+        click.secho(
+            "Error: uvicorn is required to run the server. " "Please install it with: pip install uvicorn",
+            fg="red",
+        )
+        raise SystemExit(1)
+
+    try:
+        import fastapi  # noqa: F401
+    except ImportError:
+        click.secho(
+            "Error: fastapi is required to run the server. " "Please install it with: pip install fastapi",
+            fg="red",
+        )
+        raise SystemExit(1)
+
+    uvicorn.run(
+        "taskweaver.ces.server.app:app",
+        host=effective_host,
+        port=effective_port,
+        reload=reload,
+        log_level=log_level,
+    )

taskweaver/cli/util.py

@@ -33,6 +33,7 @@ class CliContext:
     workspace_param: Optional[str]
     is_workspace_valid: bool
     is_workspace_empty: bool
+    server_url: Optional[str] = None
 
 
 def center_cli_str(text: str, width: Optional[int] = None):

taskweaver/module/execution_service.py

@@ -28,7 +28,7 @@ def _configure(self) -> None:
         )
         self.server_auto_start = self._get_bool(
             "server.auto_start",
-            True,
+            False,
         )
         self.server_container = self._get_bool(
             "server.container",