fix: make requester bridge work on OpenClaw 2026.5

Register the CloudSigma hook on the real provider path, send the local /tools/invoke payload shape expected by OpenClaw, fall back to the local OpenClaw gateway token from openclaw.json, and unref plugin timers so test/CLI processes exit cleanly.

Author: root

index.ts

@@ -38,7 +38,7 @@ const REQUESTER_BRIDGE_CAPABILITY_LEGACY = "openclaw.tool.invoke"
 const REQUESTER_BRIDGE_DEFAULT_TTL_SECONDS = 5 * 60
 const GIT_PROBE_TIMEOUT_MS = 250
 const LEASE_REQUEST_TIMEOUT_MS = 1200
-const POLL_REQUEST_TIMEOUT_MS = 1200
+const POLL_REQUEST_TIMEOUT_MS = 10_000
 const DEFAULT_POLL_INTERVAL_MS = 1000
 const DEFAULT_GATEWAY_URL = "http://127.0.0.1:18789"
 const MAX_ECHO_BYTES = 4096
@@ -338,10 +338,27 @@ function requesterGatewayUrl(): string {
 		?? (safeString(process.env.OPENCLAW_GATEWAY_PORT) ? `http://127.0.0.1:${process.env.OPENCLAW_GATEWAY_PORT}` : DEFAULT_GATEWAY_URL)
 }
 
