codex-partner 0.0.6__tar.gz → 0.0.7__tar.gz

{codex_partner-0.0.6 → codex_partner-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-partner
-Version: 0.0.6
+Version: 0.0.7
 Summary: A self-hosted web interface for managing persistent Codex tasks.
 Project-URL: Homepage, https://github.com/froststeam/Codex-Partner
 Project-URL: Repository, https://github.com/froststeam/Codex-Partner.git
@@ -48,6 +48,7 @@ Codex Partner is a self-hosted control panel for long-running Codex work. It kee
 - Model and API provider management with health checks and failover
 - Codex memories, Skills, archive, recycle bin, and SSH workspace support
 - Default YOLO mode for newly created sessions
+- Safe terminal-to-web takeover: normal web sends ask before stopping a terminal turn; `Alt+Enter` keeps the message queued without interruption
 
 ## Platform support
 
@@ -126,7 +127,7 @@ py -m codex_partner
 ## Docker
 
 ```bash
-docker build -t codex-partner:0.0.6 .
+docker build -t codex-partner:0.0.7 .
 docker run -d --name codex-partner \
   -p 8787:8787 \
   --add-host=host.docker.internal:host-gateway \
@@ -135,7 +136,7 @@ docker run -d --name codex-partner \
   -v codex-partner-data:/var/lib/codex-partner \
   -v codex-home:/home/codex/.codex \
   -v codex-workspace:/workspace \
-  codex-partner:0.0.6
+  codex-partner:0.0.7
 docker exec -it codex-partner codex login
 ```
 

{codex_partner-0.0.6 → codex_partner-0.0.7}/README.md

@@ -20,6 +20,7 @@ Codex Partner is a self-hosted control panel for long-running Codex work. It kee
 - Model and API provider management with health checks and failover
 - Codex memories, Skills, archive, recycle bin, and SSH workspace support
 - Default YOLO mode for newly created sessions
+- Safe terminal-to-web takeover: normal web sends ask before stopping a terminal turn; `Alt+Enter` keeps the message queued without interruption
 
 ## Platform support
 
@@ -98,7 +99,7 @@ py -m codex_partner
 ## Docker
 
 ```bash
-docker build -t codex-partner:0.0.6 .
+docker build -t codex-partner:0.0.7 .
 docker run -d --name codex-partner \
   -p 8787:8787 \
   --add-host=host.docker.internal:host-gateway \
@@ -107,7 +108,7 @@ docker run -d --name codex-partner \
   -v codex-partner-data:/var/lib/codex-partner \
   -v codex-home:/home/codex/.codex \
   -v codex-workspace:/workspace \
-  codex-partner:0.0.6
+  codex-partner:0.0.7
 docker exec -it codex-partner codex login
 ```
 

{codex_partner-0.0.6 → codex_partner-0.0.7}/app.py

@@ -1271,11 +1271,13 @@ def interrupt_rollout_writers(path: str) -> set[int]:
     writers = native_rollout_writer_pids(path, refresh=True)
     for pid in writers:
         try:
-            command = Path(f"/proc/{pid}/cmdline").read_bytes().replace(b"\0", b" ")
-            if b"app-server" in command:
-                continue
+            command_path = Path(f"/proc/{pid}/cmdline")
+            if command_path.is_file():
+                command = command_path.read_bytes().replace(b"\0", b" ")
+                if b"app-server" in command:
+                    continue
             os.kill(pid, signal.SIGINT)
-        except OSError:
+        except (OSError, ValueError):
             continue
     return writers
 
@@ -4305,6 +4307,61 @@ async def enqueue_task_message(task_id: str, body: str, client_message_id: Optio
     return db.one("SELECT * FROM task_messages WHERE id=?", (message_id,)) or {"id": message_id, "status": "queued"}
 
 
+async def terminal_turn_active(task_id: str) -> bool:
+    """Refresh and report a terminal-owned turn without confusing dashboard work."""
+    await refresh_live_external_turn(task_id)
+    return bool(refresh_external_primary(task_id)) and not dashboard_owns_task(task_id)
+
+
+async def interrupt_browser_terminal(task_id: str) -> None:
+    """Send Ctrl+C to the foreground process in every matching browser terminal."""
+    matching = [session for session in terminal_sessions.values() if session.get("task_id") == task_id and not session.get("closed")]
+    for session in matching:
+        try:
+            if process := session.get("windows_pty"):
+                await asyncio.to_thread(process.write, "\x03")
+            elif session.get("fd") is not None:
+                os.write(session["fd"], b"\x03")
+        except (EOFError, OSError):
+            continue
+
+
+async def stop_terminal_for_web_takeover(task_id: str) -> bool:
+    """Stop terminal-owned turns without letting Goal auto-resume race the web message."""
+    await refresh_live_external_turn(task_id)
+    tracked = list((external_turn_sets.get(task_id) or {}).values())
+    if not tracked:
+        return False
+    await interrupt_browser_terminal(task_id)
+    paths = {str(turn.get("path") or "") for turn in tracked} - {""}
+    for path in paths:
+        await asyncio.to_thread(interrupt_rollout_writers, path)
+    clear_external_turns(task_id)
+    stamp = now()
+    for external in tracked:
+        session_id = str(external.get("session_id") or "")
+        if not session_id:
+            continue
+        db.execute(
+            "UPDATE sessions SET status='stopped',finished_at=COALESCE(finished_at,?),exit_code=COALESCE(exit_code,130),summary='Terminal turn stopped for web takeover' WHERE id=?",
+            (stamp, session_id),
+        )
+        payload = {"type": "turn_aborted", "status": "stopped", "reason": "Web session took over the terminal turn"}
+        db.execute(
+            "INSERT INTO events (session_id,ts,stream,payload) VALUES (?,?,?,?)",
+            (session_id, stamp, "rollout", json.dumps(payload, ensure_ascii=False)),
+        )
+        await broadcast_task(task_id, {"type": "event", "session_id": session_id, "stream": "rollout", "payload": payload, "ts": stamp})
+    db.execute(
+        "UPDATE tasks SET status='stopped',active_session_id=NULL,execution_source='',execution_turn_id='',run_mode='',last_error='',updated_at=? WHERE id=?",
+        (stamp, task_id),
+    )
+    result = task_or_404(task_id)
+    await broadcast_task(task_id, {"type": "task_status", "task": result, "source": {"kind": "web_takeover"}})
+    await broadcast_overview(task_id, {"kind": "web_takeover"})
+    return True
+
+
 def command_event_session(task: dict) -> str:
     if task.get("active_session_id") and db.one("SELECT id FROM sessions WHERE id=?", (task["active_session_id"],)):
         return task["active_session_id"]
@@ -5933,6 +5990,16 @@ async def clear_task_messages(task_id: str, _: Any = Depends(auth)):
 
 @app.post("/api/tasks/{task_id}/messages")
 async def post_task_message(task_id: str, payload: TaskMessageIn, _: Any = Depends(auth)):
+    if payload.delivery != "queue" and await terminal_turn_active(task_id):
+        if not payload.takeover_terminal:
+            raise HTTPException(
+                409,
+                detail={
+                    "code": "terminal_turn_active",
+                    "message": "Codex 正在终端中运行。是否停止终端 turn 并由网页接管？",
+                },
+            )
+        await stop_terminal_for_web_takeover(task_id)
     return await enqueue_task_message(task_id, payload.message, payload.client_message_id, payload.delivery)
 
 

{codex_partner-0.0.6 → codex_partner-0.0.7}/codex_partner/__init__.py

@@ -1,4 +1,4 @@
 """Codex Partner application package."""
 
 APP_NAME = "Codex Partner"
-APP_VERSION = "0.0.6"
+APP_VERSION = "0.0.7"

{codex_partner-0.0.6 → codex_partner-0.0.7}/codex_partner/schemas.py

@@ -121,6 +121,7 @@ class TaskMessageIn(BaseModel):
     message: str = Field(min_length=1, max_length=20000)
     client_message_id: Optional[str] = None
     delivery: Literal["auto", "queue"] = "auto"
+    takeover_terminal: bool = False
 
 
 class TaskMessagePatch(BaseModel):

{codex_partner-0.0.6 → codex_partner-0.0.7}/codex_partner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-partner
-Version: 0.0.6
+Version: 0.0.7
 Summary: A self-hosted web interface for managing persistent Codex tasks.
 Project-URL: Homepage, https://github.com/froststeam/Codex-Partner
 Project-URL: Repository, https://github.com/froststeam/Codex-Partner.git
@@ -48,6 +48,7 @@ Codex Partner is a self-hosted control panel for long-running Codex work. It kee
 - Model and API provider management with health checks and failover
 - Codex memories, Skills, archive, recycle bin, and SSH workspace support
 - Default YOLO mode for newly created sessions
+- Safe terminal-to-web takeover: normal web sends ask before stopping a terminal turn; `Alt+Enter` keeps the message queued without interruption
 
 ## Platform support
 
@@ -126,7 +127,7 @@ py -m codex_partner
 ## Docker
 
 ```bash
-docker build -t codex-partner:0.0.6 .
+docker build -t codex-partner:0.0.7 .
 docker run -d --name codex-partner \
   -p 8787:8787 \
   --add-host=host.docker.internal:host-gateway \
@@ -135,7 +136,7 @@ docker run -d --name codex-partner \
   -v codex-partner-data:/var/lib/codex-partner \
   -v codex-home:/home/codex/.codex \
   -v codex-workspace:/workspace \
-  codex-partner:0.0.6
+  codex-partner:0.0.7
 docker exec -it codex-partner codex login
 ```
 

{codex_partner-0.0.6 → codex_partner-0.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codex-partner"
-version = "0.0.6"
+version = "0.0.7"
 description = "A self-hosted web interface for managing persistent Codex tasks."
 readme = "README.md"
 requires-python = ">=3.10"

{codex_partner-0.0.6 → codex_partner-0.0.7}/static/app.js

@@ -270,6 +270,8 @@ async function submitMessage(mode = "codex") {
     } catch (error) { input.value = message; resizeComposerInput(input); renderCommandPalette(); toast(error.message); }
     return;
   }
+  const draftMessage = message;
+  const draftAttachments = [...pendingAttachments];
   if (pendingAttachments.length) {
     message += pendingAttachments.map((file, index) => {
       const prefix = message || index ? "\n\n" : "";
@@ -277,15 +279,36 @@ async function submitMessage(mode = "codex") {
       return `${prefix}[${uiLabel("attachments")}：${file.name}]\n\n\`\`\`\n${file.content}\n\`\`\``;
     }).join("");
   }
-  // Enter never interrupts an active turn. The server owns the durable FIFO
-  // and dispatches this message as a new turn once the current owner exits.
+  let takeoverTerminal = false;
+  const terminalActive = Boolean(state.selectedTask?.external_running) && state.selectedTask?.execution_source === "terminal";
+  if (mode === "codex" && terminalActive) {
+    takeoverTerminal = await appConfirm(uiLabel("terminalTakeoverConfirm"), { danger: true, confirmLabel: uiLabel("terminalTakeoverAction") });
+    if (!takeoverTerminal) return;
+  }
+  // Dashboard-owned turns stay FIFO. A terminal-owned turn requires an
+  // explicit takeover confirmation; Alt+Enter always remains queue-only.
   const clientMessageId = crypto.randomUUID ? crypto.randomUUID() : String(Date.now());
-  const delivery = mode === "queue" || activeTurn ? "queue" : "auto";
+  const delivery = mode === "queue" || (activeTurn && !takeoverTerminal) ? "queue" : "auto";
   const optimisticStatus = delivery === "queue" ? "queued" : "sending";
   const optimistic = { id: clientMessageId, body: message, status: optimisticStatus, created_at: new Date().toISOString(), _optimistic: true };
   upsertTaskMessage(optimistic); state.historyIndex = -1; input.value = ""; resizeComposerInput(input); pendingAttachments = []; $("#composer-context").textContent = ""; $("#attach-file").value = ""; $("#command-palette").hidden = true; renderGoalBar(); scheduleRenderChat(); input.focus();
   try {
-    const delivered = await api(`/tasks/${taskId}/messages`, { method: "POST", body: JSON.stringify({ message, client_message_id: clientMessageId, delivery }) });
+    let delivered;
+    try {
+      delivered = await api(`/tasks/${taskId}/messages`, { method: "POST", body: JSON.stringify({ message, client_message_id: clientMessageId, delivery, takeover_terminal: takeoverTerminal }) });
+    } catch (error) {
+      if (mode !== "codex" || error.code !== "terminal_turn_active" || takeoverTerminal) throw error;
+      const confirmed = await appConfirm(uiLabel("terminalTakeoverConfirm"), { danger: true, confirmLabel: uiLabel("terminalTakeoverAction") });
+      if (!confirmed) {
+        if (state.selectedId === taskId) {
+          removeTaskMessage(clientMessageId); input.value = draftMessage; pendingAttachments = draftAttachments;
+          resizeComposerInput(input); renderComposerAttachments(); renderGoalBar(); scheduleRenderChat(); input.focus();
+        }
+        return;
+      }
+      takeoverTerminal = true;
+      delivered = await api(`/tasks/${taskId}/messages`, { method: "POST", body: JSON.stringify({ message, client_message_id: clientMessageId, delivery: "auto", takeover_terminal: true }) });
+    }
     if (state.selectedId === taskId) { upsertTaskMessage(delivered); renderQueuedMessages(); refreshComposerHistory(); renderGoalBar(); scheduleRenderChat(); }
     if (activeTurn && delivered.status === "queued") toast(uiLabel("queuedAfterTurn"));
   } catch (error) {

{codex_partner-0.0.6 → codex_partner-0.0.7}/static/core.js

@@ -371,6 +371,8 @@ const UI_LABELS = {
   approvalSubmit: { zh: "提交选择", en: "Submit", fr: "Envoyer", ja: "送信", ko: "제출" },
   approvalResolved: { zh: "授权选择已执行", en: "Approval choice applied", fr: "Choix appliqué", ja: "承認を反映しました", ko: "승인 선택을 적용했습니다" },
   queuedAfterTurn: { zh: "已加入队列，当前 turn 结束后自动发射", en: "Queued and will run after the current turn", fr: "Ajouté à la file et exécuté après le tour actuel", ja: "キューに追加し、現在のターン完了後に自動実行します", ko: "대기열에 추가되었으며 현재 turn 종료 후 자동 실행됩니다" },
+  terminalTakeoverConfirm: { zh: "Codex 正在终端中运行。停止终端 turn，并由网页发送这条消息？", en: "Codex is running in a terminal. Stop that turn and send this message from the web?", fr: "Codex s’exécute dans un terminal. Arrêter ce tour et envoyer ce message depuis le Web ?", ja: "Codex はターミナルで実行中です。ターミナルのターンを停止し、このメッセージを Web から送信しますか？", ko: "Codex가 터미널에서 실행 중입니다. 터미널 turn을 중지하고 웹에서 이 메시지를 보낼까요?" },
+  terminalTakeoverAction: { zh: "停止终端并发送", en: "Stop terminal and send", fr: "Arrêter et envoyer", ja: "停止して送信", ko: "터미널 중지 후 전송" },
   clearQueue: { zh: "清空所有排队消息", en: "Clear all queued messages", fr: "Vider tous les messages en attente", ja: "待機メッセージをすべて消去", ko: "대기 메시지 모두 지우기" },
   dispatchNow: { zh: "立即执行这条消息", en: "Run this message now", fr: "Exécuter ce message maintenant", ja: "このメッセージを今すぐ実行", ko: "이 메시지 지금 실행" },
   editQueuedAction: { zh: "编辑排队消息", en: "Edit queued message", fr: "Modifier le message en attente", ja: "待機メッセージを編集", ko: "대기 메시지 편집" },
@@ -677,18 +679,27 @@ async function api(path, options = {}, canPrompt = true) {
   if (response.status === 401 && canPrompt) {
     if (await requestSSHLogin()) return api(path, options, false);
   }
-  if (!response.ok) throw Error(await responseErrorMessage(response));
+  if (!response.ok) {
+    const detail = await responseErrorDetail(response);
+    const error = Error(detail.message);
+    error.code = detail.code || "";
+    error.detail = detail.detail;
+    throw error;
+  }
   return response.json();
 }
-async function responseErrorMessage(response) {
+async function responseErrorDetail(response) {
   const text = await response.text().catch(() => "");
   try {
     const payload = JSON.parse(text);
-    if (payload?.detail) return String(payload.detail);
+    if (payload?.detail && typeof payload.detail === "object") return { message: String(payload.detail.message || response.statusText || "Request failed"), code: String(payload.detail.code || ""), detail: payload.detail };
+    if (payload?.detail) return { message: String(payload.detail), code: "", detail: payload.detail };
   } catch (_) { /* Non-JSON server and proxy errors are expected here. */ }
   const plain = text.trim();
-  if (plain && !plain.startsWith("<") && plain.length <= 500) return plain;
-  return `${response.status} ${response.statusText || "Request failed"}`.trim();
+  return { message: plain && !plain.startsWith("<") && plain.length <= 500 ? plain : `${response.status} ${response.statusText || "Request failed"}`.trim(), code: "", detail: null };
+}
+async function responseErrorMessage(response) {
+  return (await responseErrorDetail(response)).message;
 }
 function toast(message) { const node = $("#toast"); node.textContent = message; node.classList.add("show"); setTimeout(() => node.classList.remove("show"), 2600); }
 async function copyText(value) {

{codex_partner-0.0.6 → codex_partner-0.0.7}/tests/test_running_state.py

@@ -1646,6 +1646,83 @@ process.stdout.write(JSON.stringify(browserMessages));
 
         asyncio.run(exercise())
 
+    def test_terminal_message_requires_takeover_confirmation_before_queueing(self):
+        task_id = "terminal-confirm-thread"
+        self.make_task(task_id, "running")
+        self.app.register_external_turn(task_id, {"turn_id": "terminal-turn", "path": "/tmp/terminal-turn.jsonl"})
+        try:
+            with mock.patch.object(self.app, "refresh_live_external_turn", new=mock.AsyncMock(return_value=False)):
+                with self.assertRaises(self.app.HTTPException) as raised:
+                    asyncio.run(self.app.post_task_message(
+                        task_id,
+                        self.app.TaskMessageIn(message="take over", client_message_id="terminal-confirm-message"),
+                        None,
+                    ))
+            self.assertEqual(409, raised.exception.status_code)
+            self.assertEqual("terminal_turn_active", raised.exception.detail["code"])
+            self.assertIsNone(self.app.db.one("SELECT id FROM task_messages WHERE id='terminal-confirm-message'"))
+        finally:
+            self.app.clear_external_turns(task_id)
+            self.app.db.execute("DELETE FROM tasks WHERE id=?", (task_id,))
+
+    def test_confirmed_terminal_takeover_stops_terminal_then_queues_message(self):
+        task_id = "terminal-takeover-thread"
+        self.make_task(task_id, "running")
+        self.app.register_external_turn(task_id, {"turn_id": "terminal-turn", "path": "/tmp/terminal-turn.jsonl"})
+        try:
+            with mock.patch.object(self.app, "refresh_live_external_turn", new=mock.AsyncMock(return_value=False)), \
+                 mock.patch.object(self.app, "stop_terminal_for_web_takeover", new=mock.AsyncMock(return_value=True)) as stop, \
+                 mock.patch.object(self.app, "schedule_task_drain") as drain:
+                result = asyncio.run(self.app.post_task_message(
+                    task_id,
+                    self.app.TaskMessageIn(
+                        message="take over",
+                        client_message_id="terminal-takeover-message",
+                        takeover_terminal=True,
+                    ),
+                    None,
+                ))
+            stop.assert_awaited_once_with(task_id)
+            drain.assert_called_once_with(task_id)
+            self.assertEqual("queued", result["status"])
+        finally:
+            self.app.clear_external_turns(task_id)
+            self.app.db.execute("DELETE FROM task_messages WHERE task_id=?", (task_id,))
+            self.app.db.execute("DELETE FROM tasks WHERE id=?", (task_id,))
+
+    def test_terminal_takeover_clears_external_owner_without_auto_resume_race(self):
+        task_id = "terminal-takeover-stop-thread"
+        session_id = "external-terminal-takeover-session"
+        self.make_task(task_id, "running")
+        self.app.db.execute(
+            "INSERT INTO sessions (id,task_id,status,attempt,command,started_at,codex_session_id) VALUES (?,?,?,?,?,?,?)",
+            (session_id, task_id, "running", 1, "codex resume", self.app.now(), task_id),
+        )
+        self.app.register_external_turn(task_id, {
+            "turn_id": "terminal-turn",
+            "session_id": session_id,
+            "path": "/tmp/terminal-takeover.jsonl",
+            "started_at": self.app.now(),
+        })
+        try:
+            with mock.patch.object(self.app, "refresh_live_external_turn", new=mock.AsyncMock(return_value=False)), \
+                 mock.patch.object(self.app, "interrupt_browser_terminal", new=mock.AsyncMock()) as browser_interrupt, \
+                 mock.patch.object(self.app, "interrupt_rollout_writers", return_value={900}) as writer_interrupt, \
+                 mock.patch.object(self.app, "schedule_task_drain") as drain:
+                stopped = asyncio.run(self.app.stop_terminal_for_web_takeover(task_id))
+            self.assertTrue(stopped)
+            browser_interrupt.assert_awaited_once_with(task_id)
+            writer_interrupt.assert_called_once_with("/tmp/terminal-takeover.jsonl")
+            drain.assert_not_called()
+            self.assertNotIn(task_id, self.app.external_turns)
+            self.assertEqual("stopped", self.app.task_or_404(task_id)["status"])
+            self.assertEqual("stopped", self.app.db.one("SELECT status FROM sessions WHERE id=?", (session_id,))["status"])
+            event = self.app.db.one("SELECT payload FROM events WHERE session_id=? ORDER BY id DESC LIMIT 1", (session_id,))
+            self.assertEqual("turn_aborted", json.loads(event["payload"])["type"])
+        finally:
+            self.app.clear_external_turns(task_id)
+            self.app.db.execute("DELETE FROM tasks WHERE id=?", (task_id,))
+
     def test_binary_dump_is_rejected_before_queueing(self):
         task_id = "binary-dump-thread"
         self.make_task(task_id, "available")
@@ -2885,7 +2962,7 @@ process.stdout.write(JSON.stringify(browserMessages));
         self.assertNotIn('id="stop-generation"', html)
         self.assertIn('$("#composer-model-select")', conversation_js)
         self.assertIn('当前 API ·', (static / "core.js").read_text(encoding="utf-8"))
-        self.assertIn('const delivery = mode === "queue" || activeTurn ? "queue" : "auto"', app_js)
+        self.assertIn('const delivery = mode === "queue" || (activeTurn && !takeoverTerminal) ? "queue" : "auto"', app_js)
         self.assertIn('function toggleGoalRun()', app_js)
         self.assertIn('id="composer-model-select"', html)
         self.assertIn('id="composer-effort-select"', html)
@@ -3104,15 +3181,17 @@ process.stdout.write(JSON.stringify(browserMessages));
         static = Path(__file__).resolve().parents[1] / "static"
         app_js = (static / "app.js").read_text(encoding="utf-8")
         conversation_js = (static / "conversation.js").read_text(encoding="utf-8")
+        core_js = (static / "core.js").read_text(encoding="utf-8")
         self.assertIn("button.dataset.queueDispatch", app_js)
         self.assertIn('button.dataset.dispatching === "1"', app_js)
         self.assertIn("result.dispatch_error", app_js)
-        self.assertIn('const delivery = mode === "queue" || activeTurn ? "queue" : "auto"', app_js)
+        self.assertIn('const delivery = mode === "queue" || (activeTurn && !takeoverTerminal) ? "queue" : "auto"', app_js)
         self.assertIn('toast(uiLabel("queuedAfterTurn"))', app_js)
-        self.assertNotIn('if (mode === "codex" && activeTurn)', app_js)
+        self.assertIn('uiLabel("terminalTakeoverConfirm")', app_js)
+        self.assertIn('takeover_terminal: true', app_js)
+        self.assertIn('error.code = detail.code', core_js)
         self.assertIn("data-queue-dispatch", conversation_js)
         self.assertIn("queued-error", conversation_js)
-        core_js = (static / "core.js").read_text(encoding="utf-8")
         self.assertIn("function taskIsRunningGroup", core_js)
         self.assertIn('["running", "retrying", "queued"].includes', core_js)
         self.assertIn("taskSortName(a).localeCompare", core_js)