juno-code 1.0.30 → 1.0.32

package/dist/bin/cli.mjs

@@ -1174,6 +1174,8 @@ var init_config = __esm({
       JUNO_CODE_MCP_RETRIES: "mcpRetries",
       JUNO_CODE_MCP_SERVER_PATH: "mcpServerPath",
       JUNO_CODE_MCP_SERVER_NAME: "mcpServerName",
+      // Hook settings
+      JUNO_CODE_HOOK_COMMAND_TIMEOUT: "hookCommandTimeout",
       // TUI settings
       JUNO_CODE_INTERACTIVE: "interactive",
       JUNO_CODE_HEADLESS_MODE: "headlessMode",
@@ -1197,6 +1199,8 @@ var init_config = __esm({
       JUNO_TASK_MCP_RETRIES: "mcpRetries",
       JUNO_TASK_MCP_SERVER_PATH: "mcpServerPath",
       JUNO_TASK_MCP_SERVER_NAME: "mcpServerName",
+      // Hook settings
+      JUNO_TASK_HOOK_COMMAND_TIMEOUT: "hookCommandTimeout",
       // TUI settings
       JUNO_TASK_INTERACTIVE: "interactive",
       JUNO_TASK_HEADLESS_MODE: "headlessMode",
@@ -1228,6 +1232,8 @@ var init_config = __esm({
       mcpRetries: z.number().int().min(0).max(10).describe("Number of retries for MCP operations"),
       mcpServerPath: z.string().optional().describe("Path to MCP server executable (auto-discovered if not specified)"),
       mcpServerName: z.string().optional().describe('Named MCP server to connect to (e.g., "roundtable-ai")'),
+      // Hook settings
+      hookCommandTimeout: z.number().int().min(1e3).max(36e5).optional().describe("Timeout for individual hook commands in milliseconds (default: 300000 = 5 minutes)"),
       // TUI settings
       interactive: z.boolean().describe("Enable interactive mode"),
       headlessMode: z.boolean().describe("Enable headless mode (no TUI)"),
@@ -3337,7 +3343,8 @@ var init_advanced_logger = __esm({
 async function executeHook(hookType, hooks, context = {}, options = {}) {
   const startTime = Date.now();
   const {
-    commandTimeout = 3e4,
+    commandTimeout = 3e5,
+    // 5 minutes default (increased from 30s to support long-running hook scripts)
     env: env2 = {},
     continueOnError = true,
     logContext = "SYSTEM" /* SYSTEM */
@@ -3412,8 +3419,12 @@ async function executeHook(hookType, hooks, context = {}, options = {}) {
         env: execEnv,
         // Capture both stdout and stderr
         all: true,
-        reject: false
+        reject: false,
         // Don't throw on non-zero exit codes
+        // Use input: '' to provide empty stdin and properly close it (sends EOF)
+        // This prevents commands from hanging waiting for stdin while still
+        // allowing internal pipe operations to work correctly
+        input: ""
       });
       const duration = Date.now() - commandStartTime;
       const success2 = result2.exitCode === 0;
@@ -3547,12 +3558,24 @@ function createExecutionRequest(options) {
   if (options.tools !== void 0) {
     result.tools = options.tools;
   }
+  if (options.allowedTools !== void 0) {
+    result.allowedTools = options.allowedTools;
+  }
+  if (options.appendAllowedTools !== void 0) {
+    result.appendAllowedTools = options.appendAllowedTools;
+  }
   if (options.disallowedTools !== void 0) {
     result.disallowedTools = options.disallowedTools;
   }
   if (options.mcpServerName !== void 0) {
     result.mcpServerName = options.mcpServerName;
   }
+  if (options.resume !== void 0) {
+    result.resume = options.resume;
+  }
+  if (options.continueConversation !== void 0) {
+    result.continueConversation = options.continueConversation;
+  }
   return result;
 }
 var DEFAULT_ERROR_RECOVERY_CONFIG, DEFAULT_RATE_LIMIT_CONFIG, DEFAULT_PROGRESS_CONFIG, ExecutionEngine;
@@ -3903,6 +3926,8 @@ var init_engine = __esm({
                 maxIterations: context.request.maxIterations,
                 instruction: context.request.instruction
               }
+            }, {
+              commandTimeout: this.engineConfig.config.hookCommandTimeout
             });
           }
         } catch (error) {
@@ -3935,6 +3960,8 @@ var init_engine = __esm({
                 duration: context.endTime ? context.endTime.getTime() - context.startTime.getTime() : 0,
                 success: context.status === "completed" /* COMPLETED */
               }
+            }, {
+              commandTimeout: this.engineConfig.config.hookCommandTimeout
             });
           }
         } catch (error) {
@@ -3986,6 +4013,8 @@ var init_engine = __esm({
                 maxIterations: context.request.maxIterations,
                 subagent: context.request.subagent
               }
+            }, {
+              commandTimeout: this.engineConfig.config.hookCommandTimeout
             });
           }
         } catch (error) {
@@ -4000,7 +4029,11 @@ var init_engine = __esm({
             ...context.request.model !== void 0 && { model: context.request.model },
             ...context.request.agents !== void 0 && { agents: context.request.agents },
             ...context.request.tools !== void 0 && { tools: context.request.tools },
+            ...context.request.allowedTools !== void 0 && { allowedTools: context.request.allowedTools },
+            ...context.request.appendAllowedTools !== void 0 && { appendAllowedTools: context.request.appendAllowedTools },
             ...context.request.disallowedTools !== void 0 && { disallowedTools: context.request.disallowedTools },
+            ...context.request.resume !== void 0 && { resume: context.request.resume },
+            ...context.request.continueConversation !== void 0 && { continueConversation: context.request.continueConversation },
             iteration: iterationNumber
           },
           timeout: context.request.timeoutMs || this.engineConfig.config.mcpTimeout,
@@ -4048,6 +4081,8 @@ var init_engine = __esm({
                   duration: iterationResult.duration,
                   toolCallStatus: iterationResult.toolResult.status
                 }
+              }, {
+                commandTimeout: this.engineConfig.config.hookCommandTimeout
               });
             }
           } catch (error) {
@@ -4096,6 +4131,8 @@ var init_engine = __esm({
                   error: mcpError.message,
                   errorType: mcpError.type
                 }
+              }, {
+                commandTimeout: this.engineConfig.config.hookCommandTimeout
               });
             }
           } catch (hookError) {
@@ -7167,14 +7204,26 @@ var init_shell_backend = __esm({
             args.push("--agents", request.arguments.agents);
           }
           if (isPython && request.arguments?.tools && Array.isArray(request.arguments.tools)) {
-            for (const tool of request.arguments.tools) {
-              args.push("--tool", tool);
-            }
+            args.push("--tools");
+            args.push(...request.arguments.tools);
+          }
+          if (isPython && request.arguments?.allowedTools && Array.isArray(request.arguments.allowedTools)) {
+            args.push("--allowedTools");
+            args.push(...request.arguments.allowedTools);
+          }
+          if (isPython && request.arguments?.appendAllowedTools && Array.isArray(request.arguments.appendAllowedTools)) {
+            args.push("--appendAllowedTools");
+            args.push(...request.arguments.appendAllowedTools);
           }
           if (isPython && request.arguments?.disallowedTools && Array.isArray(request.arguments.disallowedTools)) {
-            for (const tool of request.arguments.disallowedTools) {
-              args.push("--disallowed-tool", tool);
-            }
+            args.push("--disallowedTools");
+            args.push(...request.arguments.disallowedTools);
+          }
+          if (isPython && request.arguments?.resume) {
+            args.push("--resume", request.arguments.resume);
+          }
+          if (isPython && request.arguments?.continueConversation) {
+            args.push("--continue");
           }
           if (this.config.debug) {
             engineLogger.debug(`Executing script: ${command} ${args.join(" ")}`);
@@ -12581,8 +12630,12 @@ async function mainCommandHandler(args, options, command) {
     if (options.agents && selectedBackend !== "shell") {
       console.error(chalk15.yellow("\n\u26A0\uFE0F  Note: --agents flag is only supported with shell backend and will be ignored"));
     }
-    if ((options.tools || options.disallowedTools) && selectedBackend !== "shell") {
-      console.error(chalk15.yellow("\n\u26A0\uFE0F  Note: --tools and --disallowed-tools flags are only supported with shell backend and will be ignored"));
+    if ((options.tools || options.allowedTools || options.appendAllowedTools || options.disallowedTools) && selectedBackend !== "shell") {
+      console.error(chalk15.yellow("\n\u26A0\uFE0F  Note: --tools, --allowed-tools, --append-allowed-tools and --disallowed-tools flags are only supported with shell backend and will be ignored"));
+    }
+    if (options.allowedTools && options.appendAllowedTools) {
+      console.error(chalk15.red("\n\u274C Error: --allowed-tools and --append-allowed-tools are mutually exclusive. Use one or the other."));
+      process.exit(1);
     }
     const executionRequest = createExecutionRequest({
       instruction,
@@ -12593,7 +12646,11 @@ async function mainCommandHandler(args, options, command) {
       model: options.model || config.defaultModel,
       agents: options.agents,
       tools: options.tools,
-      disallowedTools: options.disallowedTools
+      allowedTools: options.allowedTools,
+      appendAllowedTools: options.appendAllowedTools,
+      disallowedTools: options.disallowedTools,
+      resume: options.resume,
+      continueConversation: options.continue
     });
     const coordinator = new MainExecutionCoordinator(config, options.verbose, options.enableFeedback || false);
     const result = await coordinator.execute(executionRequest);
@@ -16394,7 +16451,11 @@ async function startCommandHandler(args, options, command) {
       model: options.model,
       agents: options.agents,
       tools: options.tools,
+      allowedTools: options.allowedTools,
+      appendAllowedTools: options.appendAllowedTools,
       disallowedTools: options.disallowedTools,
+      resume: options.resume,
+      continue: options.continue,
       directory: options.directory,
       verbose: options.verbose,
       quiet: options.quiet,
@@ -23672,7 +23733,7 @@ function handleCLIError(error, verbose = false) {
   process.exit(EXIT_CODES.UNEXPECTED_ERROR);
 }
 function setupGlobalOptions(program) {
-  program.option("-v, --verbose", "Enable verbose output with detailed progress").option("-q, --quiet", "Disable rich formatting, use plain text").option("-c, --config <path>", "Configuration file path (.json, .toml, pyproject.toml)").option("-l, --log-file <path>", "Log file path (auto-generated if not specified)").option("--no-color", "Disable colored output").option("--log-level <level>", "Log level for output (error, warn, info, debug, trace)", "info").option("-s, --subagent <name>", "Subagent to use (claude, cursor, codex, gemini)").option("-b, --backend <type>", "Backend to use (mcp, shell)").option("-m, --model <name>", "Model to use (subagent-specific)").option("--agents <config>", "Agents configuration (forwarded to shell backend, ignored for MCP)").option("--tools <tools...>", "Allowed tools for Claude (passed to shell backend, ignored for MCP)").option("--disallowed-tools <tools...>", "Disallowed tools for Claude (passed to shell backend, ignored for MCP)").option("--mcp-timeout <number>", "MCP server timeout in milliseconds", parseInt).option("--enable-feedback", "Enable interactive feedback mode (F+Enter to enter, Q+Enter to submit)");
+  program.option("-v, --verbose", "Enable verbose output with detailed progress").option("-q, --quiet", "Disable rich formatting, use plain text").option("-c, --config <path>", "Configuration file path (.json, .toml, pyproject.toml)").option("-l, --log-file <path>", "Log file path (auto-generated if not specified)").option("--no-color", "Disable colored output").option("--log-level <level>", "Log level for output (error, warn, info, debug, trace)", "info").option("-s, --subagent <name>", "Subagent to use (claude, cursor, codex, gemini)").option("-b, --backend <type>", "Backend to use (mcp, shell)").option("-m, --model <name>", "Model to use (subagent-specific)").option("--agents <config>", "Agents configuration (forwarded to shell backend, ignored for MCP)").option("--tools <tools...>", 'Specify the list of available tools from the built-in set (only works with --print mode). Use "" to disable all tools, "default" to use all tools, or specify tool names (e.g. "Bash,Edit,Read"). Passed to shell backend, ignored for MCP.').option("--allowed-tools <tools...>", 'Permission-based filtering of specific tool instances (e.g. "Bash(git:*) Edit"). Default when not specified: Task, Bash, Glob, Grep, ExitPlanMode, Read, Edit, Write, NotebookEdit, WebFetch, TodoWrite, WebSearch, BashOutput, KillShell, Skill, SlashCommand, EnterPlanMode. Passed to shell backend, ignored for MCP.').option("--disallowed-tools <tools...>", "Disallowed tools for Claude (passed to shell backend, ignored for MCP). By default, no tools are disallowed").option("--append-allowed-tools <tools...>", "Append tools to the default allowed-tools list (mutually exclusive with --allowed-tools). Passed to shell backend, ignored for MCP.").option("--mcp-timeout <number>", "MCP server timeout in milliseconds", parseInt).option("--enable-feedback", "Enable interactive feedback mode (F+Enter to enter, Q+Enter to submit)").option("-r, --resume <sessionId>", "Resume a conversation by session ID (shell backend only)").option("--continue", "Continue the most recent conversation (shell backend only)");
   program.exitOverride((err) => {
     if (err.code === "commander.helpDisplayed") {
       process.exit(0);