+function localOpenClawConfigPath(): string {
+	return path.join(process.env.OPENCLAW_STATE_DIR ?? path.join(os.homedir(), ".openclaw"), "openclaw.json")
+}
+
+function requesterGatewayTokenFromConfig(): string | undefined {
+	try {
+		const raw = fs.readFileSync(localOpenClawConfigPath(), "utf8")
+		const config = JSON.parse(raw) as Record<string, unknown>
+		const gateway = config.gateway && typeof config.gateway === "object" ? config.gateway as Record<string, unknown> : undefined
+		const auth = gateway?.auth && typeof gateway.auth === "object" ? gateway.auth as Record<string, unknown> : undefined
+		return safeString(auth?.token) ?? safeString(gateway?.token)
+	} catch {
+		return undefined
+	}
+}
+
 function requesterGatewayToken(): string | undefined {
 	return safeString(process.env.TAAS_REQUESTER_LOCAL_GATEWAY_TOKEN)
 		?? safeString(process.env.OPENCLAW_GATEWAY_TOKEN)
 		?? safeString(process.env.OPENCLAW_GATEWAY_PASSWORD)
+		?? requesterGatewayTokenFromConfig()
 }
 
 async function invokeRequesterLocalTool(tool: string, args: Record<string, unknown>): Promise<{ ok: true; result: unknown } | { ok: false; error: { code: string; message: string } }> {
@@ -354,7 +371,7 @@ async function invokeRequesterLocalTool(tool: string, args: Record<string, unkno
 		const response = await fetch(`${requesterGatewayUrl().replace(/\/+$/, "")}/tools/invoke`, {
 			method: "POST",
 			headers,
-			body: JSON.stringify({ tool, args }),
+			body: JSON.stringify({ name: tool, arguments: args, tool, args }),
 			signal: controller.signal,
 		})
 		const json = await response.json().catch(() => undefined) as { ok?: boolean; result?: unknown; error?: { type?: string; code?: string; message?: string } } | undefined
@@ -1019,22 +1036,31 @@ function startBackgroundTasks(): void {
 	const sweepDelay = Math.floor(Math.random() * 30_000)
 	const sweepInit = setTimeout(() => {
 		runTrashSweep()
-		backgroundTimers.push(setInterval(() => runTrashSweep(), SWEEP_INTERVAL_MS))
+		const sweepTimer = setInterval(() => runTrashSweep(), SWEEP_INTERVAL_MS)
+		sweepTimer.unref?.()
+		backgroundTimers.push(sweepTimer)
 	}, sweepDelay)
+	sweepInit.unref?.()
 	backgroundTimers.push(sweepInit)
 
 	// Stuck-run status writer — 5s initial delay, then every 30s
 	const statusInit = setTimeout(() => {
 		writeRunStatus()
-		backgroundTimers.push(setInterval(() => writeRunStatus(), STATUS_INTERVAL_MS))
+		const statusTimer = setInterval(() => writeRunStatus(), STATUS_INTERVAL_MS)
+		statusTimer.unref?.()
+		backgroundTimers.push(statusTimer)
 	}, 5_000)
+	statusInit.unref?.()
 	backgroundTimers.push(statusInit)
 
 	// Zombie auto-abort — 10s initial delay, then every AUTO_ABORT_CHECK_INTERVAL_MS
 	const abortInit = setTimeout(() => {
 		runAbortCheck()
-		backgroundTimers.push(setInterval(() => runAbortCheck(), AUTO_ABORT_CHECK_INTERVAL_MS))
+		const abortTimer = setInterval(() => runAbortCheck(), AUTO_ABORT_CHECK_INTERVAL_MS)
+		abortTimer.unref?.()
+		backgroundTimers.push(abortTimer)
 	}, 10_000)
+	abortInit.unref?.()
 	backgroundTimers.push(abortInit)
 }
 
@@ -1228,12 +1254,12 @@ export default {
 		"pin sessions to the same upstream slot from turn 1, maximising prompt-cache hit rates.",
 
 	register(api: OpenClawPluginApi) {
-		// Unique id avoids conflicting with the config-driven "cloudsigma" provider.
-		// hookAliases routes cloudsigma/cloudsigma-staging requests to this hook.
+		// Register under the CloudSigma provider id so OpenClaw 2026.5.x applies the hook on the real request path.
+		// Keep legacy and transport aliases for staging/older bridge paths.
 		api.registerProvider({
-			id: "taas-affinity-hook",
+			id: "cloudsigma",
 			label: "CloudSigma TaaS Token Cache Optimizer",
-			hookAliases: ["cloudsigma", "cloudsigma-staging"],
+			hookAliases: ["cloudsigma-staging", "taas-affinity-hook", "openai-completions"],
 			auth: [],
 			wrapStreamFn: buildWrapper,
 			resolveTransportTurnState: buildTransportTurnState,

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-taas-affinity",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "OpenClaw provider plugin — CloudSigma TaaS session affinity. Injects a stable X-Session-Id header per conversation so TaaS can pin the session to the same OAuth token / Bedrock region / Claude Code node, maximising prompt-cache hit rates.",
   "type": "module",
   "main": "dist/index.js",

package.json

@@ -1,5 +1,8 @@
 import assert from "node:assert/strict"
+import fs from "node:fs"
 import { createServer } from "node:http"
+import os from "node:os"
+import path from "node:path"
 import { test } from "node:test"
 
 async function loadPlugin(env: Record<string, string | undefined> = {}) {
@@ -335,7 +338,7 @@ test("plugin executes non-scaffold requester tools through requester-local gatew
 	try {
 		await runPayload(captureWrapper(plugin), { messages: [] }, { baseUrl: `http://127.0.0.1:${taasAddress.port}` })
 		await new Promise((resolve) => setTimeout(resolve, 150))
-		assert.deepEqual(gatewayBody, { tool: "prd_list", args: { query: "requester bridge" } })
+		assert.deepEqual(gatewayBody, { name: "prd_list", arguments: { query: "requester bridge" }, tool: "prd_list", args: { query: "requester bridge" } })
 		assert.equal(resultBody.operation_id, "bro_tool")
 		assert.equal(resultBody.ok, true)
 		assert.deepEqual(resultBody.result, { rows: [{ title: "PRD" }] })
@@ -346,6 +349,85 @@ test("plugin executes non-scaffold requester tools through requester-local gatew
 	}
 })
 
+
+test("plugin falls back to local OpenClaw config token for requester-local gateway", async () => {
+	let resultBody: any
+	let gatewayAuth: string | string[] | undefined
+	let pollCount = 0
+	const tempState = fs.mkdtempSync(path.join(os.tmpdir(), "taas-bridge-config-token-"))
+	fs.writeFileSync(path.join(tempState, "openclaw.json"), JSON.stringify({ gateway: { auth: { token: "config-token" } } }))
+
+	const gateway = createServer((req, res) => {
+		let body = ""
+		req.on("data", (chunk) => { body += chunk })
+		req.on("end", () => {
+			void body
+			gatewayAuth = req.headers.authorization
+			res.setHeader("Content-Type", "application/json")
+			res.end(JSON.stringify({ ok: true, result: { status: "from-config-token" } }))
+		})
+	})
+	await new Promise<void>((resolve) => gateway.listen(0, "127.0.0.1", resolve))
+	const gatewayAddress = gateway.address()
+	assert(gatewayAddress && typeof gatewayAddress === "object")
+
+	const taas = createServer((req, res) => {
+		let body = ""
+		req.on("data", (chunk) => { body += chunk })
+		req.on("end", () => {
+			res.setHeader("Content-Type", "application/json")
+			if (req.url === "/internal/requester-bridges/leases") {
+				res.end(JSON.stringify({ ok: true, descriptor: {
+					name: "requester-workspace", version: "2026-05-23", status: "verified",
+					bridge_id: "br_config", lease_id: "brl_config", capabilities: ["requester.tool.invoke"],
+					endpoint_ref: "epref_config", auth_context_id: "authctx_config", expires_at: "2026-05-23T19:00:00Z",
+				} }))
+				return
+			}
+			if (req.url === "/internal/requester-bridges/poll") {
+				pollCount += 1
+				res.end(JSON.stringify({ ok: true, operations: pollCount === 1 ? [{
+					operation_id: "bro_config", audit_id: "bra_config", lease_id: "brl_config", bridge_id: "br_config",
+					operation: "requester.tool.invoke", arguments: { tool: "session_status", arguments: {} },
+				}] : [] }))
+				return
+			}
+			if (req.url === "/internal/requester-bridges/results") {
+				resultBody = JSON.parse(body)
+				res.end(JSON.stringify({ ok: true }))
+				return
+			}
+			res.statusCode = 404
+			res.end(JSON.stringify({ ok: false }))
+		})
+	})
+	await new Promise<void>((resolve) => taas.listen(0, "127.0.0.1", resolve))
+	const taasAddress = taas.address()
+	assert(taasAddress && typeof taasAddress === "object")
+
+	const { plugin, restore } = await loadPlugin({
+		TAAS_REQUESTER_BRIDGE_POLL_INTERVAL_MS: "50",
+		TAAS_REQUESTER_LOCAL_GATEWAY_URL: `http://127.0.0.1:${gatewayAddress.port}`,
+		TAAS_REQUESTER_LOCAL_GATEWAY_TOKEN: undefined,
+		OPENCLAW_GATEWAY_TOKEN: undefined,
+		OPENCLAW_GATEWAY_PASSWORD: undefined,
+		OPENCLAW_STATE_DIR: tempState,
+	})
+	try {
+		await runPayload(captureWrapper(plugin), { messages: [] }, { baseUrl: `http://127.0.0.1:${taasAddress.port}` })
+		await new Promise((resolve) => setTimeout(resolve, 150))
+		assert.equal(gatewayAuth, "Bearer config-token")
+		assert.equal(resultBody.operation_id, "bro_config")
+		assert.equal(resultBody.ok, true)
+		assert.deepEqual(resultBody.result, { status: "from-config-token" })
+	} finally {
+		restore()
+		gateway.close()
+		taas.close()
+		fs.rmSync(tempState, { recursive: true, force: true })
+	}
+})
+
 test("plugin includes claim_id in result submission when poll returns one", async () => {
 	let pollCount = 0
 	let resultBody: any

test/requester-bridge.test.ts

@@ -12,8 +12,8 @@ plugin.register({
 })
 
 assert.ok(provider, "provider should be registered")
-assert.equal(provider.id, "taas-affinity-hook")
-assert.deepEqual(provider.hookAliases, ["cloudsigma", "cloudsigma-staging"])
+assert.equal(provider.id, "cloudsigma")
+assert.deepEqual(provider.hookAliases, ["cloudsigma-staging", "taas-affinity-hook", "openai-completions"])
 assert.equal(typeof provider.wrapStreamFn, "function")
 assert.equal(typeof provider.resolveTransportTurnState, "function")