portacode 2.2.28.dev2__py3-none-any.whl → 2.2.28.dev4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- portacode/_version.py +2 -2
- portacode/connection/handlers/codex_handlers.py +20 -11
- portacode/connection/handlers/project_state/file_system_watcher.py +6 -2
- portacode/connection/handlers/project_state/manager.py +28 -7
- portacode/connection/handlers/project_state/models.py +2 -1
- portacode/connection/handlers/project_state/test_sync.py +102 -0
- portacode/tests/test_codex_handlers.py +81 -0
- {portacode-2.2.28.dev2.dist-info → portacode-2.2.28.dev4.dist-info}/METADATA +1 -1
- {portacode-2.2.28.dev2.dist-info → portacode-2.2.28.dev4.dist-info}/RECORD +13 -16
- {portacode-2.2.28.dev2.dist-info → portacode-2.2.28.dev4.dist-info}/WHEEL +1 -1
- portacode/link_capture/__pycache__/__init__.cpython-311.pyc +0 -0
- portacode/link_capture/__pycache__/__init__.cpython-38.pyc +0 -0
- portacode/link_capture/bin/__pycache__/link_capture_wrapper.cpython-311.pyc +0 -0
- portacode/link_capture/bin/__pycache__/link_capture_wrapper.cpython-38.pyc +0 -0
- {portacode-2.2.28.dev2.dist-info → portacode-2.2.28.dev4.dist-info}/entry_points.txt +0 -0
- {portacode-2.2.28.dev2.dist-info → portacode-2.2.28.dev4.dist-info}/licenses/LICENSE +0 -0
- {portacode-2.2.28.dev2.dist-info → portacode-2.2.28.dev4.dist-info}/top_level.txt +0 -0
portacode/_version.py
CHANGED
|
@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
|
|
|
18
18
|
commit_id: str | None
|
|
19
19
|
__commit_id__: str | None
|
|
20
20
|
|
|
21
|
-
__version__ = version = '2.2.28.
|
|
22
|
-
__version_tuple__ = version_tuple = (2, 2, 28, '
|
|
21
|
+
__version__ = version = '2.2.28.dev4'
|
|
22
|
+
__version_tuple__ = version_tuple = (2, 2, 28, 'dev4')
|
|
23
23
|
|
|
24
24
|
__commit_id__ = commit_id = None
|
|
@@ -21,6 +21,7 @@ MAX_LIVE_TEXT_BYTES = 512 * 1024
|
|
|
21
21
|
MAX_LIVE_ITEMS_PER_THREAD = 64
|
|
22
22
|
MAX_LIVE_SNAPSHOT_BYTES = 4 * 1024 * 1024
|
|
23
23
|
MAX_TRACKED_LIVE_THREADS = 64
|
|
24
|
+
MAX_HISTORY_TURNS = 80
|
|
24
25
|
MAX_DELEGATED_RESULT_BYTES = 16 * 1024
|
|
25
26
|
MAX_DELEGATED_DIAGNOSTIC_BYTES = 8 * 1024
|
|
26
27
|
|
|
@@ -579,23 +580,18 @@ async def _resume_thread_history(
|
|
|
579
580
|
thread = _thread_from_result(resume_result)
|
|
580
581
|
turns = thread.get("turns") if isinstance(thread.get("turns"), list) else []
|
|
581
582
|
if turns:
|
|
583
|
+
turns = turns[-MAX_HISTORY_TURNS:]
|
|
582
584
|
return resume_result, _items_from_turns(turns), _active_turn_from_turns(turns)
|
|
583
585
|
else:
|
|
584
586
|
raise
|
|
585
587
|
|
|
586
|
-
# Newer servers may embed a first page on resume.
|
|
587
|
-
page = resume_result.get("initialTurnsPage") if isinstance(resume_result, dict) else None
|
|
588
|
-
turns = _turns_from_page(page)
|
|
589
|
-
if turns:
|
|
590
|
-
return resume_result, _items_from_turns(turns), _active_turn_from_turns(turns)
|
|
591
|
-
|
|
592
588
|
try:
|
|
593
589
|
turns_page = await manager.bridge.call(
|
|
594
590
|
"thread/turns/list",
|
|
595
591
|
{
|
|
596
592
|
"threadId": thread_id,
|
|
597
|
-
"limit":
|
|
598
|
-
"sortDirection": "
|
|
593
|
+
"limit": MAX_HISTORY_TURNS,
|
|
594
|
+
"sortDirection": "desc",
|
|
599
595
|
# Summary view can intentionally omit user content, producing
|
|
600
596
|
# empty bubbles after a browser reload. Attachments are stored
|
|
601
597
|
# as lightweight path items, so full view does not embed the
|
|
@@ -604,11 +600,20 @@ async def _resume_thread_history(
|
|
|
604
600
|
},
|
|
605
601
|
timeout=120.0,
|
|
606
602
|
)
|
|
607
|
-
|
|
603
|
+
# Fetch just the newest page; restore chronology locally, without
|
|
604
|
+
# walking cursors or sending the omitted history through the broker.
|
|
605
|
+
turns = list(reversed(_turns_from_page(turns_page)[:MAX_HISTORY_TURNS]))
|
|
608
606
|
return resume_result, _items_from_turns(turns), _active_turn_from_turns(turns)
|
|
609
607
|
except (CodexAppServerError, asyncio.TimeoutError):
|
|
610
608
|
LOGGER.debug("thread/turns/list unavailable; trying lightweight thread/read", exc_info=True)
|
|
611
609
|
|
|
610
|
+
# Embedded pages have no guaranteed newest-first selection. Use them only
|
|
611
|
+
# for compatibility when the explicit newest-page API is unavailable.
|
|
612
|
+
page = resume_result.get("initialTurnsPage") if isinstance(resume_result, dict) else None
|
|
613
|
+
turns = _turns_from_page(page)[-MAX_HISTORY_TURNS:]
|
|
614
|
+
if turns:
|
|
615
|
+
return resume_result, _items_from_turns(turns), _active_turn_from_turns(turns)
|
|
616
|
+
|
|
612
617
|
# Avoid includeTurns:true — attachment-heavy rollouts hang Codex app-server.
|
|
613
618
|
try:
|
|
614
619
|
read_result = await manager.bridge.call(
|
|
@@ -617,12 +622,13 @@ async def _resume_thread_history(
|
|
|
617
622
|
timeout=30.0,
|
|
618
623
|
)
|
|
619
624
|
page = read_result.get("initialTurnsPage") if isinstance(read_result, dict) else None
|
|
620
|
-
turns = _turns_from_page(page)
|
|
625
|
+
turns = _turns_from_page(page)[-MAX_HISTORY_TURNS:]
|
|
621
626
|
if turns:
|
|
622
627
|
return resume_result, _items_from_turns(turns), _active_turn_from_turns(turns)
|
|
623
628
|
thread = _thread_from_result(read_result)
|
|
624
629
|
inline = thread.get("turns") if isinstance(thread.get("turns"), list) else []
|
|
625
630
|
if inline:
|
|
631
|
+
inline = inline[-MAX_HISTORY_TURNS:]
|
|
626
632
|
return resume_result, _items_from_turns(inline), _active_turn_from_turns(inline)
|
|
627
633
|
except (CodexAppServerError, asyncio.TimeoutError):
|
|
628
634
|
LOGGER.warning(
|
|
@@ -872,7 +878,10 @@ class CodexThreadResumeHandler(CodexAsyncHandler):
|
|
|
872
878
|
cwd=cwd,
|
|
873
879
|
already_active=str(thread_id) in manager._thread_active_turn,
|
|
874
880
|
)
|
|
875
|
-
|
|
881
|
+
# History travels once, in `items`. Legacy resume responses may embed
|
|
882
|
+
# the complete rollout in thread.turns; do not forward that duplicate.
|
|
883
|
+
thread = {key: value for key, value in _thread_from_result(resume_result).items()
|
|
884
|
+
if key not in {"turns", "initialTurnsPage"}}
|
|
876
885
|
if not active_turn:
|
|
877
886
|
known_turn_id = manager._thread_active_turn.get(str(thread_id))
|
|
878
887
|
if known_turn_id:
|
|
@@ -38,6 +38,7 @@ class FileSystemWatcher:
|
|
|
38
38
|
self.event_handler: Optional[FileSystemEventHandler] = None
|
|
39
39
|
self.watched_paths: Set[str] = set()
|
|
40
40
|
self.watch_handles: dict = {} # Map path -> watch handle for proper cleanup
|
|
41
|
+
self.directory_access = {}
|
|
41
42
|
# Store reference to the event loop for thread-safe async task creation
|
|
42
43
|
try:
|
|
43
44
|
self.event_loop = asyncio.get_running_loop()
|
|
@@ -82,8 +83,11 @@ class FileSystemWatcher:
|
|
|
82
83
|
|
|
83
84
|
# Reading directory contents during refresh generates metadata-only "modified" events.
|
|
84
85
|
if event.is_directory and event.event_type == 'modified':
|
|
85
|
-
|
|
86
|
-
|
|
86
|
+
accessible = os.access(event.src_path, os.R_OK | os.X_OK)
|
|
87
|
+
previous = self.watcher.directory_access.get(event.src_path)
|
|
88
|
+
self.watcher.directory_access[event.src_path] = accessible
|
|
89
|
+
if previous is None or previous == accessible:
|
|
90
|
+
return
|
|
87
91
|
|
|
88
92
|
# Handle .git folder events separately for git status monitoring
|
|
89
93
|
path_parts = Path(event.src_path).parts
|
|
@@ -511,6 +511,12 @@ class ProjectStateManager:
|
|
|
511
511
|
child.is_expanded = child.path in expanded_paths
|
|
512
512
|
# Set is_loaded based on monitored_paths (content loaded = in monitored folders)
|
|
513
513
|
child.is_loaded = child.path in monitored_paths
|
|
514
|
+
accessible = os.access(child.path, os.R_OK | os.X_OK)
|
|
515
|
+
self.file_watcher.directory_access[child.path] = accessible
|
|
516
|
+
if not accessible:
|
|
517
|
+
child.access_error = "permission_denied"
|
|
518
|
+
# Loading has finished with an error, not a pending scan.
|
|
519
|
+
child.is_loaded = True
|
|
514
520
|
else:
|
|
515
521
|
# Files are always loaded
|
|
516
522
|
child.is_loaded = True
|
|
@@ -614,8 +620,13 @@ class ProjectStateManager:
|
|
|
614
620
|
# Update the monitored folder to expanded state
|
|
615
621
|
monitored_folder = self._find_monitored_folder(project_state, folder_path)
|
|
616
622
|
if not monitored_folder:
|
|
617
|
-
|
|
618
|
-
|
|
623
|
+
# Inaccessible folders are listed but deliberately not watched.
|
|
624
|
+
# Reuse expansion to retry a known folder after permissions change.
|
|
625
|
+
item = self._find_item_by_path(project_state.items, folder_path)
|
|
626
|
+
if not item or not item.is_directory:
|
|
627
|
+
return False
|
|
628
|
+
monitored_folder = MonitoredFolder(folder_path=folder_path)
|
|
629
|
+
project_state.monitored_folders.append(monitored_folder)
|
|
619
630
|
|
|
620
631
|
logger.info("Found monitored folder: %s, current is_expanded: %s", monitored_folder.folder_path, monitored_folder.is_expanded)
|
|
621
632
|
monitored_folder.is_expanded = True
|
|
@@ -1114,7 +1125,10 @@ class ProjectStateManager:
|
|
|
1114
1125
|
"git_detailed_status": str(project_state.git_detailed_status) if project_state.git_detailed_status else None,
|
|
1115
1126
|
"open_tabs": tuple((tab.tab_id, tab.tab_type, tab.title) for tab in project_state.open_tabs.values()),
|
|
1116
1127
|
"active_tab": project_state.active_tab.tab_id if project_state.active_tab else None,
|
|
1117
|
-
"
|
|
1128
|
+
"items": json.dumps(
|
|
1129
|
+
[self._serialize_file_item(item) for item in project_state.items],
|
|
1130
|
+
sort_keys=True, separators=(",", ":"),
|
|
1131
|
+
),
|
|
1118
1132
|
"monitored_folders": tuple((mf.folder_path, mf.is_expanded) for mf in sorted(project_state.monitored_folders, key=lambda x: x.folder_path))
|
|
1119
1133
|
}
|
|
1120
1134
|
|
|
@@ -1129,7 +1143,6 @@ class ProjectStateManager:
|
|
|
1129
1143
|
return
|
|
1130
1144
|
|
|
1131
1145
|
# State has changed, send update
|
|
1132
|
-
project_state._last_sent_signature = current_state_signature
|
|
1133
1146
|
logger.debug("🔍 [TRACE] ✅ State has changed, preparing to send update to client: %s", project_state.client_session_id)
|
|
1134
1147
|
|
|
1135
1148
|
payload = {
|
|
@@ -1149,7 +1162,6 @@ class ProjectStateManager:
|
|
|
1149
1162
|
|
|
1150
1163
|
# Log payload size analysis before sending
|
|
1151
1164
|
try:
|
|
1152
|
-
import json
|
|
1153
1165
|
payload_json = json.dumps(payload)
|
|
1154
1166
|
payload_size_kb = len(payload_json.encode('utf-8')) / 1024
|
|
1155
1167
|
|
|
@@ -1189,6 +1201,7 @@ class ProjectStateManager:
|
|
|
1189
1201
|
logger.debug("🔍 [TRACE] About to send payload via control channel...")
|
|
1190
1202
|
try:
|
|
1191
1203
|
await self.control_channel.send(payload)
|
|
1204
|
+
project_state._last_sent_signature = current_state_signature
|
|
1192
1205
|
logger.debug("🔍 [TRACE] ✅ Successfully sent project_state_update to client: %s", project_state.client_session_id)
|
|
1193
1206
|
except Exception as e:
|
|
1194
1207
|
logger.error("🔍 [TRACE] ❌ Failed to send project_state_update: %s", e)
|
|
@@ -1206,15 +1219,21 @@ class ProjectStateManager:
|
|
|
1206
1219
|
project_folder_path = project_state.project_folder_path if project_state else None
|
|
1207
1220
|
|
|
1208
1221
|
if project_state:
|
|
1222
|
+
other_projects = [state for session, state in self.projects.items()
|
|
1223
|
+
if session != client_session_id]
|
|
1224
|
+
other_watched_paths = {folder.folder_path for state in other_projects
|
|
1225
|
+
for folder in state.monitored_folders}
|
|
1209
1226
|
# Cancel debounce timer to prevent pending refreshes running after cleanup
|
|
1210
|
-
if self._change_debounce_timer and not self._change_debounce_timer.done():
|
|
1227
|
+
if not other_projects and self._change_debounce_timer and not self._change_debounce_timer.done():
|
|
1211
1228
|
try:
|
|
1212
1229
|
self._change_debounce_timer.cancel()
|
|
1213
1230
|
except Exception:
|
|
1214
1231
|
pass
|
|
1215
1232
|
# Remove pending file change events related to this project
|
|
1216
1233
|
if self._pending_changes:
|
|
1217
|
-
removed = [path for path in list(self._pending_changes)
|
|
1234
|
+
removed = [path for path in list(self._pending_changes)
|
|
1235
|
+
if path.startswith(project_state.project_folder_path)
|
|
1236
|
+
and not any(path.startswith(state.project_folder_path) for state in other_projects)]
|
|
1218
1237
|
for path in removed:
|
|
1219
1238
|
self._pending_changes.discard(path)
|
|
1220
1239
|
self._pending_change_sources.pop(path, None)
|
|
@@ -1233,6 +1252,8 @@ class ProjectStateManager:
|
|
|
1233
1252
|
)
|
|
1234
1253
|
cleanup_loop_start = time.monotonic()
|
|
1235
1254
|
for idx, monitored_folder in enumerate(project_state.monitored_folders, start=1):
|
|
1255
|
+
if monitored_folder.folder_path in other_watched_paths:
|
|
1256
|
+
continue
|
|
1236
1257
|
per_folder_start = time.monotonic()
|
|
1237
1258
|
logger.info(
|
|
1238
1259
|
"Cleanup unschedule start: session=%s idx=%d/%d path=%s",
|
|
@@ -56,6 +56,7 @@ class FileItem:
|
|
|
56
56
|
children: Optional[List['FileItem']] = None
|
|
57
57
|
is_expanded: bool = False
|
|
58
58
|
is_loaded: bool = False
|
|
59
|
+
access_error: Optional[str] = None
|
|
59
60
|
|
|
60
61
|
|
|
61
62
|
@dataclass
|
|
@@ -105,4 +106,4 @@ class ProjectState:
|
|
|
105
106
|
if self.open_tabs is None:
|
|
106
107
|
self.open_tabs = {}
|
|
107
108
|
if self.monitored_folders is None:
|
|
108
|
-
self.monitored_folders = []
|
|
109
|
+
self.monitored_folders = []
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import asyncio
|
|
2
|
+
import os
|
|
3
|
+
import tempfile
|
|
4
|
+
import unittest
|
|
5
|
+
from pathlib import Path
|
|
6
|
+
from unittest.mock import AsyncMock
|
|
7
|
+
|
|
8
|
+
from .manager import ProjectStateManager
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
class ProjectSyncTests(unittest.IsolatedAsyncioTestCase):
|
|
12
|
+
async def asyncSetUp(self):
|
|
13
|
+
self.tmp = tempfile.TemporaryDirectory()
|
|
14
|
+
self.root = Path(self.tmp.name)
|
|
15
|
+
self.channel = AsyncMock()
|
|
16
|
+
self.manager = ProjectStateManager(self.channel, {})
|
|
17
|
+
|
|
18
|
+
async def asyncTearDown(self):
|
|
19
|
+
if self.manager._change_debounce_timer:
|
|
20
|
+
self.manager._change_debounce_timer.cancel()
|
|
21
|
+
self.manager.file_watcher.stop_all()
|
|
22
|
+
for entry in self.manager._shared_git_managers.values():
|
|
23
|
+
entry['manager'].cleanup()
|
|
24
|
+
self.tmp.cleanup()
|
|
25
|
+
|
|
26
|
+
async def test_same_count_rename_and_unchanged_refresh(self):
|
|
27
|
+
(self.root / 'before').touch()
|
|
28
|
+
state = await self.manager.initialize_project_state('tab', str(self.root))
|
|
29
|
+
await self.manager._send_project_state_update(state)
|
|
30
|
+
(self.root / 'before').rename(self.root / 'after')
|
|
31
|
+
await self.manager._refresh_project_state('tab')
|
|
32
|
+
self.assertEqual(self.channel.send.await_count, 2)
|
|
33
|
+
self.assertEqual(self.channel.send.await_args.args[0]['items'][0]['name'], 'after')
|
|
34
|
+
await self.manager._refresh_project_state('tab')
|
|
35
|
+
self.assertEqual(self.channel.send.await_count, 2)
|
|
36
|
+
|
|
37
|
+
async def test_inotify_rename_delivers_without_explicit_refresh(self):
|
|
38
|
+
(self.root / 'before').touch()
|
|
39
|
+
state = await self.manager.initialize_project_state('tab', str(self.root))
|
|
40
|
+
await self.manager._send_project_state_update(state)
|
|
41
|
+
(self.root / 'before').rename(self.root / 'after')
|
|
42
|
+
async with asyncio.timeout(5):
|
|
43
|
+
while self.channel.send.await_args.args[0]['items'][0]['name'] != 'after':
|
|
44
|
+
await asyncio.sleep(.05)
|
|
45
|
+
|
|
46
|
+
@unittest.skipIf(os.geteuid() == 0, 'Requires ordinary user permission checks')
|
|
47
|
+
async def test_permission_denied_and_existing_expand_retry(self):
|
|
48
|
+
folder = self.root / 'restricted'
|
|
49
|
+
folder.mkdir()
|
|
50
|
+
(folder / 'child').touch()
|
|
51
|
+
folder.chmod(0)
|
|
52
|
+
try:
|
|
53
|
+
state = await self.manager.initialize_project_state('tab', str(self.root))
|
|
54
|
+
item = state.items[0]
|
|
55
|
+
self.assertEqual(item.access_error, 'permission_denied')
|
|
56
|
+
self.assertTrue(item.is_loaded)
|
|
57
|
+
self.assertTrue(await self.manager.expand_folder('tab', str(folder)))
|
|
58
|
+
self.assertEqual(state.items[0].access_error, 'permission_denied')
|
|
59
|
+
folder.chmod(0o700)
|
|
60
|
+
self.assertTrue(await self.manager.expand_folder('tab', str(folder)))
|
|
61
|
+
self.assertIsNone(state.items[0].access_error)
|
|
62
|
+
self.assertIn('child', [i.name for i in state.items])
|
|
63
|
+
finally:
|
|
64
|
+
folder.chmod(0o700)
|
|
65
|
+
|
|
66
|
+
async def test_same_project_tabs_keep_independent_expansion(self):
|
|
67
|
+
folder = self.root / 'folder'
|
|
68
|
+
folder.mkdir()
|
|
69
|
+
a = await self.manager.initialize_project_state('a', str(self.root))
|
|
70
|
+
b = await self.manager.initialize_project_state('b', str(self.root))
|
|
71
|
+
await self.manager.expand_folder('a', str(folder))
|
|
72
|
+
self.assertTrue(a.items[0].is_expanded)
|
|
73
|
+
self.assertFalse(b.items[0].is_expanded)
|
|
74
|
+
|
|
75
|
+
async def test_failed_send_does_not_suppress_retry(self):
|
|
76
|
+
state = await self.manager.initialize_project_state('tab', str(self.root))
|
|
77
|
+
self.channel.send.side_effect = [RuntimeError('disconnected'), None]
|
|
78
|
+
await self.manager._send_project_state_update(state)
|
|
79
|
+
await self.manager._send_project_state_update(state)
|
|
80
|
+
self.assertEqual(self.channel.send.await_count, 2)
|
|
81
|
+
|
|
82
|
+
async def test_closing_one_tab_keeps_other_tabs_watched(self):
|
|
83
|
+
await self.manager.initialize_project_state('a', str(self.root))
|
|
84
|
+
await self.manager.initialize_project_state('b', str(self.root))
|
|
85
|
+
await self.manager.cleanup_project('a')
|
|
86
|
+
self.assertIn(str(self.root), self.manager.file_watcher.watched_paths)
|
|
87
|
+
|
|
88
|
+
@unittest.skipIf(os.geteuid() == 0, 'Requires ordinary user permission checks')
|
|
89
|
+
async def test_permission_change_is_automatically_refreshed(self):
|
|
90
|
+
folder = self.root / 'restricted'
|
|
91
|
+
folder.mkdir()
|
|
92
|
+
folder.chmod(0)
|
|
93
|
+
try:
|
|
94
|
+
state = await self.manager.initialize_project_state('tab', str(self.root))
|
|
95
|
+
await self.manager._send_project_state_update(state)
|
|
96
|
+
self.assertEqual(state.items[0].access_error, 'permission_denied')
|
|
97
|
+
folder.chmod(0o700)
|
|
98
|
+
async with asyncio.timeout(5):
|
|
99
|
+
while self.channel.send.await_args.args[0]['items'][0]['access_error']:
|
|
100
|
+
await asyncio.sleep(.05)
|
|
101
|
+
finally:
|
|
102
|
+
folder.chmod(0o700)
|
|
@@ -288,9 +288,90 @@ async def test_codex_thread_resume():
|
|
|
288
288
|
turns_call = next(c for c in manager.bridge.calls if c[0] == "thread/turns/list")
|
|
289
289
|
assert turns_call[1]["threadId"] == "th-1"
|
|
290
290
|
assert turns_call[1]["itemsView"] == "full"
|
|
291
|
+
assert turns_call[1]["sortDirection"] == "desc"
|
|
292
|
+
assert turns_call[1]["limit"] == 80
|
|
291
293
|
assert not any(c[0] == "thread/read" for c in manager.bridge.calls)
|
|
292
294
|
|
|
293
295
|
|
|
296
|
+
@pytest.mark.asyncio
|
|
297
|
+
@pytest.mark.parametrize("count", [0, 1, 80, 81, 300])
|
|
298
|
+
@pytest.mark.parametrize("already_active", [False, True])
|
|
299
|
+
async def test_resume_keeps_latest_page_in_chronological_order(count, already_active):
|
|
300
|
+
channel = DummyControlChannel()
|
|
301
|
+
context = _context()
|
|
302
|
+
manager = CodexChatManager(channel, context)
|
|
303
|
+
manager.bridge = FakeBridge()
|
|
304
|
+
context["codex_manager"] = manager
|
|
305
|
+
turns = [{"id": f"turn-{i}", "status": "inProgress" if i == count - 1 else "completed",
|
|
306
|
+
"items": [{"id": f"user-{i}", "text": f"question {i}"},
|
|
307
|
+
{"id": f"answer-{i}", "text": f"answer {i}"}]} for i in range(count)]
|
|
308
|
+
if already_active and count:
|
|
309
|
+
manager._thread_active_turn["th-1"] = f"turn-{count - 1}"
|
|
310
|
+
|
|
311
|
+
async def call(method, params, timeout=60):
|
|
312
|
+
manager.bridge.calls.append((method, params))
|
|
313
|
+
if method == "thread/resume":
|
|
314
|
+
# A first embedded page must not override explicit newest selection.
|
|
315
|
+
return {"thread": {"id": "th-1"}, "initialTurnsPage": {"data": turns[:80]}}
|
|
316
|
+
assert method == "thread/turns/list"
|
|
317
|
+
ordered = list(reversed(turns)) if params["sortDirection"] == "desc" else turns
|
|
318
|
+
return {"data": ordered[:params["limit"]], "nextCursor": "older-page"}
|
|
319
|
+
|
|
320
|
+
manager.bridge.call = call
|
|
321
|
+
await CodexThreadResumeHandler(channel, context).handle(
|
|
322
|
+
{"cmd": "codex_thread_resume", "threadId": "th-1", "project_id": "p-1"}, reply_channel="rc-1")
|
|
323
|
+
assert len(channel.sent) == 1
|
|
324
|
+
payload = channel.sent[0]
|
|
325
|
+
assert [i["id"] for i in payload["items"]] == [
|
|
326
|
+
item["id"] for turn in turns[-80:] for item in turn["items"]]
|
|
327
|
+
if count:
|
|
328
|
+
assert payload["activeTurn"]["id"] == f"turn-{count - 1}"
|
|
329
|
+
assert [method for method, _ in manager.bridge.calls] == (
|
|
330
|
+
[] if already_active and count else ["thread/resume"]) + ["thread/turns/list"]
|
|
331
|
+
assert all("cursor" not in params for _, params in manager.bridge.calls)
|
|
332
|
+
assert all("_portacode_turn_id" not in item for turn in turns for item in turn["items"])
|
|
333
|
+
|
|
334
|
+
|
|
335
|
+
@pytest.mark.asyncio
|
|
336
|
+
@pytest.mark.parametrize("fallback", ["legacy_resume", "read_inline", "read_page", "resume_page"])
|
|
337
|
+
async def test_resume_fallback_caps_history_without_duplicate_rollout(fallback):
|
|
338
|
+
from portacode.connection.codex_app_server import CodexAppServerError
|
|
339
|
+
|
|
340
|
+
channel = DummyControlChannel()
|
|
341
|
+
context = _context()
|
|
342
|
+
manager = CodexChatManager(channel, context)
|
|
343
|
+
manager.bridge = FakeBridge()
|
|
344
|
+
context["codex_manager"] = manager
|
|
345
|
+
turns = [{"id": f"t-{i}", "items": [{"id": f"m-{i}", "text": str(i)}]} for i in range(100)]
|
|
346
|
+
|
|
347
|
+
async def call(method, params, timeout=60):
|
|
348
|
+
manager.bridge.calls.append((method, params))
|
|
349
|
+
if method == "thread/resume":
|
|
350
|
+
if fallback == "legacy_resume":
|
|
351
|
+
if params.get("excludeTurns"):
|
|
352
|
+
raise CodexAppServerError("unknown excludeTurns")
|
|
353
|
+
return {"thread": {"id": "th-1", "name": "preserved", "turns": turns}}
|
|
354
|
+
if fallback == "resume_page":
|
|
355
|
+
return {"thread": {"id": "th-1"}, "initialTurnsPage": {"data": turns}}
|
|
356
|
+
return {"thread": {"id": "th-1"}}
|
|
357
|
+
if method == "thread/turns/list":
|
|
358
|
+
raise CodexAppServerError("unknown method")
|
|
359
|
+
assert method == "thread/read" and params["excludeTurns"]
|
|
360
|
+
return ({"initialTurnsPage": {"data": turns}} if fallback == "read_page"
|
|
361
|
+
else {"thread": {"id": "th-1", "turns": turns}})
|
|
362
|
+
|
|
363
|
+
manager.bridge.call = call
|
|
364
|
+
await CodexThreadResumeHandler(channel, context).handle(
|
|
365
|
+
{"cmd": "codex_thread_resume", "threadId": "th-1", "project_id": "p-1"}, reply_channel="rc-1")
|
|
366
|
+
assert len(channel.sent) == 1
|
|
367
|
+
payload = channel.sent[0]
|
|
368
|
+
assert [i["id"] for i in payload["items"]] == [f"m-{i}" for i in range(20, 100)]
|
|
369
|
+
assert "turns" not in payload["thread"]
|
|
370
|
+
assert "initialTurnsPage" not in payload["thread"]
|
|
371
|
+
if fallback == "legacy_resume":
|
|
372
|
+
assert payload["thread"]["name"] == "preserved"
|
|
373
|
+
|
|
374
|
+
|
|
294
375
|
@pytest.mark.asyncio
|
|
295
376
|
async def test_codex_turn_start():
|
|
296
377
|
channel = DummyControlChannel()
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
portacode/README.md,sha256=R76fnJCKOnLiBEirTtc7fj4A6j5vAN1pdYMGNGqu1cs,1215
|
|
2
2
|
portacode/__init__.py,sha256=Hwk8wm5KA79qi06r0qKJKT2kjUlHrWaDtH4CyhnWFw8,1086
|
|
3
3
|
portacode/__main__.py,sha256=jmHTGC1hzmo9iKJLv-SSYe9BSIbPPZ2IOpecI03PlTs,296
|
|
4
|
-
portacode/_version.py,sha256=
|
|
4
|
+
portacode/_version.py,sha256=mhSi29noqMvVUbIxGHnRwsqmA8CBjsybZmIH-BNQSRI,535
|
|
5
5
|
portacode/browser_cli.py,sha256=MEc_WxTeezR4WP9wKcC89FGDeXbLyN6Ybfs-foUnrEY,5995
|
|
6
6
|
portacode/browser_prepare.py,sha256=xZRMkSEDZxw1YYz4LbiiYbmF9nOkXLcGsgkbGtVFfmQ,4805
|
|
7
7
|
portacode/browser_runtime.py,sha256=YR0duDqZaZrgSy0I9HrfZqV2fzcU2kIvUG1VyBiC93c,4276
|
|
@@ -50,7 +50,7 @@ portacode/connection/handlers/browser_handlers.py,sha256=FRSxxkexiqJVq7zivDoPwEA
|
|
|
50
50
|
portacode/connection/handlers/chunked_content.py,sha256=h6hXRmxSeOgnIxoU8CkmvEf2Odv-ajPrpHIe_W3GKcA,9251
|
|
51
51
|
portacode/connection/handlers/cloudflare_forwarding.py,sha256=v7jLFnSYoECakB8O8cEKArhk1SuD8NYsRr_YE-QT0f8,49528
|
|
52
52
|
portacode/connection/handlers/cloudflare_tunnel.py,sha256=qHBrm2rATxFmvfoC49YOBj0EUXjh_FETiWw66krxCIg,6655
|
|
53
|
-
portacode/connection/handlers/codex_handlers.py,sha256=
|
|
53
|
+
portacode/connection/handlers/codex_handlers.py,sha256=TOMH5i-kWq9uK-TzNc1dX5gZPCreW6YB-pVsnj8vLi8,54363
|
|
54
54
|
portacode/connection/handlers/diff_handlers.py,sha256=coN8gfY85KctBEs_bL9RCrZ6iymbP7zaB4Mzwgqrsck,24676
|
|
55
55
|
portacode/connection/handlers/file_handlers.py,sha256=ZPenZ14fJu7TTZSS79pLrAF2PKHMdbgmpzz5xZalW2I,44093
|
|
56
56
|
portacode/connection/handlers/file_transfer_handlers.py,sha256=otUb6x4roms-zFuuomyZFH68CNY5abr0A-eUMVgYAO8,7746
|
|
@@ -75,16 +75,15 @@ portacode/connection/handlers/test_runtime_user.py,sha256=L1p1XuW_D1O_HTGt6INRP4
|
|
|
75
75
|
portacode/connection/handlers/update_handler.py,sha256=44eVJlvhKzCiR0KXtyrPpGlqp7fAhMRyIpllaM9ZmiI,2124
|
|
76
76
|
portacode/connection/handlers/project_state/README.md,sha256=trdd4ig6ungmwH5SpbSLfyxbL-QgPlGNU-_XrMEiXtw,10114
|
|
77
77
|
portacode/connection/handlers/project_state/__init__.py,sha256=5ucIqk6Iclqg6bKkL8r_wVs5Tlt6B9J7yQH6yQUt7gc,2541
|
|
78
|
-
portacode/connection/handlers/project_state/file_system_watcher.py,sha256=
|
|
78
|
+
portacode/connection/handlers/project_state/file_system_watcher.py,sha256=pnDOCPEliZ1MTYmRWrgiS0BbtsY8I0daKRzpSvAo6Fs,10805
|
|
79
79
|
portacode/connection/handlers/project_state/git_manager.py,sha256=prXY1Mc-n8b2QWm3A0F8aRoRhQEyD6l8FA4NhwExL7w,69882
|
|
80
80
|
portacode/connection/handlers/project_state/handlers.py,sha256=IFA3mfQ-yx-h28JRoyJnSr4xehugX4Ef-n7QJAKLyG4,40550
|
|
81
|
-
portacode/connection/handlers/project_state/manager.py,sha256=
|
|
82
|
-
portacode/connection/handlers/project_state/models.py,sha256=
|
|
81
|
+
portacode/connection/handlers/project_state/manager.py,sha256=3Iwg5QSzgClLpkYKHiB1g0TXKQOCQJUzO24yhXrfOPM,71941
|
|
82
|
+
portacode/connection/handlers/project_state/models.py,sha256=WdxGCFjjD4dHE01PjQnZSrZCboCSriIeGl50hTIg-ik,4353
|
|
83
83
|
portacode/connection/handlers/project_state/test_handlers.py,sha256=OpDMA80NDAmE3Mz5blM6sOCeSnYeBg0fZmyN3gQpOlI,2789
|
|
84
|
+
portacode/connection/handlers/project_state/test_sync.py,sha256=eHw1SMrenclMhcHrPYNjtKYMPfi6-HxzArUR_K_Yz94,4781
|
|
84
85
|
portacode/connection/handlers/project_state/utils.py,sha256=LsbQr9TH9Bz30FqikmtTxco4PlB_n0kUIuPKQ6Fb_mo,1665
|
|
85
86
|
portacode/link_capture/__init__.py,sha256=93LjyYDqzOimsIDBhsPibTl7tr-8DiIzyDF7JWQkE2A,1231
|
|
86
|
-
portacode/link_capture/__pycache__/__init__.cpython-311.pyc,sha256=yKwOu63AoGpmk4l-jfGnt2G2YkI54I8MppgDvq8K4_s,2037
|
|
87
|
-
portacode/link_capture/__pycache__/__init__.cpython-38.pyc,sha256=q8pOyPtm1HJx__3-hR_9iW94o9NSrsue1W6_AcOfJLo,1123
|
|
88
87
|
portacode/link_capture/bin/elinks,sha256=VWEQlNcPazqaEJdDMbXmXJ2SLaAqN__IUBQNp8sSSto,104
|
|
89
88
|
portacode/link_capture/bin/gio-open,sha256=jOYX5fCkqWfFAY6ebJt6C1UcXISHa4iRmLePs5jU3Ko,106
|
|
90
89
|
portacode/link_capture/bin/gnome-open,sha256=oZHDhCtUWURmPry5EgkZjeJWZC2f10Qk101Dc4fNTVs,108
|
|
@@ -102,8 +101,6 @@ portacode/link_capture/bin/sensible-browser,sha256=oKVTZM1Z_mLEI2M-Lm-eaBK-Uqc00
|
|
|
102
101
|
portacode/link_capture/bin/w3m,sha256=mdM0AF4h_ElkfI2YZ-Ko1KHgWk2zLQrRwb2w1QQxXU8,101
|
|
103
102
|
portacode/link_capture/bin/x-www-browser,sha256=3RhqrunuuVktUf6WrbozW7qKlvfIlwXShl8PwF6Q80k,111
|
|
104
103
|
portacode/link_capture/bin/xdg-open,sha256=GLUv5ejdN8tym4PNtgKqTcZpF7YHIO3BnlWs3z3SQ3U,106
|
|
105
|
-
portacode/link_capture/bin/__pycache__/link_capture_wrapper.cpython-311.pyc,sha256=qRHqIznYM3smc99RBQ0XPA7j3NP5_HrTUvlTjKCmuos,3781
|
|
106
|
-
portacode/link_capture/bin/__pycache__/link_capture_wrapper.cpython-38.pyc,sha256=sBZ-Gss-eL7bsrOA-6WRKm0Fk8a7IKgqffrkE04uX9E,1971
|
|
107
104
|
portacode/static/js/test-ntp-clock.html,sha256=bUow9sifIuLNPqKvuPbpQozmEE6RhdCI4Plib3CqUmw,2130
|
|
108
105
|
portacode/static/js/utils/ntp-clock.js,sha256=t9moJyAGGU054BVtuGuSETVstlj1AoxVy44i4y9QWSs,6940
|
|
109
106
|
portacode/tests/test_automation_v2_inputs.py,sha256=ibVWnapK9owZtq5SIf5tTHvA1cGWf5ozDYb2AiL1LtA,5221
|
|
@@ -111,7 +108,7 @@ portacode/tests/test_browser_cli.py,sha256=ZmmNdRkIdLbTybWCKW6lCjktLRHvjK48wy1tQ
|
|
|
111
108
|
portacode/tests/test_browser_prepare.py,sha256=a75un88L1E5vX1B-1Qeh0ng6I_HictNcZ-Wf-F8uqKs,5395
|
|
112
109
|
portacode/tests/test_cli_service_logs.py,sha256=Fog68tVDMEe8zOcpfA1ukPRodhgjOwbTQ6Rm4leH6dQ,1733
|
|
113
110
|
portacode/tests/test_codex_app_server.py,sha256=xUiCno_Gx3Z5KrrhoxN38c5nGJBDgJ9bT7TDvFGZDMs,13993
|
|
114
|
-
portacode/tests/test_codex_handlers.py,sha256=
|
|
111
|
+
portacode/tests/test_codex_handlers.py,sha256=CuGx-YxqezmQDhsAWTYwcTEXfIH4eSJInV3cTPMvYDg,39556
|
|
115
112
|
portacode/tests/test_codex_loopback_proxy.py,sha256=W51wtATGxNMzODXY-tmRG5IU5N2FqIN8hvqQNxNv1xg,10423
|
|
116
113
|
portacode/tests/test_codex_prepare.py,sha256=n0LyedZq8IVP5OqR1pkd0h6Qvjax5_vDOwOnJGfUou8,13331
|
|
117
114
|
portacode/tests/test_codex_prepare_cli.py,sha256=hhhU3FDbLGfsSv2uC-sLzECfEScgeyyUXc_5JLNFBzw,2666
|
|
@@ -138,7 +135,7 @@ portacode/utils/diff_apply.py,sha256=ArkT-vEQ7iyA1Nfqufq1AiNtRLhoCMnC75FCRh2kNgI
|
|
|
138
135
|
portacode/utils/diff_renderer.py,sha256=S76StnQ2DLfsz4Gg0m07UwPfRp8270PuzbNaQq-rmYk,13850
|
|
139
136
|
portacode/utils/ntp_clock.py,sha256=VqCnWCTehCufE43W23oB-WUdAZGeCcLxkmIOPwInYHc,2499
|
|
140
137
|
portacode/utils/runtime_paths.py,sha256=G9ROho5f5gnDhoQ7vpEAX2XifBzoJTvqTylkF2Hkx8E,1660
|
|
141
|
-
portacode-2.2.28.
|
|
138
|
+
portacode-2.2.28.dev4.dist-info/licenses/LICENSE,sha256=iiV44E3po4OL77NL8diCk3WtYvCNGu6gUci2TYxVUgQ,5520
|
|
142
139
|
test_modules/README.md,sha256=Do_agkm9WhSzueXjRAkV_xEj6Emy5zB3N3VKY5Roce8,9274
|
|
143
140
|
test_modules/__init__.py,sha256=1LcbHodIHsB0g-g4NGjSn6AMuCoGbymvXPYLOb6Z7F0,53
|
|
144
141
|
test_modules/test_device_online.py,sha256=QtYq0Dq9vME8Gp2O4fGSheqVf8LUtpsSKosXXk56gGM,1654
|
|
@@ -164,8 +161,8 @@ testing_framework/core/playwright_manager.py,sha256=asMe7zQg8Kp3a71F7pv92OiFt63B
|
|
|
164
161
|
testing_framework/core/runner.py,sha256=t3fq0mGCVUCE_TbieEPwmLKjxe44ez29SzW8G33ACME,19746
|
|
165
162
|
testing_framework/core/shared_cli_manager.py,sha256=BESSNtyQb7BOlaOvZmm04T8Uezjms4KCBs2MzTxvzYQ,8790
|
|
166
163
|
testing_framework/core/test_discovery.py,sha256=2FZ9fJ8Dp5dloA-fkgXoJ_gCMC_nYPBnA3Hs2xlagzM,4928
|
|
167
|
-
portacode-2.2.28.
|
|
168
|
-
portacode-2.2.28.
|
|
169
|
-
portacode-2.2.28.
|
|
170
|
-
portacode-2.2.28.
|
|
171
|
-
portacode-2.2.28.
|
|
164
|
+
portacode-2.2.28.dev4.dist-info/METADATA,sha256=VgKlw1fTAbiBoQSzyT_LbjG8x0xLdyzHlEqSLo61GzM,12881
|
|
165
|
+
portacode-2.2.28.dev4.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
|
|
166
|
+
portacode-2.2.28.dev4.dist-info/entry_points.txt,sha256=0cV_SuIztVnLWACUY5KMR8K8pWdAsLiaFbLXE5He0rk,151
|
|
167
|
+
portacode-2.2.28.dev4.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
|
|
168
|
+
portacode-2.2.28.dev4.dist-info/RECORD,,
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
File without changes
|
|
File without changes
|