@linimin/pi-letscook 0.1.32 → 0.1.35

package/scripts/canonical-evidence-artifact-test.sh

@@ -0,0 +1,348 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PKG_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+TMPDIR="$(mktemp -d)"
+CURRENT_EVIDENCE_BACKUP=""
+
+cleanup() {
+  if [[ -n "$CURRENT_EVIDENCE_BACKUP" && -f "$CURRENT_EVIDENCE_BACKUP" ]]; then
+    cp "$CURRENT_EVIDENCE_BACKUP" "$PKG_ROOT/.agent/verification-evidence.json"
+  fi
+  rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+cd "$PKG_ROOT"
+
+node <<'NODE'
+const fs = require('node:fs');
+
+const read = (file) => fs.readFileSync(file, 'utf8');
+const assertIncludes = (file, snippet) => {
+  const text = read(file);
+  if (!text.includes(snippet)) {
+    throw new Error(`${file} is missing required canonical-evidence text: ${snippet}`);
+  }
+};
+const escapeRegex = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+const readSection = (file, heading) => {
+  const text = read(file);
+  const match = text.match(new RegExp(`^${escapeRegex(heading)}\\s*$\\n([\\s\\S]*?)(?=^##\\s+|\\Z)`, 'm'));
+  if (!match) {
+    throw new Error(`${file} is missing required section: ${heading}`);
+  }
+  return match[1];
+};
+const assertSectionIncludes = (file, heading, snippet) => {
+  const section = readSection(file, heading);
+  if (!section.includes(snippet)) {
+    throw new Error(`${file} section ${heading} is missing required canonical-evidence text: ${snippet}`);
+  }
+};
+
+assertIncludes('README.md', '.agent/verification-evidence.json');
+assertIncludes('README.md', 'Fresh scaffolds create an idle placeholder');
+assertIncludes('README.md', 'bash scripts/canonical-evidence-artifact-test.sh');
+assertIncludes('.agent/README.md', '.agent/verification-evidence.json');
+assertIncludes('.agent/README.md', 'durable canonical record of deterministic verification');
+assertSectionIncludes('skills/completion-protocol/SKILL.md', '## Canonical Files', '- `.agent/verification-evidence.json`');
+assertSectionIncludes('skills/completion-protocol/SKILL.md', '## Canonical Inputs', '- `.agent/verification-evidence.json`');
+assertSectionIncludes('skills/completion-protocol/SKILL.md', '## Compaction And Recovery', '- `.agent/verification-evidence.json`');
+assertSectionIncludes('skills/completion-protocol/SKILL.md', '## Compaction And Recovery', '`completion-implementer` must also re-read canonical `.agent/state.json`, `.agent/plan.json`, `.agent/active-slice.json`, and `.agent/verification-evidence.json` before resuming work.');
+assertSectionIncludes('skills/completion-protocol/references/completion.md', '## Ignored Canonical Execution State', '- `.agent/verification-evidence.json`');
+assertSectionIncludes('skills/completion-protocol/references/completion.md', '## Canonical Inputs', '- `.agent/verification-evidence.json`');
+assertSectionIncludes('skills/completion-protocol/references/completion.md', '## Compaction And Recovery', '- `.agent/verification-evidence.json`');
+assertSectionIncludes('skills/completion-protocol/references/completion.md', '## Compaction And Recovery', '`completion-implementer` must also re-read canonical `.agent/state.json`, `.agent/plan.json`, `.agent/active-slice.json`, and `.agent/verification-evidence.json` before resuming work.');
+assertIncludes('extensions/completion/index.ts', 'Verification evidence artifact: ${evidence.path}');
+assertIncludes('extensions/completion/index.ts', 'Verification evidence summary: ${evidence.summary}');
+assertIncludes('extensions/completion/index.ts', 'Canonical verification evidence artifact is currently: ${evidence.path} (${evidence.status})');
+assertIncludes('extensions/completion/index.ts', '`- verification_evidence_path: ${evidence.path}`');
+assertIncludes('extensions/completion/index.ts', '`- verification_evidence_summary: ${evidence.summary}`');
+assertIncludes('extensions/completion/index.ts', 'Consume .agent/verification-evidence.json instead of temp-only verification summaries when it is populated.');
+assertIncludes('scripts/release-check.sh', 'bash .agent/verify_completion_control_plane.sh');
+assertIncludes('scripts/release-check.sh', 'bash ./scripts/canonical-evidence-artifact-test.sh');
+assertIncludes('.agent/verify_completion_control_plane.sh', '.agent/verification-evidence.json');
+assertIncludes('.agent/verify_completion_control_plane.sh', 'subject_type must be selected_slice when active slice exact handoff requires verification evidence');
+assertIncludes('.agent/verify_completion_stop.sh', '.agent/verification-evidence.json parity');
+NODE
+
+bash .agent/verify_completion_control_plane.sh >/dev/null
+
+CURRENT_EVIDENCE_BACKUP="$TMPDIR/current-verification-evidence.json"
+cp .agent/verification-evidence.json "$CURRENT_EVIDENCE_BACKUP"
+
+python3 - <<'PY'
+import json
+from pathlib import Path
+path = Path('.agent/verification-evidence.json')
+evidence = json.loads(path.read_text())
+evidence['head_sha'] = 'stale-head'
+path.write_text(json.dumps(evidence, indent=2) + '\n')
+PY
+
+if bash ./scripts/release-check.sh >/dev/null 2>&1; then
+  echo "expected release-check to fail when current repo verification-evidence.json is stale" >&2
+  exit 1
+fi
+
+if bash .agent/verify_completion_stop.sh >/dev/null 2>&1; then
+  echo "expected verify_completion_stop.sh to fail when current repo verification-evidence.json is stale" >&2
+  exit 1
+fi
+
+cp "$CURRENT_EVIDENCE_BACKUP" .agent/verification-evidence.json
+bash .agent/verify_completion_control_plane.sh >/dev/null
+
+ROOT="$TMPDIR/repo"
+SYSTEM_REMINDER="$TMPDIR/system-reminder.txt"
+mkdir -p "$ROOT"
+cd "$ROOT"
+git init -q
+
+PI_COMPLETION_SKIP_DRIVER_KICKOFF=1 \
+pi -e "$PKG_ROOT" -p "/cook canonical evidence fixture" \
+  >"$TMPDIR/pi-canonical-evidence-bootstrap.out" 2>"$TMPDIR/pi-canonical-evidence-bootstrap.err"
+
+for file in .agent/profile.json .agent/state.json .agent/plan.json .agent/active-slice.json .agent/verification-evidence.json; do
+  [[ -f "$file" ]] || { echo "missing canonical bootstrap file: $file" >&2; exit 1; }
+done
+
+bash .agent/verify_completion_control_plane.sh >/dev/null
+bash .agent/verify_completion_stop.sh >/dev/null
+
+python3 - <<'PY'
+import json
+from pathlib import Path
+
+evidence = json.loads(Path('.agent/verification-evidence.json').read_text())
+assert evidence['artifact_type'] == 'completion-verification-evidence', evidence
+assert evidence['subject_type'] == 'none', evidence
+assert evidence['verification_commands'] == [], evidence
+assert evidence['outcome'] == 'not_recorded', evidence
+assert evidence['recorded_at'] is None, evidence
+assert evidence['head_sha'] is None, evidence
+PY
+
+git add .
+git -c user.name='Test' -c user.email='test@example.com' commit -qm 'bootstrap fixture'
+HEAD_SHA="$(git rev-parse HEAD)"
+
+python3 - "$HEAD_SHA" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+head_sha = sys.argv[1]
+mission = 'Exercise canonical verification evidence parity.'
+task_type = 'completion-workflow'
+evaluation_profile = 'completion-rubric-v1'
+verification_commands = [
+    'bash .agent/verify_completion_control_plane.sh',
+    'bash .agent/verify_completion_stop.sh',
+]
+implementation_surfaces = [
+    '.agent/verification-evidence.json',
+    '.agent/verify_completion_control_plane.sh',
+    '.agent/verify_completion_stop.sh',
+]
+acceptance = [
+    'Canonical verification evidence is recorded for the selected slice.',
+    'Fail-closed verification rejects missing or stale evidence.',
+]
+state = {
+    'schema_version': 1,
+    'mission_anchor': mission,
+    'current_phase': 'implement',
+    'continuation_policy': 'continue',
+    'continuation_reason': 'Fixture for canonical evidence artifact regression coverage.',
+    'project_done': False,
+    'task_type': task_type,
+    'evaluation_profile': evaluation_profile,
+    'requires_reground': False,
+    'slices_since_last_reground': 0,
+    'remaining_release_blockers': 0,
+    'remaining_high_value_gaps': 1,
+    'unsatisfied_contract_ids': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+    'release_blocker_ids': [],
+    'next_mandatory_action': 'Implement selected slice evidence-fixture.',
+    'next_mandatory_role': 'completion-implementer',
+    'remaining_stop_judges': 3,
+    'last_reground_at': '2026-05-03T00:00:00Z',
+    'last_auditor_verdict': None,
+    'contract_status': 'selected_slice_pending_implementation',
+    'latest_completed_slice': head_sha,
+    'latest_verified_slice': head_sha,
+}
+plan = {
+    'schema_version': 1,
+    'mission_anchor': mission,
+    'task_type': task_type,
+    'evaluation_profile': evaluation_profile,
+    'last_reground_at': '2026-05-03T00:00:00Z',
+    'plan_basis': 'canonical_evidence_fixture',
+    'candidate_slices': [
+        {
+            'slice_id': 'evidence-fixture',
+            'goal': 'Persist canonical verification evidence for the selected slice.',
+            'acceptance_criteria': acceptance,
+            'contract_ids': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+            'priority': 70,
+            'status': 'selected',
+            'why_now': 'Exercise fail-closed evidence parity.',
+            'blocked_on': [],
+            'evidence': [],
+            'locked_notes': ['Keep the fixture scoped to canonical verification evidence parity.'],
+            'must_fix_findings': [],
+            'implementation_surfaces': implementation_surfaces,
+            'verification_commands': verification_commands,
+            'basis_commit': head_sha,
+            'remaining_contract_ids_before': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+            'release_blocker_count_before': 0,
+            'high_value_gap_count_before': 1,
+        }
+    ],
+}
+active = {
+    'schema_version': 1,
+    'mission_anchor': mission,
+    'task_type': task_type,
+    'evaluation_profile': evaluation_profile,
+    'status': 'selected',
+    'slice_id': 'evidence-fixture',
+    'goal': 'Persist canonical verification evidence for the selected slice.',
+    'contract_ids': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+    'acceptance_criteria': acceptance,
+    'blocked_on': [],
+    'locked_notes': ['Keep the fixture scoped to canonical verification evidence parity.'],
+    'must_fix_findings': [],
+    'implementation_surfaces': implementation_surfaces,
+    'verification_commands': verification_commands,
+    'basis_commit': head_sha,
+    'remaining_contract_ids_before': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+    'release_blocker_count_before': 0,
+    'high_value_gap_count_before': 1,
+    'priority': 70,
+    'why_now': 'Exercise fail-closed evidence parity.',
+}
+
+Path('.agent/state.json').write_text(json.dumps(state, indent=2) + '\n')
+Path('.agent/plan.json').write_text(json.dumps(plan, indent=2) + '\n')
+Path('.agent/active-slice.json').write_text(json.dumps(active, indent=2) + '\n')
+PY
+
+if bash .agent/verify_completion_control_plane.sh >/dev/null 2>&1; then
+  echo "expected control-plane verification to fail while selected-slice evidence remains at idle placeholder state" >&2
+  exit 1
+fi
+
+rm .agent/verification-evidence.json
+if bash .agent/verify_completion_control_plane.sh >/dev/null 2>&1; then
+  echo "expected control-plane verification to fail when verification-evidence.json is missing" >&2
+  exit 1
+fi
+
+python3 - "$HEAD_SHA" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+head_sha = sys.argv[1]
+verification_commands = [
+    'bash .agent/verify_completion_control_plane.sh',
+    'bash .agent/verify_completion_stop.sh',
+]
+invalid = {
+    'schema_version': 1,
+    'artifact_type': 'completion-verification-evidence',
+    'subject_type': 'selected_slice',
+    'slice_id': 'evidence-fixture',
+    'goal': 'Persist canonical verification evidence for the selected slice.',
+    'contract_ids': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+    'basis_commit': head_sha,
+    'head_sha': 'stale-head',
+    'verification_commands': verification_commands,
+    'outcome': 'passed',
+    'recorded_at': '2026-05-03T00:00:00Z',
+    'summary': 'Stale selected-slice evidence.',
+}
+Path('.agent/verification-evidence.json').write_text(json.dumps(invalid, indent=2) + '\n')
+PY
+
+HEAD_OUTPUT="$(bash .agent/verify_completion_control_plane.sh 2>&1 || true)"
+[[ "$HEAD_OUTPUT" == *"head_sha"* ]] || { echo "expected stale-head verification failure to mention head_sha, got: $HEAD_OUTPUT" >&2; exit 1; }
+
+python3 - "$HEAD_SHA" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+head_sha = sys.argv[1]
+invalid = {
+    'schema_version': 1,
+    'artifact_type': 'completion-verification-evidence',
+    'subject_type': 'selected_slice',
+    'slice_id': 'evidence-fixture',
+    'goal': 'Persist canonical verification evidence for the selected slice.',
+    'contract_ids': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+    'basis_commit': head_sha,
+    'head_sha': head_sha,
+    'verification_commands': ['bash .agent/verify_completion_control_plane.sh'],
+    'outcome': 'passed',
+    'recorded_at': '2026-05-03T00:00:00Z',
+    'summary': 'Out-of-parity command set.',
+}
+Path('.agent/verification-evidence.json').write_text(json.dumps(invalid, indent=2) + '\n')
+PY
+
+COMMAND_OUTPUT="$(bash .agent/verify_completion_control_plane.sh 2>&1 || true)"
+[[ "$COMMAND_OUTPUT" == *"verification_commands"* ]] || {
+  echo "expected verification-command parity failure to mention verification_commands, got: $COMMAND_OUTPUT" >&2
+  exit 1
+}
+
+python3 - "$HEAD_SHA" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+head_sha = sys.argv[1]
+valid = {
+    'schema_version': 1,
+    'artifact_type': 'completion-verification-evidence',
+    'subject_type': 'selected_slice',
+    'slice_id': 'evidence-fixture',
+    'goal': 'Persist canonical verification evidence for the selected slice.',
+    'contract_ids': ['CANONICAL-EVIDENCE-ARTIFACTS'],
+    'basis_commit': head_sha,
+    'head_sha': head_sha,
+    'verification_commands': [
+        'bash .agent/verify_completion_control_plane.sh',
+        'bash .agent/verify_completion_stop.sh',
+    ],
+    'outcome': 'passed',
+    'recorded_at': '2026-05-03T00:00:00Z',
+    'summary': 'Selected-slice verification evidence matches the active slice and current HEAD.',
+}
+Path('.agent/verification-evidence.json').write_text(json.dumps(valid, indent=2) + '\n')
+PY
+
+bash .agent/verify_completion_control_plane.sh >/dev/null
+bash .agent/verify_completion_stop.sh >/dev/null
+
+PI_COMPLETION_TEST_SYSTEM_REMINDER_PATH="$SYSTEM_REMINDER" \
+pi -e "$PKG_ROOT" -p "Summarize the completion reminder briefly." \
+  >"$TMPDIR/pi-canonical-evidence-reminder.out" 2>"$TMPDIR/pi-canonical-evidence-reminder.err"
+
+python3 - "$SYSTEM_REMINDER" <<'PY'
+import sys
+from pathlib import Path
+
+text = Path(sys.argv[1]).read_text()
+assert 'Canonical truth lives in .agent/state.json, .agent/plan.json, .agent/active-slice.json, .agent/slice-history.jsonl, .agent/stop-check-history.jsonl, and .agent/verification-evidence.json.' in text, text
+assert 'Verification evidence artifact: .agent/verification-evidence.json (present)' in text, text
+assert 'Verification evidence summary:' in text, text
+assert 'selected_slice' in text, text
+PY
+
+echo "canonical evidence artifact test passed: $TMPDIR"

package/scripts/context-proposal-test.sh

@@ -275,6 +275,35 @@ assert plan['plan_basis'] == 'user_refocus', 'plan_basis should be user_refocus
 assert active['status'] == 'idle', 'active slice should reset to idle after explicit-goal replacement'
 PY
 
+# Active workflow: cancelling the replacement proposal should keep the current workflow and redirect
+# the user back to the main chat before rerunning /cook.
+SESSION_THREE_CANCEL="$TMPDIR/session-three-cancel.jsonl"
+DISCUSSION_THREE_CANCEL=$'Scope:\n- Keep the current workflow unchanged when replacement confirmation is cancelled.\nConstraints:\n- Do not rewrite canonical state after cancel.\nAcceptance:\n- Print rerun guidance.'
+write_session "$SESSION_THREE_CANCEL" "$ROOT" "$DISCUSSION_THREE_CANCEL"
+
+PI_COMPLETION_EXISTING_WORKFLOW_ACTION=refocus \
+PI_COMPLETION_CONTEXT_PROPOSAL_ACTION=cancel \
+PI_COMPLETION_DISABLE_CONTEXT_PROPOSAL_ANALYST=1 \
+PI_COMPLETION_SKIP_DRIVER_KICKOFF=1 \
+pi --session "$SESSION_THREE_CANCEL" -e "$PKG_ROOT" -p "/cook Cancelled replacement mission for the active workflow" >"$TMPDIR/pi-completion-context-proposal-replacement-cancel.out" 2>"$TMPDIR/pi-completion-context-proposal-replacement-cancel.err"
+
+python3 - "$TMPDIR/pi-completion-context-proposal-replacement-cancel.out" "$TMPDIR/pi-completion-context-proposal-replacement-cancel.err" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+mission = 'Explicit replacement mission for the active workflow.'
+state = json.loads(Path('.agent/state.json').read_text())
+plan = json.loads(Path('.agent/plan.json').read_text())
+active = json.loads(Path('.agent/active-slice.json').read_text())
+output = Path(sys.argv[1]).read_text() + Path(sys.argv[2]).read_text()
+
+assert state['mission_anchor'] == mission, 'replacement proposal cancel should keep the existing mission anchor'
+assert plan['mission_anchor'] == mission, 'replacement proposal cancel should keep plan.json unchanged'
+assert active['mission_anchor'] == mission, 'replacement proposal cancel should keep active-slice.json unchanged'
+assert 'Discuss changes in the main chat and rerun /cook.' in output, 'replacement proposal cancel should redirect back to the main chat and rerun /cook'
+PY
+
 # Completed workflow again: /cook <goal> should start the next round directly from the explicit goal
 # even when analyst output is unavailable, without merging session-derived scope, constraints, or acceptance.
 mark_done
@@ -393,15 +422,15 @@ assert 'critique outcome=accepted critique=none' in continuation_reason, 'analys
 assert 'Keep explicit goals anchored.' in continuation_reason, 'analyst-derived scope should be preserved'
 PY
 
-# Custom confirmation UI: start should render proposal content separately from explicit Start/Edit/Cancel actions.
+# Custom confirmation UI: start should render proposal content separately from approval-only Start/Cancel actions.
 UI_ROOT_START="$TMPDIR/ui-root-start"
 mkdir -p "$UI_ROOT_START"
 cd "$UI_ROOT_START"
 git init -q
 
 UI_SESSION_START="$TMPDIR/ui-session-start.jsonl"
-UI_DISCUSSION_START=$'Mission: Replace the crowded selector with a clearer action layout.\nScope:\n- Separate proposal text from actions.\nConstraints:\n- Preserve Start/Edit/Cancel behavior.\nAcceptance:\n- Add regression coverage.'
-UI_ANALYST_OUTPUT_START='{"mission":"Replace the crowded selector with a clearer action layout.","scope":["Separate proposal text from actions."],"constraints":["Preserve Start/Edit/Cancel behavior."],"acceptance":["Add regression coverage."],"critique":["Keep critique details separate from the editable proposal body."],"risks":["Bundling critique into the action list would make the confirmation harder to scan."],"task_type":"completion-workflow","evaluation_profile":"completion-rubric-v1","possible_noise":["old selector wording"],"confidence":0.95}'
+UI_DISCUSSION_START=$'Mission: Replace the crowded selector with a clearer action layout.\nScope:\n- Separate proposal text from actions.\nConstraints:\n- Preserve approval-only Start/Cancel behavior.\nAcceptance:\n- Add regression coverage.'
+UI_ANALYST_OUTPUT_START='{"mission":"Replace the crowded selector with a clearer action layout.","scope":["Separate proposal text from actions."],"constraints":["Preserve approval-only Start/Cancel behavior."],"acceptance":["Add regression coverage."],"critique":["Keep critique details separate from the approval-only proposal summary."],"risks":["Bundling critique into the action list would make the confirmation harder to scan."],"task_type":"completion-workflow","evaluation_profile":"completion-rubric-v1","possible_noise":["old selector wording"],"confidence":0.95}'
 UI_SNAPSHOT_START="$TMPDIR/context-proposal-ui-start.json"
 write_session "$UI_SESSION_START" "$UI_ROOT_START" "$UI_DISCUSSION_START"
 
@@ -422,70 +451,37 @@ state = json.loads(Path('.agent/state.json').read_text())
 assert snapshot['proposalHeading'] == 'Proposed workflow', 'custom confirmation snapshot should expose a dedicated proposal section'
 assert snapshot['critiqueHeading'] == 'Critique and risks', 'custom confirmation snapshot should expose critique separately from the proposal body'
 assert snapshot['routingHeading'] == 'Routing recommendations', 'custom confirmation snapshot should expose routing recommendations separately from the proposal body'
+assert 'approval-only' in snapshot['intro'], 'custom confirmation intro should explain the approval-only gate'
 assert state['task_type'] == 'completion-workflow', 'start action should preserve canonical task_type'
 assert state['evaluation_profile'] == 'completion-rubric-v1', 'start action should preserve canonical evaluation_profile'
 assert 'Mission\nReplace the crowded selector with a clearer action layout.' in snapshot['proposalBody'], 'proposal body should be captured separately from the action list'
-assert 'Keep critique details separate from the editable proposal body.' not in snapshot['proposalBody'], 'critique notes should not be embedded in the proposal body'
-assert 'Critique\n- Keep critique details separate from the editable proposal body.' in snapshot['critiqueBody'], 'critique section should render accepted critique notes separately'
+assert 'Keep critique details separate from the approval-only proposal summary.' not in snapshot['proposalBody'], 'critique notes should not be embedded in the proposal body'
+assert 'Critique\n- Keep critique details separate from the approval-only proposal summary.' in snapshot['critiqueBody'], 'critique section should render accepted critique notes separately'
 assert 'Risks\n- Bundling critique into the action list would make the confirmation harder to scan.' in snapshot['critiqueBody'], 'critique section should render risk notes separately'
 assert 'Possible noise\n- old selector wording' in snapshot['critiqueBody'], 'critique section should render possible-noise notes separately'
 assert '- task_type: completion-workflow' in snapshot['routingBody'], 'routing section should render the recommended task_type'
 assert '- evaluation_profile: completion-rubric-v1' in snapshot['routingBody'], 'routing section should render the recommended evaluation_profile'
-assert [action['id'] for action in snapshot['actions']] == ['start', 'edit', 'cancel'], 'custom confirmation actions should stay Start/Edit/Cancel'
-assert [action['label'] for action in snapshot['actions']] == ['Start', 'Edit', 'Cancel'], 'custom confirmation action labels should be concise'
+assert [action['id'] for action in snapshot['actions']] == ['start', 'cancel'], 'custom confirmation actions should stay Start/Cancel only'
+assert [action['label'] for action in snapshot['actions']] == ['Start', 'Cancel'], 'custom confirmation action labels should be concise'
+assert 'Discuss changes in the main chat and rerun /cook.' in snapshot['actions'][1]['description'], 'cancel action should redirect users back to the main chat and rerun /cook'
 for action in snapshot['actions']:
     assert 'Replace the crowded selector with a clearer action layout.' not in action['label'], 'proposal mission should not be embedded in action labels'
     assert 'Separate proposal text from actions.' not in action['description'], 'proposal scope should not be embedded in action descriptions'
 assert state['mission_anchor'] == 'Replace the crowded selector with a clearer action layout.', 'start action should still accept the proposed mission'
 assert state['continuation_reason'].startswith('User started workflow via /cook:'), 'start action should persist the startup routing outcome in continuation_reason'
-assert 'Keep critique details separate from the editable proposal body.' in state['continuation_reason'], 'start action should persist the accepted critique outcome canonically'
-PY
-
-# Custom confirmation UI: edit should keep the existing editor/parsing flow when the action comes from the new layout.
-UI_ROOT_EDIT="$TMPDIR/ui-root-edit"
-mkdir -p "$UI_ROOT_EDIT"
-cd "$UI_ROOT_EDIT"
-git init -q
-
-UI_SESSION_EDIT="$TMPDIR/ui-session-edit.jsonl"
-UI_DISCUSSION_EDIT=$'Mission: Keep editing support in the custom confirmation UI.\nScope:\n- Preserve the proposal editor.\nConstraints:\n- Keep parsing structured proposal text.\nAcceptance:\n- Update the mission anchor after edit.'
-UI_ANALYST_OUTPUT_EDIT='{"mission":"Keep editing support in the custom confirmation UI.","scope":["Preserve the proposal editor."],"constraints":["Keep parsing structured proposal text."],"acceptance":["Update the mission anchor after edit."],"critique":["Keep critique persistence even when the operator edits the proposal body."],"task_type":"completion-workflow","evaluation_profile":"completion-rubric-v1","confidence":0.94}'
-UI_EDIT_TEXT=$'Mission: Edited mission from the custom confirmation UI.\nScope:\n- Preserve parsing after edit.\nConstraints:\n- Keep the shared confirmation flow.\nAcceptance:\n- Start the workflow from the edited proposal.'
-write_session "$UI_SESSION_EDIT" "$UI_ROOT_EDIT" "$UI_DISCUSSION_EDIT"
-
-PI_COMPLETION_TEST_CONTEXT_PROPOSAL_UI_ACTION=edit \
-PI_COMPLETION_CONTEXT_PROPOSAL_EDIT_TEXT="$UI_EDIT_TEXT" \
-PI_COMPLETION_CONTEXT_PROPOSAL_ANALYST_OUTPUT="$UI_ANALYST_OUTPUT_EDIT" \
-PI_COMPLETION_SKIP_DRIVER_KICKOFF=1 \
-pi --session "$UI_SESSION_EDIT" -e "$PKG_ROOT" -p "/cook" >"$TMPDIR/pi-completion-context-proposal-ui-edit.out" 2>"$TMPDIR/pi-completion-context-proposal-ui-edit.err"
-
-python3 - <<'PY'
-import json
-from pathlib import Path
-
-state = json.loads(Path('.agent/state.json').read_text())
-plan = json.loads(Path('.agent/plan.json').read_text())
-active = json.loads(Path('.agent/active-slice.json').read_text())
-mission = 'Edited mission from the custom confirmation UI.'
-
-assert state['mission_anchor'] == mission, 'edit action should still route through the proposal parser and update state.json'
-assert state['task_type'] == 'completion-workflow', 'edit action should preserve canonical task_type'
-assert state['evaluation_profile'] == 'completion-rubric-v1', 'edit action should preserve canonical evaluation_profile'
-assert plan['mission_anchor'] == mission, 'edit action should still route through the proposal parser and update plan.json'
-assert active['mission_anchor'] == mission, 'edit action should still route through the proposal parser and update active-slice.json'
-assert state['current_phase'] == 'reground', 'edit action should still bootstrap/reground the workflow'
-assert 'Keep critique persistence even when the operator edits the proposal body.' in state['continuation_reason'], 'edit action should preserve the accepted critique outcome canonically'
+assert 'Keep critique details separate from the approval-only proposal summary.' in state['continuation_reason'], 'start action should persist the accepted critique outcome canonically'
 PY
 
-# Custom confirmation UI: cancel should exit without writing canonical state.
+# Custom confirmation UI: cancel should exit without writing canonical state and should tell the user
+# to discuss changes in the main chat before rerunning /cook.
 UI_ROOT_CANCEL="$TMPDIR/ui-root-cancel"
 mkdir -p "$UI_ROOT_CANCEL"
 cd "$UI_ROOT_CANCEL"
 git init -q
 
 UI_SESSION_CANCEL="$TMPDIR/ui-session-cancel.jsonl"
-UI_DISCUSSION_CANCEL=$'Mission: Cancel from the custom confirmation UI without writing state.\nScope:\n- Show the proposal separately from the actions.\nConstraints:\n- Keep cancellation side-effect free.\nAcceptance:\n- Leave .agent absent after cancel.'
-UI_ANALYST_OUTPUT_CANCEL='{"mission":"Cancel from the custom confirmation UI without writing state.","scope":["Show the proposal separately from the actions."],"constraints":["Keep cancellation side-effect free."],"acceptance":["Leave .agent absent after cancel."],"confidence":0.92}'
+UI_DISCUSSION_CANCEL=$'Mission: Cancel from the custom confirmation UI without writing state.\nScope:\n- Show the proposal separately from the approval-only actions.\nConstraints:\n- Keep cancellation side-effect free.\nAcceptance:\n- Leave .agent absent after cancel.'
+UI_ANALYST_OUTPUT_CANCEL='{"mission":"Cancel from the custom confirmation UI without writing state.","scope":["Show the proposal separately from the approval-only actions."],"constraints":["Keep cancellation side-effect free."],"acceptance":["Leave .agent absent after cancel."],"confidence":0.92}'
 UI_SNAPSHOT_CANCEL="$TMPDIR/context-proposal-ui-cancel.json"
 write_session "$UI_SESSION_CANCEL" "$UI_ROOT_CANCEL" "$UI_DISCUSSION_CANCEL"
 
@@ -495,13 +491,18 @@ PI_COMPLETION_CONTEXT_PROPOSAL_ANALYST_OUTPUT="$UI_ANALYST_OUTPUT_CANCEL" \
 PI_COMPLETION_SKIP_DRIVER_KICKOFF=1 \
 pi --session "$UI_SESSION_CANCEL" -e "$PKG_ROOT" -p "/cook" >"$TMPDIR/pi-completion-context-proposal-ui-cancel.out" 2>"$TMPDIR/pi-completion-context-proposal-ui-cancel.err"
 
-python3 - "$UI_SNAPSHOT_CANCEL" <<'PY'
+python3 - "$UI_SNAPSHOT_CANCEL" "$TMPDIR/pi-completion-context-proposal-ui-cancel.out" "$TMPDIR/pi-completion-context-proposal-ui-cancel.err" <<'PY'
 import json
 import sys
 from pathlib import Path
 
 snapshot = json.loads(Path(sys.argv[1]).read_text())
-assert [action['id'] for action in snapshot['actions']] == ['start', 'edit', 'cancel'], 'cancel snapshot should still expose Start/Edit/Cancel actions'
+output = Path(sys.argv[2]).read_text() + Path(sys.argv[3]).read_text()
+assert 'approval-only' in snapshot['intro'], 'cancel snapshot should keep the approval-only intro'
+assert [action['id'] for action in snapshot['actions']] == ['start', 'cancel'], 'cancel snapshot should expose Start/Cancel actions only'
+assert [action['label'] for action in snapshot['actions']] == ['Start', 'Cancel'], 'cancel snapshot should keep concise Start/Cancel labels'
+assert 'Discuss changes in the main chat and rerun /cook.' in snapshot['actions'][1]['description'], 'cancel action copy should redirect users back to the main chat and rerun /cook'
+assert 'Discuss changes in the main chat and rerun /cook.' in output, 'cancel command output should redirect users back to the main chat and rerun /cook'
 assert not Path('.agent').exists(), 'cancel action should not write canonical workflow state'
 PY