Merge pull request #8 from link-assistant/issue-3-97c6556ec6f2

Add full Claude Code CLI capabilities support

Author: konard

README.md

@@ -51,12 +51,24 @@ bun add agent-commander
 
 ## Supported Tools
 
-| Tool | Description | JSON Output | Model Aliases |
-|------|-------------|-------------|---------------|
-| `claude` | Anthropic Claude Code CLI | ✅ | `sonnet`, `opus`, `haiku` |
-| `codex` | OpenAI Codex CLI | ✅ | `gpt5`, `o3`, `gpt4o` |
-| `opencode` | OpenCode CLI | ✅ | `grok`, `gemini`, `sonnet` |
-| `agent` | @link-assistant/agent | ✅ | `grok`, `sonnet`, `haiku` |
+| Tool | Description | JSON Output | JSON Input | Model Aliases |
+|------|-------------|-------------|------------|---------------|
+| `claude` | Anthropic Claude Code CLI | ✅ (stream-json) | ✅ (stream-json) | `sonnet`, `opus`, `haiku` |
+| `codex` | OpenAI Codex CLI | ✅ | ❌ | `gpt5`, `o3`, `gpt4o` |
+| `opencode` | OpenCode CLI | ✅ | ❌ | `grok`, `gemini`, `sonnet` |
+| `agent` | @link-assistant/agent | ✅ | ❌ | `grok`, `sonnet`, `haiku` |
+
+### Claude-specific Features
+
+The Claude Code CLI supports additional features:
+
+- **Stream JSON format**: Uses `--output-format stream-json` and `--input-format stream-json` for real-time streaming
+- **Permission bypass**: Automatically includes `--dangerously-skip-permissions` for unrestricted operation
+- **Fallback model**: Use `--fallback-model` for automatic fallback when the primary model is overloaded
+- **Session management**: Full support for `--session-id`, `--fork-session`, and `--resume`
+- **System prompt appending**: Use `--append-system-prompt` to add to the default system prompt
+- **Verbose mode**: Enable with `--verbose` for detailed output
+- **User message replay**: Use `--replay-user-messages` for streaming acknowledgment
 
 ## CLI Usage
 
@@ -74,7 +86,14 @@ start-agent --tool claude --working-directory "/tmp/dir" --prompt "Solve the iss
 - `--working-directory <path>` - Working directory for the agent [required]
 - `--prompt <text>` - Prompt for the agent
 - `--system-prompt <text>` - System prompt for the agent
+- `--append-system-prompt <text>` - Append to the default system prompt (Claude only)
 - `--model <name>` - Model to use (e.g., 'sonnet', 'opus', 'grok')
+- `--fallback-model <name>` - Fallback model when default is overloaded (Claude only)
+- `--verbose` - Enable verbose mode (Claude only)
+- `--resume <sessionId>` - Resume a previous session by ID
+- `--session-id <uuid>` - Use a specific session ID (Claude only, must be valid UUID)
+- `--fork-session` - Create new session ID when resuming (Claude only)
+- `--replay-user-messages` - Re-emit user messages on stdout (Claude only, streaming mode)
 - `--isolation <mode>` - Isolation mode: none, screen, docker (default: none)
 - `--screen-name <name>` - Screen session name (required for screen isolation)
 - `--container-name <name>` - Container name (required for docker isolation)
@@ -99,6 +118,18 @@ start-agent --tool codex --working-directory "/tmp/dir" --prompt "Fix the bug" -
 start-agent --tool agent --working-directory "/tmp/dir" --prompt "Analyze code" --model grok
 ```
 
+**With model fallback (Claude)**
+```bash
+start-agent --tool claude --working-directory "/tmp/dir" \
+  --prompt "Complex task" --model opus --fallback-model sonnet
+```
+
+**Resume a session with fork (Claude)**
+```bash
+start-agent --tool claude --working-directory "/tmp/dir" \
+  --resume abc123 --fork-session
+```
+
 **With screen isolation (detached)**
 ```bash
 start-agent --tool claude --working-directory "/tmp/dir" \

js/package-lock.json

