juno-code 1.0.33 → 1.0.35

package/dist/bin/cli.mjs

@@ -2,8 +2,8 @@
 import fs2 from 'fs-extra';
 import * as path3 from 'path';
 import path3__default, { dirname, join } from 'path';
-import * as os3 from 'os';
-import os3__default, { homedir, EOL } from 'os';
+import * as os4 from 'os';
+import os4__default, { homedir, EOL } from 'os';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import semver from 'semver';
@@ -3295,13 +3295,9 @@ var init_advanced_logger = __esm({
       /**
        * Output formatted log
        */
-      output(formatted, level) {
+      output(formatted, _level) {
         if (this.options.output === "console" || this.options.output === "both") {
-          if (level >= 3 /* WARN */) {
-            console.error(formatted);
-          } else {
-            console.log(formatted);
-          }
+          console.error(formatted);
         }
         if (this.options.output === "file" || this.options.output === "both") {
           this.writeToFile(formatted);
@@ -5997,7 +5993,7 @@ var init_client = __esm({
             `${serverName}`,
             // Assume it's in PATH
             `/usr/local/bin/${serverName}`,
-            path3__default.resolve(os3__default.homedir(), `.local/bin/${serverName}`),
+            path3__default.resolve(os4__default.homedir(), `.local/bin/${serverName}`),
             path3__default.resolve(this.options.workingDirectory || process.cwd(), `${serverName}`)
           ];
           for (const serverPath of possiblePaths) {
@@ -7006,7 +7002,7 @@ var init_shell_backend = __esm({
         });
         try {
           const scriptPath = await this.findScriptForSubagent(subagentType);
-          const result = await this.executeScript(scriptPath, request, toolId);
+          const result = await this.executeScript(scriptPath, request, toolId, subagentType);
           const duration = Date.now() - startTime;
           await this.emitProgressEvent({
             sessionId: request.metadata?.sessionId || "unknown",
@@ -7023,8 +7019,9 @@ var init_shell_backend = __esm({
               phase: "completion"
             }
           });
+          const structuredResult = this.buildStructuredOutput(subagentType, result);
           return {
-            content: result.output,
+            content: structuredResult.content,
             status: result.success ? "completed" : "failed",
             startTime: new Date(startTime),
             endTime: /* @__PURE__ */ new Date(),
@@ -7032,6 +7029,7 @@ var init_shell_backend = __esm({
             error: result.error ? { type: "shell_execution", message: result.error, timestamp: /* @__PURE__ */ new Date() } : void 0,
             progressEvents: [],
             // Progress events are handled via callbacks
+            ...structuredResult.metadata ? { metadata: structuredResult.metadata } : void 0,
             request
           };
         } catch (error) {
@@ -7197,8 +7195,8 @@ var init_shell_backend = __esm({
       /**
        * Execute a shell script
        */
-      async executeScript(scriptPath, request, toolId) {
-        return new Promise((resolve9, reject) => {
+      async executeScript(scriptPath, request, toolId, subagentType) {
+        return new Promise(async (resolve9, reject) => {
           const startTime = Date.now();
           const isPython = scriptPath.endsWith(".py");
           const env2 = {
@@ -7211,6 +7209,19 @@ var init_shell_backend = __esm({
             JUNO_ITERATION: String(request.arguments?.iteration || 1),
             JUNO_TOOL_ID: toolId
           };
+          let captureDir = null;
+          let capturePath = null;
+          if (subagentType === "claude") {
+            try {
+              captureDir = await promises.mkdtemp(path3.join(os4__default.tmpdir(), "juno-shell-"));
+              capturePath = path3.join(captureDir, `subagent_${toolId}.json`);
+              env2.JUNO_SUBAGENT_CAPTURE_PATH = capturePath;
+            } catch (error) {
+              if (this.config?.debug) {
+                engineLogger.warn(`Failed to prepare subagent capture path: ${error instanceof Error ? error.message : String(error)}`);
+              }
+            }
+          }
           const command = isPython ? "python3" : "bash";
           const args = [scriptPath];
           if (isPython && request.arguments?.instruction) {
@@ -7285,20 +7296,46 @@ var init_shell_backend = __esm({
             }
           });
           child.on("close", (exitCode) => {
-            if (isProcessKilled) return;
-            const duration = Date.now() - startTime;
-            const success = exitCode === 0;
-            if (this.config.debug) {
-              engineLogger.debug(`Script execution completed with exit code: ${exitCode}, duration: ${duration}ms`);
-              engineLogger.debug(`Stdout length: ${stdout2.length}, Stderr length: ${stderr.length}`);
-            }
-            resolve9({
-              success,
-              output: stdout2,
-              error: stderr || void 0,
-              exitCode: exitCode || 0,
-              duration
-            });
+            void (async () => {
+              if (isProcessKilled) return;
+              const duration = Date.now() - startTime;
+              const success = exitCode === 0;
+              let subAgentResponse;
+              if (capturePath) {
+                try {
+                  const captured = await promises.readFile(capturePath, "utf-8");
+                  if (captured.trim()) {
+                    subAgentResponse = JSON.parse(captured);
+                  }
+                } catch (error) {
+                  if (this.config?.debug) {
+                    engineLogger.warn(`Failed to read subagent capture: ${error instanceof Error ? error.message : String(error)}`);
+                  }
+                } finally {
+                  if (captureDir) {
+                    try {
+                      await promises.rm(captureDir, { recursive: true, force: true });
+                    } catch (cleanupError) {
+                      if (this.config?.debug) {
+                        engineLogger.warn(`Failed to clean capture directory: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`);
+                      }
+                    }
+                  }
+                }
+              }
+              if (this.config.debug) {
+                engineLogger.debug(`Script execution completed with exit code: ${exitCode}, duration: ${duration}ms`);
+                engineLogger.debug(`Stdout length: ${stdout2.length}, Stderr length: ${stderr.length}`);
+              }
+              resolve9({
+                success,
+                output: stdout2,
+                error: stderr || void 0,
+                exitCode: exitCode || 0,
+                duration,
+                ...subAgentResponse ? { subAgentResponse } : void 0
+              });
+            })();
           });
           child.on("error", (error) => {
             if (isProcessKilled) return;
@@ -7330,6 +7367,66 @@ var init_shell_backend = __esm({
           });
         });
       }
+      /**
+       * Build a structured, JSON-parsable result payload for programmatic capture while
+       * preserving the shell backend's existing on-screen streaming behavior.
+       */
+      buildStructuredOutput(subagentType, result) {
+        if (subagentType === "claude") {
+          const claudeEvent = result.subAgentResponse ?? this.extractLastJsonEvent(result.output);
+          const isError = claudeEvent?.is_error ?? claudeEvent?.subtype === "error" ?? !result.success;
+          const structuredPayload = {
+            type: "result",
+            subtype: claudeEvent?.subtype || (isError ? "error" : "success"),
+            is_error: isError,
+            result: claudeEvent?.result ?? claudeEvent?.error ?? claudeEvent?.content ?? result.output,
+            error: claudeEvent?.error,
+            stderr: result.error,
+            datetime: claudeEvent?.datetime,
+            counter: claudeEvent?.counter,
+            session_id: claudeEvent?.session_id,
+            num_turns: claudeEvent?.num_turns,
+            duration_ms: claudeEvent?.duration_ms ?? result.duration,
+            exit_code: result.exitCode,
+            total_cost_usd: claudeEvent?.total_cost_usd,
+            usage: claudeEvent?.usage,
+            modelUsage: claudeEvent?.modelUsage || claudeEvent?.model_usage || {},
+            permission_denials: claudeEvent?.permission_denials || [],
+            uuid: claudeEvent?.uuid,
+            sub_agent_response: claudeEvent
+          };
+          const metadata = {
+            ...claudeEvent ? { subAgentResponse: claudeEvent } : void 0,
+            structuredOutput: true,
+            contentType: "application/json",
+            rawOutput: result.output
+          };
+          return {
+            content: JSON.stringify(structuredPayload),
+            metadata
+          };
+        }
+        return { content: result.output, metadata: result.metadata };
+      }
+      /**
+       * Extract the last valid JSON object from a script's stdout to use as a structured payload fallback.
+       */
+      extractLastJsonEvent(output) {
+        if (!output) {
+          return null;
+        }
+        const lines = output.split("\n").map((line) => line.trim()).filter(Boolean);
+        for (let i = lines.length - 1; i >= 0; i--) {
+          try {
+            const parsed = JSON.parse(lines[i]);
+            if (parsed && typeof parsed === "object") {
+              return parsed;
+            }
+          } catch {
+          }
+        }
+        return null;
+      }
       /**
        * Parse streaming events from script output
        * Handles both JSON format (Claude) and TEXT format (Codex)
@@ -7337,7 +7434,7 @@ var init_shell_backend = __esm({
        * Strategy:
        * 1. Try to parse each line as JSON first (for Claude)
        * 2. If JSON parsing fails, treat as TEXT streaming (for Codex and other text-based subagents)
-       * 3. Emit all non-empty lines as progress events for real-time display
+       * 3. Emit all text lines (including whitespace-only) as progress events for real-time display
        */
       parseAndEmitStreamingEvents(data, sessionId) {
         if (!this.jsonBuffer) {
@@ -7347,14 +7444,35 @@ var init_shell_backend = __esm({
         const lines = this.jsonBuffer.split("\n");
         this.jsonBuffer = lines.pop() || "";
         for (const line of lines) {
-          const trimmedLine = line.trim();
-          if (!trimmedLine) continue;
+          const rawLine = line.endsWith("\r") ? line.slice(0, -1) : line;
+          if (!rawLine) continue;
+          const hasNonWhitespace = rawLine.trim().length > 0;
+          if (!hasNonWhitespace) {
+            this.emitProgressEvent({
+              sessionId,
+              timestamp: /* @__PURE__ */ new Date(),
+              backend: "shell",
+              count: ++this.eventCounter,
+              type: "thinking",
+              content: rawLine,
+              metadata: {
+                format: "text",
+                raw: true
+              }
+            }).catch((error) => {
+              if (this.config?.debug) {
+                engineLogger.warn(`Failed to emit whitespace-only streaming event: ${error instanceof Error ? error.message : String(error)}`);
+              }
+            });
+            continue;
+          }
+          const trimmedLine = rawLine.trim();
           let isJsonParsed = false;
           try {
             const jsonEvent = JSON.parse(trimmedLine);
             let progressEvent;
             if (this.isClaudeCliEvent(jsonEvent)) {
-              progressEvent = this.convertClaudeEventToProgress(jsonEvent, sessionId, trimmedLine);
+              progressEvent = this.convertClaudeEventToProgress(jsonEvent, sessionId, rawLine);
               isJsonParsed = true;
             } else if (this.isGenericStreamingEvent(jsonEvent)) {
               progressEvent = {
@@ -7389,7 +7507,7 @@ var init_shell_backend = __esm({
               backend: "shell",
               count: ++this.eventCounter,
               type: "thinking",
-              content: trimmedLine,
+              content: rawLine,
               metadata: {
                 format: "text",
                 raw: true
@@ -13069,7 +13187,11 @@ var init_main = __esm({
 \u274C Execution failed (${elapsed})`));
         }
         const lastIteration = result.iterations[result.iterations.length - 1];
-        if (lastIteration && lastIteration.toolResult.content && !this.hasStreamedJsonOutput) {
+        const structuredOutput = lastIteration?.toolResult.metadata?.structuredOutput === true;
+        const shouldPrintResult = Boolean(
+          lastIteration && lastIteration.toolResult.content && (!this.hasStreamedJsonOutput || structuredOutput)
+        );
+        if (shouldPrintResult) {
           console.error(chalk15.blue("\n\u{1F4C4} Result:"));
           console.log(lastIteration.toolResult.content);
         }
@@ -13407,7 +13529,7 @@ async function validateJSONConfigs(baseDir = process.cwd(), backendType = "mcp")
 }
 function displayValidationResults(result) {
   if (result.isValid && result.warnings.length === 0) {
-    console.log(chalk15.green("\u2705 All configuration files are valid\n"));
+    console.error(chalk15.green("\u2705 All configuration files are valid\n"));
     return;
   }
   if (result.errors.length > 0) {
@@ -21833,6 +21955,11 @@ var QUICK_REFERENCE = [
         description: "Shell completion setup",
         usage: "juno-code completion <install|uninstall>"
       },
+      {
+        name: "services",
+        description: "Manage service scripts (use --force to refresh codex.py/claude.py)",
+        usage: "juno-code services install --force"
+      },
       {
         name: "help",
         description: "Show help information",
@@ -22401,11 +22528,12 @@ init_service_installer();
 function createServicesCommand() {
   const servicesCmd = new Command("services").description("Manage juno-code service scripts").addHelpText("after", `
 Examples:
-  $ juno-code services install       Install service scripts to ~/.juno_code/services/
-  $ juno-code services list          List installed service scripts
-  $ juno-code services status        Check installation status
-  $ juno-code services uninstall     Remove all service scripts
-  $ juno-code services path          Show services directory path
+  $ juno-code services install            Install service scripts to ~/.juno_code/services/
+  $ juno-code services install --force    Reinstall/refresh service scripts (codex.py/claude.py)
+  $ juno-code services list               List installed service scripts
+  $ juno-code services status             Check installation status
+  $ juno-code services uninstall          Remove all service scripts
+  $ juno-code services path               Show services directory path
 
 Service scripts are Python/shell scripts that provide additional functionality
 and can be customized by users. They are installed to ~/.juno_code/services/
@@ -22579,7 +22707,7 @@ var ShellDetector = class _ShellDetector {
    * Get shell configuration file path
    */
   getConfigPath(shell) {
-    const homeDir = os3.homedir();
+    const homeDir = os4.homedir();
     switch (shell) {
       case "bash":
         if (process.platform === "darwin") {
@@ -22603,7 +22731,7 @@ var ShellDetector = class _ShellDetector {
    * Get shell completion script installation path
    */
   getCompletionPath(shell) {
-    const homeDir = os3.homedir();
+    const homeDir = os4.homedir();
     switch (shell) {
       case "bash":
         if (process.platform === "darwin") {
@@ -22881,7 +23009,7 @@ var ContextAwareCompletion = class {
    */
   expandPath(inputPath) {
     if (inputPath.startsWith("~/")) {
-      return path3.join(os3.homedir(), inputPath.slice(2));
+      return path3.join(os4.homedir(), inputPath.slice(2));
     }
     if (inputPath.startsWith("./") || inputPath.startsWith("../")) {
       return path3.resolve(inputPath);