openclaw-opencode-bridge 2.1.1 → 2.1.3

package/README.md

@@ -4,7 +4,9 @@
 [![license](https://img.shields.io/npm/l/openclaw-opencode-bridge)](LICENSE)
 [![node](https://img.shields.io/node/v/openclaw-opencode-bridge)](package.json)
 
-> Forked from [openclaw-claude-bridge](https://github.com/bettep-dev/openclaw-claude-bridge) by [@bettep-dev](https://github.com/bettep-dev) — modified to work with OpenCode instead of Claude CLI.
+> Liked this project? Consider donating!
+
+> EVM Address: 0xe81c32383C8F21A14E6C2264939dA512e9F9bb42
 
 Bridge [OpenClaw](https://openclaw.ai) messaging channels to [OpenCode](https://opencode.ai) via persistent tmux sessions.
 
@@ -98,6 +100,8 @@ Removes all installed components — plugin, shell scripts, OPENCODE.md addition
 | Delivery confirmed but no reply | Check `tmux ls` — session may have crashed |
 | Multiline sends only first line | Re-run `openclaw-opencode-bridge onboard` (v2.0.6+) |
 
+> Forked from [openclaw-claude-bridge](https://github.com/bettep-dev/openclaw-claude-bridge) by [@bettep-dev](https://github.com/bettep-dev) — modified to work with OpenCode instead of Claude CLI.
+
 ## License
 
 [MIT](LICENSE)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-opencode-bridge",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Bridge OpenClaw messaging channels to OpenCode via tmux persistent sessions",
   "main": "./lib/onboard.js",
   "bin": {
@@ -37,10 +37,10 @@
     "name": "Febrian",
     "email": "febro.aw20@gmail.com"
   },
-  "homepage": "https://febro.fun",
+  "homepage": "http://febro.fun",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/bettep-dev/openclaw-opencode-bridge"
+    "url": "https://github.com/AganFebro/openclaw-opencode-bridge"
   }
 }

package/templates/scripts/opencode-new-session.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# bridge-version: 5
+# bridge-version: 9
 # Start fresh session asynchronously and send instruction
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
@@ -9,6 +9,7 @@ WORKSPACE="{{WORKSPACE}}"
 LOG_FILE="/tmp/opencode-bridge-send.log"
 BASE_TIMEOUT_SEC=45
 MAX_TIMEOUT_SEC=300
+LOCK_WAIT_SEC=600
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
@@ -28,6 +29,21 @@ normalize_text() {
         | sed -E 's/^🔗[[:space:]]*//; s/^["'\''`]+|["'\''`]+$//g; s/[[:space:]]+/ /g; s/^[[:space:]]+|[[:space:]]+$//g'
 }
 
+acquire_bridge_lock() {
+    local safe_channel safe_target lock_file
+    safe_channel="$(printf '%s' "$CHANNEL" | sed -E 's/[^a-zA-Z0-9._-]/_/g')"
+    safe_target="$(printf '%s' "$TARGET" | sed -E 's/[^a-zA-Z0-9._-]/_/g')"
+    lock_file="/tmp/opencode-bridge-${safe_channel}-${safe_target}.lock"
+
+    if command -v flock >/dev/null 2>&1; then
+        exec 200>"$lock_file"
+        flock -w "$LOCK_WAIT_SEC" 200
+        return $?
+    fi
+
+    return 0
+}
+
 compute_timeout() {
     local msg="$1"
     local timeout="$BASE_TIMEOUT_SEC"
@@ -62,49 +78,100 @@ is_trivial_echo() {
     [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
 }
 
-extract_embedded_send_message() {
+has_external_delivery_success() {
     local raw="$1"
-    local line message
-
-    line="$(printf '%s\n' "$raw" | grep -E 'openclaw message send --channel' | tail -n 1)"
-    [ -z "$line" ] && return 0
+    printf '%s\n' "$raw" | grep -Eqi 'Sent via [A-Za-z]+|Message ID:[[:space:]]*[0-9]+'
+}
 
-    if printf '%s' "$line" | grep -q -- "-m '"; then
-        message="$(printf '%s' "$line" | sed -n "s/.* -m '\(.*\)'.*/\1/p")"
-    elif printf '%s' "$line" | grep -q -- '-m "'; then
-        message="$(printf '%s' "$line" | sed -n 's/.* -m "\(.*\)".*/\1/p')"
+extract_last_marked_block() {
+    local raw="$1"
+    if ! printf '%s' "$raw" | grep -q '🔗'; then
+        return 0
     fi
 
-    printf '%s' "$(trim_text "$message")"
+    printf '%s\n' "$raw" | awk '
+    {
+        pos = index($0, "🔗");
+        if (pos > 0) {
+            out = substr($0, pos);
+            capture = 1;
+            next;
+        }
+        if (capture) {
+            out = out "\n" $0;
+        }
+    }
+    END {
+        if (capture) print out;
+    }'
 }
 
 sanitize_output() {
     local raw="$1"
-    local extracted cleaned
-
-    extracted="$(extract_embedded_send_message "$raw")"
-    if [ -n "$extracted" ]; then
-        printf '%s' "$extracted"
-        return 0
-    fi
+    local cleaned marked
 
     cleaned="$(printf '%s' "$raw" \
         | tr '\r' '\n' \
         | sed -E $'s/\x1B\\[[0-9;?]*[ -/]*[@-~]//g; s/\x1B\\][^\a]*(\a|\x1B\\\\)//g')"
 
+    cleaned="$(printf '%s\n' "$cleaned" | sed -E 's/\[[0-9]{1,3}m//g')"
+
     cleaned="$(printf '%s\n' "$cleaned" | grep -Ev \
-        '^[[:space:]]*$|^[[:space:]]*(build ·|◇ Doctor warnings)[[:space:]]*$|^[[:space:]]*openclaw message send --channel[[:space:]]+|^[[:space:]]*Sent via Telegram|^[[:space:]]*\[[0-9]{1,3}m|^[[:space:]]*\[(telegram|discord|slack|whatsapp|signal|irc|matrix|line|mattermost|teams)\]|autoSelectFamily=|dnsResultOrder=|^[[:space:]]*[│┌┐└┘├┤┬┴┼─═╭╮╰╯]+[[:space:]]*$|^[[:space:]]*\$[[:space:]]*\[[0-9]{1,3}m')"
+        '^[[:space:]]*$|^[[:space:]]*(build[[:space:]]*·|◇[[:space:]]+Doctor warnings)[[:space:]]*$|^[[:space:]]*◇[[:space:]]+|^[[:space:]]*[←→↳].*|^[[:space:]]*Wrote file successfully\.?$|^[[:space:]]*(\$[[:space:]]*)?openclaw message send --channel[[:space:]]+|^[[:space:]]*error:[[:space:]]*too many arguments for '\''send'\''.*$|^[[:space:]]*Sent via Telegram|^[[:space:]]*\[(telegram|discord|slack|whatsapp|signal|irc|matrix|line|mattermost|teams)\]|autoSelectFamily=|dnsResultOrder=|^[[:space:]]*[│┌┐└┘├┤┬┴┼─═╭╮╰╯]+[[:space:]]*$')"
+
+    marked="$(extract_last_marked_block "$cleaned")"
+    if [ -n "$marked" ]; then
+        cleaned="$marked"
+    fi
+
+    cleaned="$(printf '%s\n' "$cleaned" | sed -E 's/^🔗[[:space:]]*//')"
 
     printf '%s' "$(trim_text "$cleaned")"
 }
 
+sentence_case_first() {
+    local text="$1"
+    printf '%s' "$text" | awk '
+    BEGIN { done = 0 }
+    {
+        if (done) { print; next }
+        line = $0
+        for (i = 1; i <= length(line); i++) {
+            ch = substr(line, i, 1)
+            if (ch ~ /[a-z]/) {
+                pre = substr(line, 1, i - 1)
+                post = substr(line, i + 1)
+                line = pre toupper(ch) post
+                done = 1
+                break
+            } else if (ch ~ /[A-Z]/) {
+                done = 1
+                break
+            }
+        }
+        print line
+    }'
+}
+
+apply_reply_style() {
+    local text="$1"
+    text="$(trim_text "$text")"
+    [ -z "$text" ] && { printf '%s' "$text"; return; }
+    text="$(sentence_case_first "$text")"
+    printf '%s' "$text"
+}
+
 run_with_timeout() {
     local mode="$1"
     local prompt="$2"
     local output rc tmp pid watchdog
 
     tmp="$(mktemp /tmp/opencode-run.XXXXXX)"
-    "$OPENCODE" run "$mode" "$prompt" >"$tmp" 2>&1 &
+    if [ -n "$mode" ]; then
+        "$OPENCODE" run "$mode" "$prompt" >"$tmp" 2>&1 &
+    else
+        "$OPENCODE" run "$prompt" >"$tmp" 2>&1 &
+    fi
     pid=$!
 
     (
@@ -140,10 +207,17 @@ run_with_timeout() {
     cd "$WORKSPACE" || exit 1
     FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
 
-    run_result="$(run_with_timeout --fork "$FULL_MSG")"
+    if ! acquire_bridge_lock; then
+        openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "Bridge is still processing a previous request. Please retry in a moment."
+        printf '[%s] /ccn lock timeout after %ss\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$LOCK_WAIT_SEC"
+        exit 0
+    fi
+
+    # Fresh request: run without --continue to avoid session carryover.
+    run_result="$(run_with_timeout "" "$FULL_MSG")"
     rc="$(printf '%s' "$run_result" | head -n 1)"
-    output="$(printf '%s' "$run_result" | tail -n +2)"
-    output="$(sanitize_output "$output")"
+    raw_output="$(printf '%s' "$run_result" | tail -n +2)"
+    output="$(sanitize_output "$raw_output")"
 
     if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
         output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Task may still be running. Try waiting a bit or send a follow-up."
@@ -153,7 +227,13 @@ run_with_timeout() {
         output="OpenCode ran, but returned a non-informative echo. Please retry with a more specific prompt."
     fi
 
-    openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "$output"
+    output="$(apply_reply_style "$output")"
+
+    if has_external_delivery_success "$raw_output"; then
+        printf '[%s] /ccn skipped bridge send (already sent by OpenCode)\n' "$(date '+%Y-%m-%d %H:%M:%S')"
+    else
+        openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "$output"
+    fi
 
     ended_at=$(date +%s)
     elapsed=$((ended_at - started_at))

package/templates/scripts/opencode-send.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# bridge-version: 5
+# bridge-version: 9
 # Dispatch instruction to OpenCode asynchronously and relay response
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
@@ -9,6 +9,7 @@ WORKSPACE="{{WORKSPACE}}"
 LOG_FILE="/tmp/opencode-bridge-send.log"
 BASE_TIMEOUT_SEC=45
 MAX_TIMEOUT_SEC=300
+LOCK_WAIT_SEC=600
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
@@ -28,6 +29,21 @@ normalize_text() {
         | sed -E 's/^🔗[[:space:]]*//; s/^["'\''`]+|["'\''`]+$//g; s/[[:space:]]+/ /g; s/^[[:space:]]+|[[:space:]]+$//g'
 }
 
+acquire_bridge_lock() {
+    local safe_channel safe_target lock_file
+    safe_channel="$(printf '%s' "$CHANNEL" | sed -E 's/[^a-zA-Z0-9._-]/_/g')"
+    safe_target="$(printf '%s' "$TARGET" | sed -E 's/[^a-zA-Z0-9._-]/_/g')"
+    lock_file="/tmp/opencode-bridge-${safe_channel}-${safe_target}.lock"
+
+    if command -v flock >/dev/null 2>&1; then
+        exec 200>"$lock_file"
+        flock -w "$LOCK_WAIT_SEC" 200
+        return $?
+    fi
+
+    return 0
+}
+
 compute_timeout() {
     local msg="$1"
     local timeout="$BASE_TIMEOUT_SEC"
@@ -62,42 +78,89 @@ is_trivial_echo() {
     [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
 }
 
-extract_embedded_send_message() {
+has_external_delivery_success() {
     local raw="$1"
-    local line message
-
-    line="$(printf '%s\n' "$raw" | grep -E 'openclaw message send --channel' | tail -n 1)"
-    [ -z "$line" ] && return 0
+    printf '%s\n' "$raw" | grep -Eqi 'Sent via [A-Za-z]+|Message ID:[[:space:]]*[0-9]+'
+}
 
-    if printf '%s' "$line" | grep -q -- "-m '"; then
-        message="$(printf '%s' "$line" | sed -n "s/.* -m '\(.*\)'.*/\1/p")"
-    elif printf '%s' "$line" | grep -q -- '-m "'; then
-        message="$(printf '%s' "$line" | sed -n 's/.* -m "\(.*\)".*/\1/p')"
+extract_last_marked_block() {
+    local raw="$1"
+    if ! printf '%s' "$raw" | grep -q '🔗'; then
+        return 0
     fi
 
-    printf '%s' "$(trim_text "$message")"
+    printf '%s\n' "$raw" | awk '
+    {
+        pos = index($0, "🔗");
+        if (pos > 0) {
+            out = substr($0, pos);
+            capture = 1;
+            next;
+        }
+        if (capture) {
+            out = out "\n" $0;
+        }
+    }
+    END {
+        if (capture) print out;
+    }'
 }
 
 sanitize_output() {
     local raw="$1"
-    local extracted cleaned
-
-    extracted="$(extract_embedded_send_message "$raw")"
-    if [ -n "$extracted" ]; then
-        printf '%s' "$extracted"
-        return 0
-    fi
+    local cleaned marked
 
     cleaned="$(printf '%s' "$raw" \
         | tr '\r' '\n' \
         | sed -E $'s/\x1B\\[[0-9;?]*[ -/]*[@-~]//g; s/\x1B\\][^\a]*(\a|\x1B\\\\)//g')"
 
+    cleaned="$(printf '%s\n' "$cleaned" | sed -E 's/\[[0-9]{1,3}m//g')"
+
     cleaned="$(printf '%s\n' "$cleaned" | grep -Ev \
-        '^[[:space:]]*$|^[[:space:]]*(build ·|◇ Doctor warnings)[[:space:]]*$|^[[:space:]]*openclaw message send --channel[[:space:]]+|^[[:space:]]*Sent via Telegram|^[[:space:]]*\[[0-9]{1,3}m|^[[:space:]]*\[(telegram|discord|slack|whatsapp|signal|irc|matrix|line|mattermost|teams)\]|autoSelectFamily=|dnsResultOrder=|^[[:space:]]*[│┌┐└┘├┤┬┴┼─═╭╮╰╯]+[[:space:]]*$|^[[:space:]]*\$[[:space:]]*\[[0-9]{1,3}m')"
+        '^[[:space:]]*$|^[[:space:]]*(build[[:space:]]*·|◇[[:space:]]+Doctor warnings)[[:space:]]*$|^[[:space:]]*◇[[:space:]]+|^[[:space:]]*[←→↳].*|^[[:space:]]*Wrote file successfully\.?$|^[[:space:]]*(\$[[:space:]]*)?openclaw message send --channel[[:space:]]+|^[[:space:]]*error:[[:space:]]*too many arguments for '\''send'\''.*$|^[[:space:]]*Sent via Telegram|^[[:space:]]*\[(telegram|discord|slack|whatsapp|signal|irc|matrix|line|mattermost|teams)\]|autoSelectFamily=|dnsResultOrder=|^[[:space:]]*[│┌┐└┘├┤┬┴┼─═╭╮╰╯]+[[:space:]]*$')"
+
+    marked="$(extract_last_marked_block "$cleaned")"
+    if [ -n "$marked" ]; then
+        cleaned="$marked"
+    fi
+
+    cleaned="$(printf '%s\n' "$cleaned" | sed -E 's/^🔗[[:space:]]*//')"
 
     printf '%s' "$(trim_text "$cleaned")"
 }
 
+sentence_case_first() {
+    local text="$1"
+    printf '%s' "$text" | awk '
+    BEGIN { done = 0 }
+    {
+        if (done) { print; next }
+        line = $0
+        for (i = 1; i <= length(line); i++) {
+            ch = substr(line, i, 1)
+            if (ch ~ /[a-z]/) {
+                pre = substr(line, 1, i - 1)
+                post = substr(line, i + 1)
+                line = pre toupper(ch) post
+                done = 1
+                break
+            } else if (ch ~ /[A-Z]/) {
+                done = 1
+                break
+            }
+        }
+        print line
+    }'
+}
+
+apply_reply_style() {
+    local text="$1"
+    text="$(trim_text "$text")"
+    [ -z "$text" ] && { printf '%s' "$text"; return; }
+    text="$(sentence_case_first "$text")"
+    printf '%s' "$text"
+}
+
 run_with_timeout() {
     local mode="$1"
     local prompt="$2"
@@ -140,10 +203,16 @@ run_with_timeout() {
     cd "$WORKSPACE" || exit 1
     FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
 
+    if ! acquire_bridge_lock; then
+        openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "Bridge is still processing a previous request. Please retry in a moment."
+        printf '[%s] /cc lock timeout after %ss\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$LOCK_WAIT_SEC"
+        exit 0
+    fi
+
     run_result="$(run_with_timeout --continue "$FULL_MSG")"
     rc="$(printf '%s' "$run_result" | head -n 1)"
-    output="$(printf '%s' "$run_result" | tail -n +2)"
-    output="$(sanitize_output "$output")"
+    raw_output="$(printf '%s' "$run_result" | tail -n +2)"
+    output="$(sanitize_output "$raw_output")"
 
     if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
         output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Task may still be running. Try waiting a bit or send a follow-up."
@@ -153,7 +222,13 @@ run_with_timeout() {
         output="OpenCode ran, but returned a non-informative echo. Please retry with a more specific prompt."
     fi
 
-    openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "$output"
+    output="$(apply_reply_style "$output")"
+
+    if has_external_delivery_success "$raw_output"; then
+        printf '[%s] /cc skipped bridge send (already sent by OpenCode)\n' "$(date '+%Y-%m-%d %H:%M:%S')"
+    else
+        openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "$output"
+    fi
 
     ended_at=$(date +%s)
     elapsed=$((ended_at - started_at))

package/templates/workspace/OPENCODE.md

@@ -39,4 +39,6 @@ The format is: `[CHANNEL:ID] actual message`
 - For follow-up status questions such as "have you created it?", do not answer with only yes/no.
   Always include short status details and the run command.
 - Keep tone clear, proactive, and helpful. Prefer concise but complete responses.
+- Use proper sentence case and punctuation. Start the first sentence with an uppercase letter.
+- Avoid slang-only openings like "hey!" or "yep!" without context; provide a complete helpful sentence.
 - Length guidance: trivial questions can be 1-2 lines; implementation results should usually be 4-10 lines.