mycode-cli 0.18.0__tar.gz → 0.19.0__tar.gz

{mycode_cli-0.18.0 → mycode_cli-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mycode-cli
-Version: 0.18.0
+Version: 0.19.0
 Summary: Minimal coding agent CLI and web UI built on mycode-sdk.
 Project-URL: Homepage, https://github.com/legibet/mycode
 Project-URL: Repository, https://github.com/legibet/mycode
@@ -25,7 +25,7 @@ Requires-Dist: beautifulsoup4>=4.15.0
 Requires-Dist: fastapi>=0.139.0
 Requires-Dist: httpx2>=2.10.0
 Requires-Dist: markdownify>=1.2.3
-Requires-Dist: mycode-sdk==0.18.0
+Requires-Dist: mycode-sdk==0.19.0
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pydantic>=2.13.4
 Requires-Dist: pygments>=2.20.0
@@ -122,21 +122,23 @@ The CLI assembles the system prompt from instructions files and discovered skill
 
 ## Terminal UI
 
-| Key                          | Action                                                                      |
-| ---------------------------- | --------------------------------------------------------------------------- |
-| Enter                        | Send the message; with a completion menu open, accept the highlighted entry |
-| Esc then Enter, or Alt+Enter | Insert a newline                                                            |
-| Esc                          | Interrupt the reply; close a selection list                                 |
-| Ctrl+C                       | Interrupt the reply; otherwise clear the input                              |
-| Ctrl+D                       | Exit (empty input only)                                                     |
-| Ctrl+L                       | Clear the screen                                                            |
-| Up / Down                    | Move between lines; on the first or last line, browse input history         |
+| Key                          | Action                                                                                 |
+| ---------------------------- | -------------------------------------------------------------------------------------- |
+| Enter                        | Send the message (steer while a reply runs); with a completion menu open, accept it    |
+| Ctrl+Q                       | Queue the message for after the reply; otherwise send it                               |
+| Alt+Up                       | Take back pending steers and queued messages into the input                            |
+| Esc then Enter, or Alt+Enter | Insert a newline                                                                       |
+| Esc                          | Take back pending messages and interrupt the reply; close a selection list             |
+| Ctrl+C                       | Take back pending messages and interrupt the reply; otherwise clear the input          |
+| Ctrl+D                       | Exit (empty input only)                                                                |
+| Ctrl+L                       | Clear the screen                                                                       |
+| Up / Down                    | Move between lines; on the first or last line, browse input history                    |
 
-Messages typed while a reply runs are queued and sent in order after it finishes.
+While a reply runs, Enter steers it: the model sees the message at its next step, after the running tools finish. Ctrl+Q queues the message instead; queued messages are sent together as the next turn when the reply finishes. Pending messages show above the input. Commands are unavailable until the reply ends.
 
 `@path` attaches a file to the message: text files as snapshots, images and PDFs as image or document input. Pasted file paths become `@path` references.
 
-Slash commands: `/new` `/resume` `/rewind` `/model` `/effort` `/clear` `/compact` `/q`. `exit` and `quit` also exit.
+Slash commands: `/new` (alias `/clear`) `/resume` `/rewind` `/model` `/effort` `/compact` `/quit` (alias `/exit`). `exit` and `quit` also exit.
 
 ## CLI Reference
 

{mycode_cli-0.18.0 → mycode_cli-0.19.0}/README.md

@@ -85,21 +85,23 @@ The CLI assembles the system prompt from instructions files and discovered skill
 
 ## Terminal UI
 
-| Key                          | Action                                                                      |
-| ---------------------------- | --------------------------------------------------------------------------- |
-| Enter                        | Send the message; with a completion menu open, accept the highlighted entry |
-| Esc then Enter, or Alt+Enter | Insert a newline                                                            |
-| Esc                          | Interrupt the reply; close a selection list                                 |
-| Ctrl+C                       | Interrupt the reply; otherwise clear the input                              |
-| Ctrl+D                       | Exit (empty input only)                                                     |
-| Ctrl+L                       | Clear the screen                                                            |
-| Up / Down                    | Move between lines; on the first or last line, browse input history         |
-
-Messages typed while a reply runs are queued and sent in order after it finishes.
+| Key                          | Action                                                                                 |
+| ---------------------------- | -------------------------------------------------------------------------------------- |
+| Enter                        | Send the message (steer while a reply runs); with a completion menu open, accept it    |
+| Ctrl+Q                       | Queue the message for after the reply; otherwise send it                               |
+| Alt+Up                       | Take back pending steers and queued messages into the input                            |
+| Esc then Enter, or Alt+Enter | Insert a newline                                                                       |
+| Esc                          | Take back pending messages and interrupt the reply; close a selection list             |
+| Ctrl+C                       | Take back pending messages and interrupt the reply; otherwise clear the input          |
+| Ctrl+D                       | Exit (empty input only)                                                                |
+| Ctrl+L                       | Clear the screen                                                                       |
+| Up / Down                    | Move between lines; on the first or last line, browse input history                    |
+
+While a reply runs, Enter steers it: the model sees the message at its next step, after the running tools finish. Ctrl+Q queues the message instead; queued messages are sent together as the next turn when the reply finishes. Pending messages show above the input. Commands are unavailable until the reply ends.
 
 `@path` attaches a file to the message: text files as snapshots, images and PDFs as image or document input. Pasted file paths become `@path` references.
 
-Slash commands: `/new` `/resume` `/rewind` `/model` `/effort` `/clear` `/compact` `/q`. `exit` and `quit` also exit.
+Slash commands: `/new` (alias `/clear`) `/resume` `/rewind` `/model` `/effort` `/compact` `/quit` (alias `/exit`). `exit` and `quit` also exit.
 
 ## CLI Reference
 

{mycode_cli-0.18.0 → mycode_cli-0.19.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mycode-cli"
-version = "0.18.0"
+version = "0.19.0"
 description = "Minimal coding agent CLI and web UI built on mycode-sdk."
 readme = "README.md"
 requires-python = ">=3.12"
@@ -26,7 +26,7 @@ classifiers = [
 ]
 keywords = ["agent", "cli", "llm", "coding-agent", "fastapi"]
 dependencies = [
-    "mycode-sdk==0.18.0",
+    "mycode-sdk==0.19.0",
     "fastapi>=0.139.0",
     "uvicorn[standard]>=0.51.0",
     "rich>=15.0.0",

{mycode_cli-0.18.0 → mycode_cli-0.19.0}/src/mycode_cli/runtime.py

@@ -5,26 +5,21 @@ from __future__ import annotations
 from mycode.agent import Agent
 from mycode_cli.config import ResolvedProvider, Settings
 from mycode_cli.permissions import ToolReviewCallback, build_permission_hooks
-from mycode_cli.sessions import SessionStore, sum_session_cost
+from mycode_cli.sessions import SessionStore, SessionTotals, sum_session_totals
 from mycode_cli.system_prompt import build_system_prompt
 from mycode_cli.tools import DEFAULT_TOOLS
 from mycode_cli.web_tools import build_web_tools
 from mycode_cli.workspace import CliDeps
 
 
-def sum_known_costs(*costs: float | None) -> float | None:
-    known = [cost for cost in costs if cost is not None]
-    return sum(known) if known else None
+async def load_session_totals(store: SessionStore, session_id: str) -> SessionTotals:
+    """Load the session's cumulative usage and USD cost from its raw JSONL timeline.
 
-
-async def load_session_cost(store: SessionStore, session_id: str) -> float | None:
-    """Load the session's cumulative USD cost from its raw JSONL timeline.
-
-    Counts persisted costs from tool loops, compact summaries, and turns
-    discarded by rewind. Records without a cost are skipped.
+    Counts tool loops, compact summaries, and turns discarded by rewind.
+    Records without usage or cost contribute nothing to that total.
     """
 
-    return sum_session_cost(await store.load_raw_messages(session_id))
+    return sum_session_totals(await store.load_raw_messages(session_id))
 
 
 def build_agent(

{mycode_cli-0.18.0 → mycode_cli-0.19.0}/src/mycode_cli/server/routers/chat.py

@@ -21,7 +21,7 @@ from mycode.attachments import (
     detect_document_mime_type,
     detect_image_mime_type,
 )
-from mycode.compact import has_compactable_history
+from mycode.compact import DEFAULT_COMPACT_THRESHOLD, has_compactable_history
 from mycode.messages import (
     ConversationMessage,
     build_message,
@@ -30,6 +30,7 @@ from mycode.messages import (
     image_block,
     text_block,
 )
+from mycode.models import ModelMetadata
 from mycode_cli.config import (
     ResolvedProvider,
     get_settings,
@@ -40,19 +41,21 @@ from mycode_cli.config import (
     resolve_provider_choices,
 )
 from mycode_cli.permissions import ToolReviewDecision, ToolReviewRequest
-from mycode_cli.runtime import build_agent, load_session_cost
+from mycode_cli.runtime import build_agent, load_session_totals
 from mycode_cli.server.deps import RunManagerDep, StoreDep, resolve_workspace_cwd
-from mycode_cli.server.run_manager import ActiveRunError
+from mycode_cli.server.run_manager import ActiveRunError, RunAgent
 from mycode_cli.server.schemas import (
     CancelRunResponse,
     ChatRequest,
     ChatResponse,
     CompactRequest,
-    CompactResponse,
     DecideRequest,
+    PendingInputRequest,
     RunInfo,
+    RunResponse,
     StatusResponse,
     StreamEvent,
+    UserInputRequest,
 )
 from mycode_cli.system_prompt import build_skill_snapshot_blocks, discover_slash_skills
 from mycode_cli.workspace import resolve_path
@@ -86,7 +89,7 @@ def _read_workspace_text_attachment(rel_path: str, *, name: str | None, cwd: str
         raise HTTPException(status_code=400, detail=str(exc)) from exc
 
 
-async def _build_user_message(chat: ChatRequest, cwd: str) -> ConversationMessage:
+async def _build_user_message(chat: UserInputRequest, cwd: str) -> ConversationMessage:
     if not chat.input:
         text = str(chat.message or "").strip()
         snapshots = await asyncio.to_thread(build_skill_snapshot_blocks, text, cwd)
@@ -143,6 +146,14 @@ async def _build_user_message(chat: ChatRequest, cwd: str) -> ConversationMessag
     return build_message("user", blocks)
 
 
+def _check_input_support(message: ConversationMessage, model: ModelMetadata | RunAgent) -> None:
+    content_types = {b.get("type") for b in (message.get("content") or []) if isinstance(b, dict)}
+    if "image" in content_types and not model.supports_image_input:
+        raise HTTPException(status_code=400, detail="current model does not support image input")
+    if "document" in content_types and not model.supports_pdf_input:
+        raise HTTPException(status_code=400, detail="current model does not support PDF input")
+
+
 def _validate_rewind_request(
     *,
     session: dict[str, Any] | None,
@@ -192,11 +203,7 @@ async def chat(chat: ChatRequest, store: StoreDep, runs: RunManagerDep) -> ChatR
         model=resolved.model,
         model_config=model_config,
     )
-    content_types = {b.get("type") for b in (user_message.get("content") or []) if isinstance(b, dict)}
-    if "image" in content_types and not model_meta.supports_image_input:
-        raise HTTPException(status_code=400, detail="current model does not support image input")
-    if "document" in content_types and not model_meta.supports_pdf_input:
-        raise HTTPException(status_code=400, detail="current model does not support PDF input")
+    _check_input_support(user_message, model_meta)
 
     reasoning_effort = resolved.reasoning_effort
     if "reasoning_effort" in chat.model_fields_set:
@@ -274,10 +281,11 @@ async def chat(chat: ChatRequest, store: StoreDep, runs: RunManagerDep) -> ChatR
         try:
             run = await runs.start_run(
                 session_id=session_id,
+                cwd=cwd,
                 user_message=user_message,
                 base_messages=agent.messages,
                 agent=agent,
-                session_cost_base=await load_session_cost(store, session_id),
+                session_base=await load_session_totals(store, session_id),
             )
         except ActiveRunError as exc:
             existing = await runs.get_run(exc.run_id)
@@ -339,7 +347,7 @@ async def compact_session(
     body: CompactRequest,
     store: StoreDep,
     runs: RunManagerDep,
-) -> CompactResponse:
+) -> RunResponse:
     """Start a compact run: summarize the session and append one compact marker."""
 
     async with runs.session_operation(session_id):
@@ -372,9 +380,10 @@ async def compact_session(
         try:
             run = await runs.start_compact(
                 session_id=session_id,
+                cwd=cwd,
                 base_messages=agent.messages,
                 agent=agent,
-                session_cost_base=data["session_cost"],
+                session_base=data["totals"],
                 on_complete=store.touch,
             )
         except ActiveRunError as exc:
@@ -384,7 +393,86 @@ async def compact_session(
                 detail["run"] = existing.info()
             raise HTTPException(status_code=409, detail=detail) from exc
 
-    return CompactResponse(run=RunInfo.model_validate(run))
+    return RunResponse(run=RunInfo.model_validate(run))
+
+
+@router.post("/runs/{run_id}/steer")
+async def steer_run(
+    run_id: Annotated[str, PathParam(min_length=1)], body: PendingInputRequest, runs: RunManagerDep
+) -> RunResponse:
+    """Hand a user message to the running chat for its next step boundary."""
+
+    state = await runs.get_run(run_id)
+    if state is None:
+        raise HTTPException(status_code=404, detail="run not found")
+    message = await _build_user_message(body, state.cwd)
+    message["meta"] = {"input_id": body.input_id}
+    _check_input_support(message, state.agent)
+    if not state.agent.steer(message):
+        raise HTTPException(
+            status_code=409,
+            detail={"message": "run is not accepting steers", "run": state.info()},
+        )
+    return RunResponse(run=RunInfo.model_validate(state.info()))
+
+
+@router.post("/sessions/{session_id}/queue")
+async def queue_message(
+    session_id: Annotated[str, PathParam(min_length=1)],
+    body: PendingInputRequest,
+    store: StoreDep,
+    runs: RunManagerDep,
+) -> RunResponse:
+    """Queue a user message as the next turn of the session's running chat."""
+
+    state = await runs.get_active_run(session_id)
+    if state is None:
+        raise HTTPException(status_code=409, detail={"message": "session has no running chat to queue on"})
+    message = await _build_user_message(body, state.cwd)
+    message["meta"] = {"input_id": body.input_id}
+    _check_input_support(message, state.agent)
+    if not await runs.enqueue(state, message):
+        raise HTTPException(status_code=409, detail={"message": "session has no running chat to queue on"})
+    await store.record_user_turn(
+        session_id,
+        cwd=state.cwd,
+        text=flatten_message_text(message, include_thinking=False),
+    )
+    return RunResponse(run=RunInfo.model_validate(state.info()))
+
+
+@router.delete("/sessions/{session_id}/queue/{input_id}")
+async def remove_queued_message(
+    session_id: Annotated[str, PathParam(min_length=1)],
+    input_id: Annotated[str, PathParam(min_length=1)],
+    runs: RunManagerDep,
+) -> RunResponse:
+    """Remove a queued message that has not been delivered."""
+
+    run = await runs.remove_queued(session_id, input_id)
+    if run is None:
+        raise HTTPException(status_code=404, detail="queued message not found")
+    return RunResponse(run=RunInfo.model_validate(run))
+
+
+@router.post("/sessions/{session_id}/queue/{input_id}/steer")
+async def steer_queued_message(
+    session_id: Annotated[str, PathParam(min_length=1)],
+    input_id: Annotated[str, PathParam(min_length=1)],
+    runs: RunManagerDep,
+) -> RunResponse:
+    """Move a queued message into the current turn, keeping it as built."""
+
+    state = await runs.get_active_run(session_id)
+    moved = None if state is None else await runs.steer_queued(state, input_id)
+    if state is None or moved is None:
+        raise HTTPException(status_code=404, detail="queued message not found")
+    if not moved:
+        raise HTTPException(
+            status_code=409,
+            detail={"message": "run is not accepting steers", "run": state.info()},
+        )
+    return RunResponse(run=RunInfo.model_validate(state.info()))
 
 
 @router.get("/config")
@@ -454,6 +542,10 @@ async def get_config(cwd: Annotated[str | None, Query()] = None) -> dict[str, An
         "cwd_exists": os.path.isdir(resolved_cwd),
         "project": settings.project,
         "config_paths": settings.config_paths,
+        # Effective for this cwd; 0 disables automatic compaction.
+        "compact_threshold": (
+            settings.compact_threshold if settings.compact_threshold is not None else DEFAULT_COMPACT_THRESHOLD
+        ),
         "skills": [{"name": skill.name, "description": skill.description} for skill in skills],
         "setup_error": setup_error,
     }

{mycode_cli-0.18.0 → mycode_cli-0.19.0}/src/mycode_cli/server/routers/sessions.py

@@ -11,6 +11,7 @@ from fastapi import Path as PathParam
 from mycode.messages import ConversationMessage
 from mycode_cli.server.deps import RunManagerDep, StoreDep, resolve_workspace_cwd
 from mycode_cli.server.schemas import SessionCreateRequest, StatusResponse
+from mycode_cli.sessions import SessionTotals
 
 router = APIRouter(prefix="/sessions", tags=["sessions"])
 
@@ -50,6 +51,21 @@ async def list_sessions(
     return {"sessions": sessions}
 
 
+@router.get("/search")
+async def search_sessions(
+    store: StoreDep,
+    runs: RunManagerDep,
+    q: Annotated[str, Query(min_length=1)],
+    cwd: Annotated[str | None, Query()] = None,
+    limit: Annotated[int, Query(ge=1)] = 50,
+) -> dict[str, Any]:
+    results = await store.search_sessions(q, cwd=cwd, limit=limit)
+    for result in results:
+        session = result["session"]
+        session["is_running"] = await runs.has_active_run(str(session["id"]))
+    return {"results": results}
+
+
 @router.get("/{session_id}")
 async def load_session(
     session_id: Annotated[str, PathParam(min_length=1)], store: StoreDep, runs: RunManagerDep
@@ -62,22 +78,31 @@ async def load_session(
             return {
                 "session": await store.load_metadata(session_id),
                 "messages": _redact_document_data(active["messages"]),
-                "session_cost": active["session_cost"],
+                **active["totals"].payload(),
                 "active_run": active["run"],
                 "pending_events": active["pending_events"],
+                "pending": {kind: _redact_document_data(messages) for kind, messages in active["pending"].items()},
             }
 
         data = await store.load_session(session_id)
 
     if data is None:
-        return {"session": None, "messages": [], "session_cost": None, "active_run": None, "pending_events": []}
+        return {
+            "session": None,
+            "messages": [],
+            **SessionTotals().payload(),
+            "active_run": None,
+            "pending_events": [],
+            "pending": {"steers": [], "queue": []},
+        }
 
     return {
         "session": data["session"],
         "messages": _redact_document_data(data["messages"]),
-        "session_cost": data["session_cost"],
+        **data["totals"].payload(),
         "active_run": None,
         "pending_events": [],
+        "pending": {"steers": [], "queue": []},
     }
 
 
@@ -90,14 +115,3 @@ async def delete_session(
             raise HTTPException(status_code=409, detail="session has a running task")
         await store.delete_session(session_id)
     return StatusResponse(status="ok")
-
-
-@router.post("/{session_id}/clear")
-async def clear_session(
-    session_id: Annotated[str, PathParam(min_length=1)], store: StoreDep, runs: RunManagerDep
-) -> StatusResponse:
-    async with runs.session_operation(session_id):
-        if await runs.has_active_run(session_id):
-            raise HTTPException(status_code=409, detail="session has a running task")
-        await store.clear_session(session_id)
-    return StatusResponse(status="ok")