klaude-code 1.2.15__tar.gz → 1.2.17__tar.gz

{klaude_code-1.2.15 → klaude_code-1.2.17}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.2.15
+Version: 1.2.17
 Summary: Add your description here
 Requires-Dist: anthropic>=0.66.0
+Requires-Dist: ddgs>=9.9.3
 Requires-Dist: openai>=1.102.0
 Requires-Dist: pillow>=12.0.0
 Requires-Dist: prompt-toolkit>=3.0.52
@@ -22,6 +23,7 @@ An minimal and opinionated code agent with multi-model support.
 ## Key Features
 - **Adaptive Tooling**: Model-aware toolsets (Claude Code tools for Sonnet, Codex `apply_patch` for GPT-5.1/Codex).
 - **Multi-Provider Support**: Compatible with `anthropic-messages-api`,`openai-responses-api`, and `openai-compatible-api`(`openrouter-api`),  featuring interleaved thinking, OpenRouter's provider sorting etc.
+- **Structured Sub-Agent Output**: Main agent defines output JSON schema for sub-agents; sub-agents use `report_back` tool with constrained decoding to return schema-compliant structured data.
 - **Skill System**: Extensible support for loading Claude Skills.
 - **Session Management**: Robust context preservation with resumable sessions (`--continue`).
 - **Simple TUI**: Clean interface offering full visibility into model responses, reasoning and actions.
@@ -70,47 +72,137 @@ Open the configuration file in editor:
 klaude config
 ```
 
-An minimal example config yaml using OpenRouter's API Key:
+An example config yaml:
 
 ```yaml
 provider_list:
-- provider_name: openrouter-work
+- provider_name: openrouter
   protocol: openrouter # support <responses|openrouter|anthropic|openai>
   api_key: <your-openrouter-api-key>
+
+- provider_name: openai-responses
+  protocol: responses
+  api_key: <your-openai-api-key>
+
+- provider_name: anthropic
+  protocol: anthropic
+  api_key: <your-anthropic-api-key>
+
+- provider_name: moonshot
+  protocol: anthropic
+  base_url: https://api.moonshot.cn/anthropic
+  api_key: <your-api-key>
+
+- provider_name: deepseek
+  protocol: anthropic
+  base_url: https://api.deepseek.com/anthropic
+  api_key: <your-api-key>
+
 model_list:
-- model_name: gpt-5.1-codex
-  provider: openrouter
+
+- model_name: deepseek
+  provider: deepseek
+  model_params:
+    model: deepseek-reasoner
+    context_limit: 128000
+    thinking:
+      type: enabled
+      budget_tokens: 8192
+    cost:
+      currency: CNY
+      input: 2
+      output: 3
+      cache_read: 0.2
+
+- model_name: codex-max
+  provider: openai-responses
   model_params:
-    model: openai/gpt-5.1-codex
-    context_limit: 368000
+    model: gpt-5.1-codex-max
     thinking:
       reasoning_effort: medium
-- model_name: gpt-5.1-high
+    context_limit: 400000
+    max_tokens: 128000
+    cost:
+      input: 1.25
+      output: 10
+      cache_read: 0.13
+
+- model_name: gpt-5.1
   provider: openrouter
   model_params:
     model: openai/gpt-5.1
-    context_limit: 368000
+    context_limit: 400000
+    max_tokens: 128000
+    verbosity: high
     thinking:
       reasoning_effort: high
-- model_name: sonnet
+    cost:
+      input: 1.25
+      output: 10
+      cache_read: 0.13
+
+- model_name: kimi@moonshot
+  provider: moonshot
+  model_params:
+    model: kimi-k2-thinking
+    context_limit: 262144
+    thinking:
+      type: enabled
+      budget_tokens: 8192
+    cost:
+      currency: CNY
+      input: 4
+      output: 16
+      cache_read: 1
+
+- model_name: opus
   provider: openrouter
   model_params:
-    model: anthropic/claude-4.5-sonnet
-    context_limit: 168000
+    model: anthropic/claude-4.5-opus
+    context_limit: 200000
     provider_routing:
-      sort: throughput
-- model_name: haiku
+      only: [ google-vertex ]
+    verbosity: high
+    thinking:
+      type: enabled
+      budget_tokens: 31999
+    cost:
+      input: 5
+      output: 25
+      cache_read: 0.5
+      cache_write: 6.25
+
+- model_name: gemini
   provider: openrouter
   model_params:
