clawmoney 0.10.13 → 0.10.15

package/dist/relay/executor.js

@@ -12,7 +12,7 @@ const DEFAULT_TIMEOUT_MS = 120_000;
 // ── Spawn CLI process ──
 export function spawnCli(cliType, args, timeoutMs = DEFAULT_TIMEOUT_MS) {
     return new Promise((resolve, reject) => {
-        logger.info(`Spawning ${cliType} with args: ${args.join(" ").slice(0, 200)}`);
+        logger.info(`  │ Exec:   ${cliType} ${args.slice(0, 3).join(" ")}...`);
         const child = spawn(cliType, args, {
             stdio: ["ignore", "pipe", "pipe"],
             timeout: timeoutMs,

package/dist/relay/provider.js

@@ -89,29 +89,51 @@ function loadRelayConfig(cliOverride) {
     };
 }
 // ── Request handler ──
+function messagesToPrompt(messages) {
+    return messages.map((m) => String(m.content ?? "")).join("\n");
+}
 async function executeRelayRequest(request, config) {
-    const { request_id, prompt, session_id, max_budget_usd } = request;
-    const cliType = config.relay.cli_type;
+    const { request_id, max_budget_usd } = request;
+    const cliType = request.cli_type ?? config.relay.cli_type;
+    const model = request.model ?? config.relay.model;
+    // Build prompt from messages (no --resume, full history as prompt)
+    const prompt = request.messages
+        ? messagesToPrompt(request.messages)
+        : request.prompt ?? "";
+    const lastUserMsg = request.messages
+        ? [...request.messages].reverse().find((m) => m.role === "user")?.content ?? ""
+        : prompt;
+    const turns = request.messages
+        ? request.messages.filter((m) => m.role === "user").length
+        : 1;
+    logger.info(`  ┌─ Request ${request_id.slice(0, 8)}`);
+    logger.info(`  │ CLI:    ${cliType} / ${model}`);
+    logger.info(`  │ Turns:  ${turns}`);
+    logger.info(`  │ Prompt: ${String(lastUserMsg).slice(0, 80)}`);
     try {
-        const args = buildCliArgs(cliType, prompt, session_id, max_budget_usd);
+        // No session_id — each request is stateless, full history in prompt
+        const args = buildCliArgs(cliType, prompt, undefined, max_budget_usd, model);
         const raw = await spawnCli(cliType, args);
         const parsed = parseCliOutput(cliType, raw);
+        const answer = parsed.text.replace(/\n/g, " ").slice(0, 80);
+        logger.info(`  │ Answer: ${answer}`);
+        logger.info(`  └─ Tokens: ${parsed.usage.input_tokens} in / ${parsed.usage.output_tokens} out`);
         return {
             event: "relay_response",
             request_id,
-            result: parsed.text,
+            content: parsed.text,
             session_id: parsed.sessionId || undefined,
             usage: parsed.usage,
-            model_used: parsed.model || config.relay.model,
+            model_used: parsed.model || model,
             cost_usd: parsed.costUsd || undefined,
         };
     }
     catch (err) {
-        logger.error(`Relay request ${request_id} failed:`, err);
+        logger.error(`  └─ ERROR: ${err instanceof Error ? err.message : err}`);
         return {
             event: "relay_response",
             request_id,
-            result: "",
+            content: "",
             error: err instanceof Error ? err.message : "Unknown execution error",
         };
     }
@@ -152,7 +174,7 @@ export function runRelayProvider(cliOverride) {
             wsClient.send({
                 event: "relay_response",
                 request_id: request.request_id,
-                result: "",
+                content: "",
                 error: "Provider is at maximum capacity. Please try again later.",
             });
             return;

package/dist/relay/types.d.ts

@@ -1,7 +1,12 @@
 export interface RelayRequest {
     event: "relay_request";
     request_id: string;
-    prompt: string;
+    prompt?: string;
+    messages?: Array<{
+        role: string;
+        content: string;
+    }>;
+    cli_type?: string;
     session_id?: string;
     model?: string;
     max_budget_usd?: number;
@@ -20,7 +25,7 @@ export type RelayIncomingEvent = RelayRequest | RelayConnectedEvent | RelayError
 export interface RelayResponse {
     event: "relay_response";
     request_id: string;
-    result: string;
+    content: string;
     session_id?: string;
     usage?: {
         input_tokens: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.10.13",
+  "version": "0.10.15",
   "description": "ClawMoney CLI -- Earn rewards with your AI agent",
   "type": "module",
   "bin": {