refactor(server): remove file watcher, daemon/relay/socket modes, rename to serve

.vscode/launch.json

@@ -6,15 +6,15 @@
       "request": "launch",
       "name": "Debug clice",
       "program": "${workspaceFolder}/build/Debug/bin/clice",
-      "args": ["server", "--mode", "socket", "--port", "50051"],
+      "args": ["serve", "--mode", "socket", "--port", "50051"],
       "cwd": "${workspaceFolder}"
     },
     {
       "type": "lldb",
       "request": "launch",
-      "name": "Debug clice (socket, RelWithDebInfo)",
+      "name": "Debug clice (tcp, RelWithDebInfo)",
       "program": "${workspaceFolder}/build/RelWithDebInfo/bin/clice",
-      "args": ["server", "--mode", "socket", "--port", "50051"],
+      "args": ["serve", "--mode", "socket", "--port", "50051"],
       "cwd": "${workspaceFolder}"
     },
     {

README.md

@@ -34,7 +34,7 @@ Download the latest binary from the [releases page](https://github.com/clice-io/
 | **VS Code** | Install the [clice extension](https://marketplace.visualstudio.com/items?itemName=ykiko.clice-vscode) from the Marketplace |
 | **Neovim**  | Add `editors/nvim` to your runtime path: `vim.opt.rtp:append("/path/to/clice/editors/nvim")`                               |
 | **Zed**     | Load `editors/zed` as a local extension                                                                                    |
-| **Other**   | Any LSP client works — point it at `clice server`                                                                          |
+| **Other**   | Any LSP client works — point it at `clice serve`                                                                           |
 
 ### Project Setup
 

docs/en/dev/test-and-debug.md

@@ -25,7 +25,7 @@ Equivalent to:
 
 ### Integration Tests
 
-End-to-end tests that start a real clice server and communicate via LSP protocol.
+End-to-end tests that start a real `clice serve` instance and communicate via LSP protocol.
 
 ```bash
 pixi run integration-test          # default RelWithDebInfo
@@ -82,21 +82,11 @@ Prerequisites outside the pixi env:
 If you want to attach a debugger to clice, start it in socket mode independently, then connect a client.
 
 ```shell
-./build/Debug/bin/clice server --mode socket --port 50051
+./build/Debug/bin/clice serve --mode socket --port 50051
 ```
 
 After the server starts, you can connect a client in two ways:
 
-### Connect via pytest
-
-Run a single integration test against the running instance:
-
-```shell
-pytest -s --log-cli-level=INFO \
-    tests/integration/lifecycle/test_file_operation.py::test_did_open \
-    --mode=socket --port=50051
-```
-
 ### Connect via VS Code
 
 Configure the clice extension to connect to your running instance:
@@ -130,6 +120,6 @@ The extension lives in-tree at `editors/vscode/`:
 
 2. Open the **repository root** in VS Code (the launch configurations are in `.vscode/launch.json` at the root).
 
-3. Create `.vscode/settings.json` with the socket config above.
+3. Create `.vscode/settings.json` with the tcp config above.
 
 4. Press `F5` and select `VSCode Extension (pipe)` or `VSCode Extension (socket)` to launch an Extension Development Host window.

docs/en/guide/editors.md

@@ -34,7 +34,7 @@ Add to `~/.config/helix/languages.toml`:
 ```toml
 [language-server.clice]
 command = "clice"
-args = ["server"]
+args = ["serve"]
 
 [[language]]
 name = "cpp"
@@ -53,7 +53,7 @@ With the built-in eglot:
 (with-eval-after-load 'eglot
   (add-to-list 'eglot-server-programs
                '((c-mode c-ts-mode c++-mode c++-ts-mode)
-                 . ("clice" "server"))))
+                 . ("clice" "serve"))))
 ```
 
 ### Sublime Text
@@ -65,7 +65,7 @@ Install the [LSP package](https://packagecontrol.io/packages/LSP), then add to i
   "clients": {
     "clice": {
       "enabled": true,
-      "command": ["clice", "server"],
+      "command": ["clice", "serve"],
       "selector": "source.c | source.c++"
     }
   }
@@ -80,7 +80,7 @@ Open `Settings → Configure Kate → LSP Client → User Server Settings` and a
 {
   "servers": {
     "c": {
-      "command": ["clice", "server"],
+      "command": ["clice", "serve"],
       "url": "https://github.com/clice-io/clice",
       "highlightingModeRegex": "^(C|C\\+\\+)$"
     }

docs/zh/dev/test-and-debug.md

@@ -82,21 +82,11 @@ pixi 环境之外的依赖：
 如果想在 clice 上附加调试器，推荐先以 socket 模式单独启动 clice，然后连接客户端。
 
 ```shell
