mycode-cli 0.4.2__py3-none-any.whl → 0.5.0__py3-none-any.whl

mycode_cli/config.py

@@ -1,11 +1,4 @@
-"""Application configuration and provider resolution.
-
-This module keeps runtime config loading intentionally simple:
-
-- read the global config, then the workspace config
-- merge provider entries by name
-- resolve one runnable provider from explicit args, config defaults, or env
-"""
+"""Config loading, provider resolution, and CLI-owned filesystem paths."""
 
 from __future__ import annotations
 
@@ -27,9 +20,24 @@ from mycode.providers import (
     provider_default_models,
     provider_env_api_key_names,
 )
-from mycode.session import resolve_mycode_home
 from mycode.utils import as_bool, as_int
 
+_DEFAULT_MYCODE_HOME = "~/.mycode"
+
+
+def resolve_mycode_home() -> Path:
+    """Resolve the mycode home directory (``$MYCODE_HOME`` or ``~/.mycode``)."""
+
+    raw = os.environ.get("MYCODE_HOME", _DEFAULT_MYCODE_HOME)
+    return Path(raw).expanduser().resolve(strict=False)
+
+
+def resolve_sessions_dir() -> Path:
+    """Resolve the directory used for persisted sessions."""
+
+    return resolve_mycode_home() / "sessions"
+
+
 _API_KEY_ENV_REF_RE = re.compile(r"^\$\{([A-Za-z_][A-Za-z0-9_]*)\}$")
 # Full set of user-facing choices. "auto" means "do not send an explicit effort
 # to the provider" and is represented internally as `None` after normalization.

mycode_cli/main.py

@@ -13,7 +13,7 @@ import typer
 from mycode.agent import Agent
 from mycode.messages import ConversationMessage
 from mycode.session import SessionStore
-from mycode_cli.config import ResolvedProvider, Settings, get_settings, resolve_provider
+from mycode_cli.config import ResolvedProvider, Settings, get_settings, resolve_provider, resolve_sessions_dir
 
 from .runtime import ResolvedSession, build_agent, resolve_session
 from .tui.chat import TerminalChat