@@ -48,6 +48,14 @@ export function parseStartAgentArgs(args) {
     workingDirectory: parsed['working-directory'],
     prompt: parsed.prompt,
     systemPrompt: parsed['system-prompt'],
+    appendSystemPrompt: parsed['append-system-prompt'],
+    model: parsed.model,
+    fallbackModel: parsed['fallback-model'],
+    verbose: parsed.verbose || false,
+    replayUserMessages: parsed['replay-user-messages'] || false,
+    resume: parsed.resume,
+    sessionId: parsed['session-id'],
+    forkSession: parsed['fork-session'] || false,
     isolation: parsed.isolation || 'none',
     screenName: parsed['screen-name'],
     containerName: parsed['container-name'],
@@ -87,6 +95,14 @@ Options:
   --working-directory <path>       Working directory for the agent [required]
   --prompt <text>                  Prompt for the agent
   --system-prompt <text>           System prompt for the agent
+  --append-system-prompt <text>    Append to the default system prompt
+  --model <model>                  Model to use (e.g., 'sonnet', 'opus', 'haiku')
+  --fallback-model <model>         Fallback model when default is overloaded
+  --verbose                        Enable verbose mode
+  --resume <sessionId>             Resume a previous session by ID
+  --session-id <uuid>              Use a specific session ID (must be valid UUID)
+  --fork-session                   Create new session ID when resuming
+  --replay-user-messages           Re-emit user messages on stdout (streaming mode)
   --isolation <mode>               Isolation mode: none, screen, docker (default: none)
   --screen-name <name>             Screen session name (required for screen isolation)
   --container-name <name>          Container name (required for docker isolation)
@@ -98,6 +114,14 @@ Examples:
   # Basic usage (no isolation)
   start-agent --tool claude --working-directory "/tmp/dir" --prompt "Hello"
 
+  # With model selection
+  start-agent --tool claude --working-directory "/tmp/dir" \\
+    --prompt "Hello" --model opus --fallback-model sonnet
+
+  # Resume a session with fork
+  start-agent --tool claude --working-directory "/tmp/dir" \\
+    --resume abc123 --fork-session
+
   # With screen isolation (detached)
   start-agent --tool claude --working-directory "/tmp/dir" \\
     --isolation screen --screen-name my-agent --detached

js/src/cli-parser.mjs

@@ -31,29 +31,51 @@ export function mapModelToId(options) {
  * @param {Object} options - Options
  * @param {string} [options.prompt] - User prompt
  * @param {string} [options.systemPrompt] - System prompt
+ * @param {string} [options.appendSystemPrompt] - System prompt to append to default
  * @param {string} [options.model] - Model to use
+ * @param {string} [options.fallbackModel] - Fallback model when default is overloaded
  * @param {boolean} [options.print] - Print mode (non-interactive)
- * @param {boolean} [options.json] - JSON output mode
+ * @param {boolean} [options.verbose] - Verbose mode
+ * @param {boolean} [options.json] - JSON output mode (stream-json format)
+ * @param {boolean} [options.jsonInput] - JSON input mode (stream-json format)
+ * @param {boolean} [options.replayUserMessages] - Re-emit user messages on stdout
  * @param {string} [options.resume] - Resume session ID
+ * @param {string} [options.sessionId] - Use specific session ID (must be valid UUID)
+ * @param {boolean} [options.forkSession] - Create new session ID when resuming
  * @returns {string[]} Array of CLI arguments
  */
 export function buildArgs(options) {
   const {
     prompt,
     systemPrompt,
+    appendSystemPrompt,
     model,
+    fallbackModel,
     print = false,
+    verbose = false,
     json = false,
+    jsonInput = false,
+    replayUserMessages = false,
     resume,
+    sessionId,
+    forkSession = false,
   } = options;
 
   const args = [];
 
+  // Permission bypass - always enabled, not configurable (per issue #3)
+  args.push('--dangerously-skip-permissions');
+
   if (model) {
     const mappedModel = mapModelToId({ model });
     args.push('--model', mappedModel);
   }
 
+  if (fallbackModel) {
+    const mappedFallback = mapModelToId({ model: fallbackModel });
+    args.push('--fallback-model', mappedFallback);
+  }
+
   if (prompt) {
     args.push('--prompt', prompt);
   }
@@ -62,18 +84,46 @@ export function buildArgs(options) {
     args.push('--system-prompt', systemPrompt);
   }
 
+  if (appendSystemPrompt) {
+    args.push('--append-system-prompt', appendSystemPrompt);
+  }
+
+  if (verbose) {
+    args.push('--verbose');
+  }
+
   if (print) {
     args.push('-p'); // Print mode
   }
 
+  // JSON output mode - use stream-json format per issue #3
   if (json) {
-    args.push('--output-format', 'json');
+    args.push('--output-format', 'stream-json');
+  }
+
+  // JSON input mode - use stream-json format per issue #3
+  if (jsonInput) {
+    args.push('--input-format', 'stream-json');
+  }
+
+  // Replay user messages (only with stream-json input/output)
+  if (replayUserMessages) {
+    args.push('--replay-user-messages');
+  }
+
+  // Session management
+  if (sessionId) {
+    args.push('--session-id', sessionId);
   }
 
   if (resume) {
     args.push('--resume', resume);
   }
 
+  if (forkSession) {
+    args.push('--fork-session');
+  }
+
   return args;
 }
 
@@ -83,10 +133,17 @@ export function buildArgs(options) {
  * @param {string} options.workingDirectory - Working directory
  * @param {string} [options.prompt] - User prompt
  * @param {string} [options.systemPrompt] - System prompt
+ * @param {string} [options.appendSystemPrompt] - System prompt to append to default
  * @param {string} [options.model] - Model to use
+ * @param {string} [options.fallbackModel] - Fallback model when default is overloaded
  * @param {boolean} [options.print] - Print mode (non-interactive)
- * @param {boolean} [options.json] - JSON output mode
+ * @param {boolean} [options.verbose] - Verbose mode
+ * @param {boolean} [options.json] - JSON output mode (stream-json format)
+ * @param {boolean} [options.jsonInput] - JSON input mode (stream-json format)
+ * @param {boolean} [options.replayUserMessages] - Re-emit user messages on stdout
  * @param {string} [options.resume] - Resume session ID
+ * @param {string} [options.sessionId] - Use specific session ID (must be valid UUID)
+ * @param {boolean} [options.forkSession] - Create new session ID when resuming
  * @returns {string} Complete command string
  */
 export function buildCommand(options) {
@@ -203,9 +260,15 @@ export const claudeTool = {
   displayName: 'Claude Code CLI',
   executable: 'claude',
   supportsJsonOutput: true,
-  supportsJsonInput: false, // Claude doesn't support JSON streaming input yet
+  supportsJsonInput: true, // Claude supports stream-json input format
   supportsSystemPrompt: true,
+  supportsAppendSystemPrompt: true, // Supports --append-system-prompt
   supportsResume: true,
+  supportsForkSession: true, // Supports --fork-session
+  supportsSessionId: true, // Supports --session-id
+  supportsFallbackModel: true, // Supports --fallback-model
+  supportsVerbose: true, // Supports --verbose
+  supportsReplayUserMessages: true, // Supports --replay-user-messages
   defaultModel: 'sonnet',
   modelMap,
   mapModelToId,

js/src/tools/claude.mjs

@@ -135,3 +135,86 @@ test('validateStopAgentOptions - missing isolation', () => {
   assert.strictEqual(result.valid, false);
   assert.ok(result.errors.some((e) => e.includes('isolation')));
 });
+
+// New Claude CLI options tests (issue #3)
+test('parseStartAgentArgs - with model and fallback-model', () => {
+  const args = [
+    '--tool',
+    'claude',
+    '--working-directory',
+    '/tmp/test',
+    '--model',
+    'opus',
+    '--fallback-model',
+    'sonnet',
+  ];
+  const result = parseStartAgentArgs(args);
+
+  assert.strictEqual(result.model, 'opus');
+  assert.strictEqual(result.fallbackModel, 'sonnet');
+});
+
+test('parseStartAgentArgs - with session management options', () => {
+  const args = [
+    '--tool',
+    'claude',
+    '--working-directory',
+    '/tmp/test',
+    '--resume',
+    'abc123',
+    '--session-id',
+    '123e4567-e89b-12d3-a456-426614174000',
+    '--fork-session',
+  ];
+  const result = parseStartAgentArgs(args);
+
+  assert.strictEqual(result.resume, 'abc123');
+  assert.strictEqual(result.sessionId, '123e4567-e89b-12d3-a456-426614174000');
+  assert.strictEqual(result.forkSession, true);
+});
+
+test('parseStartAgentArgs - with append-system-prompt', () => {
+  const args = [
+    '--tool',
+    'claude',
+    '--working-directory',
+    '/tmp/test',
+    '--system-prompt',
+    'You are a helpful assistant',
+    '--append-system-prompt',
+    'Extra instructions here',
+  ];
+  const result = parseStartAgentArgs(args);
+
+  assert.strictEqual(result.systemPrompt, 'You are a helpful assistant');
+  assert.strictEqual(result.appendSystemPrompt, 'Extra instructions here');
+});
+
+test('parseStartAgentArgs - with verbose and replay-user-messages', () => {
+  const args = [
+    '--tool',
+    'claude',
+    '--working-directory',
+    '/tmp/test',
+    '--verbose',
+    '--replay-user-messages',
+  ];
+  const result = parseStartAgentArgs(args);
+
+  assert.strictEqual(result.verbose, true);
+  assert.strictEqual(result.replayUserMessages, true);
+});
+
+test('parseStartAgentArgs - defaults for new options', () => {
+  const args = ['--tool', 'claude', '--working-directory', '/tmp/test'];
+  const result = parseStartAgentArgs(args);
+
+  assert.strictEqual(result.verbose, false);
+  assert.strictEqual(result.replayUserMessages, false);
+  assert.strictEqual(result.forkSession, false);
+  assert.strictEqual(result.model, undefined);
+  assert.strictEqual(result.fallbackModel, undefined);
+  assert.strictEqual(result.resume, undefined);
+  assert.strictEqual(result.sessionId, undefined);
+  assert.strictEqual(result.appendSystemPrompt, undefined);
+});