crewly 1.13.0 → 1.14.0

package/config/skills/agent/xiaoyuzhoufm-transcript/execute.sh

@@ -1,58 +1,49 @@
 #!/bin/bash
-# 小宇宙 Podcast Transcript — Extract and transcribe podcast episodes
+# 小宇宙 Podcast Transcript — fetch an episode and transcribe it.
 #
-# Pipeline: URL → HTML → audio URL → download → ffmpeg split → Gemini per-chunk → merge
+# Pipeline: URL → HTML → audio URL → download → transcribe-audio (Whisper)
 #
-# Long podcasts (>15min) are split into 10-minute chunks via ffmpeg,
-# each chunk is uploaded and transcribed separately, then merged.
+# This skill owns the 小宇宙 part: resolving an episode URL to its audio and
+# labelling the result. Transcription itself is delegated to the
+# `transcribe-audio` skill, so there is exactly one Whisper integration in the
+# repo to maintain and this skill inherits its engine selection (local
+# whisper.cpp by default, OpenAI Whisper API as fallback).
 #
 # Usage:
 #   bash execute.sh '{"url":"https://www.xiaoyuzhoufm.com/episode/69bbc8ea3c625cc5ae21b461"}'
 #   bash execute.sh '{"url":"...","outputFile":"/path/to/transcript.md"}'
 #   bash execute.sh '{"audioFile":"/path/to/local.m4a"}'
+#   bash execute.sh '{"url":"...","engine":"openai"}'
 #
-# Requires: GEMINI_API_KEY, ffmpeg, curl, jq
+# Requires: curl, jq, and whatever `transcribe-audio` needs (ffmpeg + a Whisper
+# engine). No API key is needed on the default local path.
 
 set -euo pipefail
 
-# ── Configuration ──────────────────────────────────────────────────────────────
-MODEL="${GEMINI_MODEL:-gemini-2.0-flash}"
-GEMINI_API_BASE="https://generativelanguage.googleapis.com"
-GEMINI_UPLOAD_URL="${GEMINI_API_BASE}/upload/v1beta/files"
-GEMINI_CONTENT_URL="${GEMINI_API_BASE}/v1beta/models/${MODEL}:generateContent"
-MAX_WAIT_SECONDS=300
-CHUNK_DURATION_SECONDS=600  # 10 minutes per chunk
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TRANSCRIBE_SKILL="${SCRIPT_DIR}/../transcribe-audio/execute.sh"
+UA="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36"
 
 # ── Input parsing ──────────────────────────────────────────────────────────────
 INPUT="${1:-}"
 if [ -z "$INPUT" ]; then
-  echo '{"success":false,"error":"Usage: execute.sh \u0027{\"url\":\"https://www.xiaoyuzhoufm.com/episode/...\"}\u0027"}'
+  echo '{"success":false,"error":"Usage: execute.sh '{\"url\":\"https://www.xiaoyuzhoufm.com/episode/...\"}'"}'
   exit 1
 fi
 
-URL=$(echo "$INPUT" | jq -r '.url // empty')
-AUDIO_FILE=$(echo "$INPUT" | jq -r '.audioFile // empty')
-OUTPUT_FILE=$(echo "$INPUT" | jq -r '.outputFile // empty')
-LANGUAGE=$(echo "$INPUT" | jq -r '.language // "auto"')
+URL=$(printf '%s' "$INPUT" | jq -r '.url // empty')
+AUDIO_FILE=$(printf '%s' "$INPUT" | jq -r '.audioFile // empty')
+OUTPUT_FILE=$(printf '%s' "$INPUT" | jq -r '.outputFile // empty')
+LANGUAGE=$(printf '%s' "$INPUT" | jq -r '.language // "auto"')
+ENGINE=$(printf '%s' "$INPUT" | jq -r '.engine // "auto"')
 
 if [ -z "$URL" ] && [ -z "$AUDIO_FILE" ]; then
   echo '{"success":false,"error":"Either url or audioFile is required"}'
   exit 1
 fi
 
