@marshell/cli 0.3.1 → 0.6.0

package/bin/marshell.js

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

package/dist/bridge.js

@@ -0,0 +1,271 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tryFastReply = tryFastReply;
+exports.handleInbound = handleInbound;
+exports.runBridge = runBridge;
+const node_child_process_1 = require("node:child_process");
+const network_1 = require("./network");
+const DEFAULT_REPLY_TIMEOUT_MS = 120_000;
+/** Instant replies — no LLM spawn. Marshell transport stays fast. */
+function tryFastReply(msg) {
+    const text = msg.text.trim();
+    if (/^(ping|pong)$/i.test(text)) {
+        return "pong";
+    }
+    if (/^(hi|hello|hey|yo|sup|picun)[!.?\s]*$/i.test(text)) {
+        return text.toLowerCase() === "picun" ? "picun" : "hi";
+    }
+    if (text.toLowerCase().startsWith("echo:")) {
+        const body = text.slice(5).trim();
+        return body || "(empty)";
+    }
+    return null;
+}
+function killProcessTree(pid) {
+    if (!pid)
+        return;
+    if (process.platform === "win32") {
+        (0, node_child_process_1.spawn)("taskkill", ["/pid", String(pid), "/T", "/F"], {
+            stdio: "ignore",
+            windowsHide: true,
+        });
+        return;
+    }
+    try {
+        process.kill(-pid, "SIGKILL");
+    }
+    catch {
+        try {
+            process.kill(pid, "SIGKILL");
+        }
+        catch {
+            // ignore
+        }
+    }
+}
+function spawnCommand(command, args, options) {
+    const timeoutMs = options?.timeoutMs ?? DEFAULT_REPLY_TIMEOUT_MS;
+    return new Promise((resolve) => {
+        const child = process.platform === "win32"
+            ? (0, node_child_process_1.spawn)(command, args, {
+                cwd: options?.cwd,
+                env: process.env,
+                windowsHide: true,
+                shell: false,
+            })
+            : (0, node_child_process_1.spawn)(command, args, {
+                cwd: options?.cwd,
+                env: process.env,
+                detached: true,
+            });
+        let stdout = "";
+        let stderr = "";
+        let settled = false;
+        const finish = (code, errText) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            resolve({
+                code,
+                stdout,
+                stderr: errText ? `${stderr}\n${errText}`.trim() : stderr,
+            });
+        };
+        const timer = setTimeout(() => {
+            killProcessTree(child.pid);
+            finish(124, `timeout after ${Math.round(timeoutMs / 1000)}s`);
+        }, timeoutMs);
+        if (options?.input) {
+            child.stdin.write(options.input);
+            child.stdin.end();
+        }
+        child.stdout.on("data", (chunk) => {
+            stdout += chunk.toString();
+        });
+        child.stderr.on("data", (chunk) => {
+            stderr += chunk.toString();
+        });
+        child.on("close", (code) => {
+            finish(code ?? 1);
+        });
+        child.on("error", (error) => {
+            finish(1, error.message);
+        });
+    });
+}
+async function generateRuntimeReply(msg, runtime, workspace, timeoutMs) {
+    const prompt = [
+        `Marshell agent "${msg.from}" sent:`,
+        msg.text,
+        "",
+        "Reply with ONLY the answer. No tools, no marshell CLI, no meta commentary.",
+    ].join("\n");
+    if (runtime === "cursor") {
+        const result = await spawnCommand("agent", [
+            "-p",
+            "--trust",
+            "--mode",
+            "ask",
+            "--workspace",
+            workspace,
+            "--output-format",
+            "text",
+            prompt,
+        ], { timeoutMs });
+        if (result.code === 124) {
+            throw new Error(`auto-reply timed out (${Math.round(timeoutMs / 1000)}s)`);
+        }
+        if (result.code !== 0) {
+            throw new Error(result.stderr || result.stdout || "cursor agent failed");
+        }
+        return result.stdout.trim();
+    }
+    const result = await spawnCommand("hermes", ["-z", prompt], { timeoutMs });
+    if (result.code === 124) {
+        throw new Error(`auto-reply timed out (${Math.round(timeoutMs / 1000)}s)`);
+    }
+    if (result.code !== 0) {
+        throw new Error(result.stderr || result.stdout || "hermes failed");
+    }
+    return result.stdout.trim();
+}
+async function runHookReply(hook, msg, timeoutMs) {
+    const payload = JSON.stringify({
+        id: msg.id,
+        from: msg.from,
+        text: msg.text,
+        created_at: msg.created_at,
+    });
+    if (process.platform === "win32") {
+        const result = await spawnCommand("cmd.exe", ["/d", "/s", "/c", hook], { input: payload, timeoutMs });
+        if (result.code === 124) {
+            throw new Error(`hook timed out (${Math.round(timeoutMs / 1000)}s)`);
+        }
+        if (result.code !== 0) {
+            throw new Error(result.stderr || result.stdout || "hook failed");
+        }
+        return result.stdout.trim();
+    }
+    const result = await spawnCommand("sh", ["-c", hook], {
+        input: payload,
+        timeoutMs,
+    });
+    if (result.code === 124) {
+        throw new Error(`hook timed out (${Math.round(timeoutMs / 1000)}s)`);
+    }
+    if (result.code !== 0) {
+        throw new Error(result.stderr || result.stdout || "hook failed");
+    }
+    return result.stdout.trim();
+}
+function emitEvent(json, event) {
+    if (json) {
+        process.stdout.write(`${JSON.stringify(event)}\n`);
+        return;
+    }
+    const kind = event.type;
+    if (kind === "message") {
+        process.stdout.write(`[message] from=${event.from} id=${event.id}\n${event.text}\n`);
+    }
+    else if (kind === "reply") {
+        process.stdout.write(`[reply] to=${event.to} id=${event.id}\n`);
+    }
+    else if (kind === "error") {
+        process.stderr.write(`[bridge] ${event.message}\n`);
+    }
+}
+async function deliverReply(networkUrl, msg, reply, json) {
+    const sent = await (0, network_1.sendMessage)(networkUrl, msg.from, reply);
+    if (sent.kind !== "sent") {
+        throw new Error(sent.message);
+    }
+    emitEvent(json, {
+        type: "reply",
+        to: msg.from,
+        id: sent.id,
+        in_reply_to: msg.id,
+        text: reply,
+    });
+}
+async function processReplyAsync(networkUrl, msg, options) {
+    try {
+        let reply = tryFastReply(msg);
+        if (!reply && options.hook) {
+            reply = await runHookReply(options.hook, msg, options.replyTimeoutMs);
+        }
+        else if (!reply && options.autoReply && options.runtime !== "fast") {
+            reply = await generateRuntimeReply(msg, options.runtime, options.workspace, options.replyTimeoutMs);
+        }
+        if (!reply) {
+            return;
+        }
+        if (!reply.trim()) {
+            throw new Error("empty reply");
+        }
+        await deliverReply(networkUrl, msg, reply.trim(), options.json);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        emitEvent(options.json, { type: "error", message, in_reply_to: msg.id });
+        await (0, network_1.sendMessage)(networkUrl, msg.from, `Auto-reply failed (${message}). Please retry.`);
+    }
+}
+async function handleInbound(networkUrl, msg, options) {
+    emitEvent(options.json, {
+        type: "message",
+        id: msg.id,
+        from: msg.from,
+        text: msg.text,
+        created_at: msg.created_at,
+    });
+    const fast = tryFastReply(msg);
+    if (fast) {
+        await deliverReply(networkUrl, msg, fast, options.json);
+        await (0, network_1.ackMessages)(networkUrl, [msg.id]);
+        return;
+    }
+    const willReply = Boolean(options.hook) ||
+        (options.autoReply && options.runtime !== "fast");
+    // Ack immediately so transport never blocks on slow LLM / hook.
+    await (0, network_1.ackMessages)(networkUrl, [msg.id]);
+    if (!willReply) {
+        return;
+    }
+    void processReplyAsync(networkUrl, msg, options);
+}
+async function runBridge(options) {
+    const label = options.agentName ?? "agent";
+    const mode = options.hook
+        ? "hook"
+        : options.autoReply
+            ? options.runtime === "fast"
+                ? "fast-only"
+                : `auto-reply (${options.runtime})`
+            : "deliver-only";
+    process.stdout.write(`Bridge listening as '${label}' (${mode}).\n`);
+    let stopped = false;
+    const cleanup = () => {
+        if (stopped)
+            return;
+        stopped = true;
+        process.stdout.write("Bridge stopped.\n");
+        process.exit(0);
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
+    while (!stopped) {
+        const result = await (0, network_1.fetchInbox)(options.networkUrl, {
+            peek: true,
+            waitSeconds: 30,
+        });
+        if (result.kind === "error") {
+            process.stderr.write(`inbox error: ${result.message}\n`);
+            await new Promise((resolve) => setTimeout(resolve, 2000));
+            continue;
+        }
+        for (const msg of result.messages) {
+            await handleInbound(options.networkUrl, msg, options);
+        }
+    }
+}

package/dist/cli.js

@@ -2,24 +2,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_os_1 = require("node:os");
+const bridge_1 = require("./bridge");
 const config_1 = require("./config");
 const network_1 = require("./network");
 function printHelp() {
     const message = [
-        "marshell - Phase 0 CLI",
+        "marshell - agent messaging bridge",
         "",
         "Usage:",
         "  marshell auth set <token> [--name <name>]",
         "  marshell auth status [--json]",
         "  marshell agent join --name <name>",
-        "  marshell agent run",
+        "  marshell bridge run [--json] [--hook <cmd>]",
+        "  marshell bridge run --auto-reply [--runtime cursor|hermes|fast] [--workspace <path>]",
+        "  marshell agent run            (alias for bridge run)",
         "  marshell discover [--json]",
         "  marshell send --to <name> --text \"...\" [--json]",
+        "  marshell ask --to <name> --text \"...\" [--wait <seconds>] [--json]",
+        "  marshell inbox [--json] [--wait <seconds>] [--from <name>]",
+        "  marshell listen [--json]      (alias for bridge run)",
         "  marshell --help",
         "",
+        "Bridge (Happy-style transport):",
+        "  Keeps a persistent listener. Delivers messages instantly.",
+        "  Fast path: ping→pong, hi→hi, echo:…→… (no LLM).",
+        "  --auto-reply spawns LLM only for non-trivial messages (async, non-blocking).",
+        "  Prefer: marshell ask --to <peer> --text \"...\" for request/response.",
+        "",
         "Environment:",
         "  MARSHELL_NETWORK_URL  default: https://network.marshell.dev",
         "  MARSHELL_AGENT_NAME   default agent name for auth set",
+        "  MARSHELL_WORKSPACE    workspace for cursor auto-reply",
+        "  MARSHELL_HOOK         default hook command for bridge",
         "  MARSHELL_CONFIG       optional path to config file",
     ].join("\n");
     process.stdout.write(`${message}\n`);
@@ -59,6 +73,36 @@ function valueForFlag(args, flag) {
     }
     return args[index + 1];
 }
+function bridgeOptionsFromArgs(args) {
+    const configPromise = (0, config_1.readConfig)();
+    // sync read not available — caller must await
+    void configPromise;
+    const autoReply = hasFlag(args, "--auto-reply");
+    const json = hasFlag(args, "--json");
+    const workspace = valueForFlag(args, "--workspace") ??
+        process.env.MARSHELL_WORKSPACE ??
+        process.cwd();
+    const hook = valueForFlag(args, "--hook") ?? process.env.MARSHELL_HOOK;
+    const runtimeFlag = valueForFlag(args, "--runtime");
+    const runtime = runtimeFlag === "hermes" || runtimeFlag === "cursor" || runtimeFlag === "fast"
+        ? runtimeFlag
+        : process.platform === "win32"
+            ? "cursor"
+            : "hermes";
+    const timeoutRaw = valueForFlag(args, "--reply-timeout");
+    const replyTimeoutMs = timeoutRaw
+        ? Math.max(5, Number(timeoutRaw)) * 1000
+        : 120_000;
+    return {
+        networkUrl: "",
+        autoReply,
+        runtime,
+        workspace,
+        hook,
+        json,
+        replyTimeoutMs,
+    };
+}
 async function cmdAuthSet(args) {
     const named = valueForFlag(args, "--name");
     const tokenArg = args.filter((a, i) => {
@@ -95,6 +139,7 @@ async function cmdAuthStatus(args) {
     const payload = {
         hasToken: Boolean(config.token),
         hasAgentKey: Boolean(config.agentKey),
+        agentName: config.agentName ?? null,
         networkUrl,
         health,
     };
@@ -124,88 +169,30 @@ async function cmdAgentJoin(args) {
     }
     printError(result.message);
 }
-function setupHeartbeat(message) {
-    process.stdout.write(`${message}\n`);
-    return setInterval(() => {
-        process.stdout.write(`[heartbeat] ${new Date().toISOString()}\n`);
-    }, 30_000);
-}
-async function tryConnectAgentWs(url) {
-    const wsCtor = globalThis.WebSocket;
-    if (!wsCtor) {
-        return false;
-    }
-    return await new Promise((resolve) => {
-        let settled = false;
-        const ws = new wsCtor(url);
-        const timeout = setTimeout(() => {
-            if (!settled) {
-                settled = true;
-                ws.close();
-                resolve(false);
-            }
-        }, 4000);
-        ws.onopen = () => {
-            clearTimeout(timeout);
-            if (settled) {
-                return;
-            }
-            settled = true;
-            process.stdout.write(`Connected to ${url}\n`);
-            ws.onmessage = (event) => {
-                process.stdout.write(`[message] ${String(event.data)}\n`);
-            };
-            resolve(true);
-        };
-        ws.onerror = () => {
-            clearTimeout(timeout);
-            if (settled) {
-                return;
-            }
-            settled = true;
-            resolve(false);
-        };
-        ws.onclose = () => {
-            clearTimeout(timeout);
-            if (!settled) {
-                settled = true;
-                resolve(false);
-            }
-        };
-    });
-}
-async function cmdAgentRun() {
+async function cmdBridgeRun(args = []) {
     const config = await (0, config_1.readConfig)();
-    const networkUrl = (0, config_1.getNetworkUrl)(config);
-    const wsUrl = (0, network_1.toWsUrl)(networkUrl);
-    const connected = await tryConnectAgentWs(wsUrl);
-    const timer = setupHeartbeat(connected
-        ? "Agent loop active. Waiting for work..."
-        : "waiting for network WSS (Phase 1)");
-    const cleanup = () => {
-        clearInterval(timer);
-        process.stdout.write("Exiting agent loop.\n");
-        process.exit(0);
-    };
-    process.on("SIGINT", cleanup);
-    process.on("SIGTERM", cleanup);
+    const opts = bridgeOptionsFromArgs(args);
+    opts.networkUrl = (0, config_1.getNetworkUrl)(config);
+    opts.agentName = config.agentName;
+    await (0, bridge_1.runBridge)(opts);
 }
 async function cmdDiscover(args) {
     const json = hasFlag(args, "--json");
     const config = await (0, config_1.readConfig)();
     const networkUrl = (0, config_1.getNetworkUrl)(config);
-    const discovered = await (0, network_1.discoverPeers)(networkUrl);
+    const { peers } = await (0, network_1.discoverPeers)(networkUrl);
     if (json) {
-        printJson({ peers: discovered.peers });
+        printJson({ peers });
         return;
     }
-    if (discovered.peers.length === 0) {
-        process.stdout.write("No peers discovered.\n");
+    if (peers.length === 0) {
+        process.stdout.write("No peers found.\n");
         return;
     }
-    process.stdout.write(`Discovered ${discovered.peers.length} peer(s):\n`);
-    for (const peer of discovered.peers) {
-        process.stdout.write(`- ${JSON.stringify(peer)}\n`);
+    for (const peer of peers) {
+        const name = typeof peer.name === "string" ? peer.name : "?";
+        const status = typeof peer.status === "string" ? peer.status : "unknown";
+        process.stdout.write(`- ${name} (${status})\n`);
     }
 }
 async function cmdSend(args) {
@@ -223,15 +210,101 @@ async function cmdSend(args) {
         return;
     }
     if (result.kind === "sent") {
-        process.stdout.write(`Sent message to '${to}' (id: ${result.id}).\n`);
+        process.stdout.write(`Sent message to '${to}' (id: ${result.id}, status: ${result.status}).\n`);
         return;
     }
-    if (result.kind === "stubbed") {
-        process.stdout.write(`Warning: ${result.reason}\n`);
+    printError(result.message);
+}
+async function cmdAsk(args) {
+    const json = hasFlag(args, "--json");
+    const to = valueForFlag(args, "--to");
+    const text = valueForFlag(args, "--text");
+    const waitRaw = valueForFlag(args, "--wait");
+    const waitSeconds = waitRaw ? Number(waitRaw) : 120;
+    if (!to || !text) {
+        printError("Usage: marshell ask --to <name> --text \"...\" [--wait <seconds>] [--json]");
+    }
+    const config = await (0, config_1.readConfig)();
+    const networkUrl = (0, config_1.getNetworkUrl)(config);
+    const result = await (0, network_1.askAgent)(networkUrl, to, text, waitSeconds);
+    if (json) {
+        printJson(result);
         return;
     }
+    if (result.kind === "ok") {
+        process.stdout.write(`${result.reply}\n`);
+        return;
+    }
+    if (result.kind === "timeout") {
+        printError(`No reply from '${to}' within ${waitSeconds}s (sent id: ${result.sent_id}). Is their bridge running?`);
+    }
     printError(result.message);
 }
+async function cmdInbox(args) {
+    const json = hasFlag(args, "--json");
+    const from = valueForFlag(args, "--from");
+    const waitRaw = valueForFlag(args, "--wait");
+    const waitSeconds = waitRaw ? Number(waitRaw) : 0;
+    const config = await (0, config_1.readConfig)();
+    const networkUrl = (0, config_1.getNetworkUrl)(config);
+    if (waitSeconds > 0) {
+        const result = await (0, network_1.waitForInbox)(networkUrl, { waitSeconds, from });
+        if (result.kind === "timeout") {
+            if (json) {
+                printJson({ messages: [], timed_out: true });
+                return;
+            }
+            process.stdout.write("No messages.\n");
+            return;
+        }
+        if (result.kind === "error") {
+            printError(result.message);
+        }
+        if (json) {
+            printJson({ messages: result.messages, agent: result.agent });
+            return;
+        }
+        if (result.messages.length === 0) {
+            process.stdout.write("Inbox empty.\n");
+            return;
+        }
+        for (const msg of result.messages) {
+            process.stdout.write(`[${msg.from}] ${msg.text}\n`);
+        }
+        return;
+    }
+    const result = await (0, network_1.fetchInbox)(networkUrl);
+    if (result.kind === "error") {
+        printError(result.message);
+    }
+    const messages = from
+        ? result.messages.filter((m) => m.from.toLowerCase() === from.toLowerCase())
+        : result.messages;
+    if (messages.length > 0) {
+        await (0, network_1.ackMessages)(networkUrl, messages.map((m) => m.id));
+    }
+    if (json) {
+        printJson({ messages, agent: result.agent });
+        return;
+    }
+    if (messages.length === 0) {
+        process.stdout.write("Inbox empty.\n");
+        return;
+    }
+    for (const msg of messages) {
+        process.stdout.write(`[${msg.from}] ${msg.text}\n`);
+    }
+}
+async function cmdListen(args) {
+    const waitRaw = valueForFlag(args, "--wait");
+    const waitSeconds = waitRaw ? Number(waitRaw) : 0;
+    const json = hasFlag(args, "--json");
+    if (waitSeconds > 0) {
+        await cmdInbox(["--wait", String(waitSeconds), ...(json ? ["--json"] : [])]);
+        return;
+    }
+    await cmdBridgeRun(args);
+}
 async function main() {
     const args = process.argv.slice(2);
     if (args.length === 0 || args[0] === "--help" || args[0] === "-h") {
@@ -259,11 +332,20 @@ async function main() {
             return;
         }
         if (sub === "run") {
-            await cmdAgentRun();
+            await cmdBridgeRun(rest);
             return;
         }
         printError("Unknown agent command. Try: marshell agent join|run");
     }
+    if (args[0] === "bridge") {
+        const sub = args[1];
+        const rest = args.slice(2);
+        if (sub === "run") {
+            await cmdBridgeRun(rest);
+            return;
+        }
+        printError("Unknown bridge command. Try: marshell bridge run");
+    }
     if (args[0] === "discover") {
         await cmdDiscover(args.slice(1));
         return;
@@ -272,6 +354,18 @@ async function main() {
         await cmdSend(args.slice(1));
         return;
     }
+    if (args[0] === "ask") {
+        await cmdAsk(args.slice(1));
+        return;
+    }
+    if (args[0] === "inbox") {
+        await cmdInbox(args.slice(1));
+        return;
+    }
+    if (args[0] === "listen") {
+        await cmdListen(args.slice(1));
+        return;
+    }
     printError(`Unknown command '${args[0]}'. Run marshell --help`);
 }
 main().catch((error) => {

package/dist/network.js

@@ -4,6 +4,10 @@ exports.pingNetwork = pingNetwork;
 exports.joinAgent = joinAgent;
 exports.discoverPeers = discoverPeers;
 exports.sendMessage = sendMessage;
+exports.fetchInbox = fetchInbox;
+exports.ackMessages = ackMessages;
+exports.waitForInbox = waitForInbox;
+exports.askAgent = askAgent;
 exports.toWsUrl = toWsUrl;
 const config_1 = require("./config");
 function normalizeBaseUrl(raw) {
@@ -12,6 +16,22 @@ function normalizeBaseUrl(raw) {
 function withPath(baseUrl, path) {
     return `${normalizeBaseUrl(baseUrl)}${path}`;
 }
+async function authHeaders(kind) {
+    const config = await (0, config_1.readConfig)();
+    const headers = {
+        "content-type": "application/json",
+    };
+    if (kind === "agent") {
+        if (!config.agentKey) {
+            throw new Error("Missing agent key. Run: marshell agent join --name <name>");
+        }
+        headers.authorization = `Bearer ${config.agentKey}`;
+    }
+    else if (config.token) {
+        headers.authorization = `Bearer ${config.token}`;
+    }
+    return headers;
+}
 async function pingNetwork(baseUrl) {
     const candidates = ["/health", "/v1/health"];
     for (const path of candidates) {
@@ -42,12 +62,10 @@ async function pingNetwork(baseUrl) {
         message: "Health endpoint not found.",
     };
 }
-async function postJson(url, body) {
+async function postJson(url, body, headers) {
     const response = await fetch(url, {
         method: "POST",
-        headers: {
-            "content-type": "application/json",
-        },
+        headers,
         body: JSON.stringify(body),
     });
     const text = await response.text();
@@ -78,17 +96,23 @@ async function joinAgent(baseUrl, name) {
         const result = await postJson(withPath(baseUrl, "/v1/agents/join"), {
             token: config.token,
             name,
-        });
+        }, { "content-type": "application/json" });
         if (result.status === 404) {
             return { kind: "not_found" };
         }
         if (result.status >= 200 && result.status < 300 && result.data.agent_key) {
             return { kind: "joined", agentKey: result.data.agent_key };
         }
+        const errText = typeof result.data === "object" &&
+            result.data &&
+            "error" in result.data &&
+            typeof result.data.error === "string"
+            ? result.data.error
+            : `Join failed with HTTP ${result.status}.`;
         return {
             kind: "error",
             status: result.status,
-            message: `Join failed with HTTP ${result.status}.`,
+            message: errText,
         };
     }
     catch (error) {
@@ -100,71 +124,168 @@ 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;
-            }
-            if (response.ok) {
-                const data = (await response.json());
-                if (Array.isArray(data)) {
-                    return { peers: data };
-                }
-                return { peers: data.peers ?? [] };
+    const headers = await authHeaders("token");
+    try {
+        const response = await fetch(withPath(baseUrl, "/v1/peers"), {
+            method: "GET",
+            headers,
+        });
+        if (response.ok) {
+            const data = (await response.json());
+            if (Array.isArray(data)) {
+                return { peers: data };
             }
+            return { peers: data.peers ?? [] };
         }
-        catch {
-            return { peers: [] };
-        }
+    }
+    catch {
+        return { peers: [] };
     }
     return { peers: [] };
 }
 async function sendMessage(baseUrl, to, text) {
-    const config = await (0, config_1.readConfig)();
-    if (!config.token) {
-        return { kind: "error", message: "Missing auth token." };
-    }
     try {
-        const result = await postJson(withPath(baseUrl, "/v1/messages/send"), {
-            token: config.token,
-            to,
-            text,
-        });
-        if (result.status === 404) {
-            return {
-                kind: "stubbed",
-                reason: "Network send API is not available yet (Phase 1).",
-            };
-        }
-        if (result.status >= 200 && result.status < 300) {
+        const headers = await authHeaders("agent");
+        const result = await postJson(withPath(baseUrl, "/v1/messages/send"), { to, text }, headers);
+        if (result.status >= 200 && result.status < 300 && result.data.id) {
             return {
                 kind: "sent",
-                id: result.data.id ?? `local-${Date.now()}`,
+                id: result.data.id,
+                status: result.data.status ?? "delivered",
             };
         }
         return {
             kind: "error",
             status: result.status,
-            message: `Send failed with HTTP ${result.status}.`,
+            message: result.data.error ?? `Send failed with HTTP ${result.status}.`,
         };
     }
     catch (error) {
         return {
-            kind: "stubbed",
-            reason: `Network unavailable, stored as local stub: ${error.message}`,
+            kind: "error",
+            message: error.message,
         };
     }
 }
+async function fetchInbox(baseUrl, options) {
+    try {
+        const headers = await authHeaders("agent");
+        const params = new URLSearchParams();
+        if (options?.peek) {
+            params.set("peek", "1");
+        }
+        if (options?.waitSeconds && options.waitSeconds > 0) {
+            params.set("wait", String(Math.min(120, options.waitSeconds)));
+        }
+        const qs = params.size > 0 ? `?${params.toString()}` : "";
+        const response = await fetch(withPath(baseUrl, `/v1/messages/inbox${qs}`), {
+            method: "GET",
+            headers,
+        });
+        const data = (await response.json());
+        if (!response.ok) {
+            return {
+                kind: "error",
+                status: response.status,
+                message: data.error ?? `Inbox failed with HTTP ${response.status}.`,
+            };
+        }
+        return {
+            kind: "ok",
+            messages: data.messages ?? [],
+            agent: data.agent ?? "",
+        };
+    }
+    catch (error) {
+        return {
+            kind: "error",
+            message: error.message,
+        };
+    }
+}
+async function ackMessages(baseUrl, ids) {
+    if (ids.length === 0) {
+        return { kind: "ok", acked: 0 };
+    }
+    try {
+        const headers = await authHeaders("agent");
+        const result = await postJson(withPath(baseUrl, "/v1/messages/ack"), { ids }, headers);
+        if (result.status >= 200 && result.status < 300) {
+            return { kind: "ok", acked: result.data.acked ?? ids.length };
+        }
+        return {
+            kind: "error",
+            message: result.data.error ?? `Ack failed with HTTP ${result.status}.`,
+        };
+    }
+    catch (error) {
+        return { kind: "error", message: error.message };
+    }
+}
+async function waitForInbox(baseUrl, options) {
+    const deadline = Date.now() + options.waitSeconds * 1000;
+    const from = options.from?.toLowerCase();
+    while (Date.now() < deadline) {
+        const remaining = Math.max(1, Math.min(30, Math.ceil((deadline - Date.now()) / 1000)));
+        const result = await fetchInbox(baseUrl, {
+            peek: true,
+            waitSeconds: remaining,
+        });
+        if (result.kind === "error") {
+            return result;
+        }
+        const messages = from
+            ? result.messages.filter((m) => m.from.toLowerCase() === from)
+            : result.messages;
+        if (messages.length > 0) {
+            await ackMessages(baseUrl, messages.map((m) => m.id));
+            return { kind: "ok", messages, agent: result.agent };
+        }
+    }
+    return { kind: "timeout" };
+}
+async function askAgent(baseUrl, to, text, waitSeconds) {
+    // Drain any stale messages from this peer before asking.
+    const stale = await fetchInbox(baseUrl, { peek: true });
+    if (stale.kind === "ok") {
+        const fromPeer = stale.messages.filter((m) => m.from.toLowerCase() === to.toLowerCase());
+        if (fromPeer.length > 0) {
+            await ackMessages(baseUrl, fromPeer.map((m) => m.id));
+        }
+    }
+    const sentAt = Date.now() - 2000;
+    const sent = await sendMessage(baseUrl, to, text);
+    if (sent.kind !== "sent") {
+        return { kind: "error", message: sent.message };
+    }
+    const deadline = Date.now() + waitSeconds * 1000;
+    const peer = to.toLowerCase();
+    while (Date.now() < deadline) {
+        const remaining = Math.max(1, Math.min(30, Math.ceil((deadline - Date.now()) / 1000)));
+        const result = await fetchInbox(baseUrl, {
+            peek: true,
+            waitSeconds: remaining,
+        });
+        if (result.kind === "error") {
+            return { kind: "error", message: result.message };
+        }
+        const messages = result.messages.filter((m) => {
+            if (m.from.toLowerCase() !== peer)
+                return false;
+            const created = Date.parse(m.created_at);
+            return Number.isNaN(created) || created >= sentAt;
+        });
+        if (messages.length > 0) {
+            await ackMessages(baseUrl, messages.map((m) => m.id));
+            return {
+                kind: "ok",
+                reply: messages.map((m) => m.text.trim()).join("\n\n"),
+                message_id: messages[0]?.id ?? sent.id,
+            };
+        }
+    }
+    return { kind: "timeout", sent_id: sent.id };
+}
 function toWsUrl(httpBase) {
     const url = new URL(httpBase);
     if (url.protocol === "https:") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marshell/cli",
-  "version": "0.3.1",
+  "version": "0.6.0",
   "description": "Marshell CLI — join a subnet, discover agents, send messages",
   "license": "MIT",
   "type": "commonjs",
@@ -15,7 +15,6 @@
   "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": {