@adaptic/maestro 1.10.7 → 1.10.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptic/maestro",
-  "version": "1.10.7",
+  "version": "1.10.8",
   "description": "Maestro — Autonomous AI agent operating system. Deploy AI employees on dedicated Mac minis.",
   "type": "module",
   "bin": {

package/scripts/slack-responded.sh

@@ -159,6 +159,49 @@ EOF
     exit 1  # Not yet handled
     ;;
 
+  release)
+    # release <channel_id> <message_ts> [session_id]
+    # Releases an unconfirmed lock so a legitimate retry isn't blocked by a
+    # 24h TTL. Called by slack-send.sh's exit trap when a send fails or the
+    # script crashes after acquiring the lock but before confirming the send.
+    #
+    # Safety:
+    #   - Refuse to release if the lock has been confirmed (real send happened)
+    #   - If session_id is provided, only release locks owned by that session
+    #     (prevents a buggy caller from blowing away a sibling's in-flight lock)
+    #
+    # Lock metadata is stored in `meta` (acquire/confirm both write to it)
+    # using the format produced by the acquire/confirm sections above:
+    #   session: "<id>"
+    #   status: acquired   (or confirmed)
+    CHANNEL="${2:?Channel ID required}"
+    MSG_TS="${3:?Message TS required}"
+    SESSION_ID="${4:-unknown}"
+
+    LOCK_DIR="$LOCK_BASE_DIR/${CHANNEL}-${MSG_TS}"
+    META="$LOCK_DIR/meta"
+
+    if [ ! -d "$LOCK_DIR" ]; then
+      echo "NOT_HELD"
+      exit 0
+    fi
+
+    if [ -f "$META" ] && grep -qE "^status:[[:space:]]*confirmed" "$META" 2>/dev/null; then
+      echo "ALREADY_CONFIRMED"
+      exit 0
+    fi
+
+    if [ -f "$META" ] && [ "$SESSION_ID" != "unknown" ]; then
+      if ! grep -qE "^session:[[:space:]]*\"?${SESSION_ID}\"?[[:space:]]*$" "$META" 2>/dev/null; then
+        echo "NOT_OWNED"
+        exit 0
+      fi
+    fi
+
+    rm -rf "$LOCK_DIR"
+    echo "RELEASED"
+    ;;
+
   mark)
     # mark <message_ts> — backward-compatible mark
     MSG_TS="${2:?Message TS required}"
@@ -175,11 +218,12 @@ EOF
     ;;
 
   *)
-    echo "Usage: slack-responded.sh {acquire|confirm|check|mark|clean} [args...]"
+    echo "Usage: slack-responded.sh {acquire|confirm|release|check|mark|clean} [args...]"
     echo ""
     echo "Commands:"
     echo "  acquire <channel> <msg_ts> [session_id]  — Atomically claim a response lock"
     echo "  confirm <channel> <msg_ts> [preview]      — Record successful send"
+    echo "  release <channel> <msg_ts> [session_id]  — Release unconfirmed lock (send failed)"
     echo "  check <msg_ts> [channel]                   — Check if already handled"
     echo "  mark <msg_ts>                              — Legacy: mark as handled"
     echo "  clean                                       — Purge old entries"

package/scripts/slack-send.sh

@@ -118,6 +118,21 @@ if [ -n "$RESPONDING_TO" ]; then
     exit 0
   fi
   DEDUP_ACQUIRED="1"
+
+  # Lock-release safety net. If this script exits BEFORE confirming the
+  # lock (e.g. validation failed, Slack API errored, python script crashed
+  # during message conversion, caller killed us), we must release the lock
+  # so the next legitimate retry isn't blocked for 24 hours. The trap is
+  # cleared after the post-send confirm; if the confirm runs, we leave
+  # the lock in place (it's now a real send marker, not a placeholder).
+  cleanup_unconfirmed_lock() {
+    local exit_code=$?
+    if [ -n "$DEDUP_ACQUIRED" ] && [ -z "$DEDUP_CONFIRMED" ]; then
+      "$SCRIPT_DIR/slack-responded.sh" release "$CHANNEL" "$RESPONDING_TO" "$SESSION_ID" 2>/dev/null || true
+    fi
+    return "$exit_code"
+  }
+  trap cleanup_unconfirmed_lock EXIT
 fi
 
 # Show typing indicator before sending (non-blocking, fire-and-forget)
@@ -230,7 +245,11 @@ if [ "$STATUS" = "invalid_auth" ] || [ "$STATUS" = "token_revoked" ] || [ "$STAT
 fi
 
 # Post-send: confirm the response lock with message details (audit trail)
+# and mark the trap as fulfilled so the exit-handler does NOT release the
+# now-legitimate confirmation marker. Any non-OK status leaves DEDUP_CONFIRMED
+# unset, so the EXIT trap releases the lock for legitimate retry.
 if [ "$STATUS" = "OK" ] && [ -n "$RESPONDING_TO" ] && [ -n "$DEDUP_ACQUIRED" ]; then
   PREVIEW=$(echo "$MESSAGE" | head -c 200)
   "$SCRIPT_DIR/slack-responded.sh" confirm "$CHANNEL" "$RESPONDING_TO" "$PREVIEW" 2>/dev/null || true
+  DEDUP_CONFIRMED="1"
 fi