@onmars/lunar-agent-claude 0.10.3 → 0.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onmars/lunar-agent-claude",
-  "version": "0.10.3",
+  "version": "0.11.1",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -12,7 +12,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@onmars/lunar-core": "^0.10.3"
+    "@onmars/lunar-core": "^0.11.1"
   },
   "description": "Claude CLI agent adapter for Lunar",
   "author": "onMars Tech",

package/src/__tests__/adapter.test.ts

@@ -55,6 +55,7 @@ function callBuildArgs(
     systemPrompt?: string
     model?: string
     context1m?: boolean
+    thinking?: string
   },
 ): string[] {
   return (agent as any).buildArgs(input)
@@ -284,6 +285,67 @@ describe('buildArgs', () => {
     expect(args[args.indexOf('--model') + 1]).toBe('claude-sonnet-4-6[1m]')
   })
 
+  // --- Thinking / --effort flag ---
+
+  it('omits --effort when no thinking level is set', () => {
+    const agent = createAgent()
+    const args = callBuildArgs(agent, { prompt: 'hello' })
+
+    expect(args).not.toContain('--effort')
+  })
+
+  it('omits --effort when thinking is "off"', () => {
+    const agent = createAgent({ thinking: 'off' })
+    const args = callBuildArgs(agent, { prompt: 'hello' })
+
+    expect(args).not.toContain('--effort')
+  })
+
+  it('omits --effort for unknown thinking values', () => {
+    const agent = createAgent()
+    const args = callBuildArgs(agent, { prompt: 'hello', thinking: 'extreme' })
+
+    expect(args).not.toContain('--effort')
+  })
+
+  it('passes --effort from agent-level thinking option', () => {
+    const agent = createAgent({ thinking: 'high' })
+    const args = callBuildArgs(agent, { prompt: 'hello' })
+
+    expect(args).toContain('--effort')
+    expect(args[args.indexOf('--effort') + 1]).toBe('high')
+  })
+
+  it('passes --effort from per-query thinking input', () => {
+    const agent = createAgent()
+    const args = callBuildArgs(agent, { prompt: 'hello', thinking: 'medium' })
+
+    expect(args).toContain('--effort')
+    expect(args[args.indexOf('--effort') + 1]).toBe('medium')
+  })
+
+  it('per-query thinking overrides agent-level', () => {
+    const agent = createAgent({ thinking: 'low' })
+    const args = callBuildArgs(agent, { prompt: 'hello', thinking: 'high' })
+
+    expect(args[args.indexOf('--effort') + 1]).toBe('high')
+  })
+
+  it('per-query "off" overrides agent-level thinking by omitting flag', () => {
+    const agent = createAgent({ thinking: 'high' })
+    const args = callBuildArgs(agent, { prompt: 'hello', thinking: 'off' })
+
+    expect(args).not.toContain('--effort')
+  })
+
+  it('accepts xhigh and max effort levels', () => {
+    const xhighArgs = callBuildArgs(createAgent({ thinking: 'xhigh' }), { prompt: 'hi' })
+    expect(xhighArgs[xhighArgs.indexOf('--effort') + 1]).toBe('xhigh')
+
+    const maxArgs = callBuildArgs(createAgent({ thinking: 'max' }), { prompt: 'hi' })
+    expect(maxArgs[maxArgs.indexOf('--effort') + 1]).toBe('max')
+  })
+
   // --- Full argument order verification ---
 
   it('produces expected argument sequence for a full configuration', () => {
@@ -292,13 +354,15 @@ describe('buildArgs', () => {
       maxTurns: 5,
       systemPrompt: 'Be concise',
       context1m: true,
+      thinking: 'high',
     })
     const args = callBuildArgs(agent, {
       prompt: 'explain recursion',
       sessionId: 'sess_123',
     })
 
-    // Verify ordering: binary, -p, prompt, output-format, verbose, resume, system-prompt, model, max-turns, permission-mode
+    // Verify ordering: binary, -p, prompt, output-format, verbose, resume,
+    // system-prompt, model, max-turns, effort, permission-mode
     expect(args[0]).toBe('claude')
     expect(args[1]).toBe('-p')
     expect(args[2]).toBe('explain recursion')
@@ -313,9 +377,11 @@ describe('buildArgs', () => {
     expect(args[11]).toBe('claude-opus-4-7[1m]')
     expect(args[12]).toBe('--max-turns')
     expect(args[13]).toBe('5')
-    expect(args[14]).toBe('--permission-mode')
-    expect(args[15]).toBe('bypassPermissions')
-    expect(args).toHaveLength(16)
+    expect(args[14]).toBe('--effort')
+    expect(args[15]).toBe('high')
+    expect(args[16]).toBe('--permission-mode')
+    expect(args[17]).toBe('bypassPermissions')
+    expect(args).toHaveLength(18)
   })
 })
 

package/src/adapter.ts

@@ -37,8 +37,19 @@ export interface ClaudeAgentOptions {
    * Pricing: same up to 200K tokens, 2x input / 1.5x output above 200K.
    */
   context1m?: boolean
+  /**
+   * Default thinking/effort level for this agent.
+   * Maps to Claude Code CLI's `--effort <level>` flag.
+   * Accepted: 'off' | 'low' | 'medium' | 'high' | 'xhigh' | 'max'.
+   * 'off' (or undefined) omits the flag, leaving CLI default behavior.
+   * Per-query `input.thinking` overrides this.
+   */
+  thinking?: string
 }
 
+/** Thinking levels accepted by Claude Code CLI's --effort flag. */
+const VALID_EFFORT_LEVELS = new Set(['low', 'medium', 'high', 'xhigh', 'max'])
+
 /**
  * Model alias → full ID mapping for Claude Code CLI.
  *
@@ -299,6 +310,14 @@ export class ClaudeAgent implements Agent {
       args.push('--max-turns', String(this.options.maxTurns))
     }
 
+    // Thinking / effort — per-query (router → moon channel) takes priority
+    // over agent-level default. 'off' or unknown values omit the flag,
+    // leaving the CLI's default behavior intact.
+    const effectiveThinking = input.thinking ?? this.options.thinking
+    if (effectiveThinking && VALID_EFFORT_LEVELS.has(effectiveThinking)) {
+      args.push('--effort', effectiveThinking)
+    }
+
     // Permission mode
     args.push('--permission-mode', 'bypassPermissions')
 
@@ -482,7 +501,11 @@ export class ClaudeAgent implements Agent {
     // model name is unchanged. We tag internally for correct pricing/window size.
     // Only tag real Claude models — skip synthetic/error responses.
     const isContext1m = input.context1m ?? this.options.context1m
-    let reportedModel = model
+    // Fallback chain: CLI-reported model first (source of truth when present),
+    // then the override Lunar passed via --model (input.model), then the adapter
+    // default. Fixes intermittent miss-logging when the CLI stream omits the
+    // model field on some turns and `model` stays undefined.
+    let reportedModel = model ?? input.model ?? this.options.model
     if (
       isContext1m &&
       reportedModel &&