fix: handle active remote Codex writers

Author: TimpiaAI

Integrations/noturcode-agent.py

@@ -8,9 +8,11 @@
 import json
 import os
 import pathlib
+import re
 import shutil
 import socket
 import stat
+import subprocess
 import sys
 import uuid
 
@@ -354,6 +356,42 @@ def doctor() -> int:
     return 0 if paired else 1
 
 
+def active_codex_session_ids(process_list: str) -> list[str]:
+    identifiers: list[str] = []
+    for match in re.finditer(r"\bcodex\s+resume\s+([0-9a-fA-F-]{36})\b", process_list):
+        identifier = match.group(1).lower()
+        if identifier not in identifiers:
+            identifiers.append(identifier)
+    return identifiers
+
+
+def resume_codex() -> int:
+    process_scan = subprocess.run(
+        ["pgrep", "-af", "codex"],
+        check=False,
+        capture_output=True,
+        text=True,
+    )
+    active = active_codex_session_ids(process_scan.stdout)
+    if active:
+        print("", file=sys.stderr)
+        print("[!] Codex chats with an active writer:", file=sys.stderr)
+        for identifier in active:
+            print(f"    {identifier}", file=sys.stderr)
+        print("    Close one in its old terminal before you select it here.", file=sys.stderr)
+        print("", file=sys.stderr)
+    try:
+        result = subprocess.call(["codex", "resume", "--all"])
+    except FileNotFoundError:
+        print("Noturcode: Codex is not installed on this VPS.", file=sys.stderr)
+        return 127
+    if result != 0:
+        print("", file=sys.stderr)
+        print("Noturcode: The chat was not resumed.", file=sys.stderr)
+        print("Choose another chat, or close its active writer first.", file=sys.stderr)
+    return result
+
+
 def build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="noturcode-agent")
     commands = parser.add_subparsers(dest="command", required=True)
@@ -363,6 +401,7 @@ def build_parser() -> argparse.ArgumentParser:
     hook_parser.add_argument("--source", required=True, choices=("claude", "codex", "gemini"))
     commands.add_parser("install")
     commands.add_parser("doctor")
+    commands.add_parser("resume")
     proxy_parser = commands.add_parser("proxy")
     proxy_parser.add_argument("--listen", required=True)
     proxy_parser.add_argument("--target", required=True)
@@ -380,6 +419,8 @@ def main() -> int:
         return install_hooks()
     if arguments.command == "doctor":
         return doctor()
+    if arguments.command == "resume":
+        return resume_codex()
     if arguments.command == "proxy":
         return serve_proxy(arguments.listen, arguments.target, arguments.max_connections)
     return 2

Integrations/noturcode-cli.zsh

@@ -174,7 +174,7 @@ connect_host() {
   terminal_id=$("$bridge" terminal-id) || return 1
   remote_socket="/tmp/noturcode-${USER//[^A-Za-z0-9_-]/_}-$$.sock"
   if [[ "$mode" == "resume" ]]; then
-    remote_command="export NOTURCODE_REMOTE_SOCKET='$remote_socket'; export NOTURCODE_TERMINAL_SESSION_ID='$terminal_id'; export NOTURCODE_REMOTE_HOST='$host'; export NOTURCODE_SESSION_NAME='$chat_name'; exec \"\${SHELL:-/bin/sh}\" -lc 'codex resume --all'"
+    remote_command="export NOTURCODE_REMOTE_SOCKET='$remote_socket'; export NOTURCODE_TERMINAL_SESSION_ID='$terminal_id'; export NOTURCODE_REMOTE_HOST='$host'; export NOTURCODE_SESSION_NAME='$chat_name'; \"\$HOME/.local/bin/noturcode-agent\" resume; resume_exit=\$?; if [ \$resume_exit -ne 0 ]; then print '\nNoturcode kept this VPS shell open. Run nc resume again after the active chat closes.' 2>/dev/null || echo '\nNoturcode kept this VPS shell open. Run nc resume again after the active chat closes.'; exec \"\${SHELL:-/bin/sh}\" -l; fi"
   else
     remote_command="export NOTURCODE_REMOTE_SOCKET='$remote_socket'; export NOTURCODE_TERMINAL_SESSION_ID='$terminal_id'; export NOTURCODE_REMOTE_HOST='$host'; export NOTURCODE_SESSION_NAME='$chat_name'; exec \"\${SHELL:-/bin/sh}\" -l"
   fi
@@ -194,9 +194,9 @@ connect_host() {
     -o StreamLocalBindUnlink=yes \
     -R "${remote_socket}:${active_proxy_socket}" \
     "$host" "$remote_command"
-  local status=$?
+  local ssh_exit_code=$?
   stop_proxy
-  return "$status"
+  return "$ssh_exit_code"
 }
 
 resume_codex() {

Tests/NoturcodeCoreTests/NoturcodeCoreTests.swift

@@ -342,7 +342,10 @@ final class NoturcodeCoreTests: XCTestCase {
         XCTAssertTrue(cli.contains("Open an SSH workspace"))
         XCTAssertTrue(cli.contains("Resume an existing Codex chat"))
         XCTAssertTrue(cli.contains("Chat name"))
-        XCTAssertTrue(cli.contains("codex resume --all"))
+        XCTAssertTrue(agent.contains("codex\", \"resume\", \"--all"))
+        XCTAssertTrue(cli.contains("noturcode-agent\\\" resume"))
+        XCTAssertTrue(cli.contains("ssh_exit_code"))
+        XCTAssertFalse(cli.contains("local status="))
         XCTAssertTrue(cli.contains("settle()"))
         XCTAssertTrue(cli.contains("[===>]"))
         XCTAssertTrue(cli.contains("StreamLocalBindUnlink=yes"))

Tests/RemoteAgentTests/test_remote_agent.py

@@ -172,6 +172,21 @@ def test_local_proxy_frames_ssh_request_before_forwarding_to_app(self):
         self.assertEqual(response["error"], "invalid code")
         self.assertEqual(app_server.request["type"], "remotePair")
 
+    def test_active_codex_session_ids_extracts_unique_resume_writers(self):
+        process_list = """
+100 node /usr/bin/codex resume 019ff72e-75b9-7700-aa47-f0295f58b30c
+101 /usr/bin/codex resume 019ff72e-75b9-7700-aa47-f0295f58b30c
+102 /usr/bin/codex resume 11111111-2222-3333-4444-555555555555
+103 /usr/bin/codex-code-mode-host
+"""
+        self.assertEqual(
+            self.agent.active_codex_session_ids(process_list),
+            [
+                "019ff72e-75b9-7700-aa47-f0295f58b30c",
+                "11111111-2222-3333-4444-555555555555",
+            ],
+        )
+
 
 if __name__ == "__main__":
     unittest.main()