@clawrent/openclaw-channel 0.5.0 → 0.6.0

package/dist/group-routing.d.ts

@@ -1,17 +1,16 @@
-/** @-routing policy (spec §6.3 + Plan 4b-2.2).
+/** Is this provider agent @-addressed by the inbound group message? (D1: was a
+ *  wake/sleep GATE — now CONTEXT only; the agent self-decides whether to reply.)
  *
- * Decides whether THIS provider agent should wake (drive the OpenClaw bot) for an
- * inbound group message:
- *  - No `mentions` → wake. Backward-compatible with the single-agent /ws/session
- *    plugin (where every consumer message is answered). Also the sensible default
- *    when a session has a single provider agent.
- *  - `mentions` present → wake ONLY if this agent's participantId is in the list.
- *    Non-@-ed agents stay silent (spec §6.3). If our participantId is unknown
- *    (handshake not yet cached), we cannot match → sleep (safer than guessing).
+ * Returns true (addressed / no @ in play) when:
+ *  - No `mentions` → true (backward-compat single-agent /ws/session; sensible
+ *    default when a session has a single provider agent).
+ *  - `mentions` present + this agent's participantId is in the list → true.
+ * Returns false only when `mentions` names others and our participantId is known
+ * but absent (or participantId unknown → conservatively false).
  *
  * Note: in legacy /ws/session mode there is no top-level `mentions` and
- * `myParticipantId` is undefined → always wakes (unchanged behavior). */
-export declare function shouldWakeAgent(myParticipantId: string | undefined, message: Record<string, unknown>): boolean;
+ * `myParticipantId` is undefined → true (unchanged). */
+export declare function isAddressedToMe(myParticipantId: string | undefined, message: Record<string, unknown>): boolean;
 /** Reduce a `model.usage` diagnostic `usage` object to a single token total.
  *  Preference: `total` → `promptTokens + output` → `input + output`. 0 if none. */
 export declare function computeUsageTotal(usage: {

package/dist/group-routing.js

@@ -2,20 +2,19 @@
 //
 // Kept dependency-free + side-effect-free so the @-routing and token-usage logic
 // can be unit-tested without standing up an OpenClaw runtime or a live WS server.
-/** @-routing policy (spec §6.3 + Plan 4b-2.2).
+/** Is this provider agent @-addressed by the inbound group message? (D1: was a
+ *  wake/sleep GATE — now CONTEXT only; the agent self-decides whether to reply.)
  *
- * Decides whether THIS provider agent should wake (drive the OpenClaw bot) for an
- * inbound group message:
- *  - No `mentions` → wake. Backward-compatible with the single-agent /ws/session
- *    plugin (where every consumer message is answered). Also the sensible default
- *    when a session has a single provider agent.
- *  - `mentions` present → wake ONLY if this agent's participantId is in the list.
- *    Non-@-ed agents stay silent (spec §6.3). If our participantId is unknown
- *    (handshake not yet cached), we cannot match → sleep (safer than guessing).
+ * Returns true (addressed / no @ in play) when:
+ *  - No `mentions` → true (backward-compat single-agent /ws/session; sensible
+ *    default when a session has a single provider agent).
+ *  - `mentions` present + this agent's participantId is in the list → true.
+ * Returns false only when `mentions` names others and our participantId is known
+ * but absent (or participantId unknown → conservatively false).
  *
  * Note: in legacy /ws/session mode there is no top-level `mentions` and
- * `myParticipantId` is undefined → always wakes (unchanged behavior). */
-export function shouldWakeAgent(myParticipantId, message) {
+ * `myParticipantId` is undefined → true (unchanged). */
+export function isAddressedToMe(myParticipantId, message) {
     const raw = message["mentions"];
     const mentions = Array.isArray(raw) ? raw : [];
     if (mentions.length === 0)

package/dist/guardrails.d.ts

@@ -1,5 +1,7 @@
 export interface GuardrailResult {
     blocked: boolean;
+    /** D2: silent drop (no reply, no warning) — vs `blocked` which replies with a warning. */
+    drop?: boolean;
     reason?: string;
 }
 export declare function loadGuardrails(path?: string): string;
@@ -12,3 +14,19 @@ export declare function parseGuardrailRules(content: string): {
     reason: string;
 }[];
 export declare function checkGuardrails(text: string, fileContent?: string): GuardrailResult;
+/**
+ * D2 prefilter: silent-drop obvious garbage (no reply, no warning) BEFORE driving the
+ * agent. Conservative — only drops content with no alphanumeric/CJK at all (pure
+ * symbols/punctuation/whitespace beyond the empty-trim check). Legit messages pass.
+ */
+export declare function prefilter(text: string): GuardrailResult;
+/**
+ * D3 phase-1 triage (default OFF, gated by `triageTwoPhase` config): cheap rule-based
+ * pre-screen BEFORE the full guardrail + dispatch. Returns {skip} to silent-drop what's
+ * clearly not worth a full turn. Conservative; twoPhase is off by default so this only
+ * runs when explicitly enabled.
+ */
+export declare function phase1Triage(text: string): {
+    skip: boolean;
+    reason?: string;
+};

package/dist/guardrails.js

@@ -52,3 +52,28 @@ export function checkGuardrails(text, fileContent) {
     }
     return { blocked: false };
 }
+/**
+ * D2 prefilter: silent-drop obvious garbage (no reply, no warning) BEFORE driving the
+ * agent. Conservative — only drops content with no alphanumeric/CJK at all (pure
+ * symbols/punctuation/whitespace beyond the empty-trim check). Legit messages pass.
+ */
+export function prefilter(text) {
+    if (!/[A-Za-z0-9一-鿿]/.test(text)) {
+        return { blocked: false, drop: true, reason: "content has no alphanumeric/CJK — likely noise" };
+    }
+    return { blocked: false, drop: false };
+}
+/**
+ * D3 phase-1 triage (default OFF, gated by `triageTwoPhase` config): cheap rule-based
+ * pre-screen BEFORE the full guardrail + dispatch. Returns {skip} to silent-drop what's
+ * clearly not worth a full turn. Conservative; twoPhase is off by default so this only
+ * runs when explicitly enabled.
+ */
+export function phase1Triage(text) {
+    const pre = prefilter(text);
+    if (pre.drop)
+        return { skip: true, reason: pre.reason };
+    if (text.trim().length < 2)
+        return { skip: true, reason: "content too short for a turn" };
+    return { skip: false };
+}

package/dist/index.js

@@ -64,6 +64,9 @@ const entry = defineChannelPluginEntry({
             // fall back to legacy /ws/session (e.g. before the server auto-provisions the
             // provider-agent participant — Plan 4b Part A — else new sessions reject 4013).
             const useGroupChannel = config.useGroupChannel ?? true;
+            // D3: triage switches (optional; prefilter defaults on at the provider, twoPhase off).
+            const triagePrefilter = config.triagePrefilter;
+            const triageTwoPhase = config.triageTwoPhase;
             // --- resolve the agents to serve (multi-agent array, else single token) ---
             // multi: config.agents:[{agentId,token}] → one ProviderClient per agent.
             // single: config.token (+ optional config.agentId), with ~/.clawrent/config.json
@@ -141,6 +144,8 @@ const entry = defineChannelPluginEntry({
                     },
                     onLog: (m) => ctx.logger?.info?.(`[clawrent] ${m}`),
                     useGroupChannel,
+                    triagePrefilter,
+                    triageTwoPhase,
                 }).catch((e) => {
                     ctx.logger?.error?.(`[clawrent] startProvider failed (agent=${agentKey}): ${String(e)}`);
                     return null;

package/dist/provider.d.ts

@@ -18,6 +18,9 @@ export interface StartProviderOptions {
     onLog?: (msg: string) => void;
     /** Plan 4b: opt into /ws/group (participant-scoped) instead of /ws/session. */
     useGroupChannel: boolean;
+    /** D3: triage switches. prefilter default on; twoPhase default off. */
+    triagePrefilter?: boolean;
+    triageTwoPhase?: boolean;
 }
 export interface ProviderHandle {
     stop: () => Promise<void> | void;

package/dist/provider.js

@@ -16,8 +16,8 @@
 //   - recordInboundSession                    ← openclaw/plugin-sdk/conversation-runtime
 //   - dispatchReplyWithBufferedBlockDispatcher ← openclaw/plugin-sdk/reply-dispatch-runtime
 //   - runChannelInboundEvent                   ← openclaw/plugin-sdk/channel-inbound
-import { checkGuardrails, loadGuardrails } from "./guardrails.js";
-import { shouldWakeAgent, computeUsageTotal, sessionIdFromKey } from "./group-routing.js";
+import { checkGuardrails, loadGuardrails, prefilter, phase1Triage } from "./guardrails.js";
+import { isAddressedToMe, computeUsageTotal, sessionIdFromKey } from "./group-routing.js";
 import { onDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 const CHANNEL = "clawrent";
 /**
@@ -119,11 +119,24 @@ export async function startProvider(opts) {
                 log(`skip empty content session=${sessionId}`);
                 return;
             }
-            // Plan 4b-2.2: @-routing — only wake when this agent is addressed (spec §6.3).
-            // /ws/session mode (no mentions, no participantId) always wakes (unchanged).
-            if (!shouldWakeAgent(session?.participantId, message)) {
-                log(`skip not-@-ed session=${sessionId} (mentions do not include this agent)`);
-                return;
+            // D1: @-gate removed — agent self-decides whether to reply (prompt-based).
+            // @ is now CONTEXT (addressedToMe), threaded to the agent via UntrustedStructuredContext (D2).
+            const addressedToMe = isAddressedToMe(session?.participantId, message);
+            // D2 prefilter (D3: gated by triagePrefilter, default on) — silent-drop garbage.
+            if (opts.triagePrefilter !== false) {
+                const pre = prefilter(content);
+                if (pre.drop) {
+                    log(`prefilter drop session=${sessionId}: ${pre.reason}`);
+                    return;
+                }
+            }
+            // D3 phase-1 (default off via triageTwoPhase) — cheap pre-screen before full dispatch.
+            if (opts.triageTwoPhase) {
+                const p1 = phase1Triage(content);
+                if (p1.skip) {
+                    log(`phase-1 skip session=${sessionId}: ${p1.reason}`);
+                    return;
+                }
             }
             // 护栏:危险指令直接拦截,不驱动 agent。
             const guard = checkGuardrails(content);
@@ -142,15 +155,37 @@ export async function startProvider(opts) {
             // Windows 文件名不允许冒号, storePath 需做安全转义。
             const storePath = routeSessionKey.replace(/[:]/g, "_");
             const consumerId = session?.consumerUserId ?? "consumer";
+            // D2: UntrustedStructuredContext — sender / mentions / gist / @-addressing. With the
+            // @-gate gone (D1), this is what lets the agent self-decide whether + how to reply.
+            const mentions = Array.isArray(message.mentions) ? message.mentions : [];
+            const untrusted = {
+                addressedToMe,
+                sender: {
+                    participantId: message.sender?.participantId,
+                    side: message.sender?.side,
+                    agentId: message.sender?.agentId,
+                    consumerUserId: session?.consumerUserId,
+                },
+                mentions,
+                gist: session?.taskDescription,
+                participantId: session?.participantId,
+            };
+            // Inject the context as a preamble in the agent-facing text so the model literally
+            // sees it (also available structured on ctxPayload.UntrustedStructuredContext).
+            const textForAgentContent = `[被@: ${addressedToMe ? "是" : "否"}] ` +
+                `[发送方: ${untrusted.sender.side ?? "unknown"}] ` +
+                `[会话: ${untrusted.gist ?? ""}] ` +
+                `[mentions: ${mentions.length}]\n${content}`;
             const ctxPayload = {
                 From: `${CHANNEL}:${consumerId}`,
                 Body: content,
                 RawBody: content,
-                BodyForAgent: content,
+                BodyForAgent: textForAgentContent,
                 channel: CHANNEL,
                 SessionKey: routeSessionKey,
+                UntrustedStructuredContext: untrusted,
             };
-            const raw = { sessionId, consumerId, content, message };
+            const raw = { sessionId, consumerId, content, message, textForAgent: textForAgentContent };
             try {
                 await opts.deps.runChannelInboundEvent({
                     channel: CHANNEL,
@@ -166,7 +201,7 @@ export async function startProvider(opts) {
                             id: `${r.sessionId}:${r.message?.id ?? Date.now()}`,
                             timestamp: Date.now(),
                             rawText: r.content,
-                            textForAgent: r.content,
+                            textForAgent: r.textForAgent ?? r.content,
                             textForCommands: r.content,
                             raw: r,
                         }),

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "clawrent",
   "name": "ClawRent Channel",
   "description": "OpenClaw channel plugin that turns ClawRent rental sessions into native OpenClaw conversations, so a local ClawRent provider agent can answer tenants autonomously with its own model and identity. / OpenClaw 频道插件：把 ClawRent 租赁会话桥接成 OpenClaw 原生对话，让本地 ClawRent provider 智能体用自有模型与身份自动应答租户。",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "channels": ["clawrent"],
   "activation": {
     "onStartup": false,
@@ -52,6 +52,16 @@
             "title": "Use /ws/group participant-scoped channel (Plan 4b)",
             "description": "true (default) = connect /ws/group (participant-scoped, @-routing, per_token usage). false = legacy /ws/session (fallback). Requires the ClawRent server to auto-provision the provider-agent participant (Plan 4b Part A) — else new sessions reject with 4013."
           },
+          "triagePrefilter": {
+            "type": "boolean",
+            "title": "Triage: prefilter silent-drop",
+            "description": "true (default) = silent-drop obvious garbage (no alphanumeric/CJK) before driving the agent. false = pass everything through."
+          },
+          "triageTwoPhase": {
+            "type": "boolean",
+            "title": "Triage: two-phase pre-screen",
+            "description": "false (default). true = run a cheap rule-based phase-1 pre-screen (skip noise / over-short content) before the full guardrail + dispatch."
+          },
           "agents": {
             "type": "array",
             "title": "Multiple provider agents (multi-agent mode)",
@@ -89,6 +99,14 @@
         "guardrailsFile": {
           "label": "Guardrails file",
           "help": "外置护栏策略文件(每行 `/regex/ || 原因`,# 开头为注释)。规则追加在内置护栏之后,实现策略外置。"
+        },
+        "triagePrefilter": {
+          "label": "Triage: prefilter (silent-drop)",
+          "help": "默认开。静默丢弃明显垃圾内容(无字母/数字/中文,纯符号/空白)。关闭则全部放行。"
+        },
+        "triageTwoPhase": {
+          "label": "Triage: two-phase pre-screen",
+          "help": "默认关。开启后在完整护栏+派发前加一道廉价规则预筛(跳过噪音/过短内容)。"
         }
       }
     }
@@ -129,6 +147,14 @@
         "type": "boolean",
         "title": "Use /ws/group participant-scoped channel (Plan 4b)"
       },
+      "triagePrefilter": {
+        "type": "boolean",
+        "title": "Triage: prefilter silent-drop"
+      },
+      "triageTwoPhase": {
+        "type": "boolean",
+        "title": "Triage: two-phase pre-screen"
+      },
       "agents": {
         "type": "array",
         "title": "Multiple provider agents (multi-agent mode)",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawrent/openclaw-channel",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "OpenClaw channel plugin that turns ClawRent rental sessions into native OpenClaw conversations, so a local ClawRent provider agent can answer tenants autonomously with its own model and identity. / OpenClaw 频道插件：把 ClawRent 租赁会话桥接成 OpenClaw 原生对话，让本地 ClawRent provider 智能体用自有模型与身份自动应答租户。",
   "license": "ISC",
   "type": "module",