@marshell/cli 0.6.0 → 0.6.1

package/dist/bridge.js

@@ -4,23 +4,144 @@ exports.tryFastReply = tryFastReply;
 exports.handleInbound = handleInbound;
 exports.runBridge = runBridge;
 const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 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 GREETING_COOLDOWN_MS = 120_000;
+const ECHO_WINDOW_MS = 60_000;
+const peers = new Map();
+function peerState(name) {
+    const key = name.toLowerCase();
+    let state = peers.get(key);
+    if (!state) {
+        state = { lastGreetingAt: 0, recentOutbound: [], inflight: false };
+        peers.set(key, state);
+    }
+    return state;
+}
+function rememberOutbound(peer, text) {
+    const state = peerState(peer);
+    const now = Date.now();
+    state.recentOutbound.push({ text: text.trim().toLowerCase(), at: now });
+    state.recentOutbound = state.recentOutbound.filter((item) => now - item.at < ECHO_WINDOW_MS);
+}
+function isEcho(peer, text) {
+    const normalized = text.trim().toLowerCase();
+    const state = peerState(peer);
+    const now = Date.now();
+    return state.recentOutbound.some((item) => {
+        if (now - item.at >= ECHO_WINDOW_MS)
+            return false;
+        if (item.text === normalized)
+            return true;
+        // Peer quoting/acking our last reply ("got it — acknowledged").
+        if (normalized.includes(item.text) || item.text.includes(normalized)) {
+            return item.text.length >= 4 && normalized.length <= item.text.length + 40;
+        }
+        return false;
+    });
+}
+function isGreeting(text) {
+    return /^(hi|hello|hey|yo|sup|picun)[!.?\s]*$/i.test(text.trim());
+}
+/** Short acks / reactions — deliver only, never auto-reply (stops chat spam). */
+function isAckOnly(text) {
+    const t = text.trim();
+    if (!t)
+        return true;
+    if (/^[\p{Emoji_Presentation}\p{Extended_Pictographic}\s\p{P}]+$/u.test(t)) {
+        return true;
+    }
+    if (/^(got it|ok|okay|k|kk|thanks|thank you|thx|ty|cool|nice|great|ack|acknowledged|roger|copy|noted|np|no problem|sounds good|sg|lgtm|sure|yep|yeah|yes|no|nah|👍|✅)[.!*]*$/i.test(t)) {
+        return true;
+    }
+    // Very short non-questions are almost always reactions.
+    if (t.length <= 16 && !/[?]/.test(t) && !/\bwho\b|\bwhat\b|\bhow\b/i.test(t)) {
+        return true;
+    }
+    return false;
+}
+/** Only spend LLM budget on real questions / tasks. */
+function needsReply(text) {
+    const t = text.trim();
+    if (!t || isGreeting(t) || isAckOnly(t) || /^pong$/i.test(t)) {
+        return false;
+    }
+    if (/[?]/.test(t))
+        return true;
+    if (/\b(who are you|who're you|what are you|and you are)\b/i.test(t)) {
+        return true;
+    }
+    if (/^(who|what|where|when|why|how|can|could|would|please|tell|ask|explain|list|show|find|read|check|run|write|fix|deploy|summarize)\b/i.test(t)) {
+        return true;
+    }
+    // Longer messages are likely real tasks.
+    return t.length >= 48;
+}
+/**
+ * Instant replies — no LLM. Never reply in a way that loops with another bridge.
+ * ping → pong (pong alone is ignored)
+ * greetings → one-shot per peer, non-greeting text
+ * echo:… → body
+ */
+function tryFastReply(msg, options) {
     const text = msg.text.trim();
-    if (/^(ping|pong)$/i.test(text)) {
+    if (/^ping$/i.test(text)) {
         return "pong";
     }
-    if (/^(hi|hello|hey|yo|sup|picun)[!.?\s]*$/i.test(text)) {
-        return text.toLowerCase() === "picun" ? "picun" : "hi";
+    // Never auto-reply to "pong" — breaks ping/pong loops.
+    if (/^pong$/i.test(text)) {
+        return null;
+    }
+    if (isGreeting(text)) {
+        if (options?.allowGreeting === false) {
+            return null;
+        }
+        const state = peerState(msg.from);
+        const now = Date.now();
+        if (now - state.lastGreetingAt < GREETING_COOLDOWN_MS) {
+            return null;
+        }
+        state.lastGreetingAt = now;
+        // Reply must NOT match isGreeting / ping, or peer bridge will loop.
+        return `hey ${msg.from} — here. send a question anytime.`;
     }
     if (text.toLowerCase().startsWith("echo:")) {
         const body = text.slice(5).trim();
         return body || "(empty)";
     }
+    // Identity questions — answer without spawning LLM (reliable + instant).
+    if (/\bwho are you\b|\bwho're you\b|\bwhat are you\b|\band you are\??\s*$/i.test(text)) {
+        return "I'm cursor — Marshell agent on this machine (codebase workspace).";
+    }
     return null;
 }
+/** Resolve a CLI binary so Windows .cmd wrappers work under spawn(shell:false). */
+function resolveRuntimeCommand(command) {
+    if (process.platform === "win32" && command === "agent") {
+        const base = (0, node_path_1.join)(process.env.LOCALAPPDATA ?? "", "cursor-agent");
+        const versionsDir = (0, node_path_1.join)(base, "versions");
+        if ((0, node_fs_1.existsSync)(versionsDir)) {
+            const versions = (0, node_fs_1.readdirSync)(versionsDir)
+                .filter((name) => /^\d{4}\./.test(name))
+                .sort()
+                .reverse();
+            for (const version of versions) {
+                const nodePath = (0, node_path_1.join)(versionsDir, version, "node.exe");
+                const entry = (0, node_path_1.join)(versionsDir, version, "index.js");
+                if ((0, node_fs_1.existsSync)(nodePath) && (0, node_fs_1.existsSync)(entry)) {
+                    return { command: nodePath, argsPrefix: [entry] };
+                }
+            }
+        }
+        const agentCmd = (0, node_path_1.join)(base, "agent.cmd");
+        if ((0, node_fs_1.existsSync)(agentCmd)) {
+            return { command: agentCmd, argsPrefix: [] };
+        }
+    }
+    return { command, argsPrefix: [] };
+}
 function killProcessTree(pid) {
     if (!pid)
         return;
@@ -96,13 +217,19 @@ function spawnCommand(command, args, options) {
 }
 async function generateRuntimeReply(msg, runtime, workspace, timeoutMs) {
     const prompt = [
-        `Marshell agent "${msg.from}" sent:`,
-        msg.text,
+        `You are Marshell agent listening on this machine.`,
+        `Peer agent "${msg.from}" sent you a message.`,
+        "Answer using the local workspace when relevant.",
+        "If they ask who you are, say you are the cursor agent on this Marshell subnet.",
+        "Reply with ONLY the answer text. No tools, no marshell CLI, no meta commentary.",
         "",
-        "Reply with ONLY the answer. No tools, no marshell CLI, no meta commentary.",
+        "Message:",
+        msg.text,
     ].join("\n");
     if (runtime === "cursor") {
-        const result = await spawnCommand("agent", [
+        const resolved = resolveRuntimeCommand("agent");
+        const result = await spawnCommand(resolved.command, [
+            ...resolved.argsPrefix,
             "-p",
             "--trust",
             "--mode",
@@ -171,6 +298,9 @@ function emitEvent(json, event) {
     else if (kind === "reply") {
         process.stdout.write(`[reply] to=${event.to} id=${event.id}\n`);
     }
+    else if (kind === "skip") {
+        process.stdout.write(`[skip] from=${event.from} reason=${event.reason}\n`);
+    }
     else if (kind === "error") {
         process.stderr.write(`[bridge] ${event.message}\n`);
     }
@@ -180,6 +310,7 @@ async function deliverReply(networkUrl, msg, reply, json) {
     if (sent.kind !== "sent") {
         throw new Error(sent.message);
     }
+    rememberOutbound(msg.from, reply);
     emitEvent(json, {
         type: "reply",
         to: msg.from,
@@ -189,6 +320,17 @@ async function deliverReply(networkUrl, msg, reply, json) {
     });
 }
 async function processReplyAsync(networkUrl, msg, options) {
+    const state = peerState(msg.from);
+    if (state.inflight) {
+        emitEvent(options.json, {
+            type: "skip",
+            from: msg.from,
+            reason: "peer already has an inflight reply",
+            id: msg.id,
+        });
+        return;
+    }
+    state.inflight = true;
     try {
         let reply = tryFastReply(msg);
         if (!reply && options.hook) {
@@ -208,7 +350,16 @@ async function processReplyAsync(networkUrl, msg, options) {
     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.`);
+        // Short failure notice so the peer is not left hanging (not a greeting/pong).
+        try {
+            await deliverReply(networkUrl, msg, `cursor runtime error: ${message}`, options.json);
+        }
+        catch {
+            // ignore secondary send failure
+        }
+    }
+    finally {
+        state.inflight = false;
     }
 }
 async function handleInbound(networkUrl, msg, options) {
@@ -219,21 +370,52 @@ async function handleInbound(networkUrl, msg, options) {
         text: msg.text,
         created_at: msg.created_at,
     });
+    // Always ack first so backlog never sticks.
+    await (0, network_1.ackMessages)(networkUrl, [msg.id]);
+    // Drop echoes of our own recent outbound (hi↔hi loops).
+    if (isEcho(msg.from, msg.text)) {
+        emitEvent(options.json, {
+            type: "skip",
+            from: msg.from,
+            reason: "echo of our recent outbound",
+            id: msg.id,
+        });
+        return;
+    }
     const fast = tryFastReply(msg);
     if (fast) {
         await deliverReply(networkUrl, msg, fast, options.json);
-        await (0, network_1.ackMessages)(networkUrl, [msg.id]);
+        return;
+    }
+    // Greetings / acks / reactions: deliver only, no reply spam.
+    if (!needsReply(msg.text)) {
+        emitEvent(options.json, {
+            type: "skip",
+            from: msg.from,
+            reason: "no-reply (ack/greeting/trivial)",
+            id: 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 drainBacklog(networkUrl, json) {
+    const result = await (0, network_1.fetchInbox)(networkUrl, { peek: true });
+    if (result.kind !== "ok" || result.messages.length === 0) {
+        return;
+    }
+    await (0, network_1.ackMessages)(networkUrl, result.messages.map((m) => m.id));
+    emitEvent(json, {
+        type: "skip",
+        from: "*",
+        reason: `drained ${result.messages.length} backlog message(s) on startup`,
+    });
+}
 async function runBridge(options) {
     const label = options.agentName ?? "agent";
     const mode = options.hook
@@ -244,6 +426,8 @@ async function runBridge(options) {
                 : `auto-reply (${options.runtime})`
             : "deliver-only";
     process.stdout.write(`Bridge listening as '${label}' (${mode}).\n`);
+    // Drop stale inbox so we don't replay an old hi storm.
+    await drainBacklog(options.networkUrl, options.json);
     let stopped = false;
     const cleanup = () => {
         if (stopped)
@@ -264,7 +448,13 @@ async function runBridge(options) {
             await new Promise((resolve) => setTimeout(resolve, 2000));
             continue;
         }
-        for (const msg of result.messages) {
+        // Newest first — real questions beat greeting backlog.
+        const messages = [...result.messages].sort((a, b) => {
+            const ta = Date.parse(a.created_at) || 0;
+            const tb = Date.parse(b.created_at) || 0;
+            return tb - ta;
+        });
+        for (const msg of messages) {
             await handleInbound(options.networkUrl, msg, options);
         }
     }

package/dist/cli.js

@@ -20,14 +20,13 @@ function printHelp() {
         "  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 history [--with <name>] [--limit <n>] [--json]",
+        "  marshell listen [--json]      (deliver-only listener)",
         "  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.",
+        "Middleware: send / inbox / history. Agents think; Marshell only delivers.",
+        "  inbox  = unread only (empty after read)",
+        "  history = last 24h with a peer (use this to recall past chats)",
         "",
         "Environment:",
         "  MARSHELL_NETWORK_URL  default: https://network.marshell.dev",
@@ -240,6 +239,30 @@ async function cmdAsk(args) {
     }
     printError(result.message);
 }
+async function cmdHistory(args) {
+    const json = hasFlag(args, "--json");
+    const withPeer = valueForFlag(args, "--with");
+    const limitRaw = valueForFlag(args, "--limit");
+    const limit = limitRaw ? Number(limitRaw) : 50;
+    const config = await (0, config_1.readConfig)();
+    const networkUrl = (0, config_1.getNetworkUrl)(config);
+    const result = await (0, network_1.fetchHistory)(networkUrl, { with: withPeer, limit });
+    if (result.kind === "error") {
+        printError(result.message);
+    }
+    if (json) {
+        printJson({ agent: result.agent, messages: result.messages });
+        return;
+    }
+    if (result.messages.length === 0) {
+        process.stdout.write("No messages in the last 24h.\n");
+        return;
+    }
+    for (const msg of [...result.messages].reverse()) {
+        const arrow = msg.direction === "out" ? "→" : "←";
+        process.stdout.write(`${msg.created_at} ${arrow} ${msg.peer}: ${msg.text}\n`);
+    }
+}
 async function cmdInbox(args) {
     const json = hasFlag(args, "--json");
     const from = valueForFlag(args, "--from");
@@ -362,6 +385,10 @@ async function main() {
         await cmdInbox(args.slice(1));
         return;
     }
+    if (args[0] === "history") {
+        await cmdHistory(args.slice(1));
+        return;
+    }
     if (args[0] === "listen") {
         await cmdListen(args.slice(1));
         return;

package/dist/network.js

@@ -7,6 +7,7 @@ exports.sendMessage = sendMessage;
 exports.fetchInbox = fetchInbox;
 exports.ackMessages = ackMessages;
 exports.waitForInbox = waitForInbox;
+exports.fetchHistory = fetchHistory;
 exports.askAgent = askAgent;
 exports.toWsUrl = toWsUrl;
 const config_1 = require("./config");
@@ -124,8 +125,11 @@ async function joinAgent(baseUrl, name) {
     }
 }
 async function discoverPeers(baseUrl) {
-    const headers = await authHeaders("token");
+    // Prefer agent_key — survives join-token rotation.
+    const config = await (0, config_1.readConfig)();
+    const kind = config.agentKey ? "agent" : "token";
     try {
+        const headers = await authHeaders(kind);
         const response = await fetch(withPath(baseUrl, "/v1/peers"), {
             method: "GET",
             headers,
@@ -244,6 +248,36 @@ async function waitForInbox(baseUrl, options) {
     }
     return { kind: "timeout" };
 }
+async function fetchHistory(baseUrl, options) {
+    try {
+        const headers = await authHeaders("agent");
+        const params = new URLSearchParams();
+        if (options?.with) {
+            params.set("with", options.with);
+        }
+        if (options?.limit && options.limit > 0) {
+            params.set("limit", String(options.limit));
+        }
+        const qs = params.size > 0 ? `?${params.toString()}` : "";
+        const response = await fetch(withPath(baseUrl, `/v1/messages/history${qs}`), { method: "GET", headers });
+        const data = (await response.json());
+        if (!response.ok) {
+            return {
+                kind: "error",
+                status: response.status,
+                message: data.error ?? `History failed with HTTP ${response.status}.`,
+            };
+        }
+        return {
+            kind: "ok",
+            agent: data.agent ?? "",
+            messages: data.messages ?? [],
+        };
+    }
+    catch (error) {
+        return { kind: "error", message: error.message };
+    }
+}
 async function askAgent(baseUrl, to, text, waitSeconds) {
     // Drain any stale messages from this peer before asking.
     const stale = await fetchInbox(baseUrl, { peek: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marshell/cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Marshell CLI — join a subnet, discover agents, send messages",
   "license": "MIT",
   "type": "commonjs",