-    model: anthropic/claude-haiku-4.5
-    context_limit: 168000
-    provider_routing:
-      sort: throughput
-main_model: gpt-5.1-codex
-subagent_models:
-  oracle: gpt-5.1-high
+    model: google/gemini-3-pro-preview
+    context_limit: 1048576
+    thinking:
+      reasoning_effort: medium
+    cost:
+      input: 2
+      output: 12
+      cache_read: 0.2
+
+- model_name: haiku
+  provider: anthropic
+  model_params:
+    model: claude-haiku-4-5-20251001
+    context_limit: 200000
+    cost:
+      input: 1
+      output: 5
+      cache_read: 0.1
+      cache_write: 1.25
+
+main_model: opus
+
+sub_agent_models:
+  oracle: gpt-5.1
   explore: haiku
-  task: sonnet
+  task: opus
+  webfetchagent: haiku
+
 ```
 
 List configured providers and models:

{klaude_code-1.2.15 → klaude_code-1.2.17}/README.md

@@ -5,6 +5,7 @@ An minimal and opinionated code agent with multi-model support.
 ## Key Features
 - **Adaptive Tooling**: Model-aware toolsets (Claude Code tools for Sonnet, Codex `apply_patch` for GPT-5.1/Codex).
 - **Multi-Provider Support**: Compatible with `anthropic-messages-api`,`openai-responses-api`, and `openai-compatible-api`(`openrouter-api`),  featuring interleaved thinking, OpenRouter's provider sorting etc.
+- **Structured Sub-Agent Output**: Main agent defines output JSON schema for sub-agents; sub-agents use `report_back` tool with constrained decoding to return schema-compliant structured data.
 - **Skill System**: Extensible support for loading Claude Skills.
 - **Session Management**: Robust context preservation with resumable sessions (`--continue`).
 - **Simple TUI**: Clean interface offering full visibility into model responses, reasoning and actions.
@@ -53,47 +54,137 @@ Open the configuration file in editor:
 klaude config
 ```
 
-An minimal example config yaml using OpenRouter's API Key:
+An example config yaml:
 
 ```yaml
 provider_list:
-- provider_name: openrouter-work
+- provider_name: openrouter
   protocol: openrouter # support <responses|openrouter|anthropic|openai>
   api_key: <your-openrouter-api-key>
+
+- provider_name: openai-responses
+  protocol: responses
+  api_key: <your-openai-api-key>
+
+- provider_name: anthropic
+  protocol: anthropic
+  api_key: <your-anthropic-api-key>
+
+- provider_name: moonshot
+  protocol: anthropic
+  base_url: https://api.moonshot.cn/anthropic
+  api_key: <your-api-key>
+
+- provider_name: deepseek
+  protocol: anthropic
+  base_url: https://api.deepseek.com/anthropic
+  api_key: <your-api-key>
+
 model_list:
-- model_name: gpt-5.1-codex
-  provider: openrouter
+
+- model_name: deepseek
+  provider: deepseek
+  model_params:
+    model: deepseek-reasoner
+    context_limit: 128000
+    thinking:
+      type: enabled
+      budget_tokens: 8192
+    cost:
+      currency: CNY
+      input: 2
+      output: 3
+      cache_read: 0.2
+
+- model_name: codex-max
+  provider: openai-responses
   model_params:
-    model: openai/gpt-5.1-codex
-    context_limit: 368000
+    model: gpt-5.1-codex-max
     thinking:
       reasoning_effort: medium
-- model_name: gpt-5.1-high
+    context_limit: 400000
+    max_tokens: 128000
+    cost:
+      input: 1.25
+      output: 10
+      cache_read: 0.13
+
+- model_name: gpt-5.1
   provider: openrouter
   model_params:
     model: openai/gpt-5.1
-    context_limit: 368000
+    context_limit: 400000
+    max_tokens: 128000
+    verbosity: high
     thinking:
       reasoning_effort: high
-- model_name: sonnet
+    cost:
+      input: 1.25
+      output: 10
+      cache_read: 0.13
+
+- model_name: kimi@moonshot
+  provider: moonshot
+  model_params:
+    model: kimi-k2-thinking
+    context_limit: 262144
+    thinking:
+      type: enabled
+      budget_tokens: 8192
+    cost:
+      currency: CNY
+      input: 4
+      output: 16
+      cache_read: 1
+
+- model_name: opus
   provider: openrouter
   model_params:
-    model: anthropic/claude-4.5-sonnet
-    context_limit: 168000
+    model: anthropic/claude-4.5-opus
+    context_limit: 200000
     provider_routing:
-      sort: throughput
-- model_name: haiku
+      only: [ google-vertex ]
+    verbosity: high
+    thinking:
+      type: enabled
+      budget_tokens: 31999
+    cost:
+      input: 5
+      output: 25
+      cache_read: 0.5
+      cache_write: 6.25
+
+- model_name: gemini
   provider: openrouter
   model_params:
-    model: anthropic/claude-haiku-4.5
-    context_limit: 168000
-    provider_routing:
-      sort: throughput
-main_model: gpt-5.1-codex
-subagent_models:
-  oracle: gpt-5.1-high
+    model: google/gemini-3-pro-preview
+    context_limit: 1048576
+    thinking:
+      reasoning_effort: medium
+    cost:
+      input: 2
+      output: 12
+      cache_read: 0.2
+
+- model_name: haiku
+  provider: anthropic
+  model_params:
+    model: claude-haiku-4-5-20251001
+    context_limit: 200000
+    cost:
+      input: 1
+      output: 5
+      cache_read: 0.1
+      cache_write: 1.25
+
+main_model: opus
+
+sub_agent_models:
+  oracle: gpt-5.1
   explore: haiku
-  task: sonnet
+  task: opus
+  webfetchagent: haiku
+
 ```
 
 List configured providers and models:

