mycode-cli 0.13.0__py3-none-any.whl → 0.13.2__py3-none-any.whl

mycode_cli/main.py

@@ -14,7 +14,6 @@ import typer
 
 from mycode.agent import Agent
 from mycode.messages import ConversationMessage
-from mycode.session import SessionStore
 from mycode_cli import __version__
 from mycode_cli.config import (
     ResolvedProvider,
@@ -26,6 +25,7 @@ from mycode_cli.config import (
     resolve_sessions_dir,
 )
 from mycode_cli.permissions import PERMISSION_DENIED_BY_USER_OUTPUT, PERMISSION_DENIED_OUTPUT
+from mycode_cli.sessions import SessionStore
 
 from .runtime import build_agent
 from .tui.chat import TerminalChat
@@ -83,8 +83,7 @@ async def resolve_session(
                 "resumed",
             )
 
-    # New sessions: the id is allocated here; the on-disk session is created
-    # lazily by Agent.achat on the first persist.
+    # The catalog and timeline are both created lazily on the first user turn.
     return ResolvedSession(uuid4().hex, {}, [], "new")
 
 
@@ -95,9 +94,10 @@ def _show_version(value: bool) -> None:
     raise typer.Exit()
 
 
-async def run_noninteractive(agent: Agent, message: str) -> int:
+async def run_noninteractive(agent: Agent, message: str, *, store: SessionStore, cwd: str) -> int:
     """Run one message non-interactively and print only the final assistant reply."""
 
+    await store.record_user_turn(agent.session_id, cwd=cwd, text=message)
     latest_assistant: ConversationMessage | None = None
 
     async def track(payload: ConversationMessage) -> None:
@@ -304,7 +304,9 @@ def run(
         reasoning_effort=reasoning_effort,
     )
 
-    code = asyncio.run(run_noninteractive(setup.agent, " ".join(message).strip()))
+    code = asyncio.run(
+        run_noninteractive(setup.agent, " ".join(message).strip(), store=setup.store, cwd=setup.settings.cwd)
+    )
     raise SystemExit(code)
 
 

mycode_cli/permissions.py

@@ -9,9 +9,9 @@ from pathlib import Path
 from typing import Literal, NamedTuple
 
 from mycode import Hooks, ToolExecutionResult, ToolHookContext
-from mycode.utils import resolve_path
 from mycode_cli.config import PermissionConfig, PermissionLevel, Settings
 from mycode_cli.system_prompt import discover_skills
+from mycode_cli.workspace import CliDeps, resolve_path
 
 PermissionTier = Literal["readonly", "safe", "standard", "yolo"]
 PermissionDecision = Literal["allow", "ask", "deny"]
@@ -78,8 +78,8 @@ def build_permission_hooks(
     skill_roots = [Path(s.path).parent.resolve(strict=False) for s in discover_skills(settings.cwd)]
 
     @hooks.before_tool
-    async def check_permission(ctx: ToolHookContext) -> ToolExecutionResult | None:
-        check = classify_tool(ctx, cwd=settings.cwd, project=settings.project, skill_roots=skill_roots)
+    async def check_permission(ctx: ToolHookContext[CliDeps]) -> ToolExecutionResult | None:
+        check = classify_tool(ctx, project=settings.project, skill_roots=skill_roots)
         decision = permission_decision(settings.permission, check.tier)
         if decision == "allow":
             return None
@@ -111,9 +111,8 @@ def permission_decision(permission: PermissionConfig, tier: PermissionTier) -> P
 
 
 def classify_tool(
-    ctx: ToolHookContext,
+    ctx: ToolHookContext[CliDeps],
     *,
-    cwd: str,
     project: str,
     skill_roots: list[Path],
 ) -> PermissionCheck:
@@ -133,11 +132,11 @@ def classify_tool(
 
     if name in {"read", "write", "edit"}:
         raw = str(ctx.tool_input.get("path") or "")
-        path = resolve_path(raw, cwd=cwd)
+        path = resolve_path(raw, cwd=ctx.deps.cwd)
         project_path = Path(project).resolve(strict=False)
         preview = raw or str(path)
         if name == "read" and (
-            path.is_relative_to(ctx.tool_output_dir.resolve(strict=False))
+            path.is_relative_to(ctx.deps.tool_output_dir.resolve(strict=False))
             or any(path.is_relative_to(root) for root in skill_roots)
         ):
             return PermissionCheck("readonly", preview)

mycode_cli/runtime.py

@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 from mycode.agent import Agent
-from mycode.session import SessionStore
 from mycode_cli.config import ResolvedProvider, Settings
 from mycode_cli.permissions import ToolReviewCallback, build_permission_hooks
+from mycode_cli.sessions import SessionStore
 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:
@@ -58,7 +59,6 @@ def build_agent(
     return Agent(
         model=resolved_provider.model,
         provider=resolved_provider.provider,
-        cwd=cwd,
         session_dir=store.data_dir,
         session_id=session_id,
         api_key=resolved_provider.api_key,
@@ -74,4 +74,5 @@ def build_agent(
         system=build_system_prompt(cwd, settings),
         tools=[*DEFAULT_TOOLS, *build_web_tools(settings.web)],
         hooks=hooks,
+        deps=CliDeps.for_session(cwd=cwd, data_dir=store.data_dir, session_id=session_id),
     )

mycode_cli/server/deps.py

@@ -8,9 +8,9 @@ from typing import Annotated
 
 from fastapi import Depends, HTTPException
 
-from mycode.session import SessionStore
 from mycode_cli.config import resolve_sessions_dir
 from mycode_cli.server.run_manager import RunManager
+from mycode_cli.sessions import SessionStore
 
 
 def resolve_workspace_cwd(raw: str | None) -> str:

mycode_cli/server/routers/chat.py

@@ -26,11 +26,11 @@ from mycode.messages import (
     ConversationMessage,
     build_message,
     document_block,
+    flatten_message_text,
     image_block,
     text_block,
 )
 from mycode.providers import provider_default_models
-from mycode.utils import resolve_path
 from mycode_cli.config import (
     ResolvedProvider,
     get_settings,
@@ -55,6 +55,7 @@ from mycode_cli.server.schemas import (
     StreamEvent,
 )
 from mycode_cli.system_prompt import build_skill_snapshot_blocks, discover_slash_skills
+from mycode_cli.workspace import resolve_path
 
 router = APIRouter()
 
@@ -80,7 +81,7 @@ def _read_workspace_text_attachment(rel_path: str, *, name: str | None, cwd: str
     if detect_image_mime_type(path) or detect_document_mime_type(path):
         raise HTTPException(status_code=400, detail=f"not a text file: {rel_path}")
     try:
-        return build_attachment_blocks([Attachment.path(path, name=name or rel_path)], cwd=cwd)
+        return build_attachment_blocks([Attachment.path(path, name=name or rel_path)])
     except ValueError as exc:
         raise HTTPException(status_code=400, detail=str(exc)) from exc
 
@@ -100,12 +101,7 @@ async def _build_user_message(chat: ChatRequest, cwd: str) -> ConversationMessag
                 continue
             text = block.text or ""
             if block.is_attachment:
-                blocks.extend(
-                    build_attachment_blocks(
-                        [Attachment.text(text, name=str(block.name or "attached-file"))],
-                        cwd=cwd,
-                    )
-                )
+                blocks.extend(build_attachment_blocks([Attachment.text(text, name=str(block.name or "attached-file"))]))
             elif text:
                 visible_text.append(text)
                 blocks.append(text_block(text))
@@ -245,14 +241,16 @@ async def chat(chat: ChatRequest, store: StoreDep, runs: RunManagerDep) -> ChatR
         existing_messages = data["messages"] if data else []
         _validate_rewind_request(session=session, messages=existing_messages, rewind_to=chat.rewind_to)
 
-        # All validation passed. Land the rewind marker (if any) and create the
-        # session so the response payload has a meta dict and the agent's
-        # auto-resume sees the correct on-disk state.
+        # All validation passed. Land the rewind marker (if any) and register
+        # the user turn in the catalog: first turn creates the entry and sets
+        # the title, later turns bump updated_at.
         if chat.rewind_to is not None:
             await store.append_rewind(session_id, chat.rewind_to)
-        if not session:
-            created = await store.create_session(session_id, cwd=cwd)
-            session = created["session"]
+        session = await store.record_user_turn(
+            session_id,
+            cwd=cwd,
+            text=flatten_message_text(user_message, include_thinking=False),
+        )
 
         async def review(request: ToolReviewRequest) -> ToolReviewDecision:
             # Bridge before_tool review waits to SSE events on the active run.
@@ -376,6 +374,7 @@ async def compact_session(
                 session_id=session_id,
                 base_messages=agent.messages,
                 agent=agent,
+                on_complete=store.touch,
             )
         except ActiveRunError as exc:
             existing = await runs.get_run(exc.run_id)

mycode_cli/server/routers/sessions.py

@@ -34,8 +34,8 @@ def _redact_document_data(messages: list[ConversationMessage]) -> list[dict[str,
 async def create_session(req: SessionCreateRequest, store: StoreDep) -> dict[str, Any]:
     cwd = resolve_workspace_cwd(req.cwd)
     session_id = uuid4().hex
-    data = await store.create_session(session_id, cwd=cwd)
-    return {"session": data["session"], "messages": data["messages"]}
+    session = await store.create_session(session_id, cwd=cwd)
+    return {"session": session, "messages": []}
 
 
 @router.get("")

mycode_cli/server/run_manager.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import asyncio
 import copy
 import time
-from collections.abc import AsyncGenerator, AsyncIterator, Awaitable
+from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable
 from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field
 from typing import Any, Literal, Protocol
@@ -18,6 +18,7 @@ from mycode_cli.runtime import sum_known_costs
 
 RunStatus = Literal["running", "completed", "failed", "cancelled"]
 RunKind = Literal["chat", "compact"]
+RunCompletionCallback = Callable[[str], Awaitable[None]]
 FINISHED_RUN_TTL_SECONDS = 300
 RUN_EVENT_BUFFER_SIZE = 2000
 RUN_TOOL_OUTPUT_BUFFER_BYTES = 1_000_000
@@ -62,6 +63,7 @@ class RunState:
     # Session cost before this run (folded from the session JSONL by the chat
     # router); None means unknown. Composed with each usage event's turn cost.
     session_cost_base: float | None = None
+    on_complete: RunCompletionCallback | None = None
     status: RunStatus = "running"
     error: str | None = None
     events: list[dict[str, Any]] = field(default_factory=list)
@@ -121,6 +123,7 @@ class RunManager:
         session_id: str,
         base_messages: list[ConversationMessage],
         agent: RunAgent,
+        on_complete: RunCompletionCallback | None = None,
     ) -> dict[str, Any]:
         return await self._start(
             session_id=session_id,
@@ -128,6 +131,7 @@ class RunManager:
             user_message=None,
             base_messages=base_messages,
             agent=agent,
+            on_complete=on_complete,
         )
 
     async def _start(
@@ -139,6 +143,7 @@ class RunManager:
         base_messages: list[ConversationMessage],
         agent: RunAgent,
         session_cost_base: float | None = None,
+        on_complete: RunCompletionCallback | None = None,
     ) -> dict[str, Any]:
         await self._prune_finished_runs()
 
@@ -155,6 +160,7 @@ class RunManager:
                 session_cost_base=session_cost_base,
                 base_messages=copy.deepcopy(base_messages),
                 agent=agent,
+                on_complete=on_complete,
             )
             state.task = asyncio.create_task(self._run(state), name=f"mycode-run-{state.id}")
             self._active_by_session[session_id] = state
@@ -323,6 +329,8 @@ class RunManager:
             if state.kind == "compact":
                 # The agent persists the compact marker before this returns.
                 await state.agent.acompact()
+                if state.on_complete is not None:
+                    await state.on_complete(state.session_id)
                 await self._append_event(state, Event("compact", {}))
             else:
                 assert state.user_message is not None

mycode_cli/server/static/assets/{EditDiff-DKu81Ilp.js → EditDiff-DOjxGJl-.js}

@@ -111,4 +111,4 @@ diff --git`)}function xa(e,t){if(e.length===0)return[``];let n=`\n${t}`,r=e.star
     ),
     var(--diffs-bg);
 }
-`;function Oo({patch:e}){let{resolvedTheme:t}=r();return(0,N.jsx)(`div`,{className:`rounded-md bg-code overflow-hidden`,children:(0,N.jsx)(Co,{patch:e,style:{...Eo,colorScheme:t},disableWorkerPool:!0,options:{theme:To,themeType:t,diffStyle:`unified`,diffIndicators:`classic`,disableFileHeader:!0,hunkSeparators:`simple`,overflow:`scroll`,unsafeCSS:Do}})})}export{Oo as default};
+`;function Oo({patch:e}){let{resolvedTheme:t}=r();return(0,N.jsx)(`div`,{className:`rounded-md bg-code shadow-hairline overflow-hidden`,children:(0,N.jsx)(Co,{patch:e,style:{...Eo,colorScheme:t},disableWorkerPool:!0,options:{theme:To,themeType:t,diffStyle:`unified`,diffIndicators:`classic`,disableFileHeader:!0,hunkSeparators:`simple`,overflow:`scroll`,unsafeCSS:Do}})})}export{Oo as default};