openclaw-opencode-bridge 2.0.8 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-opencode-bridge",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "Bridge OpenClaw messaging channels to OpenCode via tmux persistent sessions",
   "main": "./lib/onboard.js",
   "bin": {

package/plugin/index.ts

@@ -12,7 +12,8 @@ const SCRIPT_MAP: Record<string, string> = {
 };
 
 const REQUIRES_ARG = new Set(["cc", "ccn"]);
-const EXEC_TIMEOUT = 120_000;
+const EXEC_TIMEOUT = 15_000;
+const SUPPRESSION_WINDOW = 15_000;
 
 const DELIVERY_MSG = "🔗 OpenCode will reply shortly.";
 
@@ -57,15 +58,6 @@ export default function register(api: OpenClawPluginApi) {
     const script = SCRIPT_MAP[command];
     if (!script) return;
 
-    // Set flag for before_prompt_build to consume
-    pendingBridgeCommand = true;
-    // Also set suppression timer as safety net
-    bridgeSuppressUntil = Date.now() + EXEC_TIMEOUT + 5_000;
-
-    api.logger.debug?.(
-      `[opencode-bridge] message_received: command=${command}, pendingBridgeCommand=true`,
-    );
-
     const arg = match[2].trim();
 
     if (REQUIRES_ARG.has(command) && !arg) {
@@ -73,17 +65,32 @@ export default function register(api: OpenClawPluginApi) {
       return;
     }
 
+    // Set flag for before_prompt_build to consume
+    pendingBridgeCommand = true;
+    // Keep suppression narrow to this turn to avoid cross-message blocking.
+    bridgeSuppressUntil = Date.now() + SUPPRESSION_WINDOW;
+
+    api.logger.debug?.(
+      `[opencode-bridge] message_received: command=${command}, pendingBridgeCommand=true`,
+    );
+
     const scriptPath = `${scriptsDir}/${script}`;
     const args = arg ? [arg] : [];
+    const startedAt = Date.now();
 
     execFile(
       scriptPath,
       args,
       { timeout: EXEC_TIMEOUT },
       (error, _stdout, stderr) => {
+        const elapsedMs = Date.now() - startedAt;
         if (error) {
           api.logger.error?.(
-            `[opencode-bridge] ${script} failed: ${stderr?.trim() || error.message}`,
+            `[opencode-bridge] ${script} failed after ${elapsedMs}ms: ${stderr?.trim() || error.message}`,
+          );
+        } else {
+          api.logger.debug?.(
+            `[opencode-bridge] ${script} queued/completed in ${elapsedMs}ms`,
           );
         }
       },
@@ -102,7 +109,7 @@ export default function register(api: OpenClawPluginApi) {
 
     if (shouldSuppress) {
       pendingBridgeCommand = false;
-      bridgeSuppressUntil = Date.now() + EXEC_TIMEOUT + 5_000;
+      bridgeSuppressUntil = Date.now() + SUPPRESSION_WINDOW;
       return { systemPrompt: SILENT_PROMPT, prependContext: SILENT_PROMPT };
     } else {
       // Clear suppression for non-bridge messages
@@ -119,6 +126,8 @@ export default function register(api: OpenClawPluginApi) {
     );
 
     if (suppressing) {
+      // One-shot override for the intercepted bridge message.
+      bridgeSuppressUntil = 0;
       return { content: DELIVERY_MSG, cancel: false };
     }
   });

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

@@ -1,22 +1,84 @@
 #!/bin/bash
-# bridge-version: 3
-# Start fresh session and send instruction
+# bridge-version: 4
+# Start fresh session asynchronously and send instruction
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
 CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
 WORKSPACE="{{WORKSPACE}}"
+RUN_TIMEOUT_SEC=45
+LOG_FILE="/tmp/opencode-bridge-send.log"
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
     exit 1
 fi
 
-cd "$WORKSPACE"
-FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
+trim_text() {
+    local value="$1"
+    value="${value#"${value%%[![:space:]]*}"}"
+    value="${value%"${value##*[![:space:]]}"}"
+    printf '%s' "$value"
+}
 
-OUTPUT=$("$OPENCODE" run --fork "$FULL_MSG" 2>&1)
+normalize_text() {
+    printf '%s' "$1" \
+        | tr '[:upper:]' '[:lower:]' \
+        | sed -E 's/^🔗[[:space:]]*//; s/^["'\''`]+|["'\''`]+$//g; s/[[:space:]]+/ /g; s/^[[:space:]]+|[[:space:]]+$//g'
+}
 
-openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "$OUTPUT"
+is_trivial_echo() {
+    local output_norm message_norm
+    output_norm="$(normalize_text "$1")"
+    message_norm="$(normalize_text "$2")"
+    [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
+}
 
-echo "✅ OpenCode response sent."
+run_with_timeout() {
+    local mode="$1"
+    local prompt="$2"
+    local output rc
+
+    if command -v timeout >/dev/null 2>&1; then
+        output=$(timeout "${RUN_TIMEOUT_SEC}s" "$OPENCODE" run "$mode" "$prompt" 2>&1)
+        rc=$?
+    elif command -v gtimeout >/dev/null 2>&1; then
+        output=$(gtimeout "${RUN_TIMEOUT_SEC}s" "$OPENCODE" run "$mode" "$prompt" 2>&1)
+        rc=$?
+    else
+        output=$("$OPENCODE" run "$mode" "$prompt" 2>&1)
+        rc=$?
+    fi
+
+    printf '%s\n' "$rc"
+    printf '%s' "$output"
+}
+
+(
+    started_at=$(date +%s)
+    cd "$WORKSPACE" || exit 1
+    FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
+
+    run_result="$(run_with_timeout --fork "$FULL_MSG")"
+    rc="$(printf '%s' "$run_result" | head -n 1)"
+    output="$(printf '%s' "$run_result" | tail -n +2)"
+
+    output="$(printf '%s\n' "$output" | sed -E '/^[[:space:]]*openclaw message send --channel[[:space:]]+/d')"
+    output="$(trim_text "$output")"
+
+    if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
+        output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Please retry with a narrower request."
+    elif [ -z "$output" ]; then
+        output="OpenCode finished, but returned an empty response."
+    elif is_trivial_echo "$output" "$MSG"; then
+        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"
+
+    ended_at=$(date +%s)
+    elapsed=$((ended_at - started_at))
+    printf '[%s] /ccn completed in %ss (exit=%s)\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$elapsed" "$rc"
+) >>"$LOG_FILE" 2>&1 &
+
+echo "✅ OpenCode new session queued."

package/templates/scripts/opencode-send.sh

@@ -1,22 +1,84 @@
 #!/bin/bash
-# bridge-version: 3
-# Send instruction to OpenCode and relay response to telegram
+# bridge-version: 4
+# Dispatch instruction to OpenCode asynchronously and relay response
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
 CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
 WORKSPACE="{{WORKSPACE}}"
+RUN_TIMEOUT_SEC=45
+LOG_FILE="/tmp/opencode-bridge-send.log"
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
     exit 1
 fi
 
-cd "$WORKSPACE"
-FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
+trim_text() {
+    local value="$1"
+    value="${value#"${value%%[![:space:]]*}"}"
+    value="${value%"${value##*[![:space:]]}"}"
+    printf '%s' "$value"
+}
 
-OUTPUT=$("$OPENCODE" run --continue "$FULL_MSG" 2>&1)
+normalize_text() {
+    printf '%s' "$1" \
+        | tr '[:upper:]' '[:lower:]' \
+        | sed -E 's/^🔗[[:space:]]*//; s/^["'\''`]+|["'\''`]+$//g; s/[[:space:]]+/ /g; s/^[[:space:]]+|[[:space:]]+$//g'
+}
 
-openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "$OUTPUT"
+is_trivial_echo() {
+    local output_norm message_norm
+    output_norm="$(normalize_text "$1")"
+    message_norm="$(normalize_text "$2")"
+    [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
+}
 
-echo "✅ OpenCode response sent."
+run_with_timeout() {
+    local mode="$1"
+    local prompt="$2"
+    local output rc
+
+    if command -v timeout >/dev/null 2>&1; then
+        output=$(timeout "${RUN_TIMEOUT_SEC}s" "$OPENCODE" run "$mode" "$prompt" 2>&1)
+        rc=$?
+    elif command -v gtimeout >/dev/null 2>&1; then
+        output=$(gtimeout "${RUN_TIMEOUT_SEC}s" "$OPENCODE" run "$mode" "$prompt" 2>&1)
+        rc=$?
+    else
+        output=$("$OPENCODE" run "$mode" "$prompt" 2>&1)
+        rc=$?
+    fi
+
+    printf '%s\n' "$rc"
+    printf '%s' "$output"
+}
+
+(
+    started_at=$(date +%s)
+    cd "$WORKSPACE" || exit 1
+    FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
+
+    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="$(printf '%s\n' "$output" | sed -E '/^[[:space:]]*openclaw message send --channel[[:space:]]+/d')"
+    output="$(trim_text "$output")"
+
+    if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
+        output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Please retry with a narrower request."
+    elif [ -z "$output" ]; then
+        output="OpenCode finished, but returned an empty response."
+    elif is_trivial_echo "$output" "$MSG"; then
+        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"
+
+    ended_at=$(date +%s)
+    elapsed=$((ended_at - started_at))
+    printf '[%s] /cc completed in %ss (exit=%s)\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$elapsed" "$rc"
+) >>"$LOG_FILE" 2>&1 &
+
+echo "✅ OpenCode request queued."

package/templates/scripts/opencode-session.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
-# bridge-version: 4
-# Keep OpenCode server alive (runs every 30s via daemon)
-# Safe: idempotent, flock-protected (with fallback)
+# bridge-version: 5
+# Keep OpenCode server running in background (for faster message processing)
+# Daemon runs every 30s to ensure server stays alive
 
 OPENCODE="{{OPENCODE_BIN}}"
 WORKSPACE="{{WORKSPACE}}"
 LOCK_FILE="/tmp/opencode-session.lock"
+PID_FILE="/tmp/opencode-session.pid"
 TIMEOUT=10
 
 # Use flock for lock protection if available
@@ -25,10 +26,17 @@ fi
 
 cd "$WORKSPACE"
 
-# Start OpenCode in server mode if not running
-if ! pgrep -f "opencode serve" > /dev/null 2>&1; then
-    "$OPENCODE" serve &
-    sleep 2
+# Check if server is already running
+if [ -f "$PID_FILE" ]; then
+    OLD_PID=$(cat "$PID_FILE")
+    if [ -n "$OLD_PID" ] && kill -0 "$OLD_PID" 2>/dev/null; then
+        exit 0
+    fi
 fi
 
+# Start OpenCode server in background
+nohup "$OPENCODE" serve > /tmp/opencode-serve.log 2>&1 &
+echo $! > "$PID_FILE"
+sleep 3
+
 exit 0

package/templates/workspace/OPENCODE.md

@@ -2,23 +2,28 @@
 
 ## Bot Mode
 
-When a message starts with `[{CHANNEL}:{ID}]` prefix, you **MUST** follow this procedure.
+When a message starts with `[{CHANNEL}:{ID}]` prefix, you are being used as a bot.
+
+### Message Format
+
+The format is: `[CHANNEL:ID] actual message`
+
+**Examples:**
+- `[telegram:850961516] hello` → Channel=telegram, ID=850961516, Message="hello"
+- `[discord:123456] build a website` → Channel=discord, ID=123456, Message="build a website"
+
+**IMPORTANT:** The prefix `[channel:id]` is metadata. You should ONLY respond to the actual message, NOT repeat the prefix or the user's name in your response.
 
 ### Procedure
 
-1. Extract `{CHANNEL}` and `{ID}` from the prefix
-2. Perform the task described after the prefix
-3. **After completion, send the response via:**
-```bash
-openclaw message send --channel {CHANNEL} --target {ID} -m '🔗 response'
-```
-4. **Every message MUST start with 🔗** — this identifies you as OpenCode
-5. Split messages over 4000 characters into multiple sends (each starts with 🔗)
-
-### Response transmission is mandatory (never skip)
-
-- **Every `[{CHANNEL}:{ID}]` message MUST receive a response via the channel.**
-- Regardless of success, failure, or error, you must always send the result.
-- Ending a turn without sending is **strictly forbidden**.
-- If the task failed, send the failure reason. If it succeeded, send the result.
-- If you did not run `openclaw message send`, the task is **NOT** complete.
+1. Extract `{CHANNEL}` and `{ID}` from the `[...]` prefix
+2. Ignore everything before `] ` — that is metadata, not user content
+3. Perform the task described in the actual message
+4. Return only the assistant answer text
+
+### Output rules
+
+- Do not output or suggest `openclaw message send` commands.
+- Do not include the `[channel:id]` prefix in your response.
+- Do not prepend delivery markers such as `🔗` unless explicitly requested by the user.
+- If the task fails, return a direct failure reason in plain text.