python-codex 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

pycodex/utils/compactor.py

@@ -22,6 +22,7 @@ Include:
 - Important context, constraints, or user preferences
 - What remains to be done (clear next steps)
 - Any critical data, examples, or references needed to continue
+- Preserve concise verbatim excerpts of the latest user request and active constraints in their original language, and write the summary in the user's primary language.
 
 Be concise, structured, and focused on helping the next LLM seamlessly continue the work."""
 
@@ -31,15 +32,10 @@ SUMMARY_PREFIX = (
     "that were used by that language model. Use this to build on the work that "
     "has already been done and avoid duplicating work. Here is the summary "
     "produced by the other language model, use the information in this summary "
-    "to assist with your own analysis:"
+    "to assist with your own analysis. Continue the current task directly; do "
+    "not merely repeat or acknowledge the handoff:"
 )
 
-COMPACT_USER_MESSAGE_MAX_TOKENS = 20_000
-_APPROX_CHARS_PER_TOKEN = 4
-_SUBAGENT_NOTIFICATION_PREFIX = "<subagent_notification>\n"
-_EXEC_COMMAND_COMPLETED_PREFIX = "<exec_command_completed>\n"
-
-
 @dataclass(frozen=True)
 class CompactResult:
     history: 'typing.Tuple[ConversationItem, ...]'
@@ -67,8 +63,7 @@ def compact(
     history: 'typing.Sequence[ConversationItem]',
 ) -> 'typing.Tuple[ConversationItem, ...]':
     summary_text = _build_summary_message(_last_assistant_message(history))
-    user_messages = collect_user_messages(history)
-    return build_compacted_history(user_messages, summary_text)
+    return build_compacted_history(summary_text)
 
 
 async def compact_agent(
@@ -159,53 +154,10 @@ def prune_oldest_tool_response(
     )
 
 
-def collect_user_messages(
-    history: 'typing.Sequence[ConversationItem]',
-) -> 'typing.Tuple[str, ...]':
-    compact_prompt = _normalize_for_compare(DEFAULT_COMPACT_PROMPT)
-    collected: 'typing.List[str]' = []
-    for item in history:
-        if not isinstance(item, UserMessage):
-            continue
-        if is_summary_message(item.text):
-            continue
-        if _normalize_for_compare(item.text) == compact_prompt:
-            continue
-        if _is_synthetic_user_message(item.text):
-            continue
-        collected.append(item.text)
-    return tuple(collected)
-
-
-def is_summary_message(message: 'str') -> 'bool':
-    return message.startswith(f"{SUMMARY_PREFIX}\n")
-
-
 def build_compacted_history(
-    user_messages: 'typing.Sequence[str]',
     summary_text: 'str',
-    max_tokens: 'int' = COMPACT_USER_MESSAGE_MAX_TOKENS,
 ) -> 'typing.Tuple[ConversationItem, ...]':
-    selected_messages: 'typing.List[str]' = []
-    if max_tokens > 0:
-        remaining = max_tokens
-        for message in reversed(tuple(user_messages)):
-            if remaining <= 0:
-                break
-            tokens = _approx_token_count(message)
-            if tokens <= remaining:
-                selected_messages.append(message)
-                remaining -= tokens
-                continue
-            selected_messages.append(_truncate_text_to_tokens(message, remaining))
-            break
-        selected_messages.reverse()
-
-    compacted: 'typing.List[ConversationItem]' = [
-        UserMessage(text=message) for message in selected_messages
-    ]
-    compacted.append(UserMessage(text=summary_text or _build_summary_message(None)))
-    return tuple(compacted)
+    return (UserMessage(text=summary_text or _build_summary_message(None)),)
 
 
 def _last_assistant_message(
@@ -222,46 +174,12 @@ def _build_summary_message(summary_text: 'typing.Union[str, None]') -> 'str':
     return f"{SUMMARY_PREFIX}\n{normalized}"
 
 
-def _approx_token_count(text: 'str') -> 'int':
-    if not text:
-        return 0
-    return max(1, (len(text) + _APPROX_CHARS_PER_TOKEN - 1) // _APPROX_CHARS_PER_TOKEN)
-
-
-def _truncate_text_to_tokens(text: 'str', max_tokens: 'int') -> 'str':
-    if max_tokens <= 0:
-        return ""
-    max_chars = max(max_tokens, 1) * _APPROX_CHARS_PER_TOKEN
-    if len(text) <= max_chars:
-        return text
-
-    removed_tokens = _approx_token_count(text[max_chars:])
-    suffix = f"\n...[{removed_tokens} tokens truncated]..."
-    available = max_chars - len(suffix)
-    if available <= 0:
-        return suffix.lstrip()
-    return text[:available].rstrip() + suffix
-
-
-def _normalize_for_compare(text: 'str') -> 'str':
-    return "\n".join(line.rstrip() for line in text.strip().splitlines()).strip()
-
-
 def _pluralize(noun: 'str', count: 'int') -> 'str':
     if count == 1:
         return noun
     return f"{noun}s"
 
 
-def _is_synthetic_user_message(text: 'str') -> 'bool':
-    return text.startswith(
-        (
-            _SUBAGENT_NOTIFICATION_PREFIX,
-            _EXEC_COMMAND_COMPLETED_PREFIX,
-        )
-    )
-
-
 def _is_context_length_error(message: 'str') -> 'bool':
     lower = message.lower()
     return (

{python_codex-0.2.4.dist-info → python_codex-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-codex
-Version: 0.2.4
+Version: 0.2.6
 Summary: A minimal Python extraction of Codex's main agent loop
 License-File: LICENSE
 Requires-Python: >=3.6.2
@@ -23,8 +23,17 @@ Description-Content-Type: text/markdown
 
 English README. Chinese version: `README_ZH.md`
 
-PyPI distribution name: `python-codex`  
-Import path and CLI command remain `pycodex`.
+PyPI distributions:
+
+- Primary package: `python-codex`
+- Workspace install alias: `pycodex-ws`
+
+The import path remains `pycodex`; the CLI commands are `pycodex` and
+`pycodex-ws`.
+
+`pycodex-ws` is a thin metapackage that depends on the exact matching
+`python-codex` version. The implementation and console script remain owned by
+`python-codex`, so the two distributions never install duplicate modules.
 
 This repository extracts the core Codex agent loop from upstream Codex
 (`https://github.com/openai/codex`) into a deliberately small Python version,
@@ -44,6 +53,13 @@ Relevant Rust reference points:
 
 ## Quick Start
 
+Install the full package or the workspace-oriented alias:
+
+```bash
+pip install python-codex
+pip install pycodex-ws
+```
+
 Install dependencies first:
 
 ```bash
@@ -179,7 +195,8 @@ Current behavior:
 - interactive mode shows a compact event stream for user-visible phases such as
   tool execution and model follow-up after tool results
 - assistant text is printed from streaming deltas directly
-- interactive mode supports `/history`, `/title`, `/model`, `/resume`, and `/compact`
+- interactive mode supports `/history`, `/title`, `/model`, `/resume`, `/compact`,
+  and `/fork`
 - `/model <name>` switches the model used by later turns in the current
   interactive session; `/model` shows the current model and available choices
 - `/resume` with no argument lists the currently resumable sessions by their
@@ -189,9 +206,15 @@ Current behavior:
 - `/compact` synthesizes a local handoff summary, replaces the in-memory
   conversation history with the compacted view, and appends a compacted-history
   entry to the rollout so later `/resume` sees the same state
+- `/fork` generates a new model session id while preserving the current history,
+  rollout, and workspace tab
 - `model_auto_compact_token_limit = <tokens>` in `config.toml` enables the same
   compaction path automatically when the latest reported usage reaches that
   threshold before a follow-up sampling request or the next user turn
+- `service_tier = "fast"` enables Fast mode for models whose vendored metadata
+  advertises the `priority` service tier; pycodex follows upstream Codex by
+  sending `service_tier = "priority"` on the Responses request, while
+  `service_tier = "default"` or unsupported tiers are omitted
 - if a model request fails with `context_length_exceeded`, pycodex now treats
   the provider-reported requested token count as a failed-request usage sample,
   triggers the same compact path immediately, and retries the request once; if
@@ -219,8 +242,13 @@ Current behavior:
   `delete(name)` controls; omitted names become `workspace-1`, `workspace-2`,
   etc. If `board` is omitted when adding a workspace, pycodex assigns a random
   writable `/tmp/pcws-*.html` board path. Add/delete actions and later
-  session-state saves refresh the JSON file. `--password <value>` enables a
-  password-only login page for workspace pages, APIs, and websocket connections.
+  session-state saves refresh the JSON file. Board HTML can reference local
+  images beside the board (including nested paths) with relative URLs; only
+  `image/*` files contained by the board directory are served.
+  Assistant Markdown supports KaTeX formulas with `$...$`, `$$...$$`,
+  `\(...\)`, and `\[...\]` delimiters.
+  `--password <value>` enables a password-only login page for workspace pages,
+  APIs, and websocket connections.
 - steer is enabled by default in interactive mode: normal input goes into the
   runtime steer path, the current request stops at the next safe boundary, and
   later steer text is appended to the next model request's `input` in order;

{python_codex-0.2.4.dist-info → python_codex-0.2.6.dist-info}/RECORD

@@ -3,12 +3,13 @@ pycodex/agent.py,sha256=HKzWVFRag_Le8LVR1qqfdfVzk23bRsXkykZV8Zq2hLE,21659
 pycodex/cli.py,sha256=1wTlt3ccgQqczrWBV3IjUVE0_L2QUlfPZEf6GB-tGZY,20983
 pycodex/collaboration.py,sha256=yQ6pBD-R3ZWR4_FAYQFoS7KF0m4LLD42otXIbPqw2ys,641
 pycodex/compat.py,sha256=l35JE0vGAOCn9NWbWbqwGURGk83HXddXQ5wJIfcG41o,3254
-pycodex/context.py,sha256=uI8y7V7L3VsXuDBljXWhP5tQRJM6MYQtoeEu2oSIJb4,26689
+pycodex/context.py,sha256=NRCJpYpEm76cAK1akid0BvQ-Z0mAvw1ZNboVxjPtm6U,26219
 pycodex/doctor.py,sha256=De3M4hRBJq8ZeqsUJgHz0vitqrH18YugrEnz7oHhTdQ,10572
 pycodex/feishu_card.py,sha256=De6pM--3MfhgGo-WcWfhm-fop5UtzjwKrZ4gI2Lls3w,26198
 pycodex/feishu_link.py,sha256=DDQCYXQXgo_2SpXPyWlK8KYcumNO1-sqFuQDsEMQpTg,16427
-pycodex/interactive_session.py,sha256=pcIC_GvQuqQSsjzcTTFB_crrS-XVufAGplJZxnHgy7I,15769
-pycodex/model.py,sha256=O5Gf35qCMAGrqvr_5d1ZQNk3vHmNRD5Uv-8k7-zbpXg,36679
+pycodex/interactive_session.py,sha256=WzOD06d43ckF7SPer12JKzUPIK42Djw4kEjFRdM6_Lw,16420
+pycodex/model.py,sha256=2euikRqEuemeCv0gyyITCyuTdEOTK9yT50HIzd75Vtg,41808
+pycodex/model_metadata.py,sha256=7fHntKSUXhG5eASJi4yw4jU_IyzGbYBp-WE6af19ATA,877
 pycodex/portable.py,sha256=gxl2E2h5uZJbasMEPPs-nyALFPIvX79T2ZYsu6vXZrg,15656
 pycodex/portable_server.py,sha256=6I3pQkWj3e_SFlDXY2mGdCPns1w_3PSxByBV9wv5epI,7331
 pycodex/protocol.py,sha256=4qiEcBQc3d3RZqsIKBjwORsHsQa78cqwvNljtnIuNbM,10795
@@ -17,7 +18,7 @@ pycodex/runtime_services.py,sha256=6PQMI4MM8F9imijaVKBIz_0ADtoKDcdYs6vQ-c4frtQ,1
 pycodex/prompts/collaboration_default.md,sha256=MBTmPuMubeWfZgIeFVj49wwnwD4n_o3fVYAbgWKwu6Q,955
 pycodex/prompts/collaboration_plan.md,sha256=IzjQAA5oHJz-3FmJdOjsJ4LHq6LW1tlEYMoy09n0HKk,8777
 pycodex/prompts/default_base_instructions.md,sha256=D65mcj6bo4CDvVom-D9cbJRJVNquo0NghKt164_fRsg,20923
-pycodex/prompts/models.json,sha256=D9AdqWpvxkhN6y4k3G6tJsjQFj99ATb4mjwGRcggWa8,349617
+pycodex/prompts/models.json,sha256=Q3xyyqb6_c8_b3RN-0r0x2rpa-RUq5nxiCBtMdE8cZU,458204
 pycodex/prompts/permissions/approval_policy/never.md,sha256=QceTG6wjkaJARjYr0HYV1aPnPcpGcrkRUW-smWRr6MQ,120
 pycodex/prompts/permissions/approval_policy/on_failure.md,sha256=dfJjpXkpO6_ANdCKxbVJ8o4vyLxevrJWfKsGHTqtbkc,289
 pycodex/prompts/permissions/approval_policy/on_request.md,sha256=hVQalzh0FAdkKzw5u-N4H7-LtC9ijVDlYsh3OKsZKzo,3661
@@ -46,7 +47,7 @@ pycodex/tools/send_input_tool.py,sha256=vRg-f7LI2Sr01j1LeCPKeXto_ROQZ7bcUC5GIjx9
 pycodex/tools/shell_command_tool.py,sha256=wUw4lw8VLGIQ-7BIgyEsI0oqjj-Yr-MZn-_VDrnimAw,4202
 pycodex/tools/shell_tool.py,sha256=1m-Tcbn3His4ggyK5ec8Mkg6ihopqTvBd9F6fJlm6m4,4054
 pycodex/tools/spawn_agent_tool.py,sha256=7Me4Frjz7_fTpjMMFCvNmDHPOK2G1qTfXUr2Ugs61bU,6194
-pycodex/tools/unified_exec_manager.py,sha256=cKW_YNjSweVlGt8xNdeK_7gVwsGXxumCqjr-OlW5Xe0,12868
+pycodex/tools/unified_exec_manager.py,sha256=YM0mKGygkprV51iAgt-A2YXJCG8Fyg3wuGGHktXuuQM,13957
 pycodex/tools/update_plan_tool.py,sha256=UsChtCBqI1RnVnPQbByPmD2LMZXMoCwfe6NpGqP8qu0,3174
 pycodex/tools/view_image_tool.py,sha256=2Xu5Vx7djVpz7-IV-LKrDKJjvVJc9AND-MFXp3CWplg,3892
 pycodex/tools/wait_agent_tool.py,sha256=0Uj9-IrXe2dSvOtOMq-RAc0XzaidwFH5q7Mri3BXWyM,3135
@@ -55,7 +56,7 @@ pycodex/tools/web_search_tool.py,sha256=mhiK_G6VC6K6-01KctmIpsr-BURDF8L4ZJyY6IFG
 pycodex/tools/write_stdin_tool.py,sha256=K--XMp-AyEdp8yQ9EseYHsK3QrGrK4AgzOyvUk4swmw,3608
 pycodex/utils/__init__.py,sha256=p3jaERPxkimNDhmMIsm4glvKiazf3UMv1X-qoH5Zl3U,963
 pycodex/utils/async_bridge.py,sha256=d21Pjim-nsQbSG5pJddd0WaQ03CzA3w3TINWDmmjWbg,1815
-pycodex/utils/compactor.py,sha256=zny3xhbc68FzpIlUJ1o0eEw0Cr9_rjBO_CyWDuoL74E,9013
+pycodex/utils/compactor.py,sha256=REmxBha4UH7EODDhd9oKl0GsVsqujHCJ_2LUKR_R1qY,6524
 pycodex/utils/debug.py,sha256=JeEB5JfzYfbdG0fXlrWFmXyR1ts86fKsI_97IqgF6R0,296
 pycodex/utils/dotenv.py,sha256=rGKmurHjm7GdP4giyjHBPpSPv2Oi45qBqDB6HG3CnfA,1866
 pycodex/utils/get_env.py,sha256=5fNhcNhujOakWV6AS66rGW3jEA68WGpuE4YVXJZFE6U,7427
@@ -79,12 +80,12 @@ responses_server/tools/custom_adapter.py,sha256=LxO7ldydvR-GWachDz8GKC0Q8KGGFoFP
 responses_server/tools/web_search.py,sha256=pm4ZUiHUfxc0bGY1kEvt-BCzDrZIyP24xzPUcga2ul0,8908
 workspace_server/__init__.py,sha256=PRM4ONODb6hxjBUHkBD4TprE_pkTCIlT9sfftK5ic6M,866
 workspace_server/__main__.py,sha256=9SRp-Yw7ShGxc6DhSIXcDLKgGEdAVm3oBZ59rBOPjT0,62
-workspace_server/app.py,sha256=m1xG4ASJJMnB7mIIKAor43-oze7XFXXdIA8XBbUaclA,55098
-workspace_server/workspace.html,sha256=96uDofM2ZNnNzAhunyy5xPYk-Ii_m73elbiMbZJOAdA,40443
+workspace_server/app.py,sha256=20lTENFBlercCzFmtAR4fIeMvqIZr8Gq_J2VotmNPck,56858
+workspace_server/workspace.html,sha256=UqUqOfQFra7KV8btI4BUTB38jkkhYZvzzdN5OWpQwdQ,48521
 workspace_server/workspaces.html,sha256=GuYlFiOm1RJINrCKncClHt24D5i7XNABiP9C0xGxBA0,15679
 workspace_server/workspaces.py,sha256=Z-zoj0xgkOOP2CwbQl3vAI6TwLIDUInJKyobs0Jt3ps,19962
-python_codex-0.2.4.dist-info/METADATA,sha256=UgU9tI4s9gFR__d2aFnm4FqR-RPfa0odly3VWFJaWXE,18163
-python_codex-0.2.4.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
-python_codex-0.2.4.dist-info/entry_points.txt,sha256=vkV2UWCtEKvQNMJuPNjt8HyBKiwp83JyqBatrBNGDp8,80
-python_codex-0.2.4.dist-info/licenses/LICENSE,sha256=0X8ifk312hYAORM4hlzg8wVSEXYKNmiPgWlB1YIy2Nw,10926
-python_codex-0.2.4.dist-info/RECORD,,
+python_codex-0.2.6.dist-info/METADATA,sha256=AjjNd0oWIKS2og9c2chID0_K4Jz2ICk2z6JfE_npUoM,19288
+python_codex-0.2.6.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
+python_codex-0.2.6.dist-info/entry_points.txt,sha256=vkV2UWCtEKvQNMJuPNjt8HyBKiwp83JyqBatrBNGDp8,80
+python_codex-0.2.6.dist-info/licenses/LICENSE,sha256=0X8ifk312hYAORM4hlzg8wVSEXYKNmiPgWlB1YIy2Nw,10926
+python_codex-0.2.6.dist-info/RECORD,,

workspace_server/app.py

@@ -2,6 +2,7 @@ import argparse
 import asyncio
 import html
 import json
+import mimetypes
 import os
 import secrets
 import threading
@@ -13,7 +14,13 @@ except ImportError:  # pragma: no cover - Python 3.6 compatibility
 from pathlib import Path
 
 from fastapi import FastAPI, HTTPException, Request, WebSocket, WebSocketDisconnect
-from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse, Response
+from fastapi.responses import (
+    FileResponse,
+    HTMLResponse,
+    JSONResponse,
+    RedirectResponse,
+    Response,
+)
 
 from pycodex.cli import build_agent, build_cli_queue, build_model, configure_loguru
 from pycodex.interactive_session import run_interactive_session
@@ -968,6 +975,14 @@ def create_multi_workspace_app(
             return
         await _websocket_session_handler(entry.manager, websocket)
 
+    @app.api_route(
+        "/w/{workspace_id}/{asset_path:path}",
+        methods=["GET", "HEAD"],
+    )
+    async def workspace_board_asset(workspace_id: str, asset_path: str) -> Response:
+        entry = _workspace_entry_or_404(registry, workspace_id)
+        return _board_asset_response(entry.definition.board_path, asset_path)
+
     return app
 
 
@@ -1181,6 +1196,10 @@ def _install_workspace_routes(
             return
         await _websocket_session_handler(manager, websocket)
 
+    @app.api_route("/{asset_path:path}", methods=["GET", "HEAD"])
+    async def board_asset(asset_path: str) -> Response:
+        return _board_asset_response(board_path, asset_path)
+
 
 def _board_status_response(board_path: "typing.Union[Path, None]") -> JSONResponse:
     if board_path is None or not board_path.is_file():
@@ -1388,6 +1407,43 @@ def _board_response(board_path: "typing.Union[Path, None]") -> Response:
     return _html_response(board_path.read_text(encoding="utf-8", errors="replace"))
 
 
+def _board_asset_response(
+    board_path: "typing.Union[Path, None]",
+    asset_path: str,
+) -> Response:
+    media_type, unused_encoding = mimetypes.guess_type(str(asset_path or ""))
+    del unused_encoding
+    if board_path is None or not media_type or not media_type.startswith("image/"):
+        raise HTTPException(status_code=404, detail="board image not found")
+
+    resolved_asset = None
+    try:
+        board_directory = board_path.parent.resolve()
+        resolved_asset = (board_directory / asset_path).resolve()
+        within_board_directory = (
+            os.path.commonpath([str(board_directory), str(resolved_asset)])
+            == str(board_directory)
+        )
+    except (OSError, RuntimeError, ValueError):
+        within_board_directory = False
+
+    if (
+        not within_board_directory
+        or resolved_asset is None
+        or not resolved_asset.is_file()
+    ):
+        raise HTTPException(status_code=404, detail="board image not found")
+
+    return FileResponse(
+        str(resolved_asset),
+        media_type=media_type,
+        headers={
+            "Cache-Control": "no-cache",
+            "X-Content-Type-Options": "nosniff",
+        },
+    )
+
+
 def _workspace_entry_or_404(
     registry: 'WorkspaceRegistry',
     workspace_id: str,