@riddledc/riddle-proof 0.5.26 → 0.5.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riddledc/riddle-proof",
-  "version": "0.5.26",
+  "version": "0.5.28",
   "description": "Reusable Riddle Proof contracts and helpers for evidence-backed agent changes.",
   "license": "MIT",
   "author": "RiddleDC",

package/runtime/lib/ship.py

@@ -82,6 +82,24 @@ def git_stdout(args, repo_dir, timeout=30):
     return result.stdout.strip()
 
 
+def git_checked(args, repo_dir, timeout=120):
+    result = sp.run(['git'] + args, cwd=repo_dir, capture_output=True, text=True, timeout=timeout)
+    if result.returncode != 0:
+        raise SystemExit('git ' + ' '.join(args) + ' failed: ' + (result.stderr or result.stdout)[:300])
+    return result
+
+
+def gh_pr_create_args(title, body, branch):
+    return [
+        'gh', 'pr', 'create',
+        '--draft',
+        '--title', str(title or '').strip() or 'Riddle Proof change',
+        '--body', str(body or ''),
+        '--base', 'main',
+        '--head', str(branch or ''),
+    ]
+
+
 def remote_branch_head(repo_dir, branch):
     result = sp.run(['git', 'ls-remote', 'origin', 'refs/heads/' + branch], cwd=repo_dir, capture_output=True, text=True, timeout=60)
     if result.returncode != 0:
@@ -623,11 +641,11 @@ if lines:
         print('Only ship-noise paths changed; skipping commit.')
     if s.get('pr_url'):
         if staged_paths:
-            git('git commit --amend --no-edit', after_dir)
+            git_checked(['commit', '--amend', '--no-edit'], after_dir)
         push, push_info = push_existing_pr_branch(after_dir, branch, push_target)
     else:
         if staged_paths:
-            git('git commit -m ' + json.dumps(s['commit_message']), after_dir)
+            git_checked(['commit', '-m', s['commit_message']], after_dir)
         push = sp.run(
             ['git', 'push', 'origin', push_target],
             cwd=after_dir,
@@ -657,8 +675,8 @@ else:
 
 # Create PR if needed
 if not s.get('pr_url'):
-    q = sp.run('gh pr list --head "' + branch + '" --json url,number -q ".[0]"',
-               shell=True, cwd=repo_dir, capture_output=True, text=True)
+    q = sp.run(['gh', 'pr', 'list', '--head', branch, '--json', 'url,number', '-q', '.[0]'],
+               cwd=repo_dir, capture_output=True, text=True)
     pr_url = ''
     if q.stdout.strip():
         try:
@@ -667,10 +685,10 @@ if not s.get('pr_url'):
         except:
             pass
     if not pr_url:
-        c = sp.run('gh pr create --draft --title ' + json.dumps(s['commit_message']) +
-                    ' --body ' + json.dumps(s['change_request']) + ' --base main' +
-                    ' --head ' + branch,
-                    shell=True, cwd=repo_dir, capture_output=True, text=True)
+        c = sp.run(gh_pr_create_args(s.get('commit_message', ''), s.get('change_request', ''), branch),
+                    cwd=repo_dir, capture_output=True, text=True)
+        if c.returncode != 0:
+            raise SystemExit('Failed to create PR: ' + (c.stderr or c.stdout)[:500])
         pr_url = c.stdout.strip().splitlines()[-1].strip() if c.returncode == 0 else ''
     s['pr_url'] = pr_url
     s['pr_number'] = pr_url.rstrip('/').split('/')[-1] if pr_url else ''

package/runtime/lib/util.py

@@ -112,8 +112,12 @@ def select_capture_hint(state):
             if str(item).strip()
         ]
         matched_tokens = [token for token in current_tokens if token in hint_tokens]
+        mode_matches = bool(current_mode and hint_mode == current_mode)
+        root_hint = server_path == '/'
+        if not matched_tokens and mode_matches and not root_hint:
+            continue
         score = len(matched_tokens) * 3
-        if current_mode and hint_mode == current_mode:
+        if mode_matches:
             score += 2
         if score <= 0:
             continue

package/runtime/tests/recon_verify_smoke.py

@@ -957,6 +957,73 @@ def run_recon_prefers_hint_root_over_single_route_literal():
         shutil.rmtree(tempdir, ignore_errors=True)
 
 
