openclaw-opencode-bridge 2.0.6 → 2.0.7

package/lib/onboard.js

@@ -47,24 +47,20 @@ const BRIDGE_COMMANDS = [
 // Variable names used in each script (for patching existing scripts)
 const SCRIPT_VARS = {
   "opencode-session.sh": {
-    TMUX: "TMUX_BIN",
     OPENCODE: "OPENCODE_BIN",
     WORKSPACE: "WORKSPACE",
-    SESSION: "SESSION_NAME",
   },
   "opencode-send.sh": {
-    TMUX: "TMUX_BIN",
+    OPENCODE: "OPENCODE_BIN",
     CHANNEL: "CHANNEL",
     TARGET: "TARGET_ID",
-    SESSION: "SESSION_NAME",
+    WORKSPACE: "WORKSPACE",
   },
   "opencode-new-session.sh": {
-    TMUX: "TMUX_BIN",
     OPENCODE: "OPENCODE_BIN",
-    WORKSPACE: "WORKSPACE",
     CHANNEL: "CHANNEL",
     TARGET: "TARGET_ID",
-    SESSION: "SESSION_NAME",
+    WORKSPACE: "WORKSPACE",
   },
   "opencode-stats.sh": {
     TMUX: "TMUX_BIN",
@@ -80,7 +76,6 @@ const SCRIPT_VARS = {
     TARGET: "TARGET_ID",
   },
   "opencode-setmodel.sh": {
-    TMUX: "TMUX_BIN",
     OPENCODE: "OPENCODE_BIN",
     CHANNEL: "CHANNEL",
     TARGET: "TARGET_ID",

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "openclaw-opencode-bridge",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Bridge OpenClaw messaging channels to OpenCode via tmux persistent sessions",
   "main": "./lib/onboard.js",
   "bin": {
     "openclaw-opencode-bridge": "./lib/cli.js"
   },
-  "scripts": {
-  },
+  "scripts": {},
   "preferGlobal": true,
   "dependencies": {
     "commander": "^12.0.0",
@@ -17,7 +16,9 @@
     "node": ">=18.0.0"
   },
   "openclaw": {
-    "extensions": ["./plugin/index.ts"]
+    "extensions": [
+      "./plugin/index.ts"
+    ]
   },
   "keywords": [
     "openclaw",

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

@@ -1,46 +1,20 @@
 #!/bin/bash
-# bridge-version: 1
-# Kill existing session -> create new session -> send instruction
+# bridge-version: 2
+# Start fresh session and send instruction
 MSG="$1"
-TMUX="{{TMUX_BIN}}"
 OPENCODE="{{OPENCODE_BIN}}"
-WORKSPACE="{{WORKSPACE}}"
 CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
-SESSION="{{SESSION_NAME}}"
+WORKSPACE="{{WORKSPACE}}"
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
     exit 1
 fi
 
-# Kill existing session
-if "$TMUX" has-session -t "$SESSION" 2>/dev/null; then
-    "$TMUX" kill-session -t "$SESSION" 2>/dev/null
-    sleep 1
-fi
-
-# Create new session
-"$TMUX" new-session -d -s "$SESSION"
-"$TMUX" set-option -t "$SESSION" history-limit 10000
-"$TMUX" send-keys -t "$SESSION" "cd $WORKSPACE && $OPENCODE" Enter
-
-# Wait for OpenCode prompt
-WAIT=0
-while [ $WAIT -lt 60 ]; do
-    PANE=$("$TMUX" capture-pane -t "$SESSION" -p)
-    if echo "$PANE" | grep -qE "❯|>|opencode"; then
-        break
-    fi
-    sleep 2
-    WAIT=$((WAIT + 2))
-done
+cd "$WORKSPACE"
+FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
 
-# Send instruction
-sleep 1
-printf '%s' "[${CHANNEL}:${TARGET}] $MSG" | "$TMUX" load-buffer -
-"$TMUX" paste-buffer -t "$SESSION" -d -p
-sleep 0.3
-"$TMUX" send-keys -t "$SESSION" Enter
+"$OPENCODE" run --fork "$FULL_MSG" 2>&1 &
 
 echo "✅ New session started. Reply will arrive shortly."

package/templates/scripts/opencode-send.sh

@@ -1,31 +1,20 @@
 #!/bin/bash
-# bridge-version: 1
-# Send instruction to existing opencode-daemon tmux session
+# bridge-version: 2
+# Send instruction to OpenCode (non-interactive mode)
 MSG="$1"
-TMUX="{{TMUX_BIN}}"
+OPENCODE="{{OPENCODE_BIN}}"
 CHANNEL="{{CHANNEL}}"
 TARGET="{{TARGET_ID}}"
-SESSION="{{SESSION_NAME}}"
+WORKSPACE="{{WORKSPACE}}"
 
 if [ -z "$MSG" ]; then
     echo "ERROR: No message provided"
     exit 1
 fi
 
-# Check session exists
-if ! "$TMUX" has-session -t "$SESSION" 2>/dev/null; then
-    echo "ERROR: $SESSION session not found. It will be auto-created within 30 seconds."
-    exit 1
-fi
+cd "$WORKSPACE"
+FULL_MSG="[${CHANNEL}:${TARGET}] $MSG"
 
-# Clear input line, then send message with channel prefix
-"$TMUX" send-keys -t "$SESSION" C-c
-sleep 0.5
-"$TMUX" send-keys -t "$SESSION" C-u
-sleep 0.3
-printf '%s' "[${CHANNEL}:${TARGET}] $MSG" | "$TMUX" load-buffer -
-"$TMUX" paste-buffer -t "$SESSION" -d -p
-sleep 0.3
-"$TMUX" send-keys -t "$SESSION" Enter
+"$OPENCODE" run --continue "$FULL_MSG" 2>&1 &
 
 echo "✅ Delivered to OpenCode. Reply will arrive shortly."

package/templates/scripts/opencode-session.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
-# bridge-version: 3
-# Keep opencode-daemon tmux session alive (daemon runs every 30s)
-# Safe: idempotent, flock-protected (with fallback), short timeout
+# bridge-version: 4
+# Keep OpenCode server alive (runs every 30s via daemon)
+# Safe: idempotent, flock-protected (with fallback)
 
-TMUX="{{TMUX_BIN}}"
 OPENCODE="{{OPENCODE_BIN}}"
 WORKSPACE="{{WORKSPACE}}"
-SESSION="{{SESSION_NAME}}"
 LOCK_FILE="/tmp/opencode-session.lock"
 TIMEOUT=10
 
@@ -15,7 +13,7 @@ if command -v flock &> /dev/null; then
     exec 200>"$LOCK_FILE"
     flock -w "$TIMEOUT" 200 || exit 0
 else
-    # Fallback: simple PID lock (less robust but works without flock)
+    # Fallback: simple PID lock
     if [ -f "$LOCK_FILE" ]; then
         OLD_PID=$(cat "$LOCK_FILE" 2>/dev/null)
         if [ -n "$OLD_PID" ] && kill -0 "$OLD_PID" 2>/dev/null; then
@@ -25,13 +23,12 @@ else
     echo $$ > "$LOCK_FILE"
 fi
 
-# Idempotent: exit if session already exists
-if "$TMUX" has-session -t "$SESSION" 2>/dev/null; then
-    exit 0
+cd "$WORKSPACE"
+
+# Start OpenCode in server mode if not running
+if ! pgrep -f "opencode serve" > /dev/null 2>&1; then
+    "$OPENCODE" serve &
+    sleep 2
 fi
 
-# Create new session + start OpenCode
-"$TMUX" new-session -d -s "$SESSION"
-"$TMUX" set-option -t "$SESSION" history-limit 10000
-"$TMUX" send-keys -t "$SESSION" \
-  "cd $WORKSPACE && $OPENCODE --continue" Enter
+exit 0

package/templates/workspace/OPENCODE.md

@@ -1,6 +1,6 @@
 # OPENCODE.md
 
-## Bot Mode (Top Priority Rule)
+## Bot Mode
 
 When a message starts with `[{CHANNEL}:{ID}]` prefix, you **MUST** follow this procedure.
 
@@ -8,13 +8,12 @@ When a message starts with `[{CHANNEL}:{ID}]` prefix, you **MUST** follow this p
 
 1. Extract `{CHANNEL}` and `{ID}` from the prefix
 2. Perform the task described after the prefix
-3. **After completion, you MUST** send the response via:
+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 (not the gateway LLM)
-5. Split into multiple messages if over 4000 characters (each part starts with 🔗)
-6. Print `Sent` after transmission
+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)
 
@@ -22,20 +21,4 @@ openclaw message send --channel {CHANNEL} --target {ID} -m '🔗 response'
 - 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.
-
-### Self-check
-
-When completing a task, verify:
-- Did I run `openclaw message send`? -> If not, run it immediately now
-- Did I print `Sent`? -> If not, the transmission was missed
-
-## Bridge Commands (Do NOT respond)
-
-Messages starting with `@cc`, `@ccn`, `@ccu`, `/cc`, `/ccn`, `/ccu` are handled by the opencode-bridge plugin.
-These are routed to a separate OpenCode session via tmux.
-
-**When you see a message starting with these prefixes, you MUST:**
-- Do NOT interpret, process, or respond to the message content
-- Output ONLY this exact text: 🔗 Delivered to OpenCode. Reply will arrive shortly.
-- Do NOT explain, translate, or add any other text
+- If you did not run `openclaw message send`, the task is **NOT** complete.