{klaude_code-1.2.15 → klaude_code-1.2.17}/pyproject.toml

@@ -4,12 +4,13 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "1.2.15"
+version = "1.2.17"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "anthropic>=0.66.0",
+    "ddgs>=9.9.3",
     "openai>=1.102.0",
     "pillow>=12.0.0",
     "prompt-toolkit>=3.0.52",

{klaude_code-1.2.15 → klaude_code-1.2.17}/src/klaude_code/cli/main.py

@@ -13,7 +13,7 @@ from klaude_code.cli.debug import DEBUG_FILTER_HELP, open_log_file_in_editor, re
 from klaude_code.cli.session_cmd import register_session_commands
 from klaude_code.config import load_config
 from klaude_code.session import Session, resume_select_session
-from klaude_code.trace import prepare_debug_log_file
+from klaude_code.trace import DebugType, prepare_debug_log_file
 
 
 def set_terminal_title(title: str) -> None:
@@ -22,6 +22,63 @@ def set_terminal_title(title: str) -> None:
     sys.stdout.flush()
 
 
+def setup_terminal_title() -> None:
+    """Set terminal title to current folder name."""
+    folder_name = os.path.basename(os.getcwd())
+    set_terminal_title(f"{folder_name}: klaude")
+
+
+def prepare_debug_logging(debug: bool, debug_filter: str | None) -> tuple[bool, set[DebugType] | None, Path | None]:
+    """Resolve debug settings and prepare log file if debugging is enabled.
+
+    Returns:
+        A tuple of (debug_enabled, debug_filters, log_path).
+        log_path is None if debugging is disabled.
+    """
+    debug_enabled, debug_filters = resolve_debug_settings(debug, debug_filter)
+    log_path: Path | None = None
+    if debug_enabled:
+        log_path = prepare_debug_log_file()
+    return debug_enabled, debug_filters, log_path
+
+
+def read_input_content(cli_argument: str) -> str | None:
+    """Read and merge input from stdin and CLI argument.
+
+    Args:
+        cli_argument: The input content passed as CLI argument.
+
+    Returns:
+        The merged input content, or None if no input was provided.
+    """
+    from klaude_code.trace import log
+
+    parts: list[str] = []
+
+    # Handle stdin input
+    if not sys.stdin.isatty():
+        try:
+            stdin = sys.stdin.read().rstrip("\n")
+            if stdin:
+                parts.append(stdin)
+        except (OSError, ValueError) as e:
+            # Expected I/O-related errors when reading from stdin (e.g. broken pipe, closed stream).
+            log((f"Error reading from stdin: {e}", "red"))
+        except Exception as e:
+            # Unexpected errors are still reported but kept from crashing the CLI.
+            log((f"Unexpected error reading from stdin: {e}", "red"))
+
+    if cli_argument:
+        parts.append(cli_argument)
+
+    content = "\n".join(parts)
+    if len(content) == 0:
+        log(("Error: No input content provided", "red"))
+        return None
+
+    return content
+
+
 def _version_callback(value: bool) -> None:
     """Show version and exit."""
     if value:
