juno-code 1.0.30 → 1.0.32

package/dist/templates/services/claude.py

@@ -33,6 +33,13 @@ class ClaudeService:
         ":opus": "claude-opus-4-5-20251101",
     }
 
+    # Default allowed tools (used with --append-allowed-tools)
+    DEFAULT_ALLOWED_TOOLS = [
+        "Task", "Bash", "Glob", "Grep", "ExitPlanMode", "Read", "Edit", "Write",
+        "NotebookEdit", "WebFetch", "TodoWrite", "WebSearch", "BashOutput",
+        "KillShell", "Skill", "SlashCommand", "EnterPlanMode"
+    ]
+
     def __init__(self):
         self.model_name = self.DEFAULT_MODEL
         self.permission_mode = self.DEFAULT_PERMISSION_MODE
@@ -86,6 +93,14 @@ Examples:
   %(prog)s -p "Add tests" -m :opus --tool Bash --tool Edit
   %(prog)s -p "Quick task" -m :haiku --disallowed-tool Bash
   %(prog)s -p "Complex task" -m claude-opus-4-20250514 --tool Read --tool Write
+  %(prog)s -p "Multi-tool task" --allowed-tools Bash Edit Read Write
+  %(prog)s -p "Restricted task" --disallowed-tools Bash WebSearch
+  %(prog)s --continue -p "Continue previous conversation"
+  %(prog)s --resume abc123 -p "Resume session abc123"
+
+Default Tools (enabled by default when no --allowed-tools specified):
+  Task, Bash, Glob, Grep, ExitPlanMode, Read, Edit, Write, NotebookEdit,
+  WebFetch, TodoWrite, WebSearch, BashOutput, KillShell, Skill, SlashCommand, EnterPlanMode
 
 Environment Variables:
   CLAUDE_PROJECT_PATH                  Project path (default: current directory)
@@ -133,17 +148,31 @@ Environment Variables:
         )
 
         parser.add_argument(
-            "--tool",
+            "--tools",
+            action="append",
+            dest="tools",
+            help="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\"). Forwarded to claude CLI."
+        )
+
+        parser.add_argument(
+            "--allowedTools", "--allowed-tools",
             action="append",
             dest="allowed_tools",
-            help="Allowed tools (can be used multiple times, e.g. 'Bash' 'Edit')"
+            help="Permission-based filtering of specific tool instances (e.g. 'Bash(git:*)' 'Edit'). Accepts both --allowedTools and --allowed-tools. Default when not specified: Task, Bash, Glob, Grep, ExitPlanMode, Read, Edit, Write, NotebookEdit, WebFetch, TodoWrite, WebSearch, BashOutput, KillShell, Skill, SlashCommand, EnterPlanMode"
         )
 
         parser.add_argument(
-            "--disallowed-tool",
+            "--disallowedTools", "--disallowed-tools",
             action="append",
             dest="disallowed_tools",
-            help="Disallowed tools (can be used multiple times, e.g. 'Bash' 'Edit'). Default: empty"
+            help="Disallowed tools (can be used multiple times, e.g. 'Bash' 'Edit'). Accepts both --disallowedTools and --disallowed-tools. By default, no tools are disallowed"
+        )
+
+        parser.add_argument(
+            "--appendAllowedTools", "--append-allowed-tools",
+            action="append",
+            dest="append_allowed_tools",
+            help="Append tools to the default allowed-tools list (mutually exclusive with --allowed-tools). Accepts both --appendAllowedTools and --append-allowed-tools."
         )
 
         parser.add_argument(
@@ -183,6 +212,14 @@ Environment Variables:
             help="Continue the most recent conversation"
         )
 
+        parser.add_argument(
+            "-r", "--resume",
+            type=str,
+            dest="resume_session",
+            metavar="SESSION_ID",
+            help="Resume a conversation by session ID (e.g., claude --resume abc123)"
+        )
+
         parser.add_argument(
             "--agents",
             type=str,
@@ -220,34 +257,49 @@ Environment Variables:
         ]
 
         # Build the full prompt (auto_instruction + user prompt)
-        # IMPORTANT: Prompt must come BEFORE --allowed-tools
-        # because --allowed-tools consumes all following arguments as tool names
+        # IMPORTANT: Prompt must come BEFORE tool-related flags
+        # because some flags consume all following arguments
         full_prompt = f"{self.auto_instruction}\n\n{self.prompt}"
         cmd.append(full_prompt)
 
-        # Add allowed tools if specified (AFTER the prompt)
+        # Add available tools from built-in set if specified (AFTER the prompt)
+        # Note: --tools controls which built-in Claude tools are available (only works with --print mode)
+        if args.tools:
+            cmd.append("--tools")
+            cmd.extend(args.tools)
+        # No else block: By default Claude enables all tools
+
+        # Handle allowed tools (either --allowed-tools or --append-allowed-tools, but not both)
+        # These are mutually exclusive - validation already done above
+        # When neither is specified, use the default allowed-tools list
         if args.allowed_tools:
-            cmd.append("--allowed-tools")
+            # Use the explicitly specified allowed tools (replaces default)
+            cmd.append("--allowedTools")
             cmd.extend(args.allowed_tools)
+        elif args.append_allowed_tools:
+            # Append specified tools to the default list
+            combined_tools = self.DEFAULT_ALLOWED_TOOLS + args.append_allowed_tools
+            cmd.append("--allowedTools")
+            cmd.extend(combined_tools)
         else:
-            # Default allowed tools similar to claude_code.py
-            default_tools = [
-                "Read", "Write", "Edit", "MultiEdit",
-                "Bash", "Glob", "Grep", "WebFetch",
-                "WebSearch", "TodoWrite"
-            ]
-            cmd.append("--allowed-tools")
-            cmd.extend(default_tools)
+            # Use default allowed-tools list when no explicit list is provided
+            cmd.append("--allowedTools")
+            cmd.extend(self.DEFAULT_ALLOWED_TOOLS)
 
         # Add disallowed tools if specified (AFTER the prompt)
+        # Note: claude CLI expects camelCase --disallowedTools (not kebab-case --disallowed-tools)
         if args.disallowed_tools:
-            cmd.append("--disallowed-tools")
+            cmd.append("--disallowedTools")
             cmd.extend(args.disallowed_tools)
 
         # Add continue flag if specified
         if args.continue_conversation:
             cmd.append("--continue")
 
+        # Add resume flag if specified
+        if args.resume_session:
+            cmd.extend(["--resume", args.resume_session])
+
         # Add agents configuration if specified
         if args.agents:
             cmd.extend(["--agents", args.agents])
@@ -541,6 +593,14 @@ Environment Variables:
         # Parse arguments first to handle --help
         args = self.parse_arguments()
 
+        # Validate that --allowed-tools and --append-allowed-tools are mutually exclusive
+        if args.allowed_tools and args.append_allowed_tools:
+            print(
+                "Error: --allowed-tools and --append-allowed-tools are mutually exclusive. Use one or the other.",
+                file=sys.stderr
+            )
+            return 1
+
         # Check if prompt is provided
         if not args.prompt and not args.prompt_file:
             print(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juno-code",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "TypeScript CLI tool for AI subagent orchestration with code automation",
   "keywords": [
     "ai",