openclaw-opencode-bridge 2.1.0 → 2.1.2

package/lib/onboard.js

@@ -336,6 +336,53 @@ function openBrowser(url) {
   }
 }
 
+function compactError(err) {
+  const text =
+    err?.stderr?.trim() ||
+    err?.stdout?.trim() ||
+    err?.message ||
+    String(err || "");
+  return text.split("\n").map((s) => s.trim()).filter(Boolean)[0] || "unknown error";
+}
+
+async function runGatewayCommand(action, timeoutMs) {
+  try {
+    await execAsync(`openclaw gateway ${action}`, { timeout: timeoutMs });
+    return { ok: true, action };
+  } catch (e) {
+    return { ok: false, action, error: compactError(e) };
+  }
+}
+
+async function restartGatewayResilient() {
+  // 1) Normal restart with a longer timeout (gateway shutdown/startup can exceed 15s).
+  const primary = await runGatewayCommand("restart", 45000);
+  if (primary.ok) {
+    return { ok: true, mode: "restart" };
+  }
+
+  // 2) Fallback sequence: stop -> start.
+  const stop = await runGatewayCommand("stop", 20000);
+  await sleep(800);
+  const start = await runGatewayCommand("start", 45000);
+  if (start.ok) {
+    const warning = stop.ok ? "" : ` (stop warning: ${stop.error})`;
+    return { ok: true, mode: `stop/start${warning}` };
+  }
+
+  // 3) Final retry.
+  await sleep(1000);
+  const retry = await runGatewayCommand("restart", 45000);
+  if (retry.ok) {
+    return { ok: true, mode: "restart-retry" };
+  }
+
+  return {
+    ok: false,
+    error: retry.error || start.error || primary.error || "gateway restart failed",
+  };
+}
+
 // --- Main onboard flow ---
 
 async function onboard() {
@@ -825,18 +872,13 @@ async function onboard() {
   const spinner5 = startSpinner("Restarting OpenClaw Gateway...");
   await sleep(300);
 
-  let restarted = false;
-  let restartError = "";
-  try {
-    await execAsync("openclaw gateway restart", { timeout: 15000 });
-    restarted = true;
-  } catch (e) {
-    restartError = e.stderr?.trim() || e.message;
-  }
+  const gatewayRestart = await restartGatewayResilient();
+  const restarted = gatewayRestart.ok;
+  const restartError = gatewayRestart.error || "";
 
   if (restarted) {
     spinner5.stop(
-      `Gateway     ${chalk.dim("->")} restarted ${chalk.dim("(skills loaded)")}`,
+      `Gateway     ${chalk.dim("->")} restarted ${chalk.dim(`(${gatewayRestart.mode})`)}`,
     );
   } else {
     spinner5.fail(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-opencode-bridge",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "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,13 +1,15 @@
 #!/bin/bash
-# bridge-version: 4
+# bridge-version: 6
 # 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"
+BASE_TIMEOUT_SEC=45
+MAX_TIMEOUT_SEC=300
+LOCK_WAIT_SEC=600
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
@@ -27,6 +29,48 @@ 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"
+    local chars words
+
+    chars=${#msg}
+    words="$(printf '%s' "$msg" | wc -w | tr -d '[:space:]')"
+
+    if [ "$chars" -gt 120 ]; then timeout=$((timeout + 15)); fi
+    if [ "$chars" -gt 280 ]; then timeout=$((timeout + 20)); fi
+    if [ "$words" -gt 25 ]; then timeout=$((timeout + 20)); fi
+
+    if printf '%s' "$msg" | grep -Eqi '\b(create|build|write|implement|script|code|program|refactor|debug|fix|test|automation|deploy|migrate|api|database|project)\b'; then
+        timeout=$((timeout + 60))
+    fi
+
+    if printf '%s' "$msg" | grep -Eqi '\b(from scratch|end[- ]to[- ]end|single file|one file|only 1|complex|demanding)\b'; then
+        timeout=$((timeout + 30))
+    fi
+
+    if [ "$timeout" -gt "$MAX_TIMEOUT_SEC" ]; then
+        timeout="$MAX_TIMEOUT_SEC"
+    fi
+
+    printf '%s' "$timeout"
+}
+
 is_trivial_echo() {
     local output_norm message_norm
     output_norm="$(normalize_text "$1")"
@@ -34,40 +78,107 @@ is_trivial_echo() {
     [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
 }
 
+extract_last_marked_block() {
+    local raw="$1"
+    if ! printf '%s' "$raw" | grep -q '🔗'; then
+        return 0
+    fi
+
+    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 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[[: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")"
+}
+
 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=$?
+    local output rc tmp pid watchdog
+
+    tmp="$(mktemp /tmp/opencode-run.XXXXXX)"
+    "$OPENCODE" run "$mode" "$prompt" >"$tmp" 2>&1 &
+    pid=$!
+
+    (
+        sleep "$RUN_TIMEOUT_SEC"
+        if kill -0 "$pid" 2>/dev/null; then
+            touch "${tmp}.timeout"
+            kill "$pid" 2>/dev/null
+            sleep 2
+            kill -9 "$pid" 2>/dev/null
+        fi
+    ) &
+    watchdog=$!
+
+    wait "$pid"
+    rc=$?
+    kill "$watchdog" 2>/dev/null
+
+    if [ -f "${tmp}.timeout" ]; then
+        rc=124
+        rm -f "${tmp}.timeout"
     fi
 
+    output="$(cat "$tmp")"
+    rm -f "$tmp"
+
     printf '%s\n' "$rc"
     printf '%s' "$output"
 }
 
 (
     started_at=$(date +%s)
+    RUN_TIMEOUT_SEC="$(compute_timeout "$MSG")"
     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] /ccn lock timeout after %ss\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$LOCK_WAIT_SEC"
+        exit 0
+    fi
+
     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")"
+    output="$(sanitize_output "$output")"
 
     if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
-        output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Please retry with a narrower request."
+        output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Task may still be running. Try waiting a bit or send a follow-up."
     elif [ -z "$output" ]; then
         output="OpenCode finished, but returned an empty response."
     elif is_trivial_echo "$output" "$MSG"; then
@@ -78,7 +189,7 @@ run_with_timeout() {
 
     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"
+    printf '[%s] /ccn completed in %ss (exit=%s timeout=%ss)\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$elapsed" "$rc" "$RUN_TIMEOUT_SEC"
 ) >>"$LOG_FILE" 2>&1 &
 
 echo "✅ OpenCode new session queued."

package/templates/scripts/opencode-send.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
-# bridge-version: 4
+# bridge-version: 6
 # 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"
+BASE_TIMEOUT_SEC=45
+MAX_TIMEOUT_SEC=300
+LOCK_WAIT_SEC=600
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
@@ -27,6 +29,48 @@ 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"
+    local chars words
+
+    chars=${#msg}
+    words="$(printf '%s' "$msg" | wc -w | tr -d '[:space:]')"
+
+    if [ "$chars" -gt 120 ]; then timeout=$((timeout + 15)); fi
+    if [ "$chars" -gt 280 ]; then timeout=$((timeout + 20)); fi
+    if [ "$words" -gt 25 ]; then timeout=$((timeout + 20)); fi
+
+    if printf '%s' "$msg" | grep -Eqi '\b(create|build|write|implement|script|code|program|refactor|debug|fix|test|automation|deploy|migrate|api|database|project)\b'; then
+        timeout=$((timeout + 60))
+    fi
+
+    if printf '%s' "$msg" | grep -Eqi '\b(from scratch|end[- ]to[- ]end|single file|one file|only 1|complex|demanding)\b'; then
+        timeout=$((timeout + 30))
+    fi
+
+    if [ "$timeout" -gt "$MAX_TIMEOUT_SEC" ]; then
+        timeout="$MAX_TIMEOUT_SEC"
+    fi
+
+    printf '%s' "$timeout"
+}
+
 is_trivial_echo() {
     local output_norm message_norm
     output_norm="$(normalize_text "$1")"
@@ -34,40 +78,107 @@ is_trivial_echo() {
     [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
 }
 
+extract_last_marked_block() {
+    local raw="$1"
+    if ! printf '%s' "$raw" | grep -q '🔗'; then
+        return 0
+    fi
+
+    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 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[[: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")"
+}
+
 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=$?
+    local output rc tmp pid watchdog
+
+    tmp="$(mktemp /tmp/opencode-run.XXXXXX)"
+    "$OPENCODE" run "$mode" "$prompt" >"$tmp" 2>&1 &
+    pid=$!
+
+    (
+        sleep "$RUN_TIMEOUT_SEC"
+        if kill -0 "$pid" 2>/dev/null; then
+            touch "${tmp}.timeout"
+            kill "$pid" 2>/dev/null
+            sleep 2
+            kill -9 "$pid" 2>/dev/null
+        fi
+    ) &
+    watchdog=$!
+
+    wait "$pid"
+    rc=$?
+    kill "$watchdog" 2>/dev/null
+
+    if [ -f "${tmp}.timeout" ]; then
+        rc=124
+        rm -f "${tmp}.timeout"
     fi
 
+    output="$(cat "$tmp")"
+    rm -f "$tmp"
+
     printf '%s\n' "$rc"
     printf '%s' "$output"
 }
 
 (
     started_at=$(date +%s)
+    RUN_TIMEOUT_SEC="$(compute_timeout "$MSG")"
     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="$(printf '%s\n' "$output" | sed -E '/^[[:space:]]*openclaw message send --channel[[:space:]]+/d')"
-    output="$(trim_text "$output")"
+    output="$(sanitize_output "$output")"
 
     if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
-        output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Please retry with a narrower request."
+        output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Task may still be running. Try waiting a bit or send a follow-up."
     elif [ -z "$output" ]; then
         output="OpenCode finished, but returned an empty response."
     elif is_trivial_echo "$output" "$MSG"; then
@@ -78,7 +189,7 @@ run_with_timeout() {
 
     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"
+    printf '[%s] /cc completed in %ss (exit=%s timeout=%ss)\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$elapsed" "$rc" "$RUN_TIMEOUT_SEC"
 ) >>"$LOG_FILE" 2>&1 &
 
 echo "✅ OpenCode request queued."

package/templates/workspace/OPENCODE.md

@@ -27,3 +27,16 @@ The format is: `[CHANNEL:ID] actual message`
 - 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.
+
+### Response quality (default)
+
+- Be informative and actionable by default. Avoid dry one-line replies for non-trivial work.
+- For create/build/modify tasks, include:
+  1. What was completed
+  2. Main artifact names (files/scripts) or key outputs
+  3. How to run/use the result
+  4. A quick verification step or expected outcome
+- 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.
+- Length guidance: trivial questions can be 1-2 lines; implementation results should usually be 4-10 lines.