-# ── Dependency check ───────────────────────────────────────────────────────────
-if ! command -v ffmpeg >/dev/null 2>&1; then
-  echo '{"success":false,"error":"ffmpeg is required but not installed. Install via: brew install ffmpeg"}'
-  exit 1
-fi
-
-# ── API key resolution ─────────────────────────────────────────────────────────
-if [ -z "${GEMINI_API_KEY:-}" ]; then
-  GEMINI_API_KEY=$(curl -sf "http://localhost:8787/api/settings" 2>/dev/null \
-    | jq -r '.data.apiKeys.global.gemini // empty' 2>/dev/null || true)
-fi
-if [ -z "${GEMINI_API_KEY:-}" ]; then
-  echo '{"success":false,"error":"GEMINI_API_KEY not set. Set via environment or Settings > API Keys."}'
+if [ ! -f "$TRANSCRIBE_SKILL" ]; then
+  echo "{\"success\":false,\"error\":$(printf '%s' "transcribe-audio skill not found at ${TRANSCRIBE_SKILL}" | jq -Rs .)}"
   exit 1
 fi
 
@@ -61,17 +52,16 @@ TMPDIR_WORK=$(mktemp -d /tmp/xiaoyuzhoufm-XXXXXX)
 cleanup() { rm -rf "$TMPDIR_WORK"; }
 trap cleanup EXIT
 
-# ── Step 1: Extract audio URL from 小宇宙 page ────────────────────────────────
+# ── Step 1: Resolve the episode URL to a downloadable audio file ───────────────
 TITLE="Unknown Episode"
 AUDIO_URL=""
+DOWNLOADED=0
 
 if [ -n "$URL" ] && [ -z "$AUDIO_FILE" ]; then
   echo '{"status":"fetching","message":"Fetching episode page..."}' >&2
 
   HTML_FILE="${TMPDIR_WORK}/page.html"
-  curl -sL -o "$HTML_FILE" \
-    -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36" \
-    "$URL" 2>/dev/null
+  curl -sL -o "$HTML_FILE" -H "$UA" "$URL" 2>/dev/null || true
 
   if [ ! -s "$HTML_FILE" ]; then
     echo '{"success":false,"error":"Failed to fetch episode page"}'
@@ -93,198 +83,70 @@ if [ -n "$URL" ] && [ -z "$AUDIO_FILE" ]; then
     exit 1
   fi
 
-  echo "{\"status\":\"downloading\",\"message\":\"Downloading audio...\",\"title\":$(echo "$TITLE" | jq -Rs .)}" >&2
+  echo "{\"status\":\"downloading\",\"message\":\"Downloading audio...\",\"title\":$(printf '%s' "$TITLE" | jq -Rs .)}" >&2
 
   AUDIO_FILE="${TMPDIR_WORK}/audio.m4a"
-  curl -sL -o "$AUDIO_FILE" \
-    -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36" \
-    -H "Referer: https://www.xiaoyuzhoufm.com/" \
-    "$AUDIO_URL" 2>/dev/null
+  curl -sL -o "$AUDIO_FILE" -H "$UA" "$AUDIO_URL"
+  DOWNLOADED=1
 
   if [ ! -s "$AUDIO_FILE" ]; then
-    echo '{"success":false,"error":"Failed to download audio file"}'
+    echo '{"success":false,"error":"Audio download produced an empty file"}'
     exit 1
   fi
-  AUDIO_SIZE=$(wc -c < "$AUDIO_FILE" | tr -d ' ')
-  echo "{\"status\":\"downloaded\",\"message\":\"Audio downloaded (${AUDIO_SIZE} bytes)\"}" >&2
-fi
-
-if [ ! -f "$AUDIO_FILE" ]; then
-  echo "{\"success\":false,\"error\":\"Audio file not found: ${AUDIO_FILE}\"}"
-  exit 1
-fi
-
-# ── Step 2: Get duration and split into chunks ─────────────────────────────────
-DURATION_SECS=$(ffprobe -v quiet -show_entries format=duration -of csv=p=0 "$AUDIO_FILE" 2>/dev/null | cut -d. -f1)
-DURATION_SECS=${DURATION_SECS:-0}
-
-CHUNKS_DIR="${TMPDIR_WORK}/chunks"
-mkdir -p "$CHUNKS_DIR"
-
-if [ "$DURATION_SECS" -gt "$CHUNK_DURATION_SECONDS" ]; then
-  NUM_CHUNKS=$(( (DURATION_SECS + CHUNK_DURATION_SECONDS - 1) / CHUNK_DURATION_SECONDS ))
-  echo "{\"status\":\"splitting\",\"message\":\"Splitting ${DURATION_SECS}s audio into ${NUM_CHUNKS} chunks of ${CHUNK_DURATION_SECONDS}s...\"}" >&2
-
-  ffmpeg -i "$AUDIO_FILE" -f segment -segment_time "$CHUNK_DURATION_SECONDS" \
-    -c copy -reset_timestamps 1 \
-    "${CHUNKS_DIR}/chunk_%03d.m4a" 2>/dev/null
-
-  CHUNK_FILES=$(ls "${CHUNKS_DIR}"/chunk_*.m4a 2>/dev/null | sort)
+  echo "{\"status\":\"downloaded\",\"message\":\"Audio downloaded ($(wc -c < "$AUDIO_FILE" | tr -d ' ') bytes)\"}" >&2
 else
