@riddledc/riddle-proof 0.5.27 → 0.5.29

package/package.json

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

package/runtime/lib/preflight.py

@@ -42,6 +42,7 @@ with open(args_file) as f:
 
 mode = (s.get('mode') or '').strip().lower()
 reference = s.get('reference', 'both')
+requested_reference = reference
 reference_note = ''
 verification_mode = (s.get('verification_mode') or 'proof').strip() or 'proof'
 s['verification_mode'] = verification_mode
@@ -68,6 +69,15 @@ if discord_url_match:
 if reference not in ('prod', 'before', 'both'):
     raise SystemExit('Invalid reference: ' + reference + '. Must be prod, before, or both.')
 s['reference'] = reference
+prod_url_present = bool((s.get('prod_url') or '').strip())
+s['reference_resolution'] = {
+    'requested_reference': requested_reference,
+    'effective_reference': reference,
+    'prod_reference_requested': requested_reference in ('prod', 'both'),
+    'prod_url_present': prod_url_present,
+    'prod_reference_skipped': False,
+    'prod_reference_skip_reason': '',
+}
 
 # Infer a reasonable commit title during setup instead of forcing the caller to
 # fill boilerplate that can be derived from the requested change.
@@ -77,11 +87,17 @@ if not (s.get('commit_message') or '').strip():
 # Setup should not block on a missing production URL. If prod comparison was
 # requested but prod_url is not known yet, continue with a before-only setup so
 # the repo homework can happen first.
-if reference in ('prod', 'both') and not (s.get('prod_url') or '').strip():
+if reference in ('prod', 'both') and not prod_url_present:
     s['requested_reference'] = reference
     reference = 'before'
     s['reference'] = reference
     reference_note = 'prod_url not provided; setup will continue with reference=before until prod is known.'
+    s['reference_resolution'].update({
+        'effective_reference': reference,
+        'prod_reference_skipped': True,
+        'prod_reference_skip_reason': 'prod_url_not_provided',
+        'note': reference_note,
+    })
 
 # Parse optional assertions JSON
 parsed_assertions = None

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/tests/recon_verify_smoke.py

@@ -11,6 +11,7 @@ from pathlib import Path
 ROOT = Path(__file__).resolve().parents[1]
 LIB = ROOT / 'lib'
 UTIL_PATH = LIB / 'util.py'
+PREFLIGHT_PATH = LIB / 'preflight.py'
 RECON_PATH = LIB / 'recon.py'
 VERIFY_PATH = LIB / 'verify.py'
 AUTHOR_PATH = LIB / 'author.py'
@@ -593,6 +594,49 @@ def temporary_env(**updates):
                 os.environ[key] = value
 
 
+def run_preflight_records_prod_reference_skip_reason():
+    tempdir = Path(tempfile.mkdtemp(prefix='riddle-proof-preflight-reference-'))
+    args_path = tempdir / 'args.json'
+    state_path = tempdir / 'state.json'
+    repo_dir = tempdir / 'repo'
+    try:
+        make_project(repo_dir, "export const routes = [{ path: '/pricing', element: <Pricing /> }];\n")
+        args_path.write_text(json.dumps({
+            'repo': 'example/repo',
+            'repo_dir': str(repo_dir),
+            'mode': 'static',
+            'reference': 'both',
+            'prod_url': '',
+            'change_request': 'Make the pricing CTA clearer',
+            'commit_message': 'Make the pricing CTA clearer',
+            'success_criteria': 'Pricing CTA is visible.',
+            'verification_mode': 'text',
+            'build_command': BUILD_SCRIPT,
+            'build_output': 'build',
+            'allow_static_preview_fallback': True,
+            'server_path': '/pricing',
+        }, indent=2))
+        with temporary_env(
+            RIDDLE_PROOF_ARGS_FILE=str(args_path),
+            RIDDLE_PROOF_STATE_FILE=str(state_path),
+        ):
+            load_module('util_preflight_reference_skip', UTIL_PATH)
+            load_module('preflight_reference_skip', PREFLIGHT_PATH)
+        after_preflight = json.loads(state_path.read_text())
+        assert after_preflight['requested_reference'] == 'both'
+        assert after_preflight['reference'] == 'before'
+        assert after_preflight['reference_resolution']['requested_reference'] == 'both'
+        assert after_preflight['reference_resolution']['effective_reference'] == 'before'
+        assert after_preflight['reference_resolution']['prod_reference_skipped'] is True
+        assert after_preflight['reference_resolution']['prod_reference_skip_reason'] == 'prod_url_not_provided'
+        return {
+            'ok': True,
+            'reference_resolution': after_preflight['reference_resolution'],
+        }
+    finally:
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
 def base_state(tempdir: Path, *, reference='before', prod_url=''):
     before_dir = tempdir / 'before'
     after_dir = tempdir / 'after'
@@ -1646,6 +1690,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()
@@ -1704,6 +1784,7 @@ def run_ship_resolves_real_pr_branch():
 
 if __name__ == '__main__':
     payload = {
+        'preflight_reference_skip_reason': run_preflight_records_prod_reference_skip_reason(),
         'capture_artifact_enrichment': run_capture_artifact_enrichment(),
         'capture_diagnostics_redaction': run_capture_diagnostics_redact_sensitive_values(),
         'apply_auth_context': run_apply_auth_context_passes_supported_auth_payloads(),
@@ -1728,6 +1809,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))