-./build/Debug/bin/clice server --mode socket --port 50051
+./build/Debug/bin/clice serve --mode socket --port 50051
 ```
 
 服务器启动后，可以通过以下两种方式连接客户端：
 
-### 通过 pytest 连接
-
-运行单个集成测试连接到正在运行的 clice 实例：
-
-```shell
-pytest -s --log-cli-level=INFO \
-    tests/integration/lifecycle/test_file_operation.py::test_did_open \
-    --mode=socket --port=50051
-```
-
 ### 通过 VS Code 连接
 
 配置 clice 插件连接到正在运行的实例：

docs/zh/guide/editors.md

@@ -34,7 +34,7 @@ Zed 扩展位于 [`editors/zed`](https://github.com/clice-io/clice/tree/main/edi
 ```toml
 [language-server.clice]
 command = "clice"
-args = ["server"]
+args = ["serve"]
 
 [[language]]
 name = "cpp"
@@ -53,7 +53,7 @@ language-servers = ["clice"]
 (with-eval-after-load 'eglot
   (add-to-list 'eglot-server-programs
                '((c-mode c-ts-mode c++-mode c++-ts-mode)
-                 . ("clice" "server"))))
+                 . ("clice" "serve"))))
 ```
 
 ### Sublime Text
@@ -65,7 +65,7 @@ language-servers = ["clice"]
   "clients": {
     "clice": {
       "enabled": true,
-      "command": ["clice", "server"],
+      "command": ["clice", "serve"],
       "selector": "source.c | source.c++"
     }
   }
@@ -80,7 +80,7 @@ language-servers = ["clice"]
 {
   "servers": {
     "c": {
-      "command": ["clice", "server"],
+      "command": ["clice", "serve"],
       "url": "https://github.com/clice-io/clice",
       "highlightingModeRegex": "^(C|C\\+\\+)$"
     }

editors/nvim/doc/clice.lua

@@ -25,7 +25,7 @@ local clice = {
 
     cmd = {
         'clice',
-        'server',
+        'serve',
     },
 }
 

editors/nvim/tests/e2e.lua

@@ -55,7 +55,7 @@ end
 local plugin_root = vim.fn.fnamemodify(arg[0], ':p:h:h')
 local config = dofile(plugin_root .. '/doc/clice.lua')
 config.name = 'clice'
-config.cmd = { clice_path, 'server' }
+config.cmd = { clice_path, 'serve' }
 config.root_dir = fixture_dir
 
 local main_file_uri = vim.uri_from_fname(fixture_dir .. '/' .. scenario.file)

editors/vscode/src/extension.ts

@@ -45,7 +45,7 @@ export async function activate(context: ExtensionContext) {
             }
         }
 
-        let args = ["server"];
+        let args = ["serve"];
         serverOptions = {
             run: { command: executable, args: args },
             debug: { command: executable, args: args },

editors/zed/src/clice.rs

@@ -33,7 +33,7 @@ impl zed::Extension for CliceExtension {
         Ok(zed::Command {
             command: binary.path,
             args: vec![
-                "server".to_string(),
+                "serve".to_string(),
             ],
             env: Default::default(),
         })

src/clice.cc

@@ -84,30 +84,17 @@ int main(int argc, const char** argv) {
 
     int exit_code = 1;
 
-    auto server_cmd = deco::cli::command<clice::ServerOptions>("clice server [OPTIONS]");
-    server_cmd
+    auto serve_cmd = deco::cli::command<clice::ServerOptions>("clice serve [OPTIONS]");
+    serve_cmd
         .matchAll([&](clice::ServerOptions opts) {
             if(opts.help) {
-                clice::print_usage(server_cmd);
+                clice::print_usage(serve_cmd);
                 exit_code = 0;
                 return;
             }
             if(!clice::apply_log_level(opts.log_level.value_or("info")))
                 return;
-            using clice::ServerMode;
-            auto mode = opts.mode.value_or(ServerMode::Pipe);
-            if(mode == ServerMode::Relay) {
-                exit_code = clice::run_relay_mode(opts.socket.value_or(""));
-            } else if(mode == ServerMode::Daemon) {
-                auto workspace = opts.workspace.value_or("");
-                if(workspace.empty()) {
-                    LOG_ERROR("--workspace is required for daemon mode");
-                    return;
-                }
-                exit_code = clice::run_daemon_mode(opts, self_path);
-            } else {
-                exit_code = clice::run_server_mode(opts, self_path);
-            }
+            exit_code = clice::run_serve_mode(opts, self_path);
         })
         .on_error([](auto err) { LOG_ERROR("{}", err.message); });
 
@@ -181,7 +168,7 @@ int main(int argc, const char** argv) {
         clice::print_usage(clice);
     };
 
-    clice.add({.name = "server", .description = "Start LSP server"}, server_cmd)
+    clice.add({.name = "serve", .description = "Start LSP server"}, serve_cmd)
         .add({.name = "query", .description = "Query symbol information from a running server"},
              query_cmd)
         .add({.name = "worker"}, worker_cmd)

src/server/service/agentic.cpp

@@ -5,7 +5,6 @@
 #include <string>
 
 #include "server/protocol/agentic.h"
-#include "support/filesystem.h"
 #include "support/logging.h"
 
 #include "kota/async/async.h"
@@ -126,48 +125,4 @@ int run_agentic_mode(const QueryOptions& opts) {
     return exit_code;
 }
 
-static kota::task<> relay_forward(kota::ipc::Transport& from, kota::ipc::Transport& to) {
-    while(true) {
-        auto msg = co_await from.read_message();
-        if(!msg)
-            break;
-        co_await to.write_message(*msg);
-    }
-    to.close();
-}
-
-static kota::task<> relay_main(kota::event_loop& loop, int& exit_code, std::string socket_path) {
-    auto stdio = kota::ipc::StreamTransport::open_stdio(loop);
-    if(!stdio) {
-        LOG_ERROR("failed to open stdio transport");
-        loop.stop();
-        co_return;
-    }
-
-    auto conn = co_await kota::pipe::connect(socket_path, {}, loop);
-    if(!conn) {
-        LOG_ERROR("failed to connect to {}", socket_path);
-        loop.stop();
-        co_return;
-    }
-
-    auto socket = std::make_unique<kota::ipc::StreamTransport>(std::move(*conn));
-
-    co_await kota::when_all(relay_forward(**stdio, *socket), relay_forward(*socket, **stdio));
-    exit_code = 0;
-    loop.stop();
-}
-
-int run_relay_mode(llvm::StringRef socket_path) {
-    logging::stderr_logger("relay", logging::options);
-
-    auto path = socket_path.empty() ? path::default_socket_path() : socket_path.str();
-
-    kota::event_loop loop;
-    int exit_code = 1;
-    loop.schedule(relay_main(loop, exit_code, std::move(path)));
-    loop.run();
-    return exit_code;
-}
-
 }  // namespace clice

src/server/service/agentic.h

@@ -60,6 +60,4 @@ struct QueryOptions {
 
 int run_agentic_mode(const QueryOptions& opts);
 
-int run_relay_mode(llvm::StringRef socket_path);
-
 }  // namespace clice