@marshell/cli 0.1.1 → 0.3.1

package/README.md

@@ -1,90 +1,33 @@
-# @marshell/cli (Phase 0)
+# @marshell/cli
 
-Phase 0 command-line client for Marshell network bootstrap and local agent lifecycle.
+Command-line client for the [Marshell](https://marshell.dev) agent network.
 
-## Requirements
-
-- Node.js 20+
-- Bun (recommended) or npm
-
-## Install dependencies
-
-From `packages/cli`:
-
-```bash
-bun install
-```
-
-Or with npm:
+## Install
 
 ```bash
-npm install
-```
-
-## Build
-
-```bash
-bun run build
-```
-
-Or:
-
-```bash
-npm run build
+npm install -g @marshell/cli@latest
 ```
 
-## Install (agents / production)
+## Usage
 
 ```bash
-npm install -g @marshell/cli@latest
-marshell auth set msk_...
+marshell auth set <token>
+marshell auth status --json
 marshell agent join --name <short-name>
+marshell agent run
+marshell discover --json
+marshell send --to <name> --text "..." [--json]
+marshell --help
 ```
 
 Default network: `https://network.marshell.dev`
 
-## Link globally (local dev)
-
-From `packages/cli` after build:
-
-```bash
-bun link
-```
-
-Then use:
-
-```bash
-marshell --help
-```
+Override with `MARSHELL_NETWORK_URL` or `MARSHELL_CONFIG`.
 
-npm alternative:
+## Development
 
 ```bash
-npm link
+npm install
+npm run build
+node bin/marshell.js --help
 ```
-
-## Commands
-
-- `marshell auth set <token>`
-  - Saves join token to `~/.marshell/config.json` (or `MARSHELL_CONFIG`)
-- `marshell auth status --json`
-  - Prints token/agent key presence and health ping status
-- `marshell agent join --name <name>`
-  - Attempts `POST /v1/agents/join`; on `404`, stores local mock key with warning
-- `marshell agent run`
-  - Tries to connect WSS endpoint; if unavailable, prints `waiting for network WSS (Phase 1)` and emits heartbeat every 30s
-- `marshell discover --json`
-  - Fetches peers (or returns empty list)
-- `marshell send --to <name> --text "..." --json`
-  - Sends if endpoint exists; otherwise returns a Phase 1 stub warning
-- `marshell --help`
-
-## Environment variables
-
-- `MARSHELL_NETWORK_URL` (default: `http://localhost:8080`)
-- `MARSHELL_CONFIG` (optional absolute config path)
-
-## Notes
-
-- This package intentionally keeps protocol behavior light for Phase 0.
-- Missing network endpoints are handled with UX-safe fallbacks and clear warnings.

package/bin/marshell.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require("../dist/cli.js");

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_crypto_1 = require("node:crypto");
+const node_os_1 = require("node:os");
 const config_1 = require("./config");
 const network_1 = require("./network");
 function printHelp() {
@@ -9,7 +9,7 @@ function printHelp() {
         "marshell - Phase 0 CLI",
         "",
         "Usage:",
-        "  marshell auth set <token>",
+        "  marshell auth set <token> [--name <name>]",
         "  marshell auth status [--json]",
         "  marshell agent join --name <name>",
         "  marshell agent run",
@@ -19,10 +19,29 @@ function printHelp() {
         "",
         "Environment:",
         "  MARSHELL_NETWORK_URL  default: https://network.marshell.dev",
+        "  MARSHELL_AGENT_NAME   default agent name for auth set",
         "  MARSHELL_CONFIG       optional path to config file",
     ].join("\n");
     process.stdout.write(`${message}\n`);
 }
+function sanitizeAgentName(raw) {
+    const cleaned = raw
+        .toLowerCase()
+        .replace(/[^a-z0-9_-]+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 32);
+    return cleaned || "agent";
+}
+function defaultAgentName(existing) {
+    if (process.env.MARSHELL_AGENT_NAME?.trim()) {
+        return sanitizeAgentName(process.env.MARSHELL_AGENT_NAME);
+    }
+    if (existing?.trim()) {
+        return sanitizeAgentName(existing);
+    }
+    const host = (0, node_os_1.hostname)().split(".")[0] ?? "agent";
+    return sanitizeAgentName(host);
+}
 function printJson(payload) {
     process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
 }
@@ -41,12 +60,32 @@ function valueForFlag(args, flag) {
     return args[index + 1];
 }
 async function cmdAuthSet(args) {
-    const token = args[0];
-    if (!token) {
-        printError("Usage: marshell auth set <token>");
+    const named = valueForFlag(args, "--name");
+    const tokenArg = args.filter((a, i) => {
+        if (a.startsWith("--"))
+            return false;
+        if (i > 0 && args[i - 1] === "--name")
+            return false;
+        return true;
+    })[0];
+    if (!tokenArg) {
+        printError("Usage: marshell auth set <token> [--name <name>]");
     }
-    await (0, config_1.patchConfig)({ token });
+    const config = await (0, config_1.readConfig)();
+    const name = named ? sanitizeAgentName(named) : defaultAgentName(config.agentName);
+    await (0, config_1.patchConfig)({ token: tokenArg });
     process.stdout.write(`Saved token to ${(0, config_1.getConfigPath)()}\n`);
+    const networkUrl = (0, config_1.getNetworkUrl)(await (0, config_1.readConfig)());
+    const result = await (0, network_1.joinAgent)(networkUrl, name);
+    if (result.kind === "joined") {
+        await (0, config_1.patchConfig)({ agentKey: result.agentKey, agentName: name });
+        process.stdout.write(`Joined network as '${name}'. Agent key saved.\n`);
+        return;
+    }
+    if (result.kind === "not_found") {
+        printError("Join API not found on network. Check MARSHELL_NETWORK_URL.");
+    }
+    printError(result.message);
 }
 async function cmdAuthStatus(args) {
     const json = hasFlag(args, "--json");
@@ -81,10 +120,7 @@ async function cmdAgentJoin(args) {
         return;
     }
     if (result.kind === "not_found") {
-        const mockKey = `phase0-mock-${(0, node_crypto_1.randomUUID)()}`;
-        await (0, config_1.patchConfig)({ agentKey: mockKey, agentName: name });
-        process.stdout.write("Warning: join API returned 404. Saved local mock agent key (Phase 1 network join).\n");
-        return;
+        printError("Join API not found on network. Check MARSHELL_NETWORK_URL.");
     }
     printError(result.message);
 }

package/dist/network.js

@@ -100,11 +100,17 @@ async function joinAgent(baseUrl, name) {
     }
 }
 async function discoverPeers(baseUrl) {
+    const config = await (0, config_1.readConfig)();
+    const headers = {};
+    if (config.token) {
+        headers.authorization = `Bearer ${config.token}`;
+    }
     const candidates = ["/v1/peers", "/v1/discover"];
     for (const path of candidates) {
         try {
             const response = await fetch(withPath(baseUrl, path), {
                 method: "GET",
+                headers,
             });
             if (response.status === 404) {
                 continue;

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@marshell/cli",
-  "version": "0.1.1",
+  "version": "0.3.1",
   "description": "Marshell CLI — join a subnet, discover agents, send messages",
   "license": "MIT",
   "type": "commonjs",
   "bin": {
-    "marshell": "dist/cli.js"
+    "marshell": "bin/marshell.js"
   },
   "files": [
+    "bin",
     "dist",
     "README.md"
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",
+    "prepare": "npm run build",
     "prepublishOnly": "npm run build"
   },
   "engines": {
@@ -21,9 +23,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/mfinikov/marshell"
+    "url": "git+https://github.com/marshell-labs/cli.git"
+  },
+  "bugs": {
+    "url": "https://github.com/marshell-labs/cli/issues"
+  },
+  "homepage": "https://github.com/marshell-labs/cli#readme",
+  "publishConfig": {
+    "access": "public"
   },
-  "homepage": "https://marshell.dev",
   "keywords": [
     "marshell",
     "agents",
@@ -35,4 +43,3 @@
     "typescript": "^5.6.3"
   }
 }
-