+def run_capture_hint_rejects_route_specific_mode_only_match():
+    tempdir = Path(tempfile.mkdtemp(prefix='riddle-proof-hint-selection-'))
+    try:
+        util = load_module('util_hint_selection', UTIL_PATH)
+        repo_key = str(tempdir / 'repo')
+        state = {
+            'repo': repo_key,
+            'verification_mode': 'text',
+            'change_request': 'Change the Tic Tac Toe reset button label to Reset Board.',
+            'success_criteria': 'The Tic Tac Toe page shows Reset Board on /games/tic-tac-toe.',
+        }
+        _, cache_path = util.load_capture_hint_cache(state)
+        cache_file = Path(cache_path)
+        cache_file.parent.mkdir(parents=True, exist_ok=True)
+        cache_file.write_text(json.dumps({
+            'version': util.CAPTURE_HINT_CACHE_VERSION,
+            'hints': [
+                {
+                    'saved_at': '2026-04-25T00:00:00Z',
+                    'verification_mode': 'text',
+                    'request_tokens': ['sequencer', 'monkberry', 'drum'],
+                    'server_path': '/games/drum-sequencer',
+                    'wait_for_selector': '.drum-sequencer h1',
+                    'observed_path': '/games/drum-sequencer',
+                }
+            ],
+        }))
+
+        selected = util.select_capture_hint(state)
+        applied = util.apply_capture_hint(state)
+
+        assert selected is None, selected
+        assert applied is None, applied
+        assert 'server_path' not in state, state
+
+        cache_file.write_text(json.dumps({
+            'version': util.CAPTURE_HINT_CACHE_VERSION,
+            'hints': [
+                {
+                    'saved_at': '2026-04-25T00:00:00Z',
+                    'verification_mode': 'text',
+                    'request_tokens': ['homepage', 'hero'],
+                    'server_path': '/',
+                    'wait_for_selector': '',
+                    'observed_path': '/',
+                }
+            ],
+        }))
+
+        root_state = {
+            'repo': repo_key,
+            'verification_mode': 'text',
+            'change_request': 'Make a tiny harmless copy tweak.',
+            'success_criteria': 'The changed copy is visible.',
+        }
+        root_applied = util.apply_capture_hint(root_state)
+        assert root_applied is not None, root_applied
+        assert root_state['server_path'] == '/', root_state
+        assert root_state['server_path_source'] == 'hint_cache', root_state
+
+        return {'ok': True, 'route_specific_selected': selected, 'root_server_path': root_state['server_path']}
+    finally:
+        if 'cache_file' in locals():
+            cache_file.unlink(missing_ok=True)
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
 def run_author_applies_supervisor_packet():
     tempdir = Path(tempfile.mkdtemp(prefix='riddle-proof-supervisor-apply-'))
     state_path = tempdir / 'state.json'
@@ -1579,6 +1646,42 @@ def run_ship_filters_tool_noise_when_staging():
         shutil.rmtree(tempdir, ignore_errors=True)
 
 
+def run_ship_preserves_literal_backticks_in_args():
+    sys.modules.pop('util', None)
+    source = SHIP_PATH.read_text()
+    helpers_source = source.split('\ns = load_state()', 1)[0]
+    namespace = {'__file__': str(SHIP_PATH)}
+    exec(compile(helpers_source, str(SHIP_PATH), 'exec'), namespace)
+
+    title = 'Change button from `Start Run` to `Launch Run`'
+    body = 'Proof request keeps `Start Run` and `Launch Run` literal.'
+    args = namespace['gh_pr_create_args'](title, body, 'agent/test-backticks')
+    assert args[0:3] == ['gh', 'pr', 'create'], args
+    assert args[args.index('--title') + 1] == title, args
+    assert args[args.index('--body') + 1] == body, args
+
+    tempdir = Path(tempfile.mkdtemp(prefix='riddle-proof-ship-backticks-'))
+    try:
+        sp.run(['git', 'init', '-b', 'main'], cwd=tempdir, check=True, capture_output=True, text=True)
+        sp.run(['git', 'config', 'user.email', 'test@example.com'], cwd=tempdir, check=True)
+        sp.run(['git', 'config', 'user.name', 'Test User'], cwd=tempdir, check=True)
+        (tempdir / 'tracked.txt').write_text('literal backticks\n')
+        sp.run(['git', 'add', 'tracked.txt'], cwd=tempdir, check=True)
+
+        namespace['git_checked'](['commit', '-m', title], str(tempdir))
+        subject = sp.run(
+            ['git', 'log', '-1', '--pretty=%s'],
+            cwd=tempdir,
+            check=True,
+            capture_output=True,
+            text=True,
+        ).stdout.strip()
+        assert subject == title, subject
+        return {'ok': True, 'subject': subject}
+    finally:
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
 def run_ship_resolves_real_pr_branch():
     sys.modules.pop('util', None)
     source = SHIP_PATH.read_text()
@@ -1648,6 +1751,7 @@ if __name__ == '__main__':
         'recon_preserves_query_route': run_recon_preserves_query_route(),
         'recon_route_literal_preference': run_recon_prefers_route_literals_over_import_paths(),
         'recon_hint_root_preference': run_recon_prefers_hint_root_over_single_route_literal(),
+        'capture_hint_rejects_route_specific_mode_only_match': run_capture_hint_rejects_route_specific_mode_only_match(),
         'author_applies_supervisor_packet': run_author_applies_supervisor_packet(),
         'verify_requests_supervisor_assessment': run_verify_requests_supervisor_assessment(),
         'verify_structured_evidence_without_screenshot': run_verify_structured_evidence_without_screenshot(),
@@ -1660,6 +1764,7 @@ if __name__ == '__main__':
         'ship_structured_after_evidence': run_ship_accepts_structured_after_evidence(),
         'ship_discord_thread_target': run_ship_discord_thread_target(),
         'ship_filters_tool_noise_when_staging': run_ship_filters_tool_noise_when_staging(),
+        'ship_preserves_literal_backticks_in_args': run_ship_preserves_literal_backticks_in_args(),
         'ship_resolves_real_pr_branch': run_ship_resolves_real_pr_branch(),
     }
     print(json.dumps(payload, indent=2))