-  # Short audio — single chunk
-  cp "$AUDIO_FILE" "${CHUNKS_DIR}/chunk_000.m4a"
-  CHUNK_FILES="${CHUNKS_DIR}/chunk_000.m4a"
-  NUM_CHUNKS=1
-  echo "{\"status\":\"splitting\",\"message\":\"Short audio (${DURATION_SECS}s), no splitting needed.\"}" >&2
+  if [ ! -f "$AUDIO_FILE" ]; then
+    echo "{\"success\":false,\"error\":$(printf '%s' "Audio file not found: ${AUDIO_FILE}" | jq -Rs .)}"
+    exit 1
+  fi
+  TITLE=$(basename "$AUDIO_FILE")
 fi
 
-# ── Helpers: upload + transcribe a single chunk ────────────────────────────────
-
-# Determine MIME type from file extension
-get_mime() {
-  case "${1##*.}" in
-    mp3) echo "audio/mpeg" ;; m4a) echo "audio/mp4" ;; aac) echo "audio/aac" ;;
-    ogg) echo "audio/ogg" ;; wav) echo "audio/wav" ;; *) echo "audio/mp4" ;;
-  esac
-}
-
-upload_and_wait() {
-  local filepath="$1"
-  local mime_type="$2"
-  local file_size
-  file_size=$(wc -c < "$filepath" | tr -d ' ')
-  local display_name
-  display_name=$(basename "$filepath")
-
-  # Resumable upload: init
-  local init_resp
-  init_resp=$(curl -s -D- -X POST \
-    "${GEMINI_UPLOAD_URL}?key=${GEMINI_API_KEY}" \
-    -H "X-Goog-Upload-Protocol: resumable" \
-    -H "X-Goog-Upload-Command: start" \
-    -H "X-Goog-Upload-Header-Content-Length: ${file_size}" \
-    -H "X-Goog-Upload-Header-Content-Type: ${mime_type}" \
-    -H "Content-Type: application/json" \
-    -d "{\"file\":{\"display_name\":\"${display_name}\"}}" 2>&1)
-
-  local upload_url
-  upload_url=$(echo "$init_resp" | grep -i 'x-goog-upload-url:' | sed 's/.*: //' | tr -d '\r')
-  [ -z "$upload_url" ] && { echo ""; return 1; }
-
-  # Resumable upload: send bytes
-  local upload_resp
-  upload_resp=$(curl -s -X POST "$upload_url" \
-    -H "X-Goog-Upload-Offset: 0" \
-    -H "X-Goog-Upload-Command: upload, finalize" \
-    -H "Content-Type: ${mime_type}" \
-    --data-binary "@${filepath}" 2>&1)
-
-  local file_uri file_name
-  file_uri=$(echo "$upload_resp" | jq -r '.file.uri // empty' 2>/dev/null)
-  file_name=$(echo "$upload_resp" | jq -r '.file.name // empty' 2>/dev/null)
-  [ -z "$file_uri" ] && { echo ""; return 1; }
-
-  # Poll until ACTIVE
-  local state="PROCESSING" waited=0
-  while [ "$state" = "PROCESSING" ] && [ "$waited" -lt "$MAX_WAIT_SECONDS" ]; do
-    sleep 3
-    waited=$((waited + 3))
-    state=$(curl -s "${GEMINI_API_BASE}/v1beta/${file_name}?key=${GEMINI_API_KEY}" \
-      | jq -r '.state // "PROCESSING"' 2>/dev/null)
-  done
-
-  [ "$state" != "ACTIVE" ] && { echo ""; return 1; }
-  echo "$file_uri"
-}
-
-transcribe_chunk() {
-  local file_uri="$1"
-  local mime_type="$2"
-  local chunk_index="$3"
-  local total_chunks="$4"
-
-  local lang_hint=""
-  [ "$LANGUAGE" != "auto" ] && lang_hint="The audio is in ${LANGUAGE}. "
-
-  local prompt="${lang_hint}Transcribe this audio segment (chunk $((chunk_index+1)) of ${total_chunks}). Output the full transcript preserving speaker turns. Format:
-
-**Speaker Name/Label:** text spoken...
-
-Use Speaker 1, Speaker 2 etc if names unknown. Maintain original language. Add [MM:SS] timestamps at topic changes (relative to this chunk start)."
+# ── Step 2: Transcribe via the shared Whisper skill ────────────────────────────
+# The inner skill emits progress on stderr (passed through) and its result JSON
+# on stdout. It handles normalization, engine selection and long-file chunking,
+# so none of that is duplicated here.
+echo '{"status":"transcribing","message":"Handing off to transcribe-audio (Whisper)..."}' >&2
 
-  local req_file="${TMPDIR_WORK}/req_${chunk_index}.json"
-  cat > "$req_file" <<ENDJSON
-{
-  "contents": [{"parts": [
-    {"text": $(echo "$prompt" | jq -Rs .)},
-    {"file_data": {"mime_type": "${mime_type}", "file_uri": "${file_uri}"}}
-  ]}],
-  "generationConfig": {"temperature": 0.1, "maxOutputTokens": 32768}
-}
-ENDJSON
-
-  local resp
-  resp=$(curl -s --max-time 300 -X POST \
-    "${GEMINI_CONTENT_URL}?key=${GEMINI_API_KEY}" \
-    -H "Content-Type: application/json" \
-    -d "@${req_file}" 2>&1)
-
-  local err_msg
-  err_msg=$(echo "$resp" | jq -r '.error.message // empty' 2>/dev/null)
-  [ -n "$err_msg" ] && { echo "[Transcription error: ${err_msg}]"; return 0; }
+TRANSCRIBE_IN=$(jq -nc \
+  --arg audioFile "$AUDIO_FILE" \
+  --arg language "$LANGUAGE" \
+  --arg engine "$ENGINE" \
+  '{audioFile:$audioFile, language:$language, engine:$engine}')
 
-  echo "$resp" | jq -r '.candidates[0].content.parts[0].text // "[No transcript for this chunk]"' 2>/dev/null
+RESULT_JSON=$(bash "$TRANSCRIBE_SKILL" "$TRANSCRIBE_IN") || {
+  echo '{"success":false,"error":"transcribe-audio failed — see stderr for the engine error"}'
+  exit 1
 }
 
-# ── Step 3: Upload and transcribe each chunk ───────────────────────────────────
-FULL_TRANSCRIPT=""
-CHUNK_INDEX=0
-TOTAL_CHUNKS=$(echo "$CHUNK_FILES" | wc -w | tr -d ' ')
-
-for chunk_file in $CHUNK_FILES; do
-  CHUNK_INDEX_DISPLAY=$((CHUNK_INDEX + 1))
-  echo "{\"status\":\"transcribing\",\"message\":\"Chunk ${CHUNK_INDEX_DISPLAY}/${TOTAL_CHUNKS}: uploading...\"}" >&2
-
-  MIME=$(get_mime "$chunk_file")
-  FILE_URI=$(upload_and_wait "$chunk_file" "$MIME")
-
-  if [ -z "$FILE_URI" ]; then
-    echo "{\"status\":\"error\",\"message\":\"Chunk ${CHUNK_INDEX_DISPLAY} upload/processing failed, skipping\"}" >&2
-    FULL_TRANSCRIPT="${FULL_TRANSCRIPT}
-
----
-[Chunk ${CHUNK_INDEX_DISPLAY} failed to process]
----
-"
-    CHUNK_INDEX=$((CHUNK_INDEX + 1))
-    continue
-  fi
-
-  echo "{\"status\":\"transcribing\",\"message\":\"Chunk ${CHUNK_INDEX_DISPLAY}/${TOTAL_CHUNKS}: transcribing...\"}" >&2
-  CHUNK_TEXT=$(transcribe_chunk "$FILE_URI" "$MIME" "$CHUNK_INDEX" "$TOTAL_CHUNKS")
-
-  # Add time offset header for multi-chunk
-  if [ "$TOTAL_CHUNKS" -gt 1 ]; then
-    OFFSET_MINS=$(( CHUNK_INDEX * CHUNK_DURATION_SECONDS / 60 ))
-    FULL_TRANSCRIPT="${FULL_TRANSCRIPT}
-
---- Segment ${CHUNK_INDEX_DISPLAY} (from ${OFFSET_MINS}:00) ---
-
-${CHUNK_TEXT}"
-  else
-    FULL_TRANSCRIPT="$CHUNK_TEXT"
-  fi
+if [ "$(printf '%s' "$RESULT_JSON" | jq -r '.success // false')" != "true" ]; then
+  ERR=$(printf '%s' "$RESULT_JSON" | jq -r '.error // "transcribe-audio reported failure"')
+  echo "{\"success\":false,\"error\":$(printf '%s' "$ERR" | jq -Rs .)}"
+  exit 1
+fi
 
-  CHUNK_INDEX=$((CHUNK_INDEX + 1))
-  echo "{\"status\":\"transcribing\",\"message\":\"Chunk ${CHUNK_INDEX_DISPLAY}/${TOTAL_CHUNKS}: done.\"}" >&2
-done
+ENGINE_LABEL=$(printf '%s' "$RESULT_JSON" | jq -r '.engine // "whisper"')
+LANG_OUT=$(printf '%s' "$RESULT_JSON" | jq -r '.language // "unknown"')
+DURATION=$(printf '%s' "$RESULT_JSON" | jq -r '.durationSec // 0')
+FULL_TEXT=$(printf '%s' "$RESULT_JSON" | jq -r '.text // ""')
 
-if [ -z "$FULL_TRANSCRIPT" ]; then
-  echo '{"success":false,"error":"All chunks failed to transcribe"}'
+if [ -z "$FULL_TEXT" ]; then
+  echo '{"success":false,"error":"Transcription returned no text"}'
   exit 1
 fi
 
-# ── Step 4: Output ─────────────────────────────────────────────────────────────
+# Segment lines with HH:MM:SS stamps — easier to scan in a 90-minute episode
+# than the raw seconds the inner skill emits.
+TRANSCRIPT_BODY=$(printf '%s' "$RESULT_JSON" | jq -r '
+  (.segments // [])[]
+  | (.start | floor) as $s
+  | "[\($s / 3600 | floor | tostring | if length < 2 then "0" + . else . end):" +
+    "\(($s % 3600) / 60 | floor | tostring | if length < 2 then "0" + . else . end):" +
+    "\($s % 60 | tostring | if length < 2 then "0" + . else . end)] \(.text)"
+')
+[ -z "$TRANSCRIPT_BODY" ] && TRANSCRIPT_BODY="$FULL_TEXT"
+
+# ── Step 3: Output ─────────────────────────────────────────────────────────────
 if [ -n "$OUTPUT_FILE" ]; then
   mkdir -p "$(dirname "$OUTPUT_FILE")"
   cat > "$OUTPUT_FILE" <<ENDMD
@@ -292,15 +154,21 @@ if [ -n "$OUTPUT_FILE" ]; then
 
 > Source: ${URL:-local file}
 > Transcribed: $(date -u +"%Y-%m-%dT%H:%M:%SZ")
-> Model: ${MODEL}
-> Duration: ${DURATION_SECS}s (${TOTAL_CHUNKS} chunks)
+> Engine: ${ENGINE_LABEL} (language: ${LANG_OUT})
+> Duration: ${DURATION}s
 
 ---
 
-${FULL_TRANSCRIPT}
+${TRANSCRIPT_BODY}
 ENDMD
-  echo "{\"status\":\"saved\",\"message\":\"Transcript saved to ${OUTPUT_FILE}\"}" >&2
+  echo "{\"status\":\"saved\",\"message\":$(printf '%s' "Transcript saved to ${OUTPUT_FILE}" | jq -Rs .)}" >&2
 fi
 
-TRANSCRIPT_LENGTH=${#FULL_TRANSCRIPT}
-echo "{\"success\":true,\"title\":$(echo "$TITLE" | jq -Rs .),\"url\":$(echo "${URL:-}" | jq -Rs .),\"audioUrl\":$(echo "${AUDIO_URL:-}" | jq -Rs .),\"model\":\"${MODEL}\",\"duration\":${DURATION_SECS},\"chunks\":${TOTAL_CHUNKS},\"transcriptLength\":${TRANSCRIPT_LENGTH},\"transcript\":$(echo "$FULL_TRANSCRIPT" | jq -Rs .)}"
+printf '%s' "$RESULT_JSON" | jq -c \
+  --arg title "$TITLE" \
+  --arg url "${URL:-}" \
+  --arg audioUrl "${AUDIO_URL:-}" \
+  --arg transcript "$TRANSCRIPT_BODY" \
+  '{success:true, title:$title, url:$url, audioUrl:$audioUrl,
+    engine:.engine, language:.language, duration:.durationSec,
+    transcriptLength:($transcript | length), transcript:$transcript}'

package/config/skills/agent/xiaoyuzhoufm-transcript/skill.json

@@ -1,10 +1,10 @@
 {
   "name": "xiaoyuzhoufm-transcript",
   "displayName": "小宇宙 Podcast Transcript",
-  "description": "Extract and transcribe 小宇宙 podcast episodes using Gemini Audio API. Supports speaker identification and timestamps.",
+  "description": "Resolve a 小宇宙 episode URL to its audio and transcribe it with Whisper (local whisper.cpp by default, OpenAI Whisper API as fallback). Segment-level timestamps.",
   "category": "content",
   "assignableRoles": ["*"],
-  "version": "1.0.0",
+  "version": "2.0.0",
   "author": "Crewly Team",
-  "requires": ["GEMINI_API_KEY"]
+  "requires": []
 }

package/config/skills/orchestrator/delegate-task/SKILL.md

@@ -41,7 +41,7 @@ The script auto-resolves `config/skills/...` references to absolute paths so del
 | `--task` / `-T` | `task` | Yes | Task description (or pipe via stdin) |
 | `--task-file` | — | No | Read task description from a file path |
 | `--priority` / `-P` | `priority` | No | Priority: `low`, `normal`, `high` (default: `normal`) |
-| `--context` / `-c` | `context` | No | Additional context for the task |
+| `--context` / `-c` | `context` | No | Additional context for the task. Scanned for the Request Contract alongside `--task` |
 | `--project` / `-p` | `projectPath` | No | Project path; creates task file in `.crewly/tasks/` |
 | `--team` / `-g` | `teamId` | No | Team ID for cross-team validation |
 | `--task-type` | `taskType` | No | Task type: `general`, `technical` (default: `general`) |

package/config/skills/orchestrator/delegate-task/execute.sh

@@ -95,26 +95,51 @@ require_param "task (--task)" "$TASK"
 # downstream are entitled to push back per the Brief Reception Protocol when
 # these are absent. Spec:
 # .crewly/specs/2026-05-03-agent-improvement-p0-execution.md §"Fix P0-3".
+#
+# Scans the WHOLE delegated brief, not just `--task`. The Request Contract can
+# legitimately live in `--task`, in `--context`, or be split across the two,
+# and delegators routinely put the long-form G/O/E in `--context` while
+# `--task` carries the one-line ask. `--context` is delivered to the target
+# (see the TASK_MESSAGE assembly below), so a contract written there does
+# reach the recipient — it was simply not being looked at here. Scanning only
+# `--task` therefore warned "Request Contract incomplete" at briefs whose
+# contract was fully present, just in the other field.
+#
+# That false positive is corrosive rather than cosmetic: this warning is the
+# signal TLs and workers use to decide whether to push back under the Brief
+# Reception Protocol, so crying wolf trains them to ignore a real one.
+#
+# The check is NOT weakened — a marker genuinely absent from BOTH fields
+# still warns, and the missing-field list is still per-marker.
+#
+# Mirrors the same fix in config/skills/team-leader/delegate-task/execute.sh.
+#
+# $1 = task, $2 = context (either may be empty).
 warn_missing_request_contract() {
-  local task="$1"
+  # Join with a newline rather than concatenating: the patterns below anchor
+  # on `^`, which grep evaluates per line, and a seam newline also prevents a
+  # task ending in "go" plus a context starting "al:" from fabricating a
+  # spurious "goal:" match across the boundary.
+  local brief
+  brief="$(printf '%s\n%s' "${1:-}" "${2:-}")"
   local missing=()
-  if ! echo "$task" | grep -qiE '(^|[^a-zA-Z])(\*\*)?(goal|objective)(:|s?\b)'; then
+  if ! echo "$brief" | grep -qiE '(^|[^a-zA-Z])(\*\*)?(goal|objective)(:|s?\b)'; then
     missing+=("Goal")
   fi
-  if ! echo "$task" | grep -qiE '(^|[^a-zA-Z])(\*\*)?(expected )?outcome(:|s?\b)'; then
+  if ! echo "$brief" | grep -qiE '(^|[^a-zA-Z])(\*\*)?(expected )?outcome(:|s?\b)'; then
     missing+=("Outcome")
   fi
-  if ! echo "$task" | grep -qiE '(^|[^a-zA-Z])(\*\*)?(eval|evaluation criteria|acceptance criteria)(:|s?\b)'; then
+  if ! echo "$brief" | grep -qiE '(^|[^a-zA-Z])(\*\*)?(eval|evaluation criteria|acceptance criteria)(:|s?\b)'; then
     missing+=("Eval")
   fi
   if [ ${#missing[@]} -gt 0 ]; then
     local list
     list=$(IFS=, ; echo "${missing[*]}")
-    echo "{\"warning\":\"Request Contract incomplete: brief is missing markers for: ${list}. Per P0-3 spec, every delegated subtask MUST include Goal + Expected Outcome + Eval Criteria. TLs and workers may push back via the Brief Reception Protocol. Source: .crewly/specs/2026-05-03-agent-improvement-p0-execution.md §Fix P0-3.\"}" >&2
+    echo "{\"warning\":\"Request Contract incomplete: brief is missing markers for: ${list}. Neither the task nor the context field carries them. Per P0-3 spec, every delegated subtask MUST include Goal + Expected Outcome + Eval Criteria. TLs and workers may push back via the Brief Reception Protocol. Source: .crewly/specs/2026-05-03-agent-improvement-p0-execution.md §Fix P0-3.\"}" >&2
   fi
 }
 
-warn_missing_request_contract "$TASK"
+warn_missing_request_contract "$TASK" "$CONTEXT"
 
 # #180: Validate target agent belongs to the specified team
 if [ -n "$TEAM_ID" ] && [ "$FORCE_CROSS_TEAM" != "true" ]; then
@@ -141,8 +166,17 @@ if [ "$TASK_TYPE" = "technical" ] && [ -n "$TEAM_ID" ]; then
 fi
 
 # Structured message parameters (for hierarchical teams)
-# Default INPUT to empty JSON if not set (when using --flag mode)
-INPUT="${INPUT:-{}}"
+# Default INPUT to empty JSON if not set (when using --flag mode).
+#
+# NOT `${INPUT:-{}}` — bash ends the expansion at the FIRST `}`, so that form
+# means "default to `{`" followed by a literal `}`. It is correct only when
+# INPUT is unset (yielding `{}`); when INPUT holds real JSON it appends a
+# stray `}` and every subsequent `jq` call dies with
+# "parse error: Unmatched '}'". That silently broke the entire JSON-input mode
+# of this skill while --flag mode kept working.
+if [ -z "${INPUT:-}" ]; then
+  INPUT='{}'
+fi
 TITLE=$(printf '%s' "$INPUT" | jq -r '.title // empty')
 PARENT_TASK_ID=$(printf '%s' "$INPUT" | jq -r '.parentTaskId // empty')
 EXPECTED_ARTIFACTS=$(printf '%s' "$INPUT" | jq -c '.expectedArtifacts // empty')
@@ -197,13 +231,13 @@ if [ "$USE_STRUCTURED" = "true" ] && [ -n "$TITLE" ]; then
 
   [ -n "$CONTEXT" ] && TASK_MESSAGE="${TASK_MESSAGE}\n\nAdditional context: ${CONTEXT}"
   [ -n "$DEADLINE_HINT" ] && TASK_MESSAGE="${TASK_MESSAGE}\n\n**Deadline hint**: ${DEADLINE_HINT}"
-  TASK_MESSAGE="${TASK_MESSAGE}\n\n---\nWhen done, report back using: bash ${CREWLY_ROOT}/config/skills/agent/core/report-status/execute.sh '{\"sessionName\":\"${TO}\",\"status\":\"done\",\"summary\":\"<brief summary>\",\"projectPath\":\"${PROJECT_PATH}\"}'"
+  TASK_MESSAGE="${TASK_MESSAGE}\n\n---\nWhen done, report back with report-status, passing the workItemId from your [CREWLY-DISPATCH] notice (or from get-my-tasks) so the right WorkItem is closed: bash ${CREWLY_ROOT}/config/skills/agent/core/report-status/execute.sh '{\"sessionName\":\"${TO}\",\"workItemId\":\"<your WorkItem id>\",\"status\":\"done\",\"summary\":\"<brief summary>\",\"projectPath\":\"${PROJECT_PATH}\"}'"
   TASK_MESSAGE="${TASK_MESSAGE}\n\nBefore reporting done, persist key findings using: bash ${CREWLY_ROOT}/config/skills/agent/core/remember/execute.sh '{\"agentId\":\"${TO}\",\"content\":\"<key findings>\",\"category\":\"pattern\",\"scope\":\"project\",\"projectPath\":\"${PROJECT_PATH}\"}'"
 else
   # Legacy free-text format (backwards compatible)
   TASK_MESSAGE="New task from orchestrator (priority: ${PRIORITY}):\n\n${TASK}"
   [ -n "$CONTEXT" ] && TASK_MESSAGE="${TASK_MESSAGE}\n\nContext: ${CONTEXT}"
-  TASK_MESSAGE="${TASK_MESSAGE}\n\nWhen done, report back using: bash ${CREWLY_ROOT}/config/skills/agent/core/report-status/execute.sh '{\"sessionName\":\"${TO}\",\"status\":\"done\",\"summary\":\"<brief summary>\",\"projectPath\":\"${PROJECT_PATH}\"}'"
+  TASK_MESSAGE="${TASK_MESSAGE}\n\nWhen done, report back with report-status, passing the workItemId from your [CREWLY-DISPATCH] notice (or from get-my-tasks) so the right WorkItem is closed: bash ${CREWLY_ROOT}/config/skills/agent/core/report-status/execute.sh '{\"sessionName\":\"${TO}\",\"workItemId\":\"<your WorkItem id>\",\"status\":\"done\",\"summary\":\"<brief summary>\",\"projectPath\":\"${PROJECT_PATH}\"}'"
   TASK_MESSAGE="${TASK_MESSAGE}\n\nBefore reporting done, persist key findings using: bash ${CREWLY_ROOT}/config/skills/agent/core/remember/execute.sh '{\"agentId\":\"${TO}\",\"content\":\"<key findings>\",\"category\":\"pattern\",\"scope\":\"project\",\"projectPath\":\"${PROJECT_PATH}\"}'"
 fi
 
@@ -238,7 +272,7 @@ POOL_BODY=$(jq -n \
   --arg priority "$WI_PRIORITY" \
   --arg projectPath "${PROJECT_PATH:-}" \
   --arg requestId "${REQUEST_ID:-}" \
-  '{type: $type, owner: $owner, target: $target, title: $title, description: $description, briefMarkdown: $briefMarkdown, priority: $priority} + (if $projectPath != "" then {projectPath: $projectPath} else {} end) + (if $requestId != "" then {requestId: $requestId} else {} end)')
+  '{type: $type, owner: $owner, target: $target, title: $title, description: $description, briefMarkdown: $briefMarkdown, metadata: ({priority: $priority} + (if $projectPath != "" then {projectPath: $projectPath} else {} end))} + (if $requestId != "" then {requestId: $requestId} else {} end)')
 
 # Pipeline-#4 fix (spec 2026-05-05-request-decompose-pipeline-gap.md, Patch B):
 # Route is /api/task-pool/add (not /api/pool/add — that endpoint does not exist