moria-im 0.1.0 → 0.1.1

package/moria.mjs

@@ -364,6 +364,11 @@ function validatePresence(m) {
   if (b.v !== 1) errs.push("v must be 1");
   if (b.state !== "typing" && b.state !== "idle") errs.push("state must be typing or idle");
   if (b.ttlMs !== void 0 && !(typeof b.ttlMs === "number" && Number.isInteger(b.ttlMs) && b.ttlMs > 0 && b.ttlMs <= PRESENCE_TTL_MS)) errs.push(`ttlMs must be an integer 1..${PRESENCE_TTL_MS}`);
+  if (b.stage !== void 0) {
+    if (b.stage !== "received" && b.stage !== "working") errs.push("stage must be received or working");
+    if (b.state !== "typing") errs.push("stage goes only with state typing");
+  }
+  if (b.startedAt !== void 0 && !(typeof b.startedAt === "number" && Number.isInteger(b.startedAt) && b.startedAt > 0)) errs.push("startedAt must be a positive integer (ms)");
   return errs;
 }
 function encodePresence(m) {
@@ -804,7 +809,7 @@ init_src();
 import { randomBytes as randomBytes3 } from "node:crypto";
 import { existsSync as existsSync5, mkdirSync as mkdirSync6, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "node:fs";
 import { homedir as homedir2, hostname as hostname2, platform as platform2 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join4, resolve } from "node:path";
 import { parseArgs } from "node:util";
 import { generatePrivateKey as generatePrivateKey2, privateKeyToAccount as privateKeyToAccount4 } from "viem/accounts";
 
@@ -829,10 +834,17 @@ function networkFor(host) {
 }
 var DEFAULT_NETWORK = networkFor(process.env.MORIA_NETWORK || "moria.im");
 var PUBLIC_NETWORK = networkFor("moria.im");
-function enrollInstruction(token, runtime, n) {
+var shellQuote = (s) => /^[\p{L}\p{N}._\-/:@+=,]+$/u.test(s) ? s : `'${s.replace(/'/g, `'\\''`)}'`;
+function enrollCommand(token, runtime, n, d = {}) {
   const pub = n.apiUrl === PUBLIC_NETWORK.apiUrl && n.historySyncUrl === PUBLIC_NETWORK.historySyncUrl && n.directoryUrl === PUBLIC_NETWORK.directoryUrl;
   const flags = pub ? "" : ` --directory ${n.directoryUrl} --api ${n.apiUrl} --history ${n.historySyncUrl}`;
-  return `Join my Moria chats as an agent, following https://get.moria.im/agents.md. If the moria command is missing, install it: curl -fsSL https://get.moria.im/moria | sh. Then run: moria agent enroll --token ${token} --name <your name> --runtime ${runtime} --model <your model>${flags}. The code expires in 15 minutes. Tell me the 4 emoji it shows.`;
+  const name = d.name?.trim() && AGENT_NAME_RE.test(d.name.trim()) ? d.name.trim() : "<your name>";
+  const model = d.model?.trim() ? shellQuote(d.model.trim()) : "<your model>";
+  const bio = d.bio?.trim() ? ` --bio ${shellQuote(d.bio.trim().slice(0, 280))}` : "";
+  return `moria agent enroll --token ${token} --name ${name} --runtime ${runtime} --model ${model}${bio}${flags}`;
+}
+function enrollInstruction(token, runtime, n, d = {}) {
+  return `Join my Moria chats as an agent, following https://get.moria.im/agents.md. If the moria command is missing, install it: curl -fsSL https://get.moria.im/moria | sh (or: npm install -g moria-im). Then run: ${enrollCommand(token, runtime, n, d)}. The code expires in 15 minutes. Tell me the 4 emoji it shows.`;
 }
 var configPath = () => join(MORIA_HOME, "config.json");
 var dataDir = () => join(MORIA_HOME, "data");
@@ -1754,15 +1766,15 @@ async function serveMcp(cfg) {
   }, async ({ timeoutSec }) => {
     const mine = () => queue.filter((e) => e.addressedToMe);
     if (!mine().length) {
-      await new Promise((resolve) => {
+      await new Promise((resolve2) => {
         const t = setTimeout(() => {
           wake = null;
-          resolve();
+          resolve2();
         }, (timeoutSec ?? 60) * 1e3);
         wake = () => {
           clearTimeout(t);
           wake = null;
-          resolve();
+          resolve2();
         };
       });
     }
@@ -2106,6 +2118,7 @@ async function serveLocal(opts = {}) {
       a.operatorName = people.get(op)?.name ?? names.get(op) ?? a.operatorHandle;
     }
     const typing = {};
+    const progress = {};
     const now = Date.now();
     for (const c of conversations) {
       const raw = msgs.get(c.id) ?? [];
@@ -2115,7 +2128,9 @@ async function serveLocal(opts = {}) {
         const last = [...raw].reverse().find((m) => m.senderInboxId === aid);
         if (!last || !isPresenceType(last.contentType) || !last.content || typeof last.content !== "object") return false;
         const p = last.content;
-        return p.state === "typing" && now < Number(last.sentAtNs / 1000000n) + (p.ttlMs ?? 3e4);
+        const on = p.state === "typing" && now < Number(last.sentAtNs / 1000000n) + (p.ttlMs ?? 3e4);
+        if (on && (p.stage === "received" || p.stage === "working")) (progress[c.id] ??= {})[aid] = { stage: p.stage, ...p.startedAt ? { startedAt: p.startedAt } : {} };
+        return on;
       });
       if (active.length) typing[c.id] = active;
     }
@@ -2123,7 +2138,7 @@ async function serveLocal(opts = {}) {
     conversations.sort((a, b) => lastAt(b) - lastAt(a));
     if (Object.keys(typing).length) setTimeout(() => void rebuild().catch(() => {
     }), 30500);
-    doc = { me, project: projectName ? { id: "local", name: projectName, emoji: projectEmoji } : null, people: [...people.values()], agents: [...agents.values()], hosts: hosts(), conversations, messages, tasks, approvals, enrollments, waitingFor, invitesCreated, typing };
+    doc = { me, project: projectName ? { id: "local", name: projectName, emoji: projectEmoji } : null, people: [...people.values()], agents: [...agents.values()], hosts: hosts(), conversations, messages, tasks, approvals, enrollments, waitingFor, invitesCreated, typing, progress };
     bump();
     const unknown = [.../* @__PURE__ */ new Set([...people.keys(), ...[...agents.values()].map((a) => a.operatorId)])].filter((id) => id !== meId && !handles.has(id));
     if (unknown.length && dir) void (async () => {
@@ -2384,7 +2399,7 @@ async function serveLocal(opts = {}) {
       const { d } = need();
       const r = await d.createEnrollment(opts.projectTag ?? projectName ?? "project", 900);
       const n = cfg.network;
-      const instruction = enrollInstruction(r.token, RUNTIME_OF[b.app ?? "Other"] ?? "other", n);
+      const instruction = enrollInstruction(r.token, RUNTIME_OF[b.app ?? "Other"] ?? "other", n, { name: b.name, model: b.model, bio: b.bio });
       waitingFor = b.app ?? "Other";
       if (enrollTimer) clearInterval(enrollTimer);
       const poll = async () => {
@@ -2523,12 +2538,12 @@ async function serveLocal(opts = {}) {
     res.writeHead(status2, { "content-type": "application/json" });
     res.end(JSON.stringify(body));
   };
-  const readBody = (req) => new Promise((resolve, reject) => {
+  const readBody = (req) => new Promise((resolve2, reject) => {
     let t = "";
     req.on("data", (c) => t += c);
     req.on("end", () => {
       try {
-        resolve(t ? JSON.parse(t) : {});
+        resolve2(t ? JSON.parse(t) : {});
       } catch (e) {
         reject(new HttpError(400, "bad json"));
       }
@@ -2624,6 +2639,7 @@ import { Dm as Dm3, Group as Group4 } from "@xmtp/node-sdk";
 // src/llm.ts
 import Anthropic from "@anthropic-ai/sdk";
 import OpenAI from "openai";
+import { spawn } from "node:child_process";
 function makeLlm(env, ctx = {}) {
   const provider = process.env.LLM_PROVIDER || env.LLM_PROVIDER || "openai";
   const botName = env.BOT_NAME ?? "";
@@ -2639,6 +2655,7 @@ function makeLlm(env, ctx = {}) {
     const m = mockLlm(botName, ctx.otherBots ?? []);
     return async (sy, us) => ({ text: await m(sy, us), usage: { in: us.length >> 2, out: 8 } });
   }
+  if (provider === "claude-code") return claudeCodeLlm(env, clean);
   const model = required(env, "LLM_MODEL");
   const maxTokens = Number(env.LLM_MAX_TOKENS ?? 1024);
   if (provider === "anthropic") {
@@ -2680,6 +2697,59 @@ function makeLlm(env, ctx = {}) {
     return { text: clean(res.choices[0]?.message?.content ?? ""), ...u ? { usage: { in: u.prompt_tokens, out: u.completion_tokens } } : {} };
   };
 }
+function claudeCodeLlm(env, clean = (t) => t.trim()) {
+  const bin = process.env.CLAUDE_BIN || env.CLAUDE_BIN || "claude";
+  const cwd = required(env, "LLM_WORKDIR");
+  const toolList = env.LLM_TOOLS || "Read Grep Glob";
+  const tools = toolList.split(toolList.includes(",") ? /\s*,\s*/ : /\s+/).filter(Boolean);
+  const model = env.LLM_MODEL ?? "";
+  const timeoutMs = Number(env.LLM_TIMEOUT_MS ?? 6e5);
+  return (system, user) => new Promise((resolve2, reject) => {
+    const args = [
+      "-p",
+      "--output-format",
+      "json",
+      "--no-session-persistence",
+      "--permission-mode",
+      "dontAsk",
+      "--strict-mcp-config",
+      "--append-system-prompt",
+      system
+    ];
+    if (/^(claude|opus|sonnet|haiku|fable)/i.test(model)) args.push("--model", model);
+    args.push("--allowedTools", ...tools);
+    const child = spawn(bin, args, { cwd, stdio: ["pipe", "pipe", "pipe"] });
+    let out2 = "", err = "";
+    const timer = setTimeout(() => {
+      child.kill("SIGTERM");
+      reject(new Error(`claude -p took longer than ${timeoutMs / 1e3}s`));
+    }, timeoutMs);
+    child.stdout.on("data", (d) => {
+      out2 += d;
+    });
+    child.stderr.on("data", (d) => {
+      err += d;
+    });
+    child.on("error", (e) => {
+      clearTimeout(timer);
+      reject(new Error(`could not start ${bin}: ${e.message} (is Claude Code installed?)`));
+    });
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      let r;
+      try {
+        r = JSON.parse(out2);
+      } catch {
+        return reject(new Error(`claude -p exited ${code}: ${(err || out2).trim().slice(0, 300)}`));
+      }
+      if (r.is_error || typeof r.result !== "string") return reject(new Error(`claude -p failed (${r.subtype ?? code}): ${String(r.result ?? err).slice(0, 300)}`));
+      const u = r.usage ?? {};
+      const tokensIn = (u.input_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0) + (u.cache_read_input_tokens ?? 0);
+      resolve2({ text: clean(r.result), usage: { in: tokensIn, out: u.output_tokens ?? 0 } });
+    });
+    child.stdin.end(user);
+  });
+}
 function mockLlm(botName, otherBots = []) {
   return async (_system, user) => {
     const tagged = [...user.matchAll(/<msg[^>]*\sfrom="([^"]+)"[^>]*>([\s\S]*?)<\/msg>/g)].map((m) => [m[1], unescapeXml(m[2])]);
@@ -2963,9 +3033,13 @@ Write your next message as @${this.cfg.name}. Reply with the message text only.`
     }
     const { system, user } = this.prompt(conv, reg);
     const t0 = Date.now();
+    const presence = (p) => conv.send(encodePresence(p)).catch((e) => this.log(`presence failed ${e.message}`));
+    await presence({ v: 1, state: "typing", ttlMs: 3e4, stage: "received" });
+    const working = () => presence({ v: 1, state: "typing", ttlMs: 3e4, stage: "working", startedAt: t0 });
+    await working();
+    const heartbeat = setInterval(() => void working(), 2e4);
     try {
-      await conv.send(encodePresence({ v: 1, state: "typing", ttlMs: 3e4 })).catch((e) => this.log(`presence failed ${e.message}`));
-      const out2 = await this.llm(system, user);
+      const out2 = await this.llm(system, user).finally(() => clearInterval(heartbeat));
       if (!out2.text) return this.log("empty answer, skipping");
       const text = out2.text.slice(0, 4e3);
       const body = {
@@ -3226,8 +3300,21 @@ async function agentSet() {
   const cfg = requireConfig();
   const name = argv[0];
   if (!name || !cfg.agents[name]) fail(`unknown agent "${name ?? ""}"`);
-  const { values } = parseArgs({ args: argv.slice(1), options: { limit: { type: "string" }, dm: { type: "string" }, a2a: { type: "string" }, public: { type: "string" }, bio: { type: "string" }, skills: { type: "string" }, operator: { type: "string" } }, strict: true });
+  const { values } = parseArgs({ args: argv.slice(1), options: { limit: { type: "string" }, dm: { type: "string" }, a2a: { type: "string" }, public: { type: "string" }, bio: { type: "string" }, skills: { type: "string" }, operator: { type: "string" }, drive: { type: "string" }, workdir: { type: "string" }, tools: { type: "string" }, "drive-model": { type: "string" } }, strict: true });
   const a = cfg.agents[name];
+  if (values.drive !== void 0) {
+    if (values.drive === "none") {
+      delete a.drive;
+      out(`${name}: answered only by its own runtime again (moria mcp serve)`);
+    } else if (values.drive === "claude-code") {
+      if (a.provider !== "mcp") fail(`${name} is run by moria with ${a.provider}; --drive is for agents enrolled from a coding app`);
+      const workdir = resolve(values.workdir ?? a.drive?.workdir ?? fail("--workdir DIR required: the project folder Claude Code works in"));
+      if (!existsSync5(workdir)) fail(`--workdir: ${workdir} does not exist`);
+      a.drive = { kind: "claude-code", workdir, ...values.tools ? { tools: values.tools } : a.drive?.tools ? { tools: a.drive.tools } : {}, ...values["drive-model"] ? { model: values["drive-model"] } : a.drive?.model ? { model: a.drive.model } : {} };
+      out(`${name}: moria run answers its mentions with Claude Code in ${workdir} (tools: ${a.drive.tools ?? "Read Grep Glob, read-only"}).`);
+      out(`Don't keep a Claude Code session with the moria MCP server open for ${name} at the same time: both would answer.`);
+    } else fail("--drive must be claude-code or none");
+  } else if (values.workdir || values.tools || values["drive-model"]) fail("--workdir, --tools and --drive-model go with --drive claude-code");
   if (values.operator !== void 0) {
     const v = values.operator.trim();
     const inbox = v === "me" ? cfg.owner.inboxId : /^[0-9a-f]{64}$/.test(v) ? v : (await directoryClient(cfg.network.directoryUrl).profileOf(v.replace(/^@/, "").toLowerCase()))?.inboxId;
@@ -3321,8 +3408,8 @@ async function run() {
   const { values } = parseArgs({ args: argv, options: { "legacy-text-mentions": { type: "boolean" }, "agents-may-address-agents": { type: "boolean" }, "stale-ms": { type: "string" } }, strict: true });
   const cfg = requireConfig();
   const s = await secrets();
-  const active = Object.values(cfg.agents).filter((a) => a.state === "active" && a.provider !== "mcp");
-  if (!active.length) fail('no active agents to run (mcp-bridged agents are driven by their runtime via "moria mcp serve")');
+  const active = Object.values(cfg.agents).filter((a) => a.state === "active" && (a.provider !== "mcp" || a.drive));
+  if (!active.length) fail("no active agents to run (agents from coding apps answer through their app, or: moria agent set NAME --drive claude-code --workdir DIR)");
   const localAgents = Object.fromEntries(Object.values(cfg.agents).filter((a) => a.inboxId).map((a) => [a.name, a.inboxId]));
   const runners = [];
   const hostLog = (l) => out((/* @__PURE__ */ new Date()).toISOString(), "[moria]", l);
@@ -3331,7 +3418,7 @@ async function run() {
     const walletKey = s.get(secretNames.agentWallet(a.name));
     const dbKeyHex = s.get(secretNames.agentDbKey(a.name));
     if (!walletKey || !dbKeyHex) throw new Error(`missing keys for ${a.name} in the ${s.kind} secrets store`);
-    const llm = { LLM_PROVIDER: a.provider, LLM_MODEL: a.model };
+    const llm = a.drive ? { LLM_PROVIDER: a.drive.kind, LLM_WORKDIR: a.drive.workdir, LLM_MODEL: a.drive.model ?? "", ...a.drive.tools ? { LLM_TOOLS: a.drive.tools } : {} } : { LLM_PROVIDER: a.provider, LLM_MODEL: a.model };
     if (a.baseUrl) llm.LLM_BASE_URL = a.baseUrl;
     const apiKey = s.get(secretNames.agentApiKey(a.name));
     if (apiKey) llm[a.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "LLM_API_KEY"] = apiKey;
@@ -3384,13 +3471,14 @@ async function enroll() {
   const cfg = requireConfig();
   const dir = directoryClient(cfg.network.directoryUrl, await ownerKey());
   if (sub === "create") {
-    const { values } = parseArgs({ args: rest, options: { project: { type: "string" }, ttl: { type: "string" } }, strict: true });
+    const { values } = parseArgs({ args: rest, options: { project: { type: "string" }, ttl: { type: "string" }, name: { type: "string" }, model: { type: "string" }, bio: { type: "string" }, runtime: { type: "string" } }, strict: true });
+    if (values.name && !AGENT_NAME_RE.test(values.name)) fail("--name: 1..32 chars of a-z 0-9 _ -");
     const r = await dir.createEnrollment(values.project ?? "default", values.ttl ? Number(values.ttl) : 900);
     out(`enrollment ${r.id} (expires ${new Date(r.expiresAt).toISOString()})`);
     out(`token: ${r.token}`);
     out(`
 Paste into the agent's runtime:
-  ${enrollInstruction(r.token, "<claude-code|codex|gemini|junie|claude-desktop>", cfg.network)}`);
+  ${enrollInstruction(r.token, values.runtime ?? "<claude-code|codex|gemini|junie|claude-desktop>", cfg.network, { name: values.name, model: values.model, bio: values.bio })}`);
     out(`Then: moria enroll list  \u2192  moria enroll approve ${r.id} [--group <conversation id>]`);
     return;
   }
@@ -3641,10 +3729,11 @@ var HELP = `moria \u2014 Moria agent host
   moria status
   moria agent add --name NAME --provider openai|anthropic|mock [--model M] [--base-url URL] [--api-key KEY] [--runtime R] [--egress \u2026] [--no-think] [--handle H] [--bio TEXT] [--dm owner|anyone] [--a2a block|allow]
   moria agent list | pause NAME | resume NAME | remove NAME | publish NAME
+  moria agent set NAME [--drive claude-code --workdir DIR [--tools "Read Grep Glob"] [--drive-model M] | --drive none]
   moria agent set NAME [--limit 200k/day|none] [--dm owner|anyone] [--a2a block|allow] [--public yes|no] [--bio TEXT] [--skills a,b] [--operator INBOX|@user|me]
   moria agent enroll --token qet_\u2026 --name NAME --runtime R --model M [--bio TEXT] [--directory URL] [--api URL] [--history URL]
   moria agent connect claude-code|codex|gemini|junie|claude-desktop --agent NAME
-  moria enroll create [--project TAG] [--ttl SEC] | list [status] | approve ID [--group GID]\u2026 | deny ID
+  moria enroll create [--project TAG] [--ttl SEC] [--name N --runtime R --model M --bio TEXT] | list [status] | approve ID [--group GID]\u2026 | deny ID
   moria mcp serve --agent NAME
   moria serve --local [--port N]                  (loopback facade for the desktop app)
   moria run [--legacy-text-mentions] [--agents-may-address-agents]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moria-im",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Run your AI agents in Moria chats: local models, API models and coding agents.",
   "homepage": "https://moria.im/docs/agents.html",
   "type": "module",