@moxxy/cli 0.0.6 → 0.0.8

package/dist/index.js

@@ -1045,15 +1045,45 @@ var init_stream_parser = __esm({
         }
         try {
           return JSON.parse(line);
-        } catch (error2) {
+        } catch {
           return null;
         }
       }
       /**
        * Convert stream event to chat stream chunk
+       * Handles both CLI format and API format events
        */
       toChunk(event) {
         switch (event.type) {
+          // --- Claude CLI format events ---
+          case "assistant": {
+            const message = event.message;
+            if (!message?.content) return null;
+            const textBlocks = message.content.filter((b) => b.type === "text");
+            const text = textBlocks.map((b) => b.text || "").join("");
+            const thinkingBlocks = message.content.filter((b) => b.type === "thinking");
+            const thinking = thinkingBlocks.length > 0 ? thinkingBlocks.map((b) => b.thinking || b.text || "").join("") : void 0;
+            if (!text && !thinking) return null;
+            return {
+              content: text,
+              thinking,
+              done: false,
+              sessionKey: this.sessionKey,
+              timestamp: Date.now()
+            };
+          }
+          case "result": {
+            const resultText = event.result || "";
+            return {
+              content: resultText,
+              done: true,
+              sessionKey: this.sessionKey,
+              timestamp: Date.now()
+            };
+          }
+          case "system":
+            return null;
+          // --- Anthropic API format events (legacy/fallback) ---
           case "content_block_delta": {
             const text = event.delta?.text || "";
             return {
@@ -1179,23 +1209,24 @@ var init_chat = __esm({
         });
         this.events.emit("chat:stream:start", sessionKey, agentId);
         options.onStart?.(sessionKey, agentId);
-        let proc = processManager.get(sessionKey);
-        if (!proc) {
-          proc = await processManager.spawn({
-            sessionKey,
-            model: transport.config.model,
-            thinking: options.thinking,
-            permissionMode: transport.config.permissionMode,
-            workingDirectory: transport.config.workingDirectory,
-            timeout: options.timeout
-          });
+        const existingProc = processManager.get(sessionKey);
+        if (existingProc) {
+          processManager.kill(sessionKey);
         }
+        const proc = await processManager.spawn({
+          sessionKey,
+          model: transport.config.model,
+          thinking: options.thinking,
+          permissionMode: transport.config.permissionMode,
+          workingDirectory: transport.config.workingDirectory,
+          timeout: options.timeout,
+          message: options.message,
+          outputFormat: "stream-json"
+        });
         processManager.setStatus(sessionKey, "busy");
         let fullResponse = "";
         let thinking;
         try {
-          proc.process.stdin?.write(options.message + "\n");
-          proc.process.stdin?.end();
           const parser = new ClaudeStreamParser(sessionKey);
           for await (const chunk of parser.parseStream(proc.process.stdout)) {
             if (chunk.content) {
@@ -1392,25 +1423,32 @@ var init_process_manager = __esm({
        * Build CLI arguments
        */
       buildArgs(options) {
+        const outputFormat = options.outputFormat || "json";
         const args = [
           "--print",
-          "--output-format=stream-json",
-          `--session-id=${options.sessionKey}`
+          "--output-format",
+          outputFormat
         ];
+        if (outputFormat === "stream-json") {
+          args.push("--verbose");
+        }
         const model = options.model || this.config.model;
         if (model) {
-          args.push(`--model=${model}`);
+          args.push("--model", model);
         }
         if (options.thinking && options.thinking !== "none") {
-          args.push(`--thinking=${options.thinking}`);
+          args.push("--thinking", options.thinking);
         }
         const permissionMode = options.permissionMode || this.config.permissionMode;
         if (permissionMode) {
-          args.push(`--permission-mode=${permissionMode}`);
+          args.push("--permission-mode", permissionMode);
         }
         const workingDir = options.workingDirectory || this.config.workingDirectory;
         if (workingDir) {
-          args.push(`--add-dir=${workingDir}`);
+          args.push("--add-dir", workingDir);
+        }
+        if (options.message) {
+          args.push(options.message);
         }
         return args;
       }
@@ -1708,7 +1746,6 @@ var init_cli = __esm({
     import_node_util = require("util");
     init_process_manager();
     init_session();
-    init_parsers();
     init_errors2();
     execAsync = (0, import_node_util.promisify)(import_node_child_process2.exec);
     CLITransport = class {
@@ -1833,6 +1870,7 @@ var init_cli = __esm({
       }
       /**
        * Handle chat.send request
+       * Uses --output-format=json for single-shot responses
        */
       async handleChatSend(options) {
         const sessionKey = options.sessionKey || `claude-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
@@ -1844,26 +1882,37 @@ var init_cli = __esm({
           content: options.message,
           timestamp: Date.now()
         });
-        let proc = this.processManager.get(sessionKey);
-        if (!proc) {
-          proc = await this.processManager.spawn({
-            sessionKey,
-            model: this.config.model,
-            thinking: options.thinking,
-            permissionMode: this.config.permissionMode,
-            workingDirectory: this.config.workingDirectory,
-            timeout
-          });
+        const existingProc = this.processManager.get(sessionKey);
+        if (existingProc) {
+          this.processManager.kill(sessionKey);
         }
+        const proc = await this.processManager.spawn({
+          sessionKey,
+          model: this.config.model,
+          thinking: options.thinking,
+          permissionMode: this.config.permissionMode,
+          workingDirectory: this.config.workingDirectory,
+          timeout,
+          message: options.message,
+          outputFormat: "json"
+        });
         this.processManager.setStatus(sessionKey, "busy");
         try {
-          proc.process.stdin?.write(options.message + "\n");
-          proc.process.stdin?.end();
-          const parser = new ClaudeStreamParser(sessionKey);
-          const { content, thinking } = await Promise.race([
-            parser.collectFullResponse(proc.process.stdout),
+          const output = await Promise.race([
+            this.collectStdout(proc.process),
             this.createTimeoutPromise(timeout)
           ]);
+          let content = "";
+          let thinking;
+          try {
+            const parsed = JSON.parse(output);
+            content = parsed.result || "";
+            if (parsed.thinking) {
+              thinking = parsed.thinking;
+            }
+          } catch {
+            content = output.trim();
+          }
           this.sessionManager.addMessage(sessionKey, {
             role: "assistant",
             content,
@@ -1884,6 +1933,18 @@ var init_cli = __esm({
           throw error2;
         }
       }
+      /**
+       * Collect full stdout from a child process as a string
+       */
+      collectStdout(proc) {
+        return new Promise((resolve, reject) => {
+          const chunks = [];
+          proc.stdout?.on("data", (chunk) => chunks.push(chunk));
+          proc.stdout?.on("end", () => resolve(Buffer.concat(chunks).toString("utf-8").trim()));
+          proc.stdout?.on("error", reject);
+          proc.on("error", reject);
+        });
+      }
       /**
        * Handle sessions.list request
        */
@@ -24280,9 +24341,42 @@ Handle any errors by adapting. Report the results of each step.`,
   const result = await supervisor.sendInstruction(agentId, instruction);
   return { response: result.response, sessionKey: result.sessionKey };
 }
+function extractJSON(response, stageName) {
+  const fenceMatch = response.match(/```(?:json)?\s*\n?([\s\S]*?)\n?```/);
+  if (fenceMatch) {
+    try {
+      return JSON.parse(fenceMatch[1].trim());
+    } catch {
+    }
+  }
+  const braceMatch = response.match(/\{[\s\S]*\}/);
+  if (braceMatch) {
+    try {
+      return JSON.parse(braceMatch[0]);
+    } catch {
+    }
+  }
+  const firstBrace = response.indexOf("{");
+  if (firstBrace !== -1) {
+    let depth = 0;
+    for (let i = firstBrace; i < response.length; i++) {
+      if (response[i] === "{") depth++;
+      else if (response[i] === "}") depth--;
+      if (depth === 0) {
+        try {
+          return JSON.parse(response.slice(firstBrace, i + 1));
+        } catch {
+          break;
+        }
+      }
+    }
+  }
+  const snippet = response.length > 200 ? `${response.slice(0, 200)}...` : response;
+  throw new Error(`No valid JSON found in ${stageName} response. Response was: ${snippet}`);
+}
 async function inspectIssue(supervisor, agentId, payload, research) {
   const instruction = {
-    prompt: `Deeply inspect the following files for issue #${payload.issueNumber}: ${payload.title}
+    prompt: `Deeply inspect the following files for issue #${payload.issueNumber}: ${payload.title}. You MUST respond with ONLY a raw JSON object \u2014 no markdown, no explanation, no code fences.
 
 Files to inspect:
 ${research.relevantFiles.map((f) => `- ${f}`).join("\n")}
@@ -24292,17 +24386,16 @@ Provide detailed analysis:
 2. Root cause or implementation location
 3. Required changes
 
-Return JSON: {"findings": [...], "rootCause": "...", "suggestedApproach": "...", "estimatedChanges": [...]}`,
+Respond with exactly this JSON structure (no other text):
+{"findings": [...], "rootCause": "...", "suggestedApproach": "...", "estimatedChanges": [{"file": "...", "description": "..."}]}`,
     metadata: { stage: "inspect", issueNumber: payload.issueNumber }
   };
   const result = await supervisor.sendInstruction(agentId, instruction);
-  const jsonMatch = result.response.match(/\{[\s\S]*\}/);
-  if (!jsonMatch) throw new Error("No JSON found in inspect response");
-  return JSON.parse(jsonMatch[0]);
+  return extractJSON(result.response, "inspect");
 }
 async function planIssue(supervisor, agentId, payload, inspection) {
   const instruction = {
-    prompt: `Create a detailed implementation plan for issue #${payload.issueNumber}: ${payload.title}
+    prompt: `Create a detailed implementation plan for issue #${payload.issueNumber}: ${payload.title}. You MUST respond with ONLY a raw JSON object \u2014 no markdown, no explanation, no code fences.
 
 Inspection findings:
 ${JSON.stringify(inspection, null, 2)}
@@ -24312,17 +24405,16 @@ Create a step-by-step plan listing:
 2. Specific changes for each file
 3. Testing approach
 
-Return JSON: {"steps": [{"action": "create|modify|delete", "path": "...", "description": "...", "content": "..."}], "testPlan": "...", "commitMessage": "..."}`,
+Respond with exactly this JSON structure (no other text):
+{"steps": [{"action": "create|modify|delete", "path": "...", "description": "...", "content": "..."}], "testPlan": "...", "commitMessage": "..."}`,
     metadata: { stage: "plan", issueNumber: payload.issueNumber }
   };
   const result = await supervisor.sendInstruction(agentId, instruction);
-  const jsonMatch = result.response.match(/\{[\s\S]*\}/);
-  if (!jsonMatch) throw new Error("No JSON found in plan response");
-  return JSON.parse(jsonMatch[0]);
+  return extractJSON(result.response, "plan");
 }
 async function researchIssue(supervisor, agentId, payload, classification) {
   const instruction = {
-    prompt: `Research this ${classification.type} issue in the codebase.
+    prompt: `Research this ${classification.type} issue in the codebase. You MUST respond with ONLY a raw JSON object \u2014 no markdown, no explanation, no code fences.
 
 Issue #${payload.issueNumber}: ${payload.title}
 ${payload.body || ""}
@@ -24334,29 +24426,27 @@ Analyze the codebase and identify:
 2. Dependencies and related modules
 3. Potential impact areas
 
-Return JSON: {"relevantFiles": [...], "relatedModules": [...], "potentialImpact": "...", "techStack": [...]}`,
+Respond with exactly this JSON structure (no other text):
+{"relevantFiles": [...], "relatedModules": [...], "potentialImpact": "...", "techStack": [...]}`,
     metadata: { stage: "research", issueNumber: payload.issueNumber }
   };
   const result = await supervisor.sendInstruction(agentId, instruction);
-  const jsonMatch = result.response.match(/\{[\s\S]*\}/);
-  if (!jsonMatch) throw new Error("No JSON found in research response");
-  return JSON.parse(jsonMatch[0]);
+  return extractJSON(result.response, "research");
 }
 async function triageIssue(supervisor, agentId, payload) {
   const instruction = {
-    prompt: `Classify this GitHub issue. Return ONLY a JSON object.
+    prompt: `Classify this GitHub issue. You MUST respond with ONLY a raw JSON object \u2014 no markdown, no explanation, no code fences.
 
 Issue #${payload.issueNumber}: ${payload.title}
 ${payload.body || "No description provided."}
 Labels: ${payload.labels.join(", ") || "none"}
 
-Return JSON: {"type": "feature|bug|refactor|docs|test|chore", "priority": "low|medium|high|urgent", "complexity": "trivial|small|medium|large|epic", "confidence": 0.0-1.0, "reasoning": "..."}`,
+Respond with exactly this JSON structure (no other text):
+{"type": "feature|bug|refactor|docs|test|chore", "priority": "low|medium|high|urgent", "complexity": "trivial|small|medium|large|epic", "confidence": 0.0-1.0, "reasoning": "..."}`,
     metadata: { stage: "triage", issueNumber: payload.issueNumber }
   };
   const result = await supervisor.sendInstruction(agentId, instruction);
-  const jsonMatch = result.response.match(/\{[\s\S]*\}/);
-  if (!jsonMatch) throw new Error("No JSON found in triage response");
-  return JSON.parse(jsonMatch[0]);
+  return extractJSON(result.response, "triage");
 }
 function buildWorkflow(payload, plan, branchName) {
   const steps = [];
@@ -25116,7 +25206,7 @@ __export(cli_exports, {
 });
 function createProgram() {
   const program = new import_commander.Command();
-  program.name("moxxy").description("Moxxy - Agent orchestration platform").version("0.0.6");
+  program.name("moxxy").description("Moxxy - Agent orchestration platform").version("0.0.8");
   registerStartCommand(program);
   registerRepoCommand(program);
   registerConfigCommand(program);

package/dist/index.mjs

@@ -1,13 +1,13 @@
 import {
   ConfigManager,
   createProgram
-} from "./chunk-CAUXONEF.mjs";
+} from "./chunk-S7YBOV7E.mjs";
 import "./chunk-GSNMMI3H.mjs";
 import "./chunk-6DZX6EAA.mjs";
 
 // src/index.ts
 async function run() {
-  const { createProgram: createProgram2 } = await import("./cli-CGO2LZ6Z.mjs");
+  const { createProgram: createProgram2 } = await import("./cli-REVD6ISM.mjs");
   const program = createProgram2();
   await program.parseAsync(process.argv);
 }