@ikieaneh/opencode-kit 0.6.0 → 0.6.2

package/src/postflight.py

@@ -0,0 +1,211 @@
+#!/usr/bin/env python3
+"""postflight helper — batch all contract/telemetry/STATE.md operations in one call.
+
+Replaces 11 separate inline Python invocations from postflight.sh with a single
+script that handles: contract read/migration, phase telemetry, summary update,
+STATE.md generation, and contract file persistence.
+
+Usage:
+    postflight.py CONTRACT_FILE TELEMETRY_DIR STATE_FILE STATE_BACKUP_DIR TEMPLATE_FILE [NEW_STATE]
+
+Returns JSON to stdout with extracted values for shell-level echo/log messages.
+"""
+import json
+import os
+import sys
+import datetime
+
+
+def main() -> int:
+    # --- Parse arguments ---
+    contract_file = sys.argv[1] if len(sys.argv) > 1 else '.opencode/orchestration/contract.json'
+    telemetry_dir = sys.argv[2] if len(sys.argv) > 2 else '.opencode/telemetry'
+    state_file = sys.argv[3] if len(sys.argv) > 3 else 'STATE.md'
+    state_backup_dir = sys.argv[4] if len(sys.argv) > 4 else '.opencode/state'
+    template_file = sys.argv[5] if len(sys.argv) > 5 else '.opencode/templates/contract.json'
+    new_state = sys.argv[6] if len(sys.argv) > 6 else None
+
+    start_time_file = os.path.join(telemetry_dir, '.phase_start')
+    phases_file = os.path.join(telemetry_dir, 'phases.jsonl')
+    summary_file = os.path.join(telemetry_dir, 'summary.json')
+
+    now = datetime.datetime.now(datetime.UTC)
+    now_iso = now.strftime('%Y-%m-%dT%H:%M:%SZ')
+
+    # --- Load contract (file or template fallback) ---
+    contract = {}
+    if os.path.exists(contract_file):
+        with open(contract_file) as f:
+            contract = json.load(f)
+    elif os.path.exists(template_file):
+        with open(template_file) as f:
+            contract = json.load(f)
+
+    prev_state = contract.get('state', 'INIT')
+
+    # --- Update state if provided ---
+    if new_state:
+        contract['state'] = new_state
+
+    current_state = contract.get('state', 'UNKNOWN')
+
+    # --- Read start time and calculate phase elapsed ---
+    os.makedirs(telemetry_dir, exist_ok=True)
+    phase_elapsed_ms = 0
+    if os.path.exists(start_time_file):
+        with open(start_time_file) as f:
+            raw = f.read().strip()
+        if raw:
+            try:
+                start_ts = int(raw)
+                phase_elapsed_ms = int((now.timestamp() - start_ts) * 1000)
+            except ValueError:
+                pass
+        os.remove(start_time_file)
+
+    # --- Read last 'to' state from phases.jsonl for telemetry ---
+    last_to_state = 'INIT'
+    if os.path.exists(phases_file):
+        lines = [l.strip() for l in open(phases_file) if l.strip()]
+        if lines:
+            try:
+                last_to_state = json.loads(lines[-1]).get('to', 'INIT')
+            except json.JSONDecodeError:
+                pass
+
+    # --- Record phase telemetry ---
+    phase_entry = {
+        'ts': now_iso,
+        'from': last_to_state,
+        'to': current_state,
+        'elapsed_ms': phase_elapsed_ms,
+    }
+    with open(phases_file, 'a') as f:
+        f.write(json.dumps(phase_entry) + '\n')
+
+    # --- Contract migration (merge missing fields from template) ---
+    migrated = False
+    if os.path.exists(template_file):
+        with open(template_file) as f:
+            template = json.load(f)
+
+        old_ver = contract.get('contract_version', '0.0.0')
+        new_ver = template.get('contract_version', '0.5.2')
+
+        needs_migration = (
+            old_ver != new_ver
+            or not all(k in contract for k in ['state', 'requirements', 'governance', 'score'])
+        )
+
+        if needs_migration:
+            for key in template:
+                if key not in contract:
+                    contract[key] = template[key]
+            if 'extension_skills' not in contract.get('governance', {}):
+                contract.setdefault('governance', {})['extension_skills'] = []
+            contract['contract_version'] = new_ver
+            migrated = True
+
+    # --- Write contract to primary location ---
+    os.makedirs(os.path.dirname(contract_file) or '.', exist_ok=True)
+    with open(contract_file, 'w') as f:
+        json.dump(contract, f, indent=2)
+
+    # --- Backup contract to state backup dir ---
+    os.makedirs(state_backup_dir, exist_ok=True)
+    with open(os.path.join(state_backup_dir, 'contract.json'), 'w') as f:
+        json.dump(contract, f, indent=2)
+
+    # --- Update telemetry summary.json ---
+    total_ms = 0
+    phases = []
+    if os.path.exists(phases_file):
+        with open(phases_file) as f:
+            for line in f:
+                line = line.strip()
+                if not line:
+                    continue
+                try:
+                    entry = json.loads(line)
+                    total_ms += entry.get('elapsed_ms', 0)
+                    phases.append(entry.get('to', ''))
+                except json.JSONDecodeError:
+                    pass
+
+    summary = {
+        'phases_completed': phases,
+        'total_elapsed_ms': total_ms,
+        'total_elapsed_s': round(total_ms / 1000, 1),
+        'updated_at': now_iso,
+    }
+    with open(summary_file, 'w') as f:
+        json.dump(summary, f, indent=2)
+
+    # --- Extract values for STATE.md ---
+    retry = contract.get('retry', {})
+    score_obj = contract.get('score', {})
+    state_val = contract.get('state', 'UNKNOWN')
+    phase_val = retry.get('current_phase', 'none')
+    score_combined = str(score_obj.get('combined', '?'))
+
+    # Issues / blockers
+    issues = retry.get('issues', [])
+    issues_blockers = '\n'.join(f'- {i}' for i in issues) if issues else 'None'
+
+    # ADRs (last 3)
+    adr_log = contract.get('decisions', {}).get('adr_log', [])
+    if adr_log:
+        adr_lines = '\n'.join(
+            f'- {e.get("id", "?")}: {e.get("title", "")}' for e in adr_log[-3:]
+        )
+    else:
+        adr_lines = 'No ADRs recorded'
+
+    # Last completed phase
+    metrics_phases = contract.get('metrics', {}).get('phases_completed', [])
+    last_phase = metrics_phases[-1] if metrics_phases else 'INIT'
+
+    # --- Write STATE.md ---
+    state_md = (
+        '# Project State\n'
+        '\n'
+        '## Current Focus\n'
+        f'Agent orchestration — {state_val} (phase: {phase_val}). Score: {score_combined}.\n'
+        '\n'
+        '## Known Blockers\n'
+        f'{issues_blockers}\n'
+        '\n'
+        '## Active Decisions\n'
+        f'{adr_lines}\n'
+        '\n'
+        '## Recent Changes\n'
+        f'- Last state transition: {last_phase}\n'
+    )
+    state_dir = os.path.dirname(state_file)
+    if state_dir:
+        os.makedirs(state_dir, exist_ok=True)
+    with open(state_file, 'w') as f:
+        f.write(state_md)
+
+    # --- Output JSON summary for shell script consumption ---
+    output = {
+        'state': state_val,
+        'phase': phase_val,
+        'score': score_combined,
+        'prev_state': prev_state,
+        'current_state': current_state,
+        'phase_elapsed_ms': phase_elapsed_ms,
+        'phase_elapsed_s': round(phase_elapsed_ms / 1000, 1),
+        'migrated': migrated,
+        'contract_version': contract.get('contract_version', '?'),
+        'phases_count': len(phases),
+        'total_elapsed_s': summary['total_elapsed_s'],
+        'issues_count': len(issues),
+        'last_to_state': last_to_state,
+    }
+    print(json.dumps(output))
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())

