crewly 1.6.0 → 1.6.2

package/config/skills/agent/core/reply-channel/execute.sh

@@ -0,0 +1,165 @@
+#!/bin/bash
+# reply-channel — post an agent-authored reply to a chat channel.
+# Used by the Chat MVP dispatch loop: the runtime hands the agent a prompt
+# prefixed `[CHAT:<channelId>]`; the agent processes it, then invokes this
+# skill to write its reply back to the channel.
+#
+# The shared `api_call` helper attaches `X-Agent-Session: $CREWLY_SESSION_NAME`
+# automatically, which the chat-v2 controller uses to route the message as
+# `senderType:"agent"` instead of `user`.
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../../_common/lib.sh"
+
+print_usage() {
+  cat <<'EOF_USAGE'
+Usage:
+  # CLI flags (preferred)
+  bash execute.sh --channel <channelId> --content "reply text" [--cmid <clientMessageId>]
+
+  # Content from stdin
+  echo "multi-line reply" | bash execute.sh --channel chan-1
+
+  # JSON
+  bash execute.sh '{"channelId":"chan-1","content":"hi","clientMessageId":"cmid-abc"}'
+
+Options:
+  --channel   | -c   Target channel id (required)
+  --content   | -m   Reply text (required unless piped via stdin)
+  --content-file     Read reply text from a file path
+  --cmid             Optional client-message-id for idempotency
+  --json      | -j   Raw JSON payload
+  --help      | -h   Show this help
+EOF_USAGE
+}
+
+INPUT_JSON=""
+CHANNEL_ID=""
+CONTENT=""
+CMID=""
+
+# Detect legacy JSON argument as $1
+if [[ $# -gt 0 && ${1:0:1} == '{' ]]; then
+  INPUT_JSON="$1"
+  shift || true
+fi
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --channel|-c)
+      CHANNEL_ID="$2"
+      shift 2
+      ;;
+    --content|-m)
+      CONTENT="$2"
+      shift 2
+      ;;
+    --content-file)
+      CONTENT="$(cat "$2")"
+      shift 2
+      ;;
+    --cmid)
+      CMID="$2"
+      shift 2
+      ;;
+    --json|-j)
+      INPUT_JSON="$2"
+      shift 2
+      ;;
+    --help|-h)
+      print_usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      print_usage >&2
+      exit 2
+      ;;
+  esac
+done
+
+# Fall back to stdin when --content and legacy JSON are both missing
+if [ -z "$CONTENT" ] && [ -z "$INPUT_JSON" ] && [ ! -t 0 ]; then
+  CONTENT="$(cat)"
+fi
+
+# When given JSON, extract fields via python (portable — awk/sed + json is fragile)
+if [ -n "$INPUT_JSON" ]; then
+  if command -v python3 >/dev/null 2>&1; then
+    EXTRACTED=$(python3 - <<PY
+import json, sys
+try:
+    d = json.loads('''$INPUT_JSON''')
+except Exception as e:
+    print('PARSE_ERROR:' + str(e))
+    sys.exit(0)
+print('CHANNEL=' + str(d.get('channelId', '')))
+print('CMID=' + str(d.get('clientMessageId', '')))
+# content is multi-line safe — use base64
+import base64
+c = d.get('content', '')
+print('CONTENT_B64=' + base64.b64encode(c.encode('utf-8')).decode('ascii'))
+PY
+)
+    if echo "$EXTRACTED" | grep -q '^PARSE_ERROR'; then
+      echo '{"success":false,"error":"invalid JSON payload"}' >&2
+      exit 2
+    fi
+    while IFS= read -r line; do
+      case "$line" in
+        CHANNEL=*) [ -z "$CHANNEL_ID" ] && CHANNEL_ID="${line#CHANNEL=}";;
+        CMID=*) [ -z "$CMID" ] && CMID="${line#CMID=}";;
+        CONTENT_B64=*) [ -z "$CONTENT" ] && CONTENT="$(echo "${line#CONTENT_B64=}" | base64 -d 2>/dev/null)";;
+      esac
+    done <<< "$EXTRACTED"
+  else
+    echo '{"success":false,"error":"python3 required to parse JSON payload"}' >&2
+    exit 2
+  fi
+fi
+
+if [ -z "$CHANNEL_ID" ]; then
+  echo '{"success":false,"error":"--channel is required"}' >&2
+  exit 2
+fi
+
+if [ -z "$CONTENT" ]; then
+  echo '{"success":false,"error":"--content is required (or pipe via stdin)"}' >&2
+  exit 2
+fi
+
+# Build JSON body. Export CONTENT/CMID so python can read them safely without
+# quoting the values through the shell (avoids escaping hell for multi-line
+# content with quotes, backslashes, backticks, etc.).
+BODY=$(CONTENT="$CONTENT" CMID="$CMID" python3 -c '
+import os, json
+p = {"content": os.environ["CONTENT"], "contentType": "markdown"}
+cmid = os.environ.get("CMID", "")
+if cmid:
+    p["clientMessageId"] = cmid
+print(json.dumps(p))
+')
+
+ENDPOINT="/chat/channels/${CHANNEL_ID}/messages"
+
+if RESPONSE=$(api_call POST "$ENDPOINT" "$BODY" 2>&1); then
+  # Successful 2xx — surface the message id
+  MESSAGE_ID=$(echo "$RESPONSE" | python3 -c '
+import json,sys
+try:
+    d=json.load(sys.stdin)
+    print((d.get("data") or {}).get("id",""))
+except Exception:
+    pass
+' 2>/dev/null || echo "")
+  if [ -n "$MESSAGE_ID" ]; then
+    echo "{\"success\":true,\"messageId\":\"$MESSAGE_ID\",\"channelId\":\"$CHANNEL_ID\"}"
+  else
+    # Success code but unexpected body — still return success with raw response
+    echo "{\"success\":true,\"channelId\":\"$CHANNEL_ID\",\"raw\":$(echo "$RESPONSE" | python3 -c 'import json,sys;print(json.dumps(sys.stdin.read()))')}"
+  fi
+  exit 0
+else
+  echo "{\"success\":false,\"error\":$(echo "$RESPONSE" | python3 -c 'import json,sys;print(json.dumps(sys.stdin.read()))')}"
+  exit 1
+fi

package/config/skills/agent/core/reply-channel/execute.test.sh

@@ -0,0 +1,148 @@
+#!/bin/bash
+# Co-located bash test for reply-channel skill.
+# Runs a tiny python HTTP stub to capture the outgoing request, then
+# asserts both the URL and the JSON body match the documented contract.
+#
+# Usage: bash execute.test.sh  (exit 0 on pass)
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SKILL="${SCRIPT_DIR}/execute.sh"
+
+if [ ! -x "$SKILL" ]; then
+  echo "FAIL: skill not executable at $SKILL" >&2
+  exit 1
+fi
+
+PASS=0
+FAIL=0
+PORT=18787
+
+# --- Start stub backend on a fixed test port ---
+# Env MUST be exported BEFORE the python fork so the child inherits.
+STUB_LOG="$(mktemp)"
+export STUB_LOG
+export STUB_PORT="${PORT}"
+
+python3 -u <<'PY' >/tmp/reply-channel-stub.log 2>&1 &
+from http.server import BaseHTTPRequestHandler, HTTPServer
+import json, os, sys
+
+LOG_PATH = os.environ['STUB_LOG']
+PORT = int(os.environ['STUB_PORT'])
+
+class H(BaseHTTPRequestHandler):
+    def do_POST(self):
+        length = int(self.headers.get('content-length', '0'))
+        body = self.rfile.read(length).decode('utf-8') if length else ''
+        log = {
+            'path': self.path,
+            'body': body,
+            'agentSession': self.headers.get('x-agent-session', ''),
+            'contentType': self.headers.get('content-type', ''),
+        }
+        with open(LOG_PATH, 'w') as f:
+            f.write(json.dumps(log))
+        self.send_response(201)
+        self.send_header('Content-Type', 'application/json')
+        self.end_headers()
+        self.wfile.write(json.dumps({'success': True, 'data': {'id': 'm-stub-123', 'channelId': 'chan-xyz'}}).encode('utf-8'))
+    def log_message(self, *a, **k):
+        pass
+
+srv = HTTPServer(('127.0.0.1', PORT), H)
+srv.serve_forever()
+PY
+STUB_PID=$!
+
+cleanup() { kill "$STUB_PID" >/dev/null 2>&1 || true; rm -f "$STUB_LOG" || true; }
+trap cleanup EXIT
+
+# Wait until the port actually accepts a connection (up to ~3s). This is
+# more reliable than a fixed sleep on slower boxes.
+for i in $(seq 1 30); do
+  if curl -s -o /dev/null -m 0.2 "http://127.0.0.1:${PORT}/__probe__" 2>/dev/null; then
+    break
+  fi
+  sleep 0.1
+done
+
+assert_contains() {
+  local name="$1" haystack="$2" needle="$3"
+  if echo "$haystack" | grep -q -- "$needle"; then
+    PASS=$((PASS + 1))
+    echo "  ✓ $name"
+  else
+    FAIL=$((FAIL + 1))
+    echo "  ✗ $name (wanted: $needle)"
+    echo "    in: $haystack"
+  fi
+}
+
+run_skill() {
+  CREWLY_API_URL="http://127.0.0.1:${PORT}" \
+  CREWLY_SESSION_NAME="crewly-product-sam-TEST" \
+  bash "$SKILL" "$@"
+}
+
+# --- Test 1: flag form, single-line content ---
+echo "test 1: --channel + --content"
+: > "$STUB_LOG"
+OUT=$(run_skill --channel chan-xyz --content "hello from agent" 2>&1 || true)
+LOG=$(cat "$STUB_LOG" 2>/dev/null || echo '{}')
+assert_contains "success echoed" "$OUT" '"success":true'
+assert_contains "messageId echoed" "$OUT" 'm-stub-123'
+assert_contains "path targets /api/chat/channels/:id/messages" "$LOG" '/api/chat/channels/chan-xyz/messages'
+assert_contains "body carries content" "$LOG" 'hello from agent'
+assert_contains "body contentType markdown" "$LOG" 'markdown'
+assert_contains "X-Agent-Session header present" "$LOG" 'crewly-product-sam-TEST'
+
+# --- Test 2: JSON argument form ---
+echo "test 2: JSON payload"
+: > "$STUB_LOG"
+OUT=$(run_skill '{"channelId":"chan-xyz","content":"via json","clientMessageId":"cmid-123"}' 2>&1 || true)
+LOG=$(cat "$STUB_LOG" 2>/dev/null || echo '{}')
+assert_contains "success echoed (json form)" "$OUT" '"success":true'
+assert_contains "body has content (json form)" "$LOG" 'via json'
+assert_contains "body includes clientMessageId" "$LOG" 'cmid-123'
+
+# --- Test 3: multiline content via stdin ---
+echo "test 3: stdin pipe"
+: > "$STUB_LOG"
+OUT=$(printf 'line one\nline two\n' | run_skill --channel chan-xyz 2>&1 || true)
+LOG=$(cat "$STUB_LOG" 2>/dev/null || echo '{}')
+assert_contains "success echoed (stdin form)" "$OUT" '"success":true'
+assert_contains "body contains line one" "$LOG" 'line one'
+assert_contains "body contains line two" "$LOG" 'line two'
+
+# --- Test 4: missing --channel errors out ---
+echo "test 4: missing channel"
+if OUT=$(run_skill --content "no channel" 2>&1); then
+  FAIL=$((FAIL + 1))
+  echo "  ✗ expected non-zero exit when --channel missing"
+else
+  PASS=$((PASS + 1))
+  echo "  ✓ non-zero exit when --channel missing"
+fi
+assert_contains "error surfaces" "$OUT" '--channel is required'
+
+# --- Test 5: missing content errors out ---
+echo "test 5: missing content"
+if OUT=$(run_skill --channel chan-xyz 2>&1 </dev/null); then
+  FAIL=$((FAIL + 1))
+  echo "  ✗ expected non-zero exit when --content missing"
+else
+  PASS=$((PASS + 1))
+  echo "  ✓ non-zero exit when --content missing"
+fi
+assert_contains "content-required error surfaces" "$OUT" '--content is required'
+
+echo
+echo "========================================"
+echo "reply-channel skill: PASS=$PASS  FAIL=$FAIL"
+echo "========================================"
+if [ "$FAIL" -gt 0 ]; then
+  echo "--- stub server log ---"
+  cat /tmp/reply-channel-stub.log 2>/dev/null | tail -40
+  exit 1
+fi
+exit 0

package/config/skills/agent/core/schedule-followup/execute.sh

@@ -17,8 +17,6 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/../../_common/lib.sh"
 
-CREWLY_HOME="${HOME}/.crewly"
-
 print_usage() {
   cat <<'EOF_USAGE'
 Usage:
@@ -50,23 +48,6 @@ Options:
 EOF_USAGE
 }
 
-resolve_team_id() {
-  local session="${1:-${CREWLY_SESSION_NAME:-}}"
-  [ -z "$session" ] && return 1
-  local teams_dir="${CREWLY_HOME}/teams"
-  [ ! -d "$teams_dir" ] && return 1
-  for config in "$teams_dir"/*/config.json; do
-    [ -f "$config" ] || continue
-    local found
-    found=$(jq -r --arg s "$session" '.members[]? | select(.sessionName == $s) | "found"' "$config" 2>/dev/null | head -1)
-    if [ "$found" = "found" ]; then
-      basename "$(dirname "$config")"
-      return 0
-    fi
-  done
-  return 1
-}
-
 INPUT_JSON=""
 IN_MINUTES=""
 FIRE_AT=""

package/config/skills/agent/core/watch-for-event/execute.sh

@@ -18,8 +18,6 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/../../_common/lib.sh"
 
-CREWLY_HOME="${HOME}/.crewly"
-
 print_usage() {
   cat <<'EOF_USAGE'
 Usage:
@@ -46,23 +44,6 @@ Options:
 EOF_USAGE
 }
 
-resolve_team_id() {
-  local session="${1:-${CREWLY_SESSION_NAME:-}}"
-  [ -z "$session" ] && return 1
-  local teams_dir="${CREWLY_HOME}/teams"
-  [ ! -d "$teams_dir" ] && return 1
-  for config in "$teams_dir"/*/config.json; do
-    [ -f "$config" ] || continue
-    local found
-    found=$(jq -r --arg s "$session" '.members[]? | select(.sessionName == $s) | "found"' "$config" 2>/dev/null | head -1)
-    if [ "$found" = "found" ]; then
-      basename "$(dirname "$config")"
-      return 0
-    fi
-  done
-  return 1
-}
-
 INPUT_JSON=""
 EVENT_TYPE=""
 FILTER_SESSION=""