@mclawnet/agent 0.5.9 → 0.6.1

package/cli.js

@@ -1,74 +1,181 @@
 #!/usr/bin/env node
 
-const args = process.argv.slice(2);
-const command = args[0] || "start";
-
-if (command === "start") {
-  // Parse CLI flags
-  const opts = {};
-  for (let i = 1; i < args.length; i++) {
-    if ((args[i] === "--hub-url" || args[i] === "--server") && args[i + 1]) {
-      opts.hubUrl = args[++i];
-    } else if (args[i] === "--token" && args[i + 1]) {
-      opts.token = args[++i];
-    } else if (args[i] === "--name" && args[i + 1]) {
-      opts.name = args[++i];
-    } else if (args[i] === "--backend" && args[i + 1]) {
-      opts.backendType = args[++i];
-    }
-  }
+import { Command } from "commander";
+import { readFileSync } from "fs";
+
+const pkg = JSON.parse(readFileSync(new URL("./package.json", import.meta.url), "utf-8"));
 
-  // Default to claude-code adapter
-  const backendType = opts.backendType || "claude-code";
+const program = new Command();
 
-  async function main() {
-    let adapter;
+program
+  .name("clawnet-agent")
+  .description("ClawNet Agent — intelligent agent daemon service")
+  .version(pkg.version);
 
-    if (backendType === "claude-code") {
-      try {
-        const { ClaudeCodeAdapter } = await import("@mclawnet/claude-adapter");
-        adapter = new ClaudeCodeAdapter();
-      } catch (err) {
-        console.error("[clawnet] Failed to load @mclawnet/claude-adapter:", err.message);
-        console.error("[clawnet] Install it: pnpm add @mclawnet/claude-adapter");
+// === start (default command) ===
+program
+  .command("start", { isDefault: true })
+  .description("Start Agent (daemon mode by default, use -f for foreground)")
+  .option("-f, --foreground", "Run in foreground (for development/debugging)")
+  .option("--hub-url <url>", "Hub WebSocket URL")
+  .option("--token <token>", "Agent token")
+  .option("--name <name>", "Agent name")
+  .option("--backend <type>", "Backend type", "claude-code")
+  .action(async (opts) => {
+    if (opts.foreground) {
+      // Foreground mode: directly run agent (existing behavior)
+      const config = {};
+      if (opts.hubUrl) config.hubUrl = opts.hubUrl;
+      if (opts.token) config.token = opts.token;
+      if (opts.name) config.name = opts.name;
+      if (opts.backend) config.backendType = opts.backend;
+
+      let adapter;
+      const backendType = opts.backend || "claude-code";
+      if (backendType === "claude-code") {
+        try {
+          const { ClaudeCodeAdapter } = await import("@mclawnet/claude-adapter");
+          adapter = new ClaudeCodeAdapter();
+        } catch (err) {
+          console.error("[clawnet] Failed to load @mclawnet/claude-adapter:", err.message);
+          process.exit(1);
+        }
+      } else {
+        console.error(`[clawnet] Unknown backend type: ${backendType}`);
         process.exit(1);
       }
+
+      const { startAgent } = await import("./dist/start.js");
+      await startAgent({ config, adapter });
     } else {
-      console.error(`[clawnet] Unknown backend type: ${backendType}`);
-      process.exit(1);
+      // Daemon mode: register service + start
+      const { getServiceManager, mergeServiceConfig, saveServiceConfig, validateServiceConfig } =
+        await import("./dist/service/index.js");
+
+      const cliOpts = {};
+      if (opts.hubUrl) cliOpts.hubUrl = opts.hubUrl;
+      if (opts.token) cliOpts.token = opts.token;
+      if (opts.name) cliOpts.name = opts.name;
+
+      const config = mergeServiceConfig(cliOpts);
+      validateServiceConfig(config);
+      saveServiceConfig(config);
+
+      const manager = await getServiceManager();
+      const status = await manager.status();
+
+      if (status.running) {
+        console.log(`Agent is already running (PID: ${status.pid}). Use 'restart' to restart.`);
+        return;
+      }
+
+      await manager.install();
+      await manager.start();
     }
+  });
 
-    const { startAgent } = await import("./dist/start.js");
-    await startAgent({ config: opts, adapter });
-  }
+// === stop ===
+program
+  .command("stop")
+  .description("Stop Agent service")
+  .action(async () => {
+    const { getServiceManager } = await import("./dist/service/index.js");
+    const manager = await getServiceManager();
+    await manager.stop();
+  });
 
-  main().catch((err) => {
-    console.error("[clawnet] Fatal:", err);
-    process.exit(1);
+// === restart ===
+program
+  .command("restart")
+  .description("Restart Agent service")
+  .action(async () => {
+    const { getServiceManager } = await import("./dist/service/index.js");
+    const manager = await getServiceManager();
+    await manager.restart();
   });
-} else if (command === "config") {
-  const subCmd = args[1];
-  import("./dist/index.js").then(({ loadConfig, saveConfig }) => {
-    if (subCmd === "set" && args[2] && args[3]) {
-      saveConfig({ [args[2]]: args[3] });
-      console.log(`Set ${args[2]} = ${args[3]}`);
-    } else if (subCmd === "show") {
-      console.log(JSON.stringify(loadConfig(), null, 2));
-    } else {
-      console.log("Usage: clawnet-agent config set <key> <value>");
-      console.log("       clawnet-agent config show");
-    }
+
+// === enable ===
+program
+  .command("enable")
+  .description("Register system service (without starting)")
+  .option("--hub-url <url>", "Hub WebSocket URL")
+  .option("--token <token>", "Agent token")
+  .option("--name <name>", "Agent name")
+  .action(async (opts) => {
+    const { getServiceManager, mergeServiceConfig, saveServiceConfig, validateServiceConfig } =
+      await import("./dist/service/index.js");
+
+    const cliOpts = {};
+    if (opts.hubUrl) cliOpts.hubUrl = opts.hubUrl;
+    if (opts.token) cliOpts.token = opts.token;
+    if (opts.name) cliOpts.name = opts.name;
+
+    const config = mergeServiceConfig(cliOpts);
+    validateServiceConfig(config);
+    saveServiceConfig(config);
+
+    const manager = await getServiceManager();
+    await manager.install();
+  });
+
+// === disable ===
+program
+  .command("disable")
+  .description("Stop and remove system service")
+  .action(async () => {
+    const { getServiceManager } = await import("./dist/service/index.js");
+    const manager = await getServiceManager();
+    await manager.uninstall();
+  });
+
+// === status ===
+program
+  .command("status")
+  .description("Show Agent status")
+  .action(async () => {
+    const { getServiceManager } = await import("./dist/service/index.js");
+    const manager = await getServiceManager();
+    await manager.printStatus();
   });
-} else {
-  console.log("Usage: clawnet-agent [start|config] [options]");
-  console.log("");
-  console.log("Commands:");
-  console.log("  start     Start the agent (default)");
-  console.log("  config    View/set configuration");
-  console.log("");
-  console.log("Options:");
-  console.log("  --server <url>      Hub WebSocket URL (alias: --hub-url)");
-  console.log("  --token <token>     Agent token");
-  console.log("  --name <name>       Agent name");
-  console.log("  --backend <type>    Backend type (claude-code)");
-}
+
+// === logs ===
+program
+  .command("logs")
+  .description("View Agent logs")
+  .option("-f, --follow", "Follow log output in real-time")
+  .option("-n, --lines <number>", "Number of lines to show", "100")
+  .action(async (opts) => {
+    const { getServiceManager } = await import("./dist/service/index.js");
+    const manager = await getServiceManager();
+    await manager.logs({
+      follow: opts.follow,
+      lines: parseInt(opts.lines, 10),
+    });
+  });
+
+// === config ===
+const configCmd = program
+  .command("config")
+  .description("View or modify configuration");
+
+configCmd
+  .command("show")
+  .description("Show current configuration")
+  .action(async () => {
+    const { loadConfig } = await import("./dist/index.js");
+    console.log(JSON.stringify(loadConfig(), null, 2));
+  });
+
+configCmd
+  .command("set <key> <value>")
+  .description("Set a configuration value")
+  .action(async (key, value) => {
+    const { saveConfig } = await import("./dist/index.js");
+    saveConfig({ [key]: value });
+    console.log(`Set ${key} = ${value}`);
+  });
+
+program.parseAsync(process.argv).catch((err) => {
+  console.error("[clawnet] Fatal:", err.message || err);
+  process.exit(1);
+});

package/dist/__tests__/cli.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=cli.test.d.ts.map

package/dist/__tests__/cli.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/cli.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/service-config.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=service-config.test.d.ts.map

package/dist/__tests__/service-config.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-config.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/service-config.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/service-linux.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=service-linux.test.d.ts.map

package/dist/__tests__/service-linux.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-linux.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/service-linux.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/service-macos.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=service-macos.test.d.ts.map

package/dist/__tests__/service-macos.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-macos.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/service-macos.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/service-windows.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=service-windows.test.d.ts.map

package/dist/__tests__/service-windows.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-windows.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/service-windows.test.ts"],"names":[],"mappings":""}

package/dist/backend-adapter.d.ts

@@ -29,6 +29,8 @@ export interface SpawnOptions {
     mcpConfigPath?: string;
     /** Memory system role ID. When set, SessionManager auto-injects memory prompt + MCP config */
     roleId?: string;
+    /** Extra directories to mount via --add-dir */
+    additionalDirs?: string[];
 }
 export interface BackendAdapter {
     /** Backend type identifier */

package/dist/backend-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-adapter.d.ts","sourceRoot":"","sources":["../src/backend-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,cAAc;IAC7B,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,+BAA+B;IAC/B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,kCAAkC;IAClC,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtD,qCAAqC;IACrC,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C,6CAA6C;IAC7C,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnD,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI,CAAC;IAEzE,qCAAqC;IACrC,cAAc,CAAC,CACb,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAChD,KAAK,IAAI,GACT,IAAI,CAAC;IAER,6BAA6B;IAC7B,OAAO,CAAC,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;CAC1E"}
+{"version":3,"file":"backend-adapter.d.ts","sourceRoot":"","sources":["../src/backend-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,cAAc;IAC7B,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,+BAA+B;IAC/B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC7B,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,kCAAkC;IAClC,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtD,qCAAqC;IACrC,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C,6CAA6C;IAC7C,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnD,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI,CAAC;IAEzE,qCAAqC;IACrC,cAAc,CAAC,CACb,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAChD,KAAK,IAAI,GACT,IAAI,CAAC;IAER,6BAA6B;IAC7B,OAAO,CAAC,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;CAC1E"}