openclaw-opencode-bridge 2.0.9 → 2.1.1

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.0.9",
+  "version": "2.1.1",
   "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,163 @@
 #!/bin/bash
-# bridge-version: 3
-# Start fresh session and send instruction
+# bridge-version: 5
+# Start fresh session asynchronously and send instruction
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
 CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
 WORKSPACE="{{WORKSPACE}}"
+LOG_FILE="/tmp/opencode-bridge-send.log"
+BASE_TIMEOUT_SEC=45
+MAX_TIMEOUT_SEC=300
 
 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"
+compute_timeout() {
+    local msg="$1"
+    local timeout="$BASE_TIMEOUT_SEC"
+    local chars words
 
-echo "✅ OpenCode response sent."
+    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")"
+    message_norm="$(normalize_text "$2")"
+    [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
+}
+
+extract_embedded_send_message() {
+    local raw="$1"
+    local line message
+
+    line="$(printf '%s\n' "$raw" | grep -E 'openclaw message send --channel' | tail -n 1)"
+    [ -z "$line" ] && return 0
+
+    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')"
+    fi
+
+    printf '%s' "$(trim_text "$message")"
+}
+
+sanitize_output() {
+    local raw="$1"
+    local extracted cleaned
+
+    extracted="$(extract_embedded_send_message "$raw")"
+    if [ -n "$extracted" ]; then
+        printf '%s' "$extracted"
+        return 0
+    fi
+
+    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" | 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')"
+
+    printf '%s' "$(trim_text "$cleaned")"
+}
+
+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 &
+    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"
+
+    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="$(sanitize_output "$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."
+    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 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,22 +1,163 @@
 #!/bin/bash
-# bridge-version: 3
-# Send instruction to OpenCode and relay response to telegram
+# bridge-version: 5
+# Dispatch instruction to OpenCode asynchronously and relay response
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
 CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
 WORKSPACE="{{WORKSPACE}}"
+LOG_FILE="/tmp/opencode-bridge-send.log"
+BASE_TIMEOUT_SEC=45
+MAX_TIMEOUT_SEC=300
 
 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"
+compute_timeout() {
+    local msg="$1"
+    local timeout="$BASE_TIMEOUT_SEC"
+    local chars words
 
-echo "✅ OpenCode response sent."
+    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")"
+    message_norm="$(normalize_text "$2")"
+    [ -n "$message_norm" ] && [ "$output_norm" = "$message_norm" ]
+}
+
+extract_embedded_send_message() {
+    local raw="$1"
+    local line message
+
+    line="$(printf '%s\n' "$raw" | grep -E 'openclaw message send --channel' | tail -n 1)"
+    [ -z "$line" ] && return 0
+
+    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')"
+    fi
+
+    printf '%s' "$(trim_text "$message")"
+}
+
+sanitize_output() {
+    local raw="$1"
+    local extracted cleaned
+
+    extracted="$(extract_embedded_send_message "$raw")"
+    if [ -n "$extracted" ]; then
+        printf '%s' "$extracted"
+        return 0
+    fi
+
+    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" | 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')"
+
+    printf '%s' "$(trim_text "$cleaned")"
+}
+
+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 &
+    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"
+
+    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")"
+
+    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."
+    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 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

@@ -17,18 +17,26 @@ The format is: `[CHANNEL:ID] actual message`
 ### Procedure
 
 1. Extract `{CHANNEL}` and `{ID}` from the `[...]` prefix
-2. Ignore everything before `] ` — that is the prefix, not the message
+2. Ignore everything before `] ` — that is metadata, not user content
 3. Perform the task described in the actual message
-4. **After completion, send the response via:**
-```bash
-openclaw message send --channel {CHANNEL} --target {ID} -m '🔗 your response here'
-```
-5. **Every message MUST start with 🔗** — this identifies you as OpenCode
-6. Split messages over 4000 characters into multiple sends (each starts with 🔗)
-
-### Response transmission is mandatory (never skip)
-
-- **Every message MUST receive a response.**
-- Ignore the prefix, only respond to the actual message content.
-- 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.
+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.
+
+### 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.