diff --git a/packages/adapter-utils/src/types.ts b/packages/adapter-utils/src/types.ts
index 2aac3d8c..60cf1279 100644
--- a/packages/adapter-utils/src/types.ts
+++ b/packages/adapter-utils/src/types.ts
@@ -505,4 +505,19 @@ export interface CreateConfigValues {
   intervalSec: number;
   /** Arbitrary key-value pairs populated by schema-driven config fields. */
   adapterSchemaValues?: Record<string, unknown>;
+  // openclaw_gateway adapter fields
+  authToken?: string;
+  agentId?: string;
+  sessionKeyStrategy?: string;
+  sessionKey?: string;
+  timeoutSec?: number;
+  waitTimeoutMs?: number;
+  disableDeviceAuth?: boolean;
+  autoPairOnFirstConnect?: boolean;
+  devicePrivateKeyPem?: string;
+  role?: string;
+  scopes?: string;
+  paperclipApiUrl?: string;
+  headersJson?: string;
+  password?: string;
 }
diff --git a/packages/adapters/openclaw-gateway/src/server/execute.ts b/packages/adapters/openclaw-gateway/src/server/execute.ts
index f019bfa8..d5caabd2 100644
--- a/packages/adapters/openclaw-gateway/src/server/execute.ts
+++ b/packages/adapters/openclaw-gateway/src/server/execute.ts
@@ -243,7 +243,11 @@ function resolveAuthToken(config: Record<string, unknown>, headers: Record<strin
   const authHeader =
     headerMapGetIgnoreCase(headers, "x-openclaw-auth") ??
     headerMapGetIgnoreCase(headers, "authorization");
-  return tokenFromAuthHeader(authHeader);
+  const fromHeader = tokenFromAuthHeader(authHeader);
+  if (fromHeader) return fromHeader;
+
+  // Fallback to environment variable
+  return nonEmpty(process.env.OPENCLAW_TOKEN);
 }
 
 function isSensitiveLogKey(key: string): boolean {
@@ -1120,10 +1124,11 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
 
   const sessionKeyStrategy = normalizeSessionKeyStrategy(ctx.config.sessionKeyStrategy);
   const configuredSessionKey = nonEmpty(ctx.config.sessionKey);
+  const configuredAgentId = nonEmpty(ctx.config.agentId);
   const sessionKey = resolveSessionKey({
     strategy: sessionKeyStrategy,
     configuredSessionKey,
-    agentId: nonEmpty(ctx.config.agentId),
+    agentId: configuredAgentId,
     runId: ctx.runId,
     issueId: wakePayload.issueId,
   });
@@ -1141,7 +1146,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
   delete agentParams.text;
   agentParams.paperclip = paperclipPayload;
 
-  const configuredAgentId = nonEmpty(ctx.config.agentId);
   if (configuredAgentId && !nonEmpty(agentParams.agentId)) {
     agentParams.agentId = configuredAgentId;
   }
@@ -1185,6 +1189,8 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
   const autoPairOnFirstConnect = parseBoolean(ctx.config.autoPairOnFirstConnect, true);
   let autoPairAttempted = false;
   let latestResultPayload: unknown = null;
+  let retryCount = 0;
+  const MAX_RETRIES = 2;
 
   while (true) {
     const trackedRunIds = new Set<string>([ctx.runId]);
@@ -1474,6 +1480,25 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
         );
       }
 
+      // Retry transient errors (connection refused, reset, socket hang up)
+      const isTransient =
+        !pairingRequired &&
+        (lower.includes("econnrefused") ||
+          lower.includes("econnreset") ||
+          lower.includes("socket hang up") ||
+          (timedOut && !lower.includes("agent.wait")));
+
+      if (isTransient && retryCount < MAX_RETRIES) {
+        retryCount++;
+        const backoffMs = retryCount * 2000;
+        await ctx.onLog(
+          "stdout",
+          `[openclaw-gateway] transient error, retry ${retryCount}/${MAX_RETRIES} after ${backoffMs}ms: ${message}\n`,
+        );
+        await new Promise((r) => setTimeout(r, backoffMs));
+        continue;
+      }
+
       const detailedMessage = pairingRequired
         ? `${message}. Approve the pending device in OpenClaw (for example: openclaw devices approve --latest --url <gateway-ws-url> --token <gateway-token>) and retry. Ensure this agent has a persisted adapterConfig.devicePrivateKeyPem so approvals are reused.`
         : message;
