openclaw-opencode-bridge 2.1.2 → 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.2",
+  "version": "2.1.3",
   "description": "Bridge OpenClaw messaging channels to OpenCode via tmux persistent sessions",
   "main": "./lib/onboard.js",
   "bin": {

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

@@ -1,5 +1,5 @@
 #!/bin/bash
-# bridge-version: 6
+# bridge-version: 9
 # Start fresh session asynchronously and send instruction
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
@@ -78,6 +78,11 @@ is_trivial_echo() {
     [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
 }
 
+has_external_delivery_success() {
+    local raw="$1"
+    printf '%s\n' "$raw" | grep -Eqi 'Sent via [A-Za-z]+|Message ID:[[:space:]]*[0-9]+'
+}
+
 extract_last_marked_block() {
     local raw="$1"
     if ! printf '%s' "$raw" | grep -q '🔗'; then
@@ -124,13 +129,49 @@ sanitize_output() {
     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=$!
 
     (
@@ -172,10 +213,11 @@ run_with_timeout() {
         exit 0
     fi
 
-    run_result="$(run_with_timeout --fork "$FULL_MSG")"
+    # 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."
@@ -185,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: 6
+# bridge-version: 9
 # Dispatch instruction to OpenCode asynchronously and relay response
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
@@ -78,6 +78,11 @@ is_trivial_echo() {
     [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
 }
 
+has_external_delivery_success() {
+    local raw="$1"
+    printf '%s\n' "$raw" | grep -Eqi 'Sent via [A-Za-z]+|Message ID:[[:space:]]*[0-9]+'
+}
+
 extract_last_marked_block() {
     local raw="$1"
     if ! printf '%s' "$raw" | grep -q '🔗'; then
@@ -124,6 +129,38 @@ sanitize_output() {
     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"
@@ -174,8 +211,8 @@ run_with_timeout() {
 
     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."
@@ -185,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.