@@ -90,33 +147,10 @@ def exec_command(
     ),
 ) -> None:
     """Execute non-interactively with provided input."""
-    from klaude_code.trace import log
-
-    # Set terminal title with current folder name
-    folder_name = os.path.basename(os.getcwd())
-    set_terminal_title(f"{folder_name}: klaude")
-
-    parts: list[str] = []
+    setup_terminal_title()
 
-    # Handle stdin input
-    if not sys.stdin.isatty():
-        try:
-            stdin = sys.stdin.read().rstrip("\n")
-            if stdin:
-                parts.append(stdin)
-        except (OSError, ValueError) as e:
-            # Expected I/O-related errors when reading from stdin (e.g. broken pipe, closed stream).
-            log((f"Error reading from stdin: {e}", "red"))
-        except Exception as e:
-            # Unexpected errors are still reported but kept from crashing the CLI.
-            log((f"Unexpected error reading from stdin: {e}", "red"))
-
-    if input_content:
-        parts.append(input_content)
-
-    input_content = "\n".join(parts)
-    if len(input_content) == 0:
-        log(("Error: No input content provided", "red"))
+    merged_input = read_input_content(input_content)
+    if merged_input is None:
         raise typer.Exit(1)
 
     from klaude_code.cli.runtime import AppInitConfig, run_exec