@@ -82,7 +82,7 @@ def _bootstrap(
         raise typer.BadParameter("--session and --continue are mutually exclusive")
 
     cwd = os.path.abspath(os.getcwd())
-    store = SessionStore()
+    store = SessionStore(data_dir=resolve_sessions_dir())
     view = TerminalView()
     settings = get_settings(cwd)
 
@@ -91,10 +91,7 @@ def _bootstrap(
         resolved_session = asyncio.run(
             resolve_session(
                 store=store,
-                provider=resolved_provider.provider,
                 cwd=cwd,
-                model=resolved_provider.model,
-                api_base=resolved_provider.api_base,
                 requested_session_id=session,
                 continue_last=continue_last,
             )
@@ -109,7 +106,6 @@ def _bootstrap(
         settings=settings,
         resolved_provider=resolved_provider,
         session_id=resolved_session.session_id,
-        messages=resolved_session.messages,
         max_turns=max_turns,
     )
 
@@ -222,7 +218,7 @@ def session_list(
     """List saved sessions."""
 
     cwd = os.path.abspath(os.getcwd())
-    store = SessionStore()
+    store = SessionStore(data_dir=resolve_sessions_dir())
     view = TerminalView()
 
     sessions = asyncio.run(store.list_sessions(cwd=None if all_workspaces else cwd))

mycode_cli/runtime.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from typing import Any
+from uuid import uuid4
 
 from mycode.agent import Agent
 from mycode.providers import (
@@ -48,22 +49,24 @@ def build_agent(
     settings: Settings,
     resolved_provider: ResolvedProvider,
     session_id: str,
-    messages: list[dict[str, Any]] | None = None,
     max_turns: int | None = None,
     reasoning_effort: str | None = None,
 ) -> Agent:
-    """Build an agent from the resolved provider, honoring model config overrides."""
+    """Build an agent from the resolved provider, honoring model config overrides.
 
-    model_config = _model_config_for(settings, resolved_provider)
+    History is auto-loaded from disk when ``session_id`` already exists under
+    the store; callers never pass messages explicitly.
+    """
+
+    model_config = model_config_for(settings, resolved_provider)
     return Agent(
         model=resolved_provider.model,
         provider=resolved_provider.provider,
         cwd=cwd,
-        session_dir=store.session_dir(session_id),
+        session_dir=store.data_dir,
         session_id=session_id,
         api_key=resolved_provider.api_key,
         api_base=resolved_provider.api_base,
-        messages=messages,
         reasoning_effort=reasoning_effort if reasoning_effort is not None else resolved_provider.reasoning_effort,
         max_tokens=model_config.max_output_tokens if model_config else None,
         context_window=model_config.context_window if model_config else None,
@@ -77,7 +80,7 @@ def build_agent(
     )
 
 
-def _model_config_for(settings: Settings, resolved: ResolvedProvider) -> ModelConfig | None:
+def model_config_for(settings: Settings, resolved: ResolvedProvider) -> ModelConfig | None:
     """Return the user-configured overrides for the resolved provider+model, if any."""
 
     provider_config = settings.providers.get(resolved.provider_name or "")
@@ -86,18 +89,20 @@ def _model_config_for(settings: Settings, resolved: ResolvedProvider) -> ModelCo
     return provider_config.models.get(resolved.model)
 
 
-def clone_agent(agent: Agent, *, store: SessionStore, session_id: str, messages: list[dict[str, Any]]) -> Agent:
-    """Keep the current runtime config while swapping session state."""
+def clone_agent(agent: Agent, *, store: SessionStore, session_id: str) -> Agent:
+    """Keep the current runtime config while swapping session state.
+
+    History auto-loads from disk when ``session_id`` exists under the store.
+    """
 
     return Agent(
         model=agent.model,
         provider=agent.provider,
         cwd=agent.cwd,
-        session_dir=store.session_dir(session_id),
+        session_dir=store.data_dir,
         session_id=session_id,
         api_key=agent.api_key,
         api_base=agent.api_base,
-        messages=messages,
         max_turns=agent.max_turns,
         max_tokens=agent.max_tokens,
         context_window=agent.context_window,
@@ -171,10 +176,7 @@ def supports_reasoning_effort(agent: Agent) -> bool:
 async def resolve_session(
     *,
     store: SessionStore,
-    provider: str,
     cwd: str,
-    model: str,
-    api_base: str | None,
     requested_session_id: str | None,
     continue_last: bool,
 ) -> ResolvedSession:
@@ -205,9 +207,9 @@ async def resolve_session(
                 "resumed",
             )
 
-    data = store.draft_session(None, provider=provider, model=model, cwd=cwd, api_base=api_base)
-    session = data.get("session") or {}
-    return ResolvedSession(str(session.get("id") or ""), session, [], "new")
+    # New sessions: the id is allocated here; the on-disk session is created
+    # lazily by Agent.achat on the first persist.
+    return ResolvedSession(uuid4().hex, {}, [], "new")
 
 
 def apply_resolved_provider(agent: Agent, resolved: ResolvedProvider, settings: Settings) -> bool:
@@ -233,7 +235,7 @@ def apply_resolved_provider(agent: Agent, resolved: ResolvedProvider, settings:
     agent.reasoning_effort = resolved.reasoning_effort
 
     if runtime_changed:
-        model_config = _model_config_for(settings, resolved)
+        model_config = model_config_for(settings, resolved)
         agent.refresh_capabilities(
             max_tokens=model_config.max_output_tokens if model_config else None,
             context_window=model_config.context_window if model_config else None,

mycode_cli/server/deps.py

@@ -8,6 +8,7 @@ from typing import Annotated
 from fastapi import Depends
 
 from mycode.session import SessionStore
+from mycode_cli.config import resolve_sessions_dir
 from mycode_cli.server.run_manager import RunManager
 
 
@@ -15,7 +16,7 @@ from mycode_cli.server.run_manager import RunManager
 def get_store() -> SessionStore:
     """Return the shared session store for server requests."""
 
-    return SessionStore()
+    return SessionStore(data_dir=resolve_sessions_dir())
 
 
 @lru_cache

mycode_cli/server/routers/chat.py

@@ -17,7 +17,6 @@ from fastapi.responses import StreamingResponse
 from mycode.messages import (
     build_message,
     document_block,
-    flatten_message_text,
     image_block,
     text_block,
 )
@@ -31,7 +30,7 @@ from mycode_cli.config import (
     resolve_provider,
     resolve_provider_choices,
 )
-from mycode_cli.runtime import build_agent
+from mycode_cli.runtime import build_agent, model_config_for
 from mycode_cli.server.deps import RunManagerDep, StoreDep
 from mycode_cli.server.run_manager import ActiveRunError, RunState
 from mycode_cli.server.schemas import ChatRequest, StreamEvent
@@ -165,19 +164,19 @@ async def chat(chat: ChatRequest, store: StoreDep, runs: RunManagerDep):
 
     data = await store.load_session(session_id)
     session = (data or {}).get("session")
-    messages = (data or {}).get("messages") or []
+    existing_messages = (data or {}).get("messages") or []
 
     if not session and chat.rewind_to is not None:
         raise HTTPException(status_code=400, detail="rewind_to requires an existing session")
 
     if chat.rewind_to is not None:
-        if not (0 <= chat.rewind_to < len(messages)):
+        if not (0 <= chat.rewind_to < len(existing_messages)):
             raise HTTPException(
                 status_code=400,
-                detail=f"rewind_to must reference a visible message index between 0 and {len(messages) - 1}",
+                detail=f"rewind_to must reference a visible message index between 0 and {len(existing_messages) - 1}",
             )
 
-        target = messages[chat.rewind_to]
+        target = existing_messages[chat.rewind_to]
         raw_blocks = target.get("content")
         blocks = raw_blocks if isinstance(raw_blocks, list) else []
         has_user_content = any(
@@ -194,7 +193,29 @@ async def chat(chat: ChatRequest, store: StoreDep, runs: RunManagerDep):
                 detail="rewind_to must reference a real user message",
             )
 
-        messages = messages[: chat.rewind_to]
+    # Capability check before any disk mutation — a failed check must not
+    # leave an empty session on disk or land a premature rewind marker.
+    model_config = model_config_for(settings, resolved)
+    caps = resolve_model_metadata(
+        provider=resolved.provider,
+        model=resolved.model,
+        supports_image_input=model_config.supports_image_input if model_config else None,
+        supports_pdf_input=model_config.supports_pdf_input if model_config else None,
+    )
+    content_types = {b.get("type") for b in (user_message.get("content") or []) if isinstance(b, dict)}
+    if "image" in content_types and not caps.supports_image_input:
+        raise HTTPException(status_code=400, detail="current model does not support image input")
+    if "document" in content_types and not caps.supports_pdf_input:
+        raise HTTPException(status_code=400, detail="current model does not support PDF input")
+
+    # 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.
+    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"]
 
     agent = build_agent(
         store=store,
@@ -202,37 +223,14 @@ async def chat(chat: ChatRequest, store: StoreDep, runs: RunManagerDep):
         settings=settings,
         resolved_provider=resolved,
         session_id=session_id,
-        messages=messages,
         reasoning_effort=reasoning_effort,
     )
 
-    content_types = {b.get("type") for b in (user_message.get("content") or []) if isinstance(b, dict)}
-    if "image" in content_types and not agent.supports_image_input:
-        raise HTTPException(status_code=400, detail="current model does not support image input")
-    if "document" in content_types and not agent.supports_pdf_input:
-        raise HTTPException(status_code=400, detail="current model does not support PDF input")
-
-    if not session:
-        title = flatten_message_text(user_message).replace("\n", " ").strip()[:48] or "New chat"
-        created = await store.create_session(
-            title,
-            session_id=session_id,
-            provider=resolved.provider,
-            model=resolved.model,
-            cwd=cwd,
-            api_base=resolved.api_base,
-        )
-        session = created["session"]
-
-    if chat.rewind_to is not None:
-        # Land the rewind marker before the agent appends the next user turn.
-        await store.append_rewind(session_id, chat.rewind_to)
-
     try:
         run = await runs.start_run(
             session_id=session_id,
             user_message=user_message,
-            base_messages=messages,
+            base_messages=agent.messages,
             agent=agent,
         )
     except ActiveRunError as exc:

mycode_cli/server/routers/sessions.py

@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import os
+from uuid import uuid4
 
 from fastapi import APIRouter, HTTPException
 
-from mycode_cli.config import get_settings, resolve_provider
 from mycode_cli.server.deps import RunManagerDep, StoreDep
 from mycode_cli.server.schemas import SessionCreateRequest
 
@@ -16,15 +16,8 @@ router = APIRouter(prefix="/sessions", tags=["sessions"])
 @router.post("")
 async def create_session(req: SessionCreateRequest, store: StoreDep):
     cwd = os.path.abspath(req.cwd or os.getcwd())
-    settings = get_settings(cwd)
-    resolved = resolve_provider(settings, provider_name=req.provider, model=req.model, api_base=req.api_base)
-    return await store.create_session(
-        req.title,
-        provider=resolved.provider,
-        model=resolved.model,
-        cwd=cwd,
-        api_base=resolved.api_base,
-    )
+    session_id = uuid4().hex
+    return await store.create_session(session_id, cwd=cwd)
 
 
 @router.get("")

mycode_cli/server/schemas.py

@@ -37,11 +37,7 @@ class ChatRequest(BaseModel):
 class SessionCreateRequest(BaseModel):
     """Request body for /sessions."""
 
-    title: str | None = None
-    provider: str | None = None
-    model: str | None = None
     cwd: str | None = None
-    api_base: str | None = None
 
 
 class ToolCallPayload(BaseModel):
@@ -60,8 +56,7 @@ class StreamEvent(BaseModel):
     delta: str | None = None  # text/reasoning
     tool_call: ToolCallPayload | None = None  # tool_start
     tool_use_id: str | None = None
-    output: str | None = None  # tool_output
-    model_text: str | None = None  # tool_done
-    display_text: str | None = None  # tool_done
+    output: str | None = None  # tool_output + tool_done
+    metadata: dict[str, Any] | None = None  # tool_done
     is_error: bool | None = None  # tool_done
     message: str | None = None  # error

mycode_cli/server/static/assets/{EditDiff-BCA9aTUr.js → EditDiff-WSvfoXLm.js}

@@ -1,4 +1,4 @@
-import{r as N,h as D,a as _,l as O,j as y,c as q,S as A}from"./index-C8gu4B-1.js";class R{diff(e,n,t={}){let l;typeof t=="function"?(l=t,t={}):"callback"in t&&(l=t.callback);const o=this.castInput(e,t),i=this.castInput(n,t),a=this.removeEmpty(this.tokenize(o,t)),s=this.removeEmpty(this.tokenize(i,t));return this.diffWithOptionsObj(a,s,t,l)}diffWithOptionsObj(e,n,t,l){var o;const i=m=>{if(m=this.postProcess(m,t),l){setTimeout(function(){l(m)},0);return}else return m},a=n.length,s=e.length;let r=1,d=a+s;t.maxEditLength!=null&&(d=Math.min(d,t.maxEditLength));const h=(o=t.timeout)!==null&&o!==void 0?o:1/0,x=Date.now()+h,f=[{oldPos:-1,lastComponent:void 0}];let p=this.extractCommon(f[0],n,e,0,t);if(f[0].oldPos+1>=s&&p+1>=a)return i(this.buildValues(f[0].lastComponent,n,e));let g=-1/0,P=1/0;const T=()=>{for(let m=Math.max(g,-r);m<=Math.min(P,r);m+=2){let v;const L=f[m-1],j=f[m+1];L&&(f[m-1]=void 0);let u=!1;if(j){const k=j.oldPos-m;u=j&&0<=k&&k<a}const w=L&&L.oldPos+1<s;if(!u&&!w){f[m]=void 0;continue}if(!w||u&&L.oldPos<j.oldPos?v=this.addToPath(j,!0,!1,0,t):v=this.addToPath(L,!1,!0,1,t),p=this.extractCommon(v,n,e,m,t),v.oldPos+1>=s&&p+1>=a)return i(this.buildValues(v.lastComponent,n,e))||!0;f[m]=v,v.oldPos+1>=s&&(P=Math.min(P,m-1)),p+1>=a&&(g=Math.max(g,m+1))}r++};if(l)(function m(){setTimeout(function(){if(r>d||Date.now()>x)return l(void 0);T()||m()},0)})();else for(;r<=d&&Date.now()<=x;){const m=T();if(m)return m}}addToPath(e,n,t,l,o){const i=e.lastComponent;return i&&!o.oneChangePerToken&&i.added===n&&i.removed===t?{oldPos:e.oldPos+l,lastComponent:{count:i.count+1,added:n,removed:t,previousComponent:i.previousComponent}}:{oldPos:e.oldPos+l,lastComponent:{count:1,added:n,removed:t,previousComponent:i}}}extractCommon(e,n,t,l,o){const i=n.length,a=t.length;let s=e.oldPos,r=s-l,d=0;for(;r+1<i&&s+1<a&&this.equals(t[s+1],n[r+1],o);)r++,s++,d++,o.oneChangePerToken&&(e.lastComponent={count:1,previousComponent:e.lastComponent,added:!1,removed:!1});return d&&!o.oneChangePerToken&&(e.lastComponent={count:d,previousComponent:e.lastComponent,added:!1,removed:!1}),e.oldPos=s,r}equals(e,n,t){return t.comparator?t.comparator(e,n):e===n||!!t.ignoreCase&&e.toLowerCase()===n.toLowerCase()}removeEmpty(e){const n=[];for(let t=0;t<e.length;t++)e[t]&&n.push(e[t]);return n}castInput(e,n){return e}tokenize(e,n){return Array.from(e)}join(e){return e.join("")}postProcess(e,n){return e}get useLongestToken(){return!1}buildValues(e,n,t){const l=[];let o;for(;e;)l.push(e),o=e.previousComponent,delete e.previousComponent,e=o;l.reverse();const i=l.length;let a=0,s=0,r=0;for(;a<i;a++){const d=l[a];if(d.removed)d.value=this.join(t.slice(r,r+d.count)),r+=d.count;else{if(!d.added&&this.useLongestToken){let h=n.slice(s,s+d.count);h=h.map(function(x,f){const p=t[r+f];return p.length>x.length?p:x}),d.value=this.join(h)}else d.value=this.join(n.slice(s,s+d.count));s+=d.count,d.added||(r+=d.count)}}return l}}class z extends R{constructor(){super(...arguments),this.tokenize=V}equals(e,n,t){return t.ignoreWhitespace?((!t.newlineIsToken||!e.includes(`
+import{r as N,h as D,a as _,l as O,j as y,c as q,S as A}from"./index-CzU-UeUh.js";class R{diff(e,n,t={}){let l;typeof t=="function"?(l=t,t={}):"callback"in t&&(l=t.callback);const o=this.castInput(e,t),i=this.castInput(n,t),a=this.removeEmpty(this.tokenize(o,t)),s=this.removeEmpty(this.tokenize(i,t));return this.diffWithOptionsObj(a,s,t,l)}diffWithOptionsObj(e,n,t,l){var o;const i=m=>{if(m=this.postProcess(m,t),l){setTimeout(function(){l(m)},0);return}else return m},a=n.length,s=e.length;let r=1,d=a+s;t.maxEditLength!=null&&(d=Math.min(d,t.maxEditLength));const h=(o=t.timeout)!==null&&o!==void 0?o:1/0,x=Date.now()+h,f=[{oldPos:-1,lastComponent:void 0}];let p=this.extractCommon(f[0],n,e,0,t);if(f[0].oldPos+1>=s&&p+1>=a)return i(this.buildValues(f[0].lastComponent,n,e));let g=-1/0,P=1/0;const T=()=>{for(let m=Math.max(g,-r);m<=Math.min(P,r);m+=2){let v;const L=f[m-1],j=f[m+1];L&&(f[m-1]=void 0);let u=!1;if(j){const k=j.oldPos-m;u=j&&0<=k&&k<a}const w=L&&L.oldPos+1<s;if(!u&&!w){f[m]=void 0;continue}if(!w||u&&L.oldPos<j.oldPos?v=this.addToPath(j,!0,!1,0,t):v=this.addToPath(L,!1,!0,1,t),p=this.extractCommon(v,n,e,m,t),v.oldPos+1>=s&&p+1>=a)return i(this.buildValues(v.lastComponent,n,e))||!0;f[m]=v,v.oldPos+1>=s&&(P=Math.min(P,m-1)),p+1>=a&&(g=Math.max(g,m+1))}r++};if(l)(function m(){setTimeout(function(){if(r>d||Date.now()>x)return l(void 0);T()||m()},0)})();else for(;r<=d&&Date.now()<=x;){const m=T();if(m)return m}}addToPath(e,n,t,l,o){const i=e.lastComponent;return i&&!o.oneChangePerToken&&i.added===n&&i.removed===t?{oldPos:e.oldPos+l,lastComponent:{count:i.count+1,added:n,removed:t,previousComponent:i.previousComponent}}:{oldPos:e.oldPos+l,lastComponent:{count:1,added:n,removed:t,previousComponent:i}}}extractCommon(e,n,t,l,o){const i=n.length,a=t.length;let s=e.oldPos,r=s-l,d=0;for(;r+1<i&&s+1<a&&this.equals(t[s+1],n[r+1],o);)r++,s++,d++,o.oneChangePerToken&&(e.lastComponent={count:1,previousComponent:e.lastComponent,added:!1,removed:!1});return d&&!o.oneChangePerToken&&(e.lastComponent={count:d,previousComponent:e.lastComponent,added:!1,removed:!1}),e.oldPos=s,r}equals(e,n,t){return t.comparator?t.comparator(e,n):e===n||!!t.ignoreCase&&e.toLowerCase()===n.toLowerCase()}removeEmpty(e){const n=[];for(let t=0;t<e.length;t++)e[t]&&n.push(e[t]);return n}castInput(e,n){return e}tokenize(e,n){return Array.from(e)}join(e){return e.join("")}postProcess(e,n){return e}get useLongestToken(){return!1}buildValues(e,n,t){const l=[];let o;for(;e;)l.push(e),o=e.previousComponent,delete e.previousComponent,e=o;l.reverse();const i=l.length;let a=0,s=0,r=0;for(;a<i;a++){const d=l[a];if(d.removed)d.value=this.join(t.slice(r,r+d.count)),r+=d.count;else{if(!d.added&&this.useLongestToken){let h=n.slice(s,s+d.count);h=h.map(function(x,f){const p=t[r+f];return p.length>x.length?p:x}),d.value=this.join(h)}else d.value=this.join(n.slice(s,s+d.count));s+=d.count,d.added||(r+=d.count)}}return l}}class z extends R{constructor(){super(...arguments),this.tokenize=V}equals(e,n,t){return t.ignoreWhitespace?((!t.newlineIsToken||!e.includes(`
 `))&&(e=e.trim()),(!t.newlineIsToken||!n.includes(`
 `))&&(n=n.trim())):t.ignoreNewlineAtEof&&!t.newlineIsToken&&(e.endsWith(`
 `)&&(e=e.slice(0,-1)),n.endsWith(`