package/src/postflight.sh

@@ -11,7 +11,6 @@ CONTRACT_KEY="orchestration-contract"
 CONTRACT_FILE=".opencode/orchestration/contract.json"
 STATE_FILE="STATE.md"
 TELEMETRY_DIR=".opencode/telemetry"
-START_TIME_FILE=".opencode/telemetry/.phase_start"
 STATE_BACKUP_DIR=".opencode/state"
 TEMPLATE_FILE=".opencode/templates/contract.json"
 
@@ -19,171 +18,65 @@ mkdir -p "$TELEMETRY_DIR" "$STATE_BACKUP_DIR"
 
 echo "[opencode-kit] Post-flight: persisting state..."
 
-# --- Telemetry: record phase completion ---
-mkdir -p "$TELEMETRY_DIR"
-PHASE_START=$(cat "$START_TIME_FILE" 2>/dev/null || echo "")
-if [ -n "$PHASE_START" ]; then
-  PHASE_ELAPSED=$(( $(date +%s) - PHASE_START ))
-  # Read current state from contract
-  if [ -f "$CONTRACT_FILE" ]; then
-    CURRENT_STATE=$($PYTHON_CMD -c "
-import json
-with open('$CONTRACT_FILE') as f: d=json.load(f)
-print(d.get('state','UNKNOWN'))
-" 2>/dev/null || echo "UNKNOWN")
-    PREV_STATE=""
-    [ -f "$TELEMETRY_DIR/phases.jsonl" ] && PREV_STATE=$(tail -1 "$TELEMETRY_DIR/phases.jsonl" 2>/dev/null | $PYTHON_CMD -c "import sys,json; print(json.load(sys.stdin).get('to','INIT'))" 2>/dev/null || echo "INIT")
-    echo "{\"ts\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"from\":\"$PREV_STATE\",\"to\":\"$CURRENT_STATE\",\"elapsed_ms\":$((PHASE_ELAPSED * 1000))}" >> "$TELEMETRY_DIR/phases.jsonl"
-    echo "  📊 Telemetry: $PREV_STATE → $CURRENT_STATE (${PHASE_ELAPSED}s)"
-  fi
-  rm -f "$START_TIME_FILE"
+# --- Resolve contract: try lean-ctx first, fall back to file ---
+LEAN_CTX_CONTRACT=$(lean-ctx ctx_knowledge recall --query "$CONTRACT_KEY" 2>/dev/null || true)
+if [ -n "$LEAN_CTX_CONTRACT" ]; then
+  echo "$LEAN_CTX_CONTRACT" > "$CONTRACT_FILE"
 fi
 
-# --- Step 1: Read contract (try lean-ctx first, fall back to file) ---
-CURRENT_CONTRACT=$(lean-ctx ctx_knowledge recall --query "$CONTRACT_KEY" 2>/dev/null || cat "$CONTRACT_FILE" 2>/dev/null || echo "")
-if [ -z "$CURRENT_CONTRACT" ]; then
-  echo "  ⚠️  No contract found in lean-ctx or file. Creating new from template..."
-  if [ -f "$TEMPLATE_FILE" ]; then
-    CURRENT_CONTRACT=$(cat "$TEMPLATE_FILE")
+# --- Single Python call: batch all contract/telemetry/STATE.md operations ---
+PYTHON_OUTPUT=""
+STATE=""
+if [ -n "$PYTHON_CMD" ]; then
+  PYTHON_OUTPUT=$($PYTHON_CMD "$SCRIPT_DIR/postflight.py" \
+    "$CONTRACT_FILE" "$TELEMETRY_DIR" "$STATE_FILE" \
+    "$STATE_BACKUP_DIR" "$TEMPLATE_FILE" \
+  )
+
+  # Single Python parse call: extract all values as pipe-delimited string
+  IFS='|' read -r STATE PHASE SCORE PREV_STATE CURRENT_STATE ELAPSED_S MIGRATED CONTRACT_VER PHASES_COUNT TOTAL_ELAPSED_S LAST_TO_STATE <<< \
+    "$(echo "$PYTHON_OUTPUT" | $PYTHON_CMD -c "
+import sys, json
+d = json.load(sys.stdin)
+print('|'.join([str(d.get(k, '')) for k in [
+    'state', 'phase', 'score', 'prev_state', 'current_state',
+    'phase_elapsed_s', 'migrated', 'contract_version',
+    'phases_count', 'total_elapsed_s', 'last_to_state'
+]]))
+" 2>/dev/null || echo "UNKNOWN|none|?|INIT|UNKNOWN|0|false|?|0|0|INIT")"
+
+  # --- Echo status messages ---
+  echo "  📊 Telemetry: $PREV_STATE → $CURRENT_STATE (${ELAPSED_S}s)"
+
+  if [ "$MIGRATED" = "true" ]; then
+    echo "  🔄 Contract migrated to v${CONTRACT_VER}"
   fi
-fi
-
-# --- Step 1b: Contract migration (auto-upgrade old schema) ---
-if [ -n "$CURRENT_CONTRACT" ] && [ -f "$TEMPLATE_FILE" ] && [ -n "$PYTHON_CMD" ]; then
-  MIGRATED=$($PYTHON_CMD -c "
-import json
 
-try:
-    contract = json.loads('''$CURRENT_CONTRACT''')
-    with open('$TEMPLATE_FILE') as f:
-        template = json.load(f)
-
-    # Check version
-    old_ver = contract.get('contract_version', '0.0.0')
-    new_ver = template.get('contract_version', '0.5.2')
-
-    if old_ver == new_ver and all(k in contract for k in ['state','requirements','governance','score']):
-        print('NO_MIGRATION')
-    else:
-        # Merge missing top-level fields from template
-        for key in template:
-            if key not in contract:
-                contract[key] = template[key]
-        # Merge governance.extension_skills if missing
-        if 'extension_skills' not in contract.get('governance', {}):
-            if 'governance' not in contract:
-                contract['governance'] = {}
-            contract['governance']['extension_skills'] = []
-        # Update version
-        contract['contract_version'] = new_ver
-        print(json.dumps(contract))
-except Exception as e:
-    print('MIGRATE_ERROR:'+str(e))
-" 2>/dev/null || echo "MIGRATE_ERROR")
+  echo "  📝 Contract state: $STATE (phase: $PHASE, score: $SCORE)"
+  echo "  ✅ STATE.md synced"
 
-  if [ -n "$MIGRATED" ] && [ "$MIGRATED" != "NO_MIGRATION" ] && [ "$MIGRATED" != "MIGRATE_ERROR" ]; then
-    CURRENT_CONTRACT="$MIGRATED"
-    echo "$MIGRATED" > "$CONTRACT_FILE"
-    echo "  🔄 Contract migrated to v$(echo "$MIGRATED" | $PYTHON_CMD -c "import sys,json; print(json.load(sys.stdin).get('contract_version','?'))" 2>/dev/null)"
-  fi
+  echo "  📈 Telemetry summary: ${PHASES_COUNT} phases, ${TOTAL_ELAPSED_S}s total"
+else
+  echo "  ⚠️  Python not available, skipping postflight processing"
 fi
 
-# --- Step 2: Persist (try lean-ctx first, fall back to file) ---
-PERSISTED=false
-if lean-ctx ctx_knowledge remember \
-  category architecture \
-  key "$CONTRACT_KEY" \
-  value "$CURRENT_CONTRACT" 2>/dev/null; then
-  echo "  ✅ Contract persisted to lean-ctx"
-  PERSISTED=true
+# --- Persist to lean-ctx ---
+if [ -n "$PYTHON_CMD" ] && [ -f "$CONTRACT_FILE" ]; then
+  CONTRACT_JSON=$(cat "$CONTRACT_FILE")
+  if lean-ctx ctx_knowledge remember \
+    category architecture \
+    key "$CONTRACT_KEY" \
+    value "$CONTRACT_JSON" 2>/dev/null; then
+    echo "  ✅ Contract persisted to lean-ctx"
+  fi
 fi
 
-# File fallback: write to .opencode/state/contract.json
-echo "$CURRENT_CONTRACT" > "$STATE_BACKUP_DIR/contract.json"
+# File fallback always written by Python script to $STATE_BACKUP_DIR/contract.json
 echo "  ✅ Contract persisted to file: $STATE_BACKUP_DIR/contract.json"
 
-# --- Step 3: Sync STATE.md ---
-mkdir -p "$(dirname "$STATE_FILE")"
-if [ -f "$CONTRACT_FILE" ]; then
-  STATE=$(echo "$CURRENT_CONTRACT" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('state','UNKNOWN'))" 2>/dev/null || echo "UNKNOWN")
-  PHASE=$(echo "$CURRENT_CONTRACT" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); r=d.get('retry',{}); print(r.get('current_phase','none'))" 2>/dev/null || echo "none")
-  SCORE=$(echo "$CURRENT_CONTRACT" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); s=d.get('score',{}); print(s.get('combined','?'))" 2>/dev/null || echo "?")
-  echo "  📝 Contract state: $STATE (phase: $PHASE, score: $SCORE)"
-
-  # Create or update STATE.md with current focus
-  cat > "$STATE_FILE" << STATEMD
-# Project State
-
-## Current Focus
-Agent orchestration — $STATE (phase: ${PHASE:-none}). Score: $SCORE.
-
-## Known Blockers
-$(echo "$CURRENT_CONTRACT" | $PYTHON_CMD -c "
-import sys,json
-d=json.load(sys.stdin)
-r=d.get('retry',{})
-issues=r.get('issues',[])
-if issues:
-  for i in issues: print(f'- {i}')
-else:
-  print('None')
-" 2>/dev/null || echo "None")
-
-## Active Decisions
-$(echo "$CURRENT_CONTRACT" | $PYTHON_CMD -c "
-import sys,json
-d=json.load(sys.stdin)
-log=d.get('decisions',{}).get('adr_log',[])
-if log:
-  for entry in log[-3:]:
-    print(f'- {entry.get(\"id\",\"?\")}: {entry.get(\"title\",\"\")}')
-else:
-  print('No ADRs recorded')
-" 2>/dev/null || echo "None")
-
-## Recent Changes
-- Last state transition: $(echo "$CURRENT_CONTRACT" | $PYTHON_CMD -c "
-import sys,json
-d=json.load(sys.stdin)
-phases=d.get('metrics',{}).get('phases_completed',[])
-print(phases[-1] if phases else 'INIT')
-" 2>/dev/null || echo "INIT")
-STATEMD
-  echo "  ✅ STATE.md synced"
-fi
-
-# --- Step 4: Save ctx_session ---
+# --- Save ctx_session ---
 lean-ctx ctx_session save 2>/dev/null && \
   echo "  ✅ Session saved" || \
   echo "  ⚠️  ctx_session save skipped (not available)"
 
-# --- Step 5: Update telemetry summary ---
-if [ -f "$TELEMETRY_DIR/phases.jsonl" ] && [ -n "$PYTHON_CMD" ]; then
-  $PYTHON_CMD -c "
-import json
-total_ms = 0
-agents = set()
-phases = []
-with open('$TELEMETRY_DIR/phases.jsonl') as f:
-  for line in f:
-    line=line.strip()
-    if not line: continue
-    try:
-      entry=json.loads(line)
-      total_ms+=entry.get('elapsed_ms',0)
-      phases.append(entry.get('to',''))
-    except: pass
-
-summary = {
-  'phases_completed': phases,
-  'total_elapsed_ms': total_ms,
-  'total_elapsed_s': round(total_ms/1000, 1),
-  'updated_at': '$(date -u +%Y-%m-%dT%H:%M:%SZ)'
-}
-with open('$TELEMETRY_DIR/summary.json', 'w') as f:
-  json.dump(summary, f, indent=2)
-print(f'  📈 Telemetry summary: {len(phases)} phases, {total_ms/1000:.0f}s total')
-" 2>/dev/null || true
-fi
-
 echo "[opencode-kit] ✅ Post-flight complete."

package/src/telemetry.sh

@@ -32,33 +32,49 @@ case "$MODE" in
   --phases)
     if [ -f "$TELEMETRY_DIR/phases.jsonl" ]; then
       echo "Phase transitions:"
-      cat "$TELEMETRY_DIR/phases.jsonl" | while IFS= read -r line; do
-        [ -z "$line" ] && continue
-        FROM=$(echo "$line" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('from','?'))" 2>/dev/null)
-        TO=$(echo "$line" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('to','?'))" 2>/dev/null)
-        MS=$(echo "$line" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('elapsed_ms',0))" 2>/dev/null)
-        printf "  %-20s → %-20s  %5.1fs\n" "$FROM" "$TO" "$($PYTHON_CMD -c "print($MS/1000)" 2>/dev/null || echo "0.0")"
-      done
+      $PYTHON_CMD -c "
+import sys, json
+for line in sys.stdin:
+    line = line.strip()
+    if not line:
+        continue
+    d = json.loads(line)
+    from_ = d.get('from', '?')
+    to_ = d.get('to', '?')
+    ms = d.get('elapsed_ms', 0)
+    print(f'  {from_:20s} → {to_:20s}  {ms/1000:5.1f}s')
+" < "$TELEMETRY_DIR/phases.jsonl" 2>/dev/null || echo -e "${YELLOW}Could not parse phase data${NC}"
     else
       echo -e "${YELLOW}No phase data yet.${NC}"
     fi
     ;;
   --summary|*)
     if [ -f "$TELEMETRY_DIR/summary.json" ]; then
-      TOTAL_S=$($PYTHON_CMD -c "import json; d=json.load(open('$TELEMETRY_DIR/summary.json')); print(d.get('total_elapsed_s',0))" 2>/dev/null || echo "0")
-      PHASES=$($PYTHON_CMD -c "import json; d=json.load(open('$TELEMETRY_DIR/summary.json')); print(len(d.get('phases_completed',[])))" 2>/dev/null || echo "0")
+      read -r TOTAL_S PHASES < <(TELEMETRY_DIR="$TELEMETRY_DIR" $PYTHON_CMD -c "
+import json, os
+d = json.load(open(os.environ['TELEMETRY_DIR'] + '/summary.json'))
+print(d.get('total_elapsed_s', 0))
+print(len(d.get('phases_completed', [])))
+" 2>/dev/null || echo -e "0\n0")
       echo "  Total elapsed: ${TOTAL_S}s"
       echo "  Phases completed: $PHASES"
       echo ""
       echo "  Latest phases:"
-      tail -5 "$TELEMETRY_DIR/phases.jsonl" 2>/dev/null | while IFS= read -r line; do
-        [ -z "$line" ] && continue
-        TS=$(echo "$line" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('ts','?'))" 2>/dev/null | cut -dT -f2 | cut -d. -f1)
-        FROM=$(echo "$line" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('from','?'))" 2>/dev/null)
-        TO=$(echo "$line" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('to','?'))" 2>/dev/null)
-        MS=$(echo "$line" | $PYTHON_CMD -c "import sys,json; d=json.load(sys.stdin); print(d.get('elapsed_ms',0))" 2>/dev/null)
-        echo "    $TS  $FROM → $TO  ($((MS/1000))s)"
-      done
+      tail -5 "$TELEMETRY_DIR/phases.jsonl" 2>/dev/null | $PYTHON_CMD -c "
+import sys, json
+for line in sys.stdin:
+    line = line.strip()
+    if not line:
+        continue
+    d = json.loads(line)
+    ts = d.get('ts', '?')
+    if ts != '?':
+        ts = ts.split('T')[1].split('.')[0] if 'T' in ts else ts
+    from_ = d.get('from', '?')
+    to_ = d.get('to', '?')
+    ms = d.get('elapsed_ms', 0)
+    print(f'    {ts}  {from_} → {to_}  ({ms//1000}s)')
+" 2>/dev/null || echo -e "${YELLOW}Could not parse phase data${NC}"
     else
       echo -e "${YELLOW}No telemetry data yet. Run a phase first.${NC}"
       echo "  Phases are recorded automatically by postflight.sh"

package/src/update.sh

@@ -28,6 +28,12 @@ while [ $# -gt 0 ]; do
   esac
 done
 
+# --- Verify Python availability ---
+if [ -z "${PYTHON_CMD:-}" ]; then
+  echo -e "${RED}❌ PYTHON_CMD is not set. Python is required for update operations.${NC}"
+  exit 1
+fi
+
 echo -e "${CYAN}[opencode-kit] 🔄 Update check${NC}"
 echo "  Current dir: $PWD"
 echo "  Source:      $REPO_URL (branch: $VERSION)"
@@ -42,6 +48,7 @@ fi
 
 # --- Clone latest to temp ---
 TEMP_DIR=$(mktemp -d /tmp/opencode-kit-XXXXX)
+trap 'rm -rf "$TEMP_DIR"' EXIT INT TERM
 echo "  Cloning latest version to $TEMP_DIR..."
 
 if ! git clone --depth 1 --branch "$VERSION" "$REPO_URL" "$TEMP_DIR" 2>/dev/null; then
@@ -62,9 +69,9 @@ print(d.get('contract_version', 'unknown'))
 " 2>/dev/null || echo "unknown")
 fi
 
-LATEST_VERSION=$($PYTHON_CMD -c "
-import json
-with open('$TEMP_DIR/templates/contract.json') as f:
+LATEST_VERSION=$(TEMP_DIR="$TEMP_DIR" $PYTHON_CMD -c "
+import os, json
+with open(os.environ['TEMP_DIR'] + '/templates/contract.json') as f:
   d=json.load(f)
 print(d.get('contract_version', 'unknown'))
 " 2>/dev/null || echo "unknown")
@@ -82,8 +89,8 @@ fi
 # --- Backup contract state ---
 echo "  Backing up contract state..."
 STATE_BACKUP=$(mktemp /tmp/opencode-contract-state-XXXXX.json)
-$PYTHON_CMD -c "
-import json
+STATE_BACKUP="$STATE_BACKUP" $PYTHON_CMD -c "
+import os, json
 with open('.opencode/orchestration/contract.json') as f:
   d = json.load(f)
 # Extract only the state fields to preserve
@@ -98,7 +105,7 @@ state = {
   'score': d.get('score', {}),
   'outputs': d.get('outputs', {})
 }
-with open('$STATE_BACKUP', 'w') as f:
+with open(os.environ['STATE_BACKUP'], 'w') as f:
   json.dump(state, f, indent=2)
 " 2>/dev/null || echo "  ⚠️  Could not backup contract state"
 echo "  ✅ State backed up"
@@ -151,18 +158,18 @@ update_file "$TEMP_DIR/templates/superpowers-contract.json" ".opencode/templates
 
 # --- Restore contract state ---
 if [ "$DRY_RUN" = false ] && [ -f "$STATE_BACKUP" ]; then
-  $PYTHON_CMD -c "
-import json
+  STATE_BACKUP="$STATE_BACKUP" LATEST_VERSION="$LATEST_VERSION" $PYTHON_CMD -c "
+import os, json
 with open('.opencode/orchestration/contract.json') as f:
   contract = json.load(f)
-with open('$STATE_BACKUP') as f:
+with open(os.environ['STATE_BACKUP']) as f:
   state = json.load(f)
 # Merge preserved state back into new contract
 for key, val in state.items():
   if val:  # only overwrite if backup has data
     contract[key] = val
 # Update contract_version to latest
-contract['contract_version'] = '$LATEST_VERSION'
+contract['contract_version'] = os.environ['LATEST_VERSION']
 with open('.opencode/orchestration/contract.json', 'w') as f:
   json.dump(contract, f, indent=2)
 " 2>/dev/null && echo "  ✅ Contract state restored" || echo "  ⚠️  Contract state restore failed"