@@ -133,11 +167,7 @@ def exec_command(
         if chosen_model is None:
             return
 
-    debug_enabled, debug_filters = resolve_debug_settings(debug, debug_filter)
-
-    log_path: Path | None = None
-    if debug_enabled:
-        log_path = prepare_debug_log_file()
+    debug_enabled, debug_filters, log_path = prepare_debug_logging(debug, debug_filter)
 
     init_config = AppInitConfig(
         model=chosen_model,
@@ -154,7 +184,7 @@ def exec_command(
     asyncio.run(
         run_exec(
             init_config=init_config,
-            input_content=input_content,
+            input_content=merged_input,
         )
     )
 
@@ -210,10 +240,8 @@ def main_callback(
         from klaude_code.cli.runtime import AppInitConfig, run_interactive
         from klaude_code.config.select_model import select_model_from_config
 
-        # Set terminal title with current folder name
-        folder_name = os.path.basename(os.getcwd())
-        set_terminal_title(f"{folder_name}: klaude")
-        # Interactive mode
+        setup_terminal_title()
+
         chosen_model = model
         if select_model:
             chosen_model = select_model_from_config(preferred=model)
@@ -232,11 +260,7 @@ def main_callback(
             session_id = Session.most_recent_session_id()
         # If still no session_id, leave as None to create a new session
 
-        debug_enabled, debug_filters = resolve_debug_settings(debug, debug_filter)
-
-        log_path: Path | None = None
-        if debug_enabled:
-            log_path = prepare_debug_log_file()
+        debug_enabled, debug_filters, log_path = prepare_debug_logging(debug, debug_filter)
 
         init_config = AppInitConfig(
             model=chosen_model,

{klaude_code-1.2.15 → klaude_code-1.2.17}/src/klaude_code/cli/runtime.py

@@ -127,6 +127,28 @@ async def initialize_app_components(init_config: AppInitConfig) -> AppComponents
     )
 
 
+async def initialize_session(
+    executor: Executor,
+    event_queue: asyncio.Queue[events.Event],
+    session_id: str | None = None,
+) -> str | None:
+    """Initialize a session and return the active session ID.
+
+    Args:
+        executor: The executor to submit operations to.
+        event_queue: The event queue for synchronization.
+        session_id: Optional session ID to resume. If None, creates a new session.
+
+    Returns:
+        The active session ID, or None if no session is active.
+    """
+    await executor.submit_and_wait(op.InitAgentOperation(session_id=session_id))
+    await event_queue.join()
+
+    active_session_ids = executor.context.agent_manager.active_session_ids()
+    return active_session_ids[0] if active_session_ids else session_id
+
+
 async def cleanup_app_components(components: AppComponents) -> None:
     """Clean up all application components."""
     try:
@@ -167,13 +189,7 @@ async def run_exec(init_config: AppInitConfig, input_content: str) -> None:
     components = await initialize_app_components(init_config)
 
     try:
-        # Initialize a new session (session_id=None means create new)
-        await components.executor.submit_and_wait(op.InitAgentOperation())
-        await components.event_queue.join()
-
-        # Get the session_id from the newly created agent
-        session_ids = components.executor.context.agent_manager.active_session_ids()
-        session_id = session_ids[0] if session_ids else None
+        session_id = await initialize_session(components.executor, components.event_queue)
 
         # Submit the input content directly
         await components.executor.submit_and_wait(
@@ -245,12 +261,15 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
     restore_sigint = install_sigint_double_press_exit(_show_toast_once, _hide_progress)
 
     try:
-        await components.executor.submit_and_wait(op.InitAgentOperation(session_id=session_id))
-        await components.event_queue.join()
+        await initialize_session(components.executor, components.event_queue, session_id=session_id)
+
+        def _get_active_session_id() -> str | None:
+            """Get the current active session ID dynamically.
 
-        # Get the actual session_id (may have been auto-generated if None was passed)
-        active_session_ids = components.executor.context.agent_manager.active_session_ids()
-        active_session_id = active_session_ids[0] if active_session_ids else session_id
+            This is necessary because /clear command creates a new session with a different ID.
+            """
+            active_ids = components.executor.context.agent_manager.active_session_ids()
+            return active_ids[0] if active_ids else None
 
         # Input
         await input_provider.start()
@@ -261,6 +280,8 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
             elif user_input.text.strip() == "":
                 continue
             # Submit user input operation - directly use the payload from iter_inputs
+            # Use dynamic session_id lookup to handle /clear creating new sessions
+            active_session_id = _get_active_session_id()
             submission_id = await components.executor.submit(
                 op.UserInputOperation(input=user_input, session_id=active_session_id)
             )
@@ -271,7 +292,7 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
             else:
                 # Esc monitor for long-running, interruptible operations
                 async def _on_esc_interrupt() -> None:
-                    await components.executor.submit(op.InterruptOperation(target_session_id=active_session_id))
+                    await components.executor.submit(op.InterruptOperation(target_session_id=_get_active_session_id()))
 
                 stop_event, esc_task = start_esc_interrupt_monitor(_on_esc_interrupt)
                 # Wait for this specific task to complete before accepting next input

{klaude_code-1.2.15 → klaude_code-1.2.17}/src/klaude_code/command/__init__.py

@@ -30,6 +30,7 @@ def ensure_commands_loaded() -> None:
     from .clear_cmd import ClearCommand
     from .diff_cmd import DiffCommand
     from .export_cmd import ExportCommand
+    from .export_online_cmd import ExportOnlineCommand
     from .help_cmd import HelpCommand
     from .model_cmd import ModelCommand
     from .refresh_cmd import RefreshTerminalCommand
@@ -40,6 +41,7 @@ def ensure_commands_loaded() -> None:
 
     # Register in desired display order
     register(ExportCommand())
+    register(ExportOnlineCommand())
     register(RefreshTerminalCommand())
     register(ThinkingCommand())
     register(ModelCommand())
@@ -60,6 +62,7 @@ def __getattr__(name: str) -> object:
         "ClearCommand": "clear_cmd",
         "DiffCommand": "diff_cmd",
         "ExportCommand": "export_cmd",
+        "ExportOnlineCommand": "export_online_cmd",
         "HelpCommand": "help_cmd",
         "ModelCommand": "model_cmd",
         "RefreshTerminalCommand": "refresh_cmd",

{klaude_code-1.2.15 → klaude_code-1.2.17}/src/klaude_code/command/export_cmd.py

@@ -25,7 +25,7 @@ class ExportCommand(CommandABC):
 
     @property
     def support_addition_params(self) -> bool:
-        return True
+        return False
 
     @property
     def is_interactive(self) -> bool:
@@ -33,7 +33,7 @@ class ExportCommand(CommandABC):
 
     async def run(self, raw: str, agent: Agent) -> CommandResult:
         try:
-            output_path = self._resolve_output_path(raw, agent)
+            output_path = self._resolve_output_path("", agent)
             html_doc = self._build_html(agent)
             output_path.parent.mkdir(parents=True, exist_ok=True)
             output_path.write_text(html_doc, encoding="utf-8")