diff --git a/packages/adapters/openclaw-gateway/src/ui/build-config.test.ts b/packages/adapters/openclaw-gateway/src/ui/build-config.test.ts
new file mode 100644
index 00000000..d92dd7fb
--- /dev/null
+++ b/packages/adapters/openclaw-gateway/src/ui/build-config.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import type { CreateConfigValues } from "@paperclipai/adapter-utils";
+import { buildOpenClawGatewayConfig } from "./build-config.js";
+
+function baseValues(): CreateConfigValues {
+  return {
+    adapterType: "openclaw_gateway",
+    cwd: "",
+    promptTemplate: "",
+    model: "",
+    thinkingEffort: "",
+    chrome: false,
+    dangerouslySkipPermissions: false,
+    search: false,
+    fastMode: false,
+    dangerouslyBypassSandbox: false,
+    command: "",
+    args: "",
+    extraArgs: "",
+    envVars: "",
+    envBindings: {},
+    url: "wss://gateway.example/ws",
+    bootstrapPrompt: "",
+    maxTurnsPerRun: 0,
+    heartbeatEnabled: false,
+    intervalSec: 0,
+  };
+}
+
+describe("buildOpenClawGatewayConfig", () => {
+  it("applies the documented timeout defaults when unset (timeoutSec=120, waitTimeoutMs=120000)", () => {
+    const config = buildOpenClawGatewayConfig(baseValues());
+    expect(config.timeoutSec).toBe(120);
+    expect(config.waitTimeoutMs).toBe(120000);
+  });
+
+  it("preserves explicit timeout values when provided", () => {
+    const config = buildOpenClawGatewayConfig({
+      ...baseValues(),
+      timeoutSec: 45,
+      waitTimeoutMs: 9000,
+    });
+    expect(config.timeoutSec).toBe(45);
+    expect(config.waitTimeoutMs).toBe(9000);
+  });
+
+  it("applies the documented identity defaults when unset", () => {
+    const config = buildOpenClawGatewayConfig(baseValues());
+    expect(config.sessionKeyStrategy).toBe("issue");
+    expect(config.role).toBe("operator");
+    expect(config.scopes).toEqual(["operator.admin"]);
+  });
+});
diff --git a/packages/adapters/openclaw-gateway/src/ui/build-config.ts b/packages/adapters/openclaw-gateway/src/ui/build-config.ts
index 70604f20..b13906d0 100644
--- a/packages/adapters/openclaw-gateway/src/ui/build-config.ts
+++ b/packages/adapters/openclaw-gateway/src/ui/build-config.ts
@@ -14,17 +14,61 @@ function parseJsonObject(text: string): Record<string, unknown> | null {
 
 export function buildOpenClawGatewayConfig(v: CreateConfigValues): Record<string, unknown> {
   const ac: Record<string, unknown> = {};
+  
+  // Required / Primary fields
   if (v.url) ac.url = v.url;
-  ac.timeoutSec = 120;
-  ac.waitTimeoutMs = 120000;
-  ac.sessionKeyStrategy = "issue";
-  ac.role = "operator";
-  ac.scopes = ["operator.admin"];
+  if (v.authToken) ac.authToken = v.authToken;
+  if (v.password) ac.password = v.password;
+  if (v.agentId) ac.agentId = v.agentId;
+  
+  // Session routing fields
+  if (v.sessionKeyStrategy) ac.sessionKeyStrategy = v.sessionKeyStrategy;
+  if (v.sessionKey) ac.sessionKey = v.sessionKey;
+  
+  // Timeout fields
+  if (typeof v.timeoutSec === "number") ac.timeoutSec = v.timeoutSec;
+  if (typeof v.waitTimeoutMs === "number") ac.waitTimeoutMs = v.waitTimeoutMs;
+  
+  // Device auth fields
+  if (typeof v.disableDeviceAuth === "boolean") ac.disableDeviceAuth = v.disableDeviceAuth;
+  if (typeof v.autoPairOnFirstConnect === "boolean") ac.autoPairOnFirstConnect = v.autoPairOnFirstConnect;
+  if (v.devicePrivateKeyPem) ac.devicePrivateKeyPem = v.devicePrivateKeyPem;
+  
+  // Gateway identity fields
+  if (v.role) ac.role = v.role;
+  if (v.scopes) {
+    const parsed = v.scopes.split(",").map((s) => s.trim()).filter(Boolean);
+    if (parsed.length > 0) ac.scopes = parsed;
+  }
+  
+  // Paperclip API override
+  if (v.paperclipApiUrl) ac.paperclipApiUrl = v.paperclipApiUrl;
+  
+  // Headers — parse headersJson first, then inject authToken on top
+  const headers = parseJsonObject(v.headersJson ?? "");
+  if (headers) ac.headers = headers;
+  if (v.authToken) {
+    const h = (ac.headers as Record<string, unknown>) ?? {};
+    h["x-openclaw-token"] = v.authToken;
+    ac.headers = h;
+  }
+
+  // Payload template
   const payloadTemplate = parseJsonObject(v.payloadTemplateJson ?? "");
   if (payloadTemplate) ac.payloadTemplate = payloadTemplate;
+  
+  // Workspace runtime (from runtimeServicesJson)
   const runtimeServices = parseJsonObject(v.runtimeServicesJson ?? "");
   if (runtimeServices && Array.isArray(runtimeServices.services)) {
     ac.workspaceRuntime = runtimeServices;
   }
+
+  // Safe defaults — applied when fields are not explicitly set
+  if (ac.timeoutSec == null) ac.timeoutSec = 120;
+  if (ac.waitTimeoutMs == null) ac.waitTimeoutMs = 120000;
+  if (!ac.sessionKeyStrategy) ac.sessionKeyStrategy = "issue";
+  if (!ac.role) ac.role = "operator";
+  if (!ac.scopes) ac.scopes = ["operator.admin"];
+
   return ac;
 }
diff --git a/server/src/__tests__/heartbeat-lock-release-on-reassignment.test.ts b/server/src/__tests__/heartbeat-lock-release-on-reassignment.test.ts
index 167c4c18..2345748b 100644
--- a/server/src/__tests__/heartbeat-lock-release-on-reassignment.test.ts
+++ b/server/src/__tests__/heartbeat-lock-release-on-reassignment.test.ts
@@ -3,6 +3,7 @@ import { and, eq } from "drizzle-orm";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import {
   agents,
+  agentRuntimeState,
   agentWakeupRequests,
   companies,
   createDb,
@@ -39,6 +40,7 @@ describeEmbeddedPostgres("heartbeat lock release on cross-agent reassignment", (
     await db.delete(heartbeatRuns);
     await db.delete(agentWakeupRequests);
     await db.delete(issues);
+    await db.delete(agentRuntimeState);
     await db.delete(agents);
     await db.delete(companies);
   });
diff --git a/server/src/services/heartbeat.ts b/server/src/services/heartbeat.ts
index 56180470..c5b6cc23 100644
--- a/server/src/services/heartbeat.ts
+++ b/server/src/services/heartbeat.ts
@@ -10593,10 +10593,9 @@ export function heartbeatService(db: Db, options: HeartbeatServiceOptions = {})
             shouldQueueFollowupForRunningIssueWake({ contextSnapshot: enrichedContextSnapshot, wakeCommentId }) &&
             activeExecutionRun.status === "running" &&
             isSameExecutionAgent;
-          const availableActiveExecutionRun = filterZombieCoalesceTarget(
-            activeExecutionRun,
-            liveRunExecutions,
-          );
+          const availableActiveExecutionRun = isSameExecutionAgent
+            ? filterZombieCoalesceTarget(activeExecutionRun, liveRunExecutions)
+            : activeExecutionRun;
 
           if (
             isSameExecutionAgent
diff --git a/ui/src/adapters/openclaw-gateway/config-fields.tsx b/ui/src/adapters/openclaw-gateway/config-fields.tsx
index 82bff3e2..18b0cc00 100644
--- a/ui/src/adapters/openclaw-gateway/config-fields.tsx
+++ b/ui/src/adapters/openclaw-gateway/config-fields.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Eye, EyeOff } from "lucide-react";
 import type { AdapterConfigFieldsProps } from "../types";
 import {
@@ -14,6 +14,50 @@ import {
 const inputClass =
   "w-full rounded-md border border-border px-2.5 py-1.5 bg-transparent outline-none text-sm font-mono placeholder:text-muted-foreground/40";
 
+function HeadersJsonTextarea({
+  isCreate,
+  createDraft,
+  onCreateDraftChange,
+  editStringified,
+  onEditCommit,
+  inputClass,
+}: {
+  isCreate: boolean;
+  createDraft: string;
+  onCreateDraftChange: (next: string) => void;
+  editStringified: string;
+  onEditCommit: (next: string) => void;
+  inputClass: string;
+}) {
+  const [editDraft, setEditDraft] = useState<string>(editStringified);
+  const [lastSyncedFromConfig, setLastSyncedFromConfig] = useState<string>(editStringified);
+  useEffect(() => {
+    if (isCreate) return;
+    if (editStringified !== lastSyncedFromConfig) {
+      setEditDraft(editStringified);
+      setLastSyncedFromConfig(editStringified);
+    }
+  }, [editStringified, isCreate, lastSyncedFromConfig]);
+  const value = isCreate ? createDraft : editDraft;
+  return (
+    <textarea
+      value={value}
+      onChange={(e) => {
+        const next = e.target.value;
+        if (isCreate) {
+          onCreateDraftChange(next);
+        } else {
+          setEditDraft(next);
+          onEditCommit(next);
+        }
+      }}
+      rows={3}
+      className={inputClass}
+      placeholder='{"x-custom-header": "value"}'
+    />
+  );
+}
+
 function SecretField({
   label,
   value,
@@ -124,6 +168,137 @@ export function OpenClawGatewayConfigFields({
         mark={mark}
       />
 
+      {/* Auth and Identity - available in both create and edit modes */}
+      <SecretField
+        label="Gateway auth token"
+        value={
+          isCreate
+            ? values!.authToken ?? ""
+            : effectiveGatewayToken
+        }
+        onCommit={(v) =>
+          isCreate
+            ? set!({ authToken: v })
+            : commitGatewayToken(v)
+        }
+        placeholder="OpenClaw gateway token"
+      />
+
+      <Field label="Agent ID">
+        <DraftInput
+          value={
+            isCreate
+              ? values!.agentId ?? ""
+              : eff("adapterConfig", "agentId", String(config.agentId ?? ""))
+          }
+          onCommit={(v) =>
+            isCreate
+              ? set!({ agentId: v })
+              : mark("adapterConfig", "agentId", v || undefined)
+          }
+          immediate
+          className={inputClass}
+          placeholder="agent-123"
+        />
+      </Field>
+
+      <Field label="Session strategy">
+        <select
+          value={
+            isCreate
+              ? values!.sessionKeyStrategy ?? "fixed"
+              : sessionStrategy
+          }
+          onChange={(e) =>
+            isCreate
+              ? set!({ sessionKeyStrategy: e.target.value })
+              : mark("adapterConfig", "sessionKeyStrategy", e.target.value)
+          }
+          className={inputClass}
+        >
+          <option value="fixed">Fixed</option>
+          <option value="issue">Per issue</option>
+          <option value="run">Per run</option>
+        </select>
+      </Field>
+
+      {(isCreate ? values!.sessionKeyStrategy ?? "fixed" : sessionStrategy) === "fixed" && (
+        <Field label="Session key">
+          <DraftInput
+            value={
+              isCreate
+                ? values!.sessionKey ?? ""
+                : eff("adapterConfig", "sessionKey", String(config.sessionKey ?? "paperclip"))
+            }
+            onCommit={(v) =>
+              isCreate
+                ? set!({ sessionKey: v })
+                : mark("adapterConfig", "sessionKey", v || undefined)
+            }
+            immediate
+            className={inputClass}
+            placeholder="paperclip"
+          />
+        </Field>
+      )}
+
+      <SecretField
+        label="Password (alternative auth)"
+        value={
+          isCreate
+            ? values!.password ?? ""
+            : eff("adapterConfig", "password", String(config.password ?? ""))
+        }
+        onCommit={(v) =>
+          isCreate
+            ? set!({ password: v })
+            : mark("adapterConfig", "password", v || undefined)
+        }
+        placeholder="Gateway shared password"
+      />
+
+      <Field label="Role">
+        <DraftInput
+          value={
+            isCreate
+              ? values!.role ?? ""
+              : eff("adapterConfig", "role", String(config.role ?? "operator"))
+          }
+          onCommit={(v) =>
+            isCreate
+              ? set!({ role: v })
+              : mark("adapterConfig", "role", v || undefined)
+          }
+          immediate
+          className={inputClass}
+          placeholder="operator"
+        />
+      </Field>
+
+      <Field label="Scopes (comma-separated)">
+        <DraftInput
+          value={
+            isCreate
+              ? values!.scopes ?? ""
+              : eff("adapterConfig", "scopes", parseScopes(config.scopes ?? ["operator.admin"]))
+          }
+          onCommit={(v) => {
+            const parsed = v
+              .split(",")
+              .map((entry) => entry.trim())
+              .filter(Boolean);
+            if (isCreate) {
+              set!({ scopes: v });
+            } else {
+              mark("adapterConfig", "scopes", parsed.length > 0 ? parsed : undefined);
+            }
+          }}
+          immediate
+          className={inputClass}
+          placeholder="operator.admin"
+        />
+      </Field>
+
       <RuntimeServicesJsonField
         isCreate={isCreate}
         values={values}
@@ -132,116 +307,151 @@ export function OpenClawGatewayConfigFields({
         mark={mark}
       />
 
-      {!isCreate && (
-        <>
-          <Field label="Paperclip API URL override">
-            <DraftInput
-              value={
-                eff(
-                  "adapterConfig",
-                  "paperclipApiUrl",
-                  String(config.paperclipApiUrl ?? ""),
-                )
+      <Field label="Paperclip API URL override">
+        <DraftInput
+          value={
+            isCreate
+              ? values!.paperclipApiUrl ?? ""
+              : eff("adapterConfig", "paperclipApiUrl", String(config.paperclipApiUrl ?? ""))
+          }
+          onCommit={(v) =>
+            isCreate
+              ? set!({ paperclipApiUrl: v })
+              : mark("adapterConfig", "paperclipApiUrl", v || undefined)
+          }
+          immediate
+          className={inputClass}
+          placeholder="https://paperclip.example"
+        />
+      </Field>
+
+      <Field label="Timeout (seconds)">
+        <DraftInput
+          value={
+            isCreate
+              ? values!.timeoutSec != null ? String(values!.timeoutSec) : ""
+              : eff("adapterConfig", "timeoutSec", String(config.timeoutSec ?? ""))
+          }
+          onCommit={(v) => {
+            const parsed = Number.parseInt(v.trim(), 10);
+            const val = Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
+            if (isCreate) {
+              set!({ timeoutSec: val });
+            } else {
+              mark("adapterConfig", "timeoutSec", val);
+            }
+          }}
+          immediate
+          className={inputClass}
+          placeholder="120"
+        />
+      </Field>
+
+      <Field label="Headers JSON">
+        <HeadersJsonTextarea
+          isCreate={isCreate}
+          createDraft={isCreate ? values!.headersJson ?? "" : ""}
+          onCreateDraftChange={(next) => set!({ headersJson: next })}
+          editStringified={JSON.stringify(eff("adapterConfig", "headers", config.headers ?? {}), null, 2)}
+          onEditCommit={(next) => {
+            const trimmed = next.trim();
+            if (!trimmed) {
+              mark("adapterConfig", "headers", undefined);
+              return;
+            }
+            try {
+              const parsed = JSON.parse(trimmed);
+              if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+                mark("adapterConfig", "headers", parsed);
               }
-              onCommit={(v) => mark("adapterConfig", "paperclipApiUrl", v || undefined)}
-              immediate
-              className={inputClass}
-              placeholder="https://paperclip.example"
-            />
-          </Field>
+            } catch {
+              // Keep local draft until JSON is valid
+            }
+          }}
+          inputClass={inputClass}
+        />
+      </Field>
 
-          <Field label="Claimed API key path">
-            <DraftInput
-              value={eff("adapterConfig", "claimedApiKeyPath", String(config.claimedApiKeyPath ?? ""))}
-              onCommit={(v) => mark("adapterConfig", "claimedApiKeyPath", v || undefined)}
-              immediate
-              className={inputClass}
-              placeholder="~/.openclaw/workspace/paperclip-claimed-api-key.json"
-            />
-          </Field>
-
-          <Field label="Session strategy">
-            <select
-              value={sessionStrategy}
-              onChange={(e) => mark("adapterConfig", "sessionKeyStrategy", e.target.value)}
-              className={inputClass}
-            >
-              <option value="fixed">Fixed</option>
-              <option value="issue">Per issue</option>
-              <option value="run">Per run</option>
-            </select>
-          </Field>
-
-          {sessionStrategy === "fixed" && (
-            <Field label="Session key">
-              <DraftInput
-                value={eff("adapterConfig", "sessionKey", String(config.sessionKey ?? "paperclip"))}
-                onCommit={(v) => mark("adapterConfig", "sessionKey", v || undefined)}
-                immediate
-                className={inputClass}
-                placeholder="paperclip"
-              />
-            </Field>
-          )}
-
-          <SecretField
-            label="Gateway auth token (x-openclaw-token)"
-            value={effectiveGatewayToken}
-            onCommit={commitGatewayToken}
-            placeholder="OpenClaw gateway token"
+      {!isCreate && (
+        <Field label="Claimed API key path">
+          <DraftInput
+            value={eff("adapterConfig", "claimedApiKeyPath", String(config.claimedApiKeyPath ?? ""))}
+            onCommit={(v) => mark("adapterConfig", "claimedApiKeyPath", v || undefined)}
+            immediate
+            className={inputClass}
+            placeholder="~/.openclaw/workspace/paperclip-claimed-api-key.json"
           />
-
-          <Field label="Role">
-            <DraftInput
-              value={eff("adapterConfig", "role", String(config.role ?? "operator"))}
-              onCommit={(v) => mark("adapterConfig", "role", v || undefined)}
-              immediate
-              className={inputClass}
-              placeholder="operator"
-            />
-          </Field>
-
-          <Field label="Scopes (comma-separated)">
-            <DraftInput
-              value={eff("adapterConfig", "scopes", parseScopes(config.scopes ?? ["operator.admin"]))}
-              onCommit={(v) => {
-                const parsed = v
-                  .split(",")
-                  .map((entry) => entry.trim())
-                  .filter(Boolean);
-                mark("adapterConfig", "scopes", parsed.length > 0 ? parsed : undefined);
-              }}
-              immediate
-              className={inputClass}
-              placeholder="operator.admin"
-            />
-          </Field>
-
-          <Field label="Wait timeout (ms)">
-            <DraftInput
-              value={eff("adapterConfig", "waitTimeoutMs", String(config.waitTimeoutMs ?? "120000"))}
-              onCommit={(v) => {
-                const parsed = Number.parseInt(v.trim(), 10);
-                mark(
-                  "adapterConfig",
-                  "waitTimeoutMs",
-                  Number.isFinite(parsed) && parsed > 0 ? parsed : undefined,
-                );
-              }}
-              immediate
-              className={inputClass}
-              placeholder="120000"
-            />
-          </Field>
-
-          <Field label="Device auth">
-            <div className="text-xs text-muted-foreground leading-relaxed">
-              Always enabled for gateway agents. Paperclip persists a device key during onboarding so pairing approvals
-              remain stable across runs.
-            </div>
-          </Field>
-        </>
+        </Field>
       )}
+
+      <Field label="Wait timeout (ms)">
+        <DraftInput
+          value={
+            isCreate
+              ? values!.waitTimeoutMs != null
+                ? String(values!.waitTimeoutMs)
+                : ""
+              : eff("adapterConfig", "waitTimeoutMs", String(config.waitTimeoutMs ?? "120000"))
+          }
+          onCommit={(v) => {
+            const parsed = Number.parseInt(v.trim(), 10);
+            const next = Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
+            if (isCreate) {
+              set!({ waitTimeoutMs: next });
+            } else {
+              mark("adapterConfig", "waitTimeoutMs", next);
+            }
+          }}
+          immediate
+          className={inputClass}
+          placeholder="120000"
+        />
+      </Field>
+
+      <Field label="Disable device auth">
+        <label className="flex items-center gap-2 text-sm">
+          <input
+            type="checkbox"
+            checked={
+              isCreate
+                ? values!.disableDeviceAuth ?? false
+                : eff("adapterConfig", "disableDeviceAuth", Boolean(config.disableDeviceAuth ?? false))
+            }
+            onChange={(e) =>
+              isCreate
+                ? set!({ disableDeviceAuth: e.target.checked })
+                : mark("adapterConfig", "disableDeviceAuth", e.target.checked || undefined)
+            }
+          />
+          Skip device key authentication
+        </label>
+      </Field>
+
+      <Field label="Auto-pair on first connect">
+        <label className="flex items-center gap-2 text-sm">
+          <input
+            type="checkbox"
+            checked={
+              isCreate
+                ? values!.autoPairOnFirstConnect ?? true
+                : eff("adapterConfig", "autoPairOnFirstConnect", config.autoPairOnFirstConnect !== false)
+            }
+            onChange={(e) =>
+              isCreate
+                ? set!({ autoPairOnFirstConnect: e.target.checked })
+                : mark("adapterConfig", "autoPairOnFirstConnect", e.target.checked)
+            }
+          />
+          Automatically approve device pairing
+        </label>
+      </Field>
+
+      <Field label="Device auth">
+        <div className="text-xs text-muted-foreground leading-relaxed">
+          When enabled, Paperclip persists a device key during onboarding so pairing approvals
+          remain stable across runs.
+        </div>
+      </Field>
     </>
   );
 }
diff --git a/ui/src/components/agent-config-defaults.ts b/ui/src/components/agent-config-defaults.ts
index f8b39b6d..118494fd 100644
--- a/ui/src/components/agent-config-defaults.ts
+++ b/ui/src/components/agent-config-defaults.ts
@@ -28,4 +28,19 @@ export const defaultCreateValues: CreateConfigValues = {
   maxTurnsPerRun: 1000,
   heartbeatEnabled: false,
   intervalSec: 300,
+  // openclaw_gateway defaults
+  authToken: "",
+  agentId: "",
+  sessionKeyStrategy: "issue",
+  sessionKey: "",
+  timeoutSec: undefined,
+  waitTimeoutMs: undefined,
+  disableDeviceAuth: undefined,
+  autoPairOnFirstConnect: undefined,
+  devicePrivateKeyPem: "",
+  role: "",
+  scopes: "",
+  paperclipApiUrl: "",
+  headersJson: "",
+  password: "",
 };