openclaw-opencode-bridge 2.1.4 → 2.1.6

package/README.md

@@ -4,31 +4,41 @@
 [![license](https://img.shields.io/npm/l/openclaw-opencode-bridge)](LICENSE)
 [![node](https://img.shields.io/node/v/openclaw-opencode-bridge)](package.json)
 
-> Liked this project? Consider donating!
+Language: [English](README_EN.md)
 
-> EVM Address: 0xe81c32383C8F21A14E6C2264939dA512e9F9bb42
+Bridge untuk menghubungkan channel OpenClaw ke OpenCode lewat command prefix seperti `/cc` atau `@cc`.
 
-Bridge [OpenClaw](https://openclaw.ai) messaging channels to [OpenCode](https://opencode.ai) via persistent tmux sessions.
-
-Send `@cc` or `/cc` from any chat — your message is routed directly to OpenCode running in your terminal, bypassing the gateway LLM entirely. No separate API keys, no OAuth, no extra costs.
+Pesan dari user akan langsung dieksekusi oleh OpenCode CLI (`opencode run`), lalu hasilnya dikirim balik lewat `openclaw message send`.
 
 <p>
   <img src="DEMO_1.png" alt="Telegram demo — sending a command" width="400" />
   <img src="DEMO_2.png" alt="Telegram demo — receiving a response" width="400" />
 </p>
 
-> **⚠️ Telegram only.** This plugin has been developed and tested exclusively with the Telegram channel. Other channels (Discord, Slack, etc.) may use different message formats or metadata wrapping that could break prefix detection or LLM suppression. Community contributions for additional channels are welcome — please open an issue if you encounter problems.
+> ⚠️ Fokus pengujian saat ini adalah Telegram. Channel lain mungkin butuh penyesuaian format.
+
+## Donasi
+
+Kalau project ini membantu, kamu bisa dukung lewat:
+
+`0xe81c32383C8F21A14E6C2264939dA512e9F9bb42`
 
-## How It Works
+## Fitur Utama
 
-<img alt="Architecture" src="https://mermaid.ink/img/Z3JhcGggVEQKICAgIEFbIkNoYXQiXSAtLT58IkBjYyBtZXNzYWdlInwgQlsiT3BlbkNsYXcgR2F0ZXdheSJdCiAgICBCIC0tPiBDWyJvcGVuY29kZS1icmlkZ2UgcGx1Z2luIl0KICAgIEMgLS0+fHN1cHByZXNzIExMTHwgQgogICAgQyAtLT58ZXhlY0ZpbGV8IERbIlNoZWxsIFNjcmlwdCJdCiAgICBEIC0tPnx0bXV4IHBhc3RlLWJ1ZmZlcnwgRVsiT3BlbkNvZGUgLyB0bXV4Il0KICAgIEUgLS0+fCJvcGVuY2xhdyBtZXNzYWdlIHNlbmQifCBB" />
+- Prefix command: `@cc`, `/cc`, `@ccn`, `/ccn`, `@ccu`, `@ccm`, `@ccms`
+- Reply OpenCode dikirim otomatis ke user lewat channel OpenClaw
+- Output dibersihkan dari noise terminal/tool logs
+- Timeout bersifat batas maksimum, bukan delay tetap
+- Dukungan onboarding/uninstall otomatis
 
-1. User sends a prefixed message (e.g. `@cc deploy the app`)
-2. The plugin intercepts the message and suppresses the gateway LLM
-3. A shell script forwards the message to OpenCode in a persistent tmux session
-4. OpenCode replies back through the same channel via `openclaw message send`
+## Alur Kerja Singkat
 
-## Prerequisites
+1. User kirim pesan ber-prefix, contoh: `/cc buat script python`.
+2. Plugin menangkap pesan dan menahan reply default gateway.
+3. Script bridge menjalankan `opencode run`.
+4. Hasil OpenCode dikirim balik ke user melalui `openclaw message send`.
+
+## Prasyarat
 
 | Dependency | Install |
 |---|---|
@@ -36,53 +46,63 @@ Send `@cc` or `/cc` from any chat — your message is routed directly to OpenCod
 | [OpenCode](https://opencode.ai) | `npm i -g opencode-ai` |
 | [tmux](https://github.com/tmux/tmux) | Auto-installed during onboard if missing |
 
-> **Note:** macOS and Linux only. Windows is not supported (tmux dependency).
+> Sistem operasi yang didukung: Linux dan macOS.
 
-## Quick Start
+## Instalasi Cepat
 
 ```bash
 npm i -g openclaw-opencode-bridge
 openclaw-opencode-bridge onboard
 ```
 
-The interactive wizard configures everything — plugin, shell scripts, OPENCODE.md, daemon, and channel settings.
+Wizard onboarding akan mengatur plugin, script, AGENTS.md, daemon, dan konfigurasi channel.
 
-Verify the connection:
+Tes awal:
 
-```
-@cc hello
+```bash
+/cc hello
 ```
 
-## Commands
+## Daftar Perintah
 
-| Prefix | Description |
+| Prefix | Fungsi |
 |---|---|
-| `@cc` · `/cc` | Send to the current session (retains conversation context) |
-| `@ccn` · `/ccn` | Start a fresh session (kills existing, creates new) |
-| `@ccu` · `/ccu` | Show OpenCode usage stats |
-| `@ccm` · `/ccm` | List OpenCode models |
-| `@ccms` · `/ccms` | Set OpenCode model (by number or model-id) |
+| `@cc` · `/cc` | Lanjut ke sesi terbaru (`--continue`) |
+| `@ccn` · `/ccn` | Jalankan sesi baru tanpa `--continue` (konteks fresh) |
+| `@ccu` · `/ccu` | Tampilkan statistik pemakaian OpenCode |
+| `@ccm` · `/ccm` | Tampilkan daftar model OpenCode |
+| `@ccms` · `/ccms` | Ganti model OpenCode (nomor atau model-id) |
 
-Messages are sent as-is — no quoting needed:
+Contoh:
 
+```bash
+/cc refactor auth module dan tambah unit test
+/ccn review PR ini: https://github.com/org/repo/pull/42
+/ccu
 ```
-@cc refactor the auth module and add tests
-@ccn review this PR: https://github.com/org/repo/pull/42
-@ccu
-```
 
-Multiline messages and special characters (`$`, `` ` ``, `\`, quotes) are preserved exactly as typed.
+## Perilaku Timeout
+
+- `/cc` memakai timeout adaptif dengan base `60s` dan maksimum `300s`.
+- `/ccn` memakai timeout adaptif dengan base `90s` dan maksimum `420s`.
+- Timeout adalah batas maksimal proses. Kalau OpenCode selesai lebih cepat, reply langsung dikirim saat itu juga.
 
-## Migration from v1
+## Catatan Sesi
 
-v2 replaces the legacy skill/hook system with a single OpenClaw plugin:
+- `/ccn` tidak menghapus semua history OpenCode.
+- `/cc` biasanya melanjutkan sesi terbaru.
+- Data sesi OpenCode tersimpan di direktori data OpenCode user (contoh Linux: `~/.local/share/opencode`).
+
+## Migrasi dari Versi Lama
+
+Versi 2+ menggantikan sistem skill/hook lama menjadi plugin OpenClaw tunggal:
 
 ```bash
 npm i -g openclaw-opencode-bridge
 openclaw-opencode-bridge onboard
 ```
 
-The wizard detects and removes legacy components automatically.
+Komponen legacy akan dibersihkan otomatis saat onboarding.
 
 ## Uninstall
 
@@ -90,17 +110,16 @@ The wizard detects and removes legacy components automatically.
 openclaw-opencode-bridge uninstall
 ```
 
-Removes all installed components — plugin, shell scripts, OPENCODE.md additions, and daemon.
+Ini akan menghapus plugin, script bridge, AGENTS.md hasil instalasi bridge, dan daemon.
 
 ## Troubleshooting
 
-| Symptom | Fix |
+| Gejala | Solusi |
 |---|---|
-| LLM responds instead of delivery message | `openclaw gateway restart` |
-| 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.
+| Gateway LLM tetap membalas | Jalankan `openclaw gateway restart` |
+| Ada “OpenCode will reply shortly” tapi tidak ada balasan akhir | Cek log `/tmp/opencode-bridge-send.log` lalu ulangi `openclaw-opencode-bridge onboard` |
+| Perintah lambat/timeout | Cek prompt terlalu berat, lihat log bridge, pastikan OpenCode CLI normal |
+| Output aneh/berantakan | Ulangi onboarding agar script/plugin terbaru terpasang |
 
 ## License
 

package/README_EN.md

@@ -0,0 +1,126 @@
+# openclaw-opencode-bridge
+
+[![npm version](https://img.shields.io/npm/v/openclaw-opencode-bridge)](https://www.npmjs.com/package/openclaw-opencode-bridge)
+[![license](https://img.shields.io/npm/l/openclaw-opencode-bridge)](LICENSE)
+[![node](https://img.shields.io/node/v/openclaw-opencode-bridge)](package.json)
+
+Bridge OpenClaw channels to OpenCode using command prefixes like `/cc` or `@cc`.
+
+User messages are executed via OpenCode CLI (`opencode run`), then sent back through `openclaw message send`.
+
+Language: [Bahasa Indonesia](README.md)
+
+<p>
+  <img src="DEMO_1.png" alt="Telegram demo — sending a command" width="400" />
+  <img src="DEMO_2.png" alt="Telegram demo — receiving a response" width="400" />
+</p>
+
+> ⚠️ Current testing focus is Telegram. Other channels may need format-specific adjustments.
+
+## Key Features
+
+- Prefix commands: `@cc`, `/cc`, `@ccn`, `/ccn`, `@ccu`, `@ccm`, `@ccms`
+- OpenCode output is automatically sent back to users via OpenClaw
+- Output is sanitized to remove terminal/tool noise
+- Timeout acts as a maximum limit, not a fixed delay
+- Automatic onboarding and uninstall workflow
+
+## How It Works
+
+1. User sends a prefixed message, for example: `/cc build a python script`.
+2. The plugin intercepts the message and suppresses the default gateway reply.
+3. Bridge scripts run `opencode run`.
+4. OpenCode output is delivered back to the same user/channel.
+
+## Prerequisites
+
+| Dependency | Install |
+|---|---|
+| [OpenClaw](https://openclaw.ai) | `npm i -g openclaw` |
+| [OpenCode](https://opencode.ai) | `npm i -g opencode-ai` |
+| [tmux](https://github.com/tmux/tmux) | Auto-installed during onboard if missing |
+
+> Supported OS: Linux and macOS.
+
+## Quick Start
+
+```bash
+npm i -g openclaw-opencode-bridge
+openclaw-opencode-bridge onboard
+```
+
+Onboarding configures plugin entries, scripts, AGENTS.md, daemon, and channel settings.
+
+Quick test:
+
+```bash
+/cc hello
+```
+
+## Command List
+
+| Prefix | Function |
+|---|---|
+| `@cc` · `/cc` | Continue the latest session (`--continue`) |
+| `@ccn` · `/ccn` | Start a fresh run without `--continue` |
+| `@ccu` · `/ccu` | Show OpenCode usage stats |
+| `@ccm` · `/ccm` | List OpenCode models |
+| `@ccms` · `/ccms` | Set OpenCode model (number or model-id) |
+
+Examples:
+
+```bash
+/cc refactor auth module and add tests
+/ccn review this PR: https://github.com/org/repo/pull/42
+/ccu
+```
+
+## Timeout Behavior
+
+- `/cc` uses adaptive timeout with base `60s` and max `300s`.
+- `/ccn` uses adaptive timeout with base `90s` and max `420s`.
+- Timeout is a hard upper bound. If OpenCode finishes early, output is sent immediately.
+
+## Session Notes
+
+- `/ccn` does not delete existing OpenCode history.
+- `/cc` usually continues the latest session.
+- OpenCode session data is stored in OpenCode user data directory (Linux example: `~/.local/share/opencode`).
+
+## Migration from Legacy Version
+
+Version 2+ replaces the legacy skill/hook flow with a single OpenClaw plugin:
+
+```bash
+npm i -g openclaw-opencode-bridge
+openclaw-opencode-bridge onboard
+```
+
+Legacy components are cleaned automatically during onboarding.
+
+## Uninstall
+
+```bash
+openclaw-opencode-bridge uninstall
+```
+
+This removes plugin entries, bridge scripts, bridge-managed AGENTS.md, and daemon registration.
+
+## Troubleshooting
+
+| Symptom | Fix |
+|---|---|
+| Gateway LLM still responds | Run `openclaw gateway restart` |
+| Delivery message appears but no final reply | Check `/tmp/opencode-bridge-send.log`, then rerun `openclaw-opencode-bridge onboard` |
+| Slow response / timeout | Check prompt complexity and bridge logs; confirm OpenCode CLI is healthy |
+| Messy output | Rerun onboarding to ensure latest scripts/plugin are installed |
+
+## Donation
+
+If this project helps you, you can support it via:
+
+`0xe81c32383C8F21A14E6C2264939dA512e9F9bb42`
+
+## License
+
+[MIT](LICENSE)

package/lib/cli.js

@@ -42,7 +42,7 @@ const program = new Command();
 program
   .name("openclaw-opencode-bridge")
   .description(
-    "Bridge OpenClaw messaging channels to OpenCode via tmux persistent sessions",
+    "Bridge OpenClaw messaging channels to OpenCode via persistent OpenCode sessions",
   )
   .version(pkg.version);
 

package/lib/onboard.js

@@ -347,11 +347,40 @@ function compactError(err) {
 
 async function runGatewayCommand(action, timeoutMs) {
   try {
-    await execAsync(`openclaw gateway ${action}`, { timeout: timeoutMs });
-    return { ok: true, action };
+    const { stdout = "", stderr = "" } = await execAsync(
+      `openclaw gateway ${action}`,
+      { timeout: timeoutMs },
+    );
+    return { ok: true, action, stdout, stderr };
   } catch (e) {
-    return { ok: false, action, error: compactError(e) };
+    return {
+      ok: false,
+      action,
+      error: compactError(e),
+      stdout: e?.stdout || "",
+      stderr: e?.stderr || "",
+    };
+  }
+}
+
+async function isGatewayHealthy() {
+  const status = await runGatewayCommand("status", 20000);
+  if (!status.ok) return false;
+
+  const text = `${status.stdout || ""}\n${status.stderr || ""}`.toLowerCase();
+  return (
+    text.includes("runtime: running") ||
+    (text.includes("rpc probe: ok") && text.includes("listening:"))
+  );
+}
+
+function ensureGatewayHint(errorText) {
+  if (!errorText) return "gateway restart failed";
+  const text = String(errorText).trim();
+  if (/running|active|already|ok/i.test(text)) {
+    return `${text}; gateway appears to be running`;
   }
+  return text;
 }
 
 async function restartGatewayResilient() {
@@ -377,6 +406,17 @@ async function restartGatewayResilient() {
     return { ok: true, mode: "restart-retry" };
   }
 
+  // 4) If command failed but status is healthy, treat as success with warning.
+  if (await isGatewayHealthy()) {
+    return {
+      ok: true,
+      mode: "status-healthy",
+      warning: ensureGatewayHint(
+        retry.error || start.error || primary.error || stop.error || "",
+      ),
+    };
+  }
+
   return {
     ok: false,
     error: retry.error || start.error || primary.error || "gateway restart failed",
@@ -877,8 +917,11 @@ async function onboard() {
   const restartError = gatewayRestart.error || "";
 
   if (restarted) {
+    const warningSuffix = gatewayRestart.warning
+      ? ` ${chalk.yellow.dim(`(${gatewayRestart.warning})`)}`
+      : "";
     spinner5.stop(
-      `Gateway     ${chalk.dim("->")} restarted ${chalk.dim(`(${gatewayRestart.mode})`)}`,
+      `Gateway     ${chalk.dim("->")} restarted ${chalk.dim(`(${gatewayRestart.mode})`)}${warningSuffix}`,
     );
   } else {
     spinner5.fail(

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "opencode-bridge",
   "name": "OpenCode Bridge",
-  "description": "Route @cc/@ccn/@ccu prefix messages to OpenCode via tmux, suppressing the default LLM response.",
+  "description": "Route @cc/@ccn/@ccu prefix messages to OpenCode CLI, suppressing the default LLM response.",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

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

package/plugin/index.ts

@@ -13,7 +13,7 @@ const SCRIPT_MAP: Record<string, string> = {
 
 const REQUIRES_ARG = new Set(["cc", "ccn"]);
 const EXEC_TIMEOUT = 15_000;
-const SUPPRESSION_WINDOW = 15_000;
+const DELIVERY_TTL_MS = 10_000;
 
 const DELIVERY_MSG = "🔗 OpenCode will reply shortly.";
 
@@ -24,15 +24,13 @@ const SILENT_PROMPT =
   "You MUST NOT call any tools or functions.\n" +
   `Output ONLY this exact text, nothing else: ${DELIVERY_MSG}`;
 
-// NOTE: Single-user assumption — concurrent users may see cross-suppression
-let bridgeSuppressUntil = 0;
-
 /**
  * Flag set by message_received (fires FIRST) and consumed by before_prompt_build (fires SECOND).
  * This bypasses the unreliable extractLastUserText approach entirely.
  * message_received gets event.content (raw user text) which always correctly detects @cc prefix.
  */
 let pendingBridgeCommand = false;
+let pendingDeliveryUntil = 0;
 
 export default function register(api: OpenClawPluginApi) {
   const config = api.pluginConfig as {
@@ -67,9 +65,6 @@ export default function register(api: OpenClawPluginApi) {
 
     // 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`,
     );
@@ -102,42 +97,40 @@ export default function register(api: OpenClawPluginApi) {
   // No longer relies on extractLastUserText for prefix detection.
   api.on("before_prompt_build", async (event, ctx) => {
     const shouldSuppress = pendingBridgeCommand;
+    const deliveryPending = Date.now() < pendingDeliveryUntil;
 
     api.logger.debug?.(
-      `[opencode-bridge] before_prompt_build: pendingBridgeCommand=${pendingBridgeCommand}, bridgeSuppressUntil=${bridgeSuppressUntil > Date.now()}`,
+      `[opencode-bridge] before_prompt_build: pendingBridgeCommand=${pendingBridgeCommand}, deliveryPending=${deliveryPending}`,
     );
 
     if (shouldSuppress) {
       pendingBridgeCommand = false;
-      bridgeSuppressUntil = Date.now() + SUPPRESSION_WINDOW;
+      pendingDeliveryUntil = Date.now() + DELIVERY_TTL_MS;
       return { systemPrompt: SILENT_PROMPT, prependContext: SILENT_PROMPT };
-    } else {
-      // Clear suppression for non-bridge messages
-      bridgeSuppressUntil = 0;
     }
   });
 
   // --- Hook 3: message_sending (modifying) ---
-  // Replace LLM output with delivery confirmation while bridge suppression is active
+  // Replace one outgoing LLM message with delivery confirmation
   api.on("message_sending", async (_event, _ctx) => {
-    const suppressing = Date.now() < bridgeSuppressUntil;
+    const suppressing = Date.now() < pendingDeliveryUntil;
     api.logger.debug?.(
       `[opencode-bridge] message_sending: suppressing=${suppressing}`,
     );
 
     if (suppressing) {
       // One-shot override for the intercepted bridge message.
-      bridgeSuppressUntil = 0;
+      pendingDeliveryUntil = 0;
       return { content: DELIVERY_MSG, cancel: false };
     }
   });
 
   // --- Hook 4: before_tool_call (modifying) ---
-  // Block ALL tool calls while bridge suppression is active
+  // Block ALL tool calls while delivery override is pending
   api.on("before_tool_call", async (_event, _ctx) => {
-    if (Date.now() < bridgeSuppressUntil) {
+    if (Date.now() < pendingDeliveryUntil) {
       api.logger.debug?.(
-        `[opencode-bridge] before_tool_call: BLOCKED (suppression active)`,
+        `[opencode-bridge] before_tool_call: BLOCKED (delivery pending)`,
       );
       return { block: true, blockReason: "opencode-bridge: message intercepted, tools disabled" };
     }

package/plugin/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "opencode-bridge",
   "name": "OpenCode Bridge",
-  "description": "Route @cc/@ccn/@ccu prefix messages to OpenCode via tmux, suppressing the default LLM response.",
+  "description": "Route @cc/@ccn/@ccu prefix messages to OpenCode CLI, suppressing the default LLM response.",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/plugin/package.json

@@ -1,8 +1,8 @@
 {
   "name": "opencode-bridge",
-  "version": "2.0.6",
+  "version": "2.1.12",
   "private": true,
-  "description": "OpenClaw plugin: route prefix messages to OpenCode via tmux",
+  "description": "OpenClaw plugin: route prefix messages to OpenCode CLI",
   "type": "module",
   "openclaw": {
     "extensions": ["./index.ts"]

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

@@ -1,5 +1,5 @@
 #!/bin/bash
-# bridge-version: 10
+# bridge-version: 16
 # Start fresh session asynchronously and send instruction
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
@@ -7,9 +7,9 @@ CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
 WORKSPACE="{{WORKSPACE}}"
 LOG_FILE="/tmp/opencode-bridge-send.log"
-BASE_TIMEOUT_SEC=45
-MAX_TIMEOUT_SEC=300
-LOCK_WAIT_SEC=600
+BASE_TIMEOUT_SEC=90
+MAX_TIMEOUT_SEC=420
+LOCK_WAIT_SEC=3
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
@@ -30,20 +30,43 @@ normalize_text() {
 }
 
 acquire_bridge_lock() {
-    local safe_channel safe_target lock_file
+    local safe_channel safe_target holder_pid waited
     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"
+    LOCK_DIR="/tmp/opencode-bridge-${safe_channel}-${safe_target}.lockdir"
+    waited=0
 
-    if command -v flock >/dev/null 2>&1; then
-        exec 200>"$lock_file"
-        flock -w "$LOCK_WAIT_SEC" 200
-        return $?
-    fi
+    while ! mkdir "$LOCK_DIR" 2>/dev/null; do
+        if [ ! -s "$LOCK_DIR/pid" ]; then
+            rm -rf "$LOCK_DIR"
+            continue
+        fi
+        if [ -f "$LOCK_DIR/pid" ]; then
+            holder_pid="$(cat "$LOCK_DIR/pid" 2>/dev/null || true)"
+            if [ -n "$holder_pid" ] && ! kill -0 "$holder_pid" 2>/dev/null; then
+                rm -rf "$LOCK_DIR"
+                continue
+            fi
+        fi
 
+        if [ "$waited" -ge "$LOCK_WAIT_SEC" ]; then
+            return 1
+        fi
+        sleep 1
+        waited=$((waited + 1))
+    done
+
+    printf '%s\n' "${BASHPID:-$$}" > "$LOCK_DIR/pid"
+    trap 'release_bridge_lock' EXIT INT TERM
     return 0
 }
 
+release_bridge_lock() {
+    if [ -n "${LOCK_DIR:-}" ] && [ -d "$LOCK_DIR" ]; then
+        rm -rf "$LOCK_DIR"
+    fi
+}
+
 compute_timeout() {
     local msg="$1"
     local timeout="$BASE_TIMEOUT_SEC"
@@ -56,7 +79,7 @@ compute_timeout() {
     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
+    if printf '%s' "$msg" | grep -Eqi '\b(create|build|write|implement|script|code|program|refactor|debug|fix|test|automation|deploy|migrate|api|database|project|search|news|weather|forecast|cuaca|berita)\b'; then
         timeout=$((timeout + 60))
     fi
 
@@ -78,11 +101,6 @@ 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
@@ -119,7 +137,7 @@ sanitize_output() {
     cleaned="$(printf '%s\n' "$cleaned" | sed -E 's/^[[:space:]]*>+[[:space:]]?//; /^```/d')"
 
     cleaned="$(printf '%s\n' "$cleaned" | grep -Eiv \
-        '^[[:space:]]*$|^[[:space:]]*(build[[:space:]]*·|◇[[:space:]]+doctor warnings)[[:space:]]*$|^[[:space:]]*◇[[:space:]]+|^[[:space:]]*exa[[:space:]]+(web|code)[[:space:]]+search([[: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:]]*$')"
+        '^[[:space:]]*$|^[[:space:]]*(build[[:space:]]*·|◇[[:space:]]+doctor warnings)[[:space:]]*$|^[[:space:]]*◇[[:space:]]+|^[[:space:]]*exa[[:space:]]+(web|code)[[:space:]]+search([[:space:]]+.*)?$|^[[:space:]]*[←→↳].*|^[[:space:]]*wrote file successfully\.?$|^[[:space:]]*(\$[[:space:]]*)?openclaw message send --channel[[:space:]]+|^[[:space:]]*bridge-guard:[[:space:]]*blocked openclaw message send.*$|^[[: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
@@ -131,6 +149,14 @@ sanitize_output() {
     printf '%s' "$(trim_text "$cleaned")"
 }
 
+extract_text_from_json_stream() {
+    local raw="$1"
+    local parsed
+
+    parsed="$(printf '%s\n' "$raw" | node -e "const fs=require('fs');const lines=fs.readFileSync(0,'utf8').split(/\r?\n/);let out='';for(const line of lines){const s=line.trim();if(!s)continue;try{const obj=JSON.parse(s);if(obj&&obj.type==='text'&&obj.part&&typeof obj.part.text==='string'){out+=obj.part.text;}}catch{}}process.stdout.write(out);" 2>/dev/null)"
+    printf '%s' "$(trim_text "$parsed")"
+}
+
 sentence_case_first() {
     local text="$1"
     printf '%s' "$text" | awk '
@@ -166,38 +192,60 @@ apply_reply_style() {
 run_with_timeout() {
     local mode="$1"
     local prompt="$2"
-    local output rc tmp pid watchdog
+    local output rc tmp pid watchdog guard_dir guarded_path real_openclaw
 
     tmp="$(mktemp /tmp/opencode-run.XXXXXX)"
-    if [ -n "$mode" ]; then
-        "$OPENCODE" run "$mode" "$prompt" >"$tmp" 2>&1 &
-    else
-        "$OPENCODE" run "$prompt" >"$tmp" 2>&1 &
+    guarded_path="$PATH"
+    real_openclaw="$(command -v openclaw 2>/dev/null || true)"
+    if [ -n "$real_openclaw" ]; then
+        guard_dir="$(mktemp -d /tmp/opencode-bridge-guard.XXXXXX)"
+        printf '#!/bin/sh\nif [ "$1" = "message" ] && [ "$2" = "send" ]; then\n  echo "bridge-guard: blocked openclaw message send from opencode runtime" >&2\n  exit 64\nfi\nexec "%s" "$@"\n' "$real_openclaw" > "${guard_dir}/openclaw"
+        chmod +x "${guard_dir}/openclaw"
+        guarded_path="${guard_dir}:${PATH}"
     fi
-    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"
+    # Timeout here is an upper bound only; command returns immediately when OpenCode finishes.
+    if command -v timeout >/dev/null 2>&1; then
+        if [ -n "$mode" ]; then
+            PATH="$guarded_path" timeout --signal=TERM --kill-after=2 "${RUN_TIMEOUT_SEC}s" \
+                "$OPENCODE" run "$mode" --no-fork --format json "$prompt" >"$tmp" 2>&1
+        else
+            PATH="$guarded_path" timeout --signal=TERM --kill-after=2 "${RUN_TIMEOUT_SEC}s" \
+                "$OPENCODE" run --no-fork --format json "$prompt" >"$tmp" 2>&1
+        fi
+        rc=$?
+    else
+        if [ -n "$mode" ]; then
+            PATH="$guarded_path" "$OPENCODE" run "$mode" --no-fork --format json "$prompt" >"$tmp" 2>&1 &
+        else
+            PATH="$guarded_path" "$OPENCODE" run --no-fork --format json "$prompt" >"$tmp" 2>&1 &
+        fi
+        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
     fi
 
     output="$(cat "$tmp")"
     rm -f "$tmp"
+    [ -n "${guard_dir:-}" ] && rm -rf "$guard_dir"
 
     printf '%s\n' "$rc"
     printf '%s' "$output"
@@ -219,10 +267,17 @@ run_with_timeout() {
     run_result="$(run_with_timeout "" "$FULL_MSG")"
     rc="$(printf '%s' "$run_result" | head -n 1)"
     raw_output="$(printf '%s' "$run_result" | tail -n +2)"
-    output="$(sanitize_output "$raw_output")"
+    output="$(extract_text_from_json_stream "$raw_output")"
+    if [ -z "$output" ]; then
+        output="$(sanitize_output "$raw_output")"
+    fi
 
     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."
+        if [ -n "$output" ] && ! is_trivial_echo "$output" "$MSG"; then
+            output="${output}\n\n(Stopped after ${RUN_TIMEOUT_SEC}s timeout.)"
+        else
+            output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Try a narrower prompt or send a follow-up."
+        fi
     elif [ -z "$output" ]; then
         output="OpenCode finished, but returned an empty response."
     elif is_trivial_echo "$output" "$MSG"; then
@@ -231,11 +286,7 @@ run_with_timeout() {
 
     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
+    openclaw message send --channel "$CHANNEL" --target "$TARGET" -m "$output"
 
     ended_at=$(date +%s)
     elapsed=$((ended_at - started_at))

package/templates/scripts/opencode-send.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# bridge-version: 10
+# bridge-version: 18
 # Dispatch instruction to OpenCode asynchronously and relay response
 MSG="$1"
 OPENCODE="{{OPENCODE_BIN}}"
@@ -7,9 +7,9 @@ CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
 WORKSPACE="{{WORKSPACE}}"
 LOG_FILE="/tmp/opencode-bridge-send.log"
-BASE_TIMEOUT_SEC=45
+BASE_TIMEOUT_SEC=60
 MAX_TIMEOUT_SEC=300
-LOCK_WAIT_SEC=600
+LOCK_WAIT_SEC=3
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
@@ -30,20 +30,43 @@ normalize_text() {
 }
 
 acquire_bridge_lock() {
-    local safe_channel safe_target lock_file
+    local safe_channel safe_target holder_pid waited
     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"
+    LOCK_DIR="/tmp/opencode-bridge-${safe_channel}-${safe_target}.lockdir"
+    waited=0
 
-    if command -v flock >/dev/null 2>&1; then
-        exec 200>"$lock_file"
-        flock -w "$LOCK_WAIT_SEC" 200
-        return $?
-    fi
+    while ! mkdir "$LOCK_DIR" 2>/dev/null; do
+        if [ ! -s "$LOCK_DIR/pid" ]; then
+            rm -rf "$LOCK_DIR"
+            continue
+        fi
+        if [ -f "$LOCK_DIR/pid" ]; then
+            holder_pid="$(cat "$LOCK_DIR/pid" 2>/dev/null || true)"
+            if [ -n "$holder_pid" ] && ! kill -0 "$holder_pid" 2>/dev/null; then
+                rm -rf "$LOCK_DIR"
+                continue
+            fi
+        fi
 
+        if [ "$waited" -ge "$LOCK_WAIT_SEC" ]; then
+            return 1
+        fi
+        sleep 1
+        waited=$((waited + 1))
+    done
+
+    printf '%s\n' "${BASHPID:-$$}" > "$LOCK_DIR/pid"
+    trap 'release_bridge_lock' EXIT INT TERM
     return 0
 }
 
+release_bridge_lock() {
+    if [ -n "${LOCK_DIR:-}" ] && [ -d "$LOCK_DIR" ]; then
+        rm -rf "$LOCK_DIR"
+    fi
+}
+
 compute_timeout() {
     local msg="$1"
     local timeout="$BASE_TIMEOUT_SEC"
@@ -56,7 +79,7 @@ compute_timeout() {
     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
+    if printf '%s' "$msg" | grep -Eqi '\b(create|build|write|implement|script|code|program|refactor|debug|fix|test|automation|deploy|migrate|api|database|project|search|news|weather|forecast|cuaca|berita)\b'; then
         timeout=$((timeout + 60))
     fi
 
@@ -78,11 +101,6 @@ 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
@@ -119,7 +137,7 @@ sanitize_output() {
     cleaned="$(printf '%s\n' "$cleaned" | sed -E 's/^[[:space:]]*>+[[:space:]]?//; /^```/d')"
 
     cleaned="$(printf '%s\n' "$cleaned" | grep -Eiv \
-        '^[[:space:]]*$|^[[:space:]]*(build[[:space:]]*·|◇[[:space:]]+doctor warnings)[[:space:]]*$|^[[:space:]]*◇[[:space:]]+|^[[:space:]]*exa[[:space:]]+(web|code)[[:space:]]+search([[: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:]]*$')"
+        '^[[:space:]]*$|^[[:space:]]*(build[[:space:]]*·|◇[[:space:]]+doctor warnings)[[:space:]]*$|^[[:space:]]*◇[[:space:]]+|^[[:space:]]*exa[[:space:]]+(web|code)[[:space:]]+search([[:space:]]+.*)?$|^[[:space:]]*[←→↳].*|^[[:space:]]*wrote file successfully\.?$|^[[:space:]]*(\$[[:space:]]*)?openclaw message send --channel[[:space:]]+|^[[:space:]]*bridge-guard:[[:space:]]*blocked openclaw message send.*$|^[[: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
@@ -131,6 +149,14 @@ sanitize_output() {
     printf '%s' "$(trim_text "$cleaned")"
 }
 
+extract_text_from_json_stream() {
+    local raw="$1"
+    local parsed
+
+    parsed="$(printf '%s\n' "$raw" | node -e "const fs=require('fs');const lines=fs.readFileSync(0,'utf8').split(/\r?\n/);let out='';for(const line of lines){const s=line.trim();if(!s)continue;try{const obj=JSON.parse(s);if(obj&&obj.type==='text'&&obj.part&&typeof obj.part.text==='string'){out+=obj.part.text;}}catch{}}process.stdout.write(out);" 2>/dev/null)"
+    printf '%s' "$(trim_text "$parsed")"
+}
+
 sentence_case_first() {
     local text="$1"
     printf '%s' "$text" | awk '
@@ -166,34 +192,60 @@ apply_reply_style() {
 run_with_timeout() {
     local mode="$1"
     local prompt="$2"
-    local output rc tmp pid watchdog
+    local output rc tmp pid watchdog guard_dir guarded_path real_openclaw
 
     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
+    guarded_path="$PATH"
+    real_openclaw="$(command -v openclaw 2>/dev/null || true)"
+    if [ -n "$real_openclaw" ]; then
+        guard_dir="$(mktemp -d /tmp/opencode-bridge-guard.XXXXXX)"
+        printf '#!/bin/sh\nif [ "$1" = "message" ] && [ "$2" = "send" ]; then\n  echo "bridge-guard: blocked openclaw message send from opencode runtime" >&2\n  exit 64\nfi\nexec "%s" "$@"\n' "$real_openclaw" > "${guard_dir}/openclaw"
+        chmod +x "${guard_dir}/openclaw"
+        guarded_path="${guard_dir}:${PATH}"
+    fi
 
-    if [ -f "${tmp}.timeout" ]; then
-        rc=124
-        rm -f "${tmp}.timeout"
+    # Timeout here is an upper bound only; command returns immediately when OpenCode finishes.
+    if command -v timeout >/dev/null 2>&1; then
+        if [ -n "$mode" ]; then
+            PATH="$guarded_path" timeout --signal=TERM --kill-after=2 "${RUN_TIMEOUT_SEC}s" \
+                "$OPENCODE" run "$mode" --no-fork --format json "$prompt" >"$tmp" 2>&1
+        else
+            PATH="$guarded_path" timeout --signal=TERM --kill-after=2 "${RUN_TIMEOUT_SEC}s" \
+                "$OPENCODE" run --no-fork --format json "$prompt" >"$tmp" 2>&1
+        fi
+        rc=$?
+    else
+        if [ -n "$mode" ]; then
+            PATH="$guarded_path" "$OPENCODE" run "$mode" --no-fork --format json "$prompt" >"$tmp" 2>&1 &
+        else
+            PATH="$guarded_path" "$OPENCODE" run --no-fork --format json "$prompt" >"$tmp" 2>&1 &
+        fi
+        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
     fi
 
     output="$(cat "$tmp")"
     rm -f "$tmp"
+    [ -n "${guard_dir:-}" ] && rm -rf "$guard_dir"
 
     printf '%s\n' "$rc"
     printf '%s' "$output"
@@ -202,6 +254,7 @@ run_with_timeout() {
 (
     started_at=$(date +%s)
     RUN_TIMEOUT_SEC="$(compute_timeout "$MSG")"
+    RUN_MODE="--continue"
     cd "$WORKSPACE" || exit 1
     FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
 
@@ -211,13 +264,20 @@ run_with_timeout() {
         exit 0
     fi
 
-    run_result="$(run_with_timeout --continue "$FULL_MSG")"
+    run_result="$(run_with_timeout "$RUN_MODE" "$FULL_MSG")"
     rc="$(printf '%s' "$run_result" | head -n 1)"
     raw_output="$(printf '%s' "$run_result" | tail -n +2)"
-    output="$(sanitize_output "$raw_output")"
+    output="$(extract_text_from_json_stream "$raw_output")"
+    if [ -z "$output" ]; then
+        output="$(sanitize_output "$raw_output")"
+    fi
 
     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."
+        if [ -n "$output" ] && ! is_trivial_echo "$output" "$MSG"; then
+            output="${output}\n\n(Stopped after ${RUN_TIMEOUT_SEC}s timeout.)"
+        else
+            output="OpenCode timed out after ${RUN_TIMEOUT_SEC}s. Try a narrower prompt or send a follow-up."
+        fi
     elif [ -z "$output" ]; then
         output="OpenCode finished, but returned an empty response."
     elif is_trivial_echo "$output" "$MSG"; then
@@ -226,15 +286,12 @@ run_with_timeout() {
 
     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
+    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"
+    mode_label="${RUN_MODE:---new}"
+    printf '[%s] /cc completed in %ss (exit=%s timeout=%ss mode=%s)\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$elapsed" "$rc" "$RUN_TIMEOUT_SEC" "$mode_label"
 ) >>"$LOG_FILE" 2>&1 &
 
 echo "✅ OpenCode request queued."