agent-relay 3.1.10 → 3.1.12

package/packages/openclaw/src/runtime/openclaw-config.ts

@@ -8,6 +8,8 @@ export interface OpenClawConfigOptions {
   openclawHome?: string;
   /** Default workspace path (default: ~/.openclaw/workspace). */
   workspacePath?: string;
+  /** Config filename override (e.g. 'clawdbot.json'). Defaults to 'openclaw.json'. */
+  configFilename?: string;
   /** MCP servers to include. Keys are server names, values are MCP server configs. */
   mcpServers?: Record<string, { command: string; args: string[]; env?: Record<string, string> }>;
 }
@@ -20,7 +22,7 @@ export async function writeOpenClawConfig(options: OpenClawConfigOptions): Promi
   const home = options.openclawHome ?? join(process.env.HOME ?? '/home/node', '.openclaw');
   await mkdir(home, { recursive: true });
 
-  const configPath = join(home, 'openclaw.json');
+  const configPath = join(home, options.configFilename ?? 'openclaw.json');
   let config: Record<string, unknown> = {};
 
   try {

package/packages/openclaw/src/runtime/setup.ts

@@ -1,16 +1,13 @@
 import { join } from 'node:path';
-import { unlink } from 'node:fs/promises';
+import { readdir, unlink } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 
 import { normalizeModelRef } from '../identity/model.js';
 import { convertCodexAuth } from '../auth/converter.js';
 import { writeOpenClawConfig } from './openclaw-config.js';
 import { patchOpenClawDist, clearJitCache } from './patch.js';
-import {
-  generateSoulMd,
-  generateIdentityMd,
-  ensureWorkspace,
-} from '../identity/files.js';
+import { ensureWorkspace } from '../identity/files.js';
+import { openclawHome as resolveOpenclawHome, openclawConfigFilename } from '../config.js';
 
 export interface RuntimeSetupOptions {
   /** Raw model string (e.g. "gpt-5.3-codex"). Defaults to env OPENCLAW_MODEL. */
@@ -23,8 +20,6 @@ export interface RuntimeSetupOptions {
   role?: string;
   /** OpenClaw dist directory for patching. Defaults to /usr/lib/node_modules/openclaw/dist. */
   openclawDistDir?: string;
-  /** Home directory. Defaults to $HOME. */
-  homeDir?: string;
 }
 
 /**
@@ -38,7 +33,8 @@ export async function runtimeSetup(options: RuntimeSetupOptions = {}): Promise<{
   agentName: string;
   workspaceId: string;
 }> {
-  const home = options.homeDir ?? process.env.HOME ?? '/home/node';
+  // Resolve OpenClaw home using canonical precedence (OPENCLAW_CONFIG_PATH > OPENCLAW_HOME > probe)
+  const ocHome = resolveOpenclawHome();
   const model = options.model ?? process.env.OPENCLAW_MODEL ?? 'openai-codex/gpt-5.3-codex';
   const name = options.name ?? process.env.OPENCLAW_NAME ?? process.env.AGENT_NAME ?? 'agent';
   const workspaceId = options.workspaceId ?? process.env.OPENCLAW_WORKSPACE_ID ?? 'unknown';
@@ -47,8 +43,8 @@ export async function runtimeSetup(options: RuntimeSetupOptions = {}): Promise<{
   const distDirCandidates = options.openclawDistDir
     ? [options.openclawDistDir]
     : [
-        '/usr/lib/node_modules/openclaw/dist',    // Global npm (ClawRunner sandbox)
-        '/app/dist',                                // Vanilla Docker image
+        '/usr/lib/node_modules/openclaw/dist', // Global npm (ClawRunner sandbox)
+        '/app/dist', // Vanilla Docker image
         '/usr/local/lib/node_modules/openclaw/dist', // Global npm (macOS/other)
       ];
   const distDir = distDirCandidates.find((d) => existsSync(d)) ?? distDirCandidates[0];
@@ -57,14 +53,15 @@ export async function runtimeSetup(options: RuntimeSetupOptions = {}): Promise<{
   const { preferredProvider } = await convertCodexAuth();
   const modelRef = normalizeModelRef(model, preferredProvider);
 
-  // 2. Write openclaw.json config
+  // 2. Write config (openclaw.json or clawdbot.json depending on variant)
   await writeOpenClawConfig({
     modelRef,
-    openclawHome: join(home, '.openclaw'),
+    openclawHome: ocHome,
+    configFilename: openclawConfigFilename(ocHome),
   });
 
   // 3. Write identity files in workspace
-  const wsDir = join(home, '.openclaw', 'workspace');
+  const wsDir = join(ocHome, 'workspace');
   await ensureWorkspace({
     workspacePath: wsDir,
     workspaceId,
@@ -79,11 +76,55 @@ export async function runtimeSetup(options: RuntimeSetupOptions = {}): Promise<{
     await unlink(bootstrapPath);
   }
 
-  // 4. Patch OpenClaw dist
+  // 4. Remove stale session lock files from previous runs
+  await clearStaleLocks(ocHome);
+
+  // 5. Patch OpenClaw dist
   await patchOpenClawDist(distDir, modelRef);
 
-  // 5. Clear JIT cache
+  // 6. Clear JIT cache
   await clearJitCache();
 
   return { modelRef, agentName: name, workspaceId };
 }
+
+/**
+ * Remove stale .lock files from OpenClaw session directories.
+ *
+ * OpenClaw creates per-session lock files at ~/.openclaw/agents/<name>/sessions/<uuid>.jsonl.lock.
+ * If the process dies uncleanly, stale locks prevent new sessions from starting
+ * ("session file locked (timeout 10000ms)"). Since runtime-setup runs before the
+ * gateway starts, no legitimate locks should exist — all locks are stale.
+ */
+async function clearStaleLocks(openclawHome: string): Promise<void> {
+  const agentsDir = join(openclawHome, 'agents');
+  if (!existsSync(agentsDir)) return;
+
+  try {
+    const agentNames = await readdir(agentsDir, { withFileTypes: true });
+    let cleared = 0;
+
+    for (const agent of agentNames) {
+      if (!agent.isDirectory()) continue;
+      const sessionsDir = join(agentsDir, agent.name, 'sessions');
+      if (!existsSync(sessionsDir)) continue;
+
+      const files = await readdir(sessionsDir);
+      for (const file of files) {
+        if (file.endsWith('.lock')) {
+          await unlink(join(sessionsDir, file))
+            .then(() => {
+              cleared++;
+            })
+            .catch(() => {});
+        }
+      }
+    }
+
+    if (cleared > 0) {
+      process.stderr.write(`[runtime-setup] Cleared ${cleared} stale session lock(s)\n`);
+    }
+  } catch {
+    // Non-fatal — session lock cleanup is best-effort
+  }
+}

package/packages/openclaw/src/types.ts

@@ -1,6 +1,35 @@
 /** Default port for the local OpenClaw gateway WebSocket API. */
 export const DEFAULT_OPENCLAW_GATEWAY_PORT = 18789;
 
+export interface GatewayPollFallbackProbeConfig {
+  /** Whether background WS recovery probes should run while polling. */
+  enabled?: boolean;
+  /** How often to attempt WS recovery probes. */
+  intervalMs?: number;
+  /** How long WS must stay healthy before promotion back to WS. */
+  stableGraceMs?: number;
+}
+
+export interface GatewayPollFallbackConfig {
+  /** Enable HTTP long-poll fallback when Relaycast WS is unhealthy. */
+  enabled?: boolean;
+  /** Consecutive WS failures before switching to poll mode. */
+  wsFailureThreshold?: number;
+  /** Long-poll wait time in seconds. */
+  timeoutSeconds?: number;
+  /** Maximum events to request per poll. */
+  limit?: number;
+  /** Initial cursor used when no persisted cursor exists yet. */
+  initialCursor?: string;
+  /** Background WS recovery probe settings. */
+  probeWs?: GatewayPollFallbackProbeConfig;
+}
+
+export interface GatewayTransportConfig {
+  /** WS -> HTTP long-poll fallback settings for inbound Relaycast events. */
+  pollFallback?: GatewayPollFallbackConfig;
+}
+
 export interface GatewayConfig {
   /** Relaycast workspace API key (rk_live_*). */
   apiKey: string;
@@ -14,6 +43,8 @@ export interface GatewayConfig {
   openclawGatewayToken?: string;
   /** OpenClaw gateway port (default: 18789). */
   openclawGatewayPort?: number;
+  /** Optional inbound transport tuning. */
+  transport?: GatewayTransportConfig;
 }
 
 export interface InboundMessage {

package/packages/openclaw/test/vitest.setup.ts

@@ -0,0 +1 @@
+// Package-local Vitest setup shim.

package/packages/policy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/policy",
-  "version": "3.1.10",
+  "version": "3.1.12",
   "description": "Agent policy management with multi-level fallback (repo, local PRPM, cloud workspace)",
   "type": "module",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/config": "3.1.10"
+    "@agent-relay/config": "3.1.12"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",