ed
dc397db7ed
TIER-3 READ AGENTS.md + conductor/workflow.md + conductor/code_styleguides/error_handling.md + the 4 source files + 3 test files before this commit. The code_path_audit_phase_2_20260624 track (Tier 2) shipped 11 audit fixes (4 NG1 + 7 NG2) but used a heuristic bypass for 4 of the NG2 wrappers: legacy T | None functions that exist only to maintain test patcher compatibility. Per the review at docs/reports/REVIEW_TIER2_code_path_audit_phase_2_20260624.md Finding 8, this track eliminates the legacy wrappers properly. 11 wrappers eliminated (8 main + 3 _legacy_compat inner): - src/ai_client.py: get_current_tier (1 src + 1 test consumer) - src/ai_client.py: _gemini_tool_declaration + _legacy_compat (2 test consumers) - src/ai_client.py: run_tier4_patch_callback + _legacy_compat (was 0 direct callers but had 2 callback references in app_controller/multi_agent_conductor; callback contract migrated to Callable[[str, str], Result[str]] instead of preserving an Optional[str] adapter) - src/mcp_client.py: _get_symbol_node + _legacy_compat (8 in-file consumers) - src/mcp_client.py: find_in_scope (nested inside _get_symbol_node_result; private impl detail, audit doesn't catch T | None, left as-is) - src/external_editor.py: launch_diff (1 src + 3 test + 1 live_gui test consumer) - src/external_editor.py: launch_editor (no consumers; deleted) - src/session_logger.py: log_tool_output (2 src + 3 test consumers) - src/project_manager.py: parse_ts (no consumers; deleted) For each consumer: replace legacy_fn(args) with legacy_fn_result(args).data. For T | None checks: replace if x is None: with if not result.ok: or if not result.ok or not isinstance(result.data, ...) (depending on pattern). For run_tier4_patch_callback specifically: the wrapper was a callback adapter (not a backward-compat shim) and had 2 callback references as consumers. Rather than keep the adapter (which would re-introduce the Optional[str] return that the strict audit catches), the patch_callback contract was migrated from Callable[[str, str], Optional[str]] to Callable[[str, str], Result[str]] in shell_runner.py + app_controller.py + 9 _send_<vendor>_result signatures in ai_client.py. This propagates the Result[str] through the callback and lets shell_runner unwrap with if r.ok and r.data instead of if patch_text. Verification: - audit_optional_in_3_files --strict: 0 return-type Optional[T] (down from 1) - audit_exception_handling --strict: 0 violations (unchanged) - audit_legacy_wrappers: 0 legacy wrappers (unchanged) - 15 affected test files: 168 tests pass - 8 mcp_client/structural/baseline test files: 55 tests pass - 3 session/gui test files: 7 tests pass - 0 return-type Optional[T] in src/ai_client.py (was 1: run_tier4_patch_callback)
40 lines
1.2 KiB
Python
40 lines
1.2 KiB
Python
import threading
|
|
from src import ai_client
|
|
|
|
def test_ai_client_tier_isolation():
|
|
original_append = ai_client._append_comms
|
|
captured_logs = []
|
|
def intercepted_append(direction, kind, payload):
|
|
captured_logs.append({
|
|
'thread_name': threading.current_thread().name,
|
|
'source_tier': ai_client.get_current_tier_result().data
|
|
})
|
|
original_append(direction, kind, payload)
|
|
ai_client._append_comms = intercepted_append
|
|
ai_client.clear_comms_log()
|
|
barrier = threading.Barrier(2)
|
|
def run_t1():
|
|
ai_client.set_current_tier('Tier 3')
|
|
barrier.wait()
|
|
ai_client._append_comms('OUT', 'test', {})
|
|
def run_t2():
|
|
ai_client.set_current_tier('Tier 4')
|
|
barrier.wait()
|
|
ai_client._append_comms('OUT', 'test', {})
|
|
t1 = threading.Thread(target=run_t1, name='T1')
|
|
t2 = threading.Thread(target=run_t2, name='T2')
|
|
t1.start()
|
|
t2.start()
|
|
t1.join()
|
|
t2.join()
|
|
try:
|
|
log_t1 = next(log for log in captured_logs if log['thread_name'] == 'T1')
|
|
log_t2 = next(log for log in captured_logs if log['thread_name'] == 'T2')
|
|
assert log_t1['source_tier'] == 'Tier 3'
|
|
assert log_t2['source_tier'] == 'Tier 4'
|
|
finally:
|
|
ai_client._append_comms = original_append
|
|
|
|
if __name__ == "__main__":
|
|
test_ai_client_tier_isolation()
|