@swarmclawai/swarmclaw 0.7.5 → 0.7.6

package/README.md

@@ -18,6 +18,7 @@ Inspired by [OpenClaw](https://github.com/openclaw).
 
 - [Getting Started](https://swarmclaw.ai/docs/getting-started) - install and first-run setup
 - [Providers](https://swarmclaw.ai/docs/providers) - provider setup and failover options
+- [OpenClaw Setup](https://swarmclaw.ai/docs/openclaw-setup) - local, VPS, and hosted OpenClaw deployment paths
 - [Agents](https://swarmclaw.ai/docs/agents) - agent configuration, tools, and platform capabilities
 - [Tools](https://swarmclaw.ai/docs/tools) - built-in tool reference and guardrails
 - [Orchestration](https://swarmclaw.ai/docs/orchestration) - multi-agent flows, checkpoints, and restore
@@ -39,6 +40,20 @@ SwarmClaw includes the `openclaw` CLI as a bundled dependency, so there is no se
 
 The Providers screen now supports named OpenClaw gateway profiles with discovery, health checks, default-gateway selection, and an External Agent Runtimes view for remote workers that register/heartbeat into SwarmClaw.
 
+SwarmClaw now also includes **Smart Deploy** for OpenClaw in three places:
+
+- **Onboarding** - non-technical users can launch a local OpenClaw runtime or generate a remote bundle before they finish first-run setup
+- **Providers -> OpenClaw Gateways** - operators can deploy or prepare more gateways later without leaving the main app
+- **Gateway editor** - every gateway profile includes the same deploy panel for local restarts, VPS bundles, and hosted repo-backed deployments
+
+The deployment flow stays **in-house and official-only**:
+
+- local deploys run the bundled official `openclaw` CLI directly from SwarmClaw
+- VPS deploys use the official OpenClaw Docker image with prefilled `.env`, `docker-compose.yml`, `bootstrap.sh`, and `cloud-init.yaml`
+- hosted templates target the official OpenClaw repo for Render, Fly.io, and Railway
+
+Supported VPS presets currently include Hetzner, DigitalOcean, Vultr, Linode, Lightsail, Google Cloud, Azure, OCI, and a generic Ubuntu host path. Smart defaults prefill the gateway token, endpoint, storage paths, and copy-paste commands so the resulting gateway can be saved into SwarmClaw with minimal manual editing.
+
 The OpenClaw Control Plane in SwarmClaw adds:
 - Reload mode switching (`hot`, `hybrid`, `full`)
 - Config issue detection and guided repair
@@ -59,6 +74,15 @@ Each agent can point to a **different** OpenClaw gateway profile or direct endpo
 
 URLs without a protocol are auto-prefixed with `http://`. For remote gateways with TLS, use `https://` explicitly.
 
+CLI operators can use the same deploy surface without opening the UI:
+
+```bash
+swarmclaw openclaw deploy-status
+swarmclaw openclaw deploy-local-start --data '{"port":18789}'
+swarmclaw openclaw deploy-bundle --data '{"template":"docker","provider":"hetzner","target":"openclaw.example.com"}'
+swarmclaw openclaw deploy-bundle --data '{"template":"render","target":"https://openclaw.example.com"}'
+```
+
 ## SwarmClaw ClawHub Skill
 
 Use the `swarmclaw` ClawHub skill when you want an OpenClaw agent to operate your SwarmClaw control plane directly from chat: list agents, dispatch tasks, check chats, run diagnostics, and coordinate multi-agent work.
@@ -78,7 +102,6 @@ Skill source and runbook: [`swarmclaw/SKILL.md`](swarmclaw/SKILL.md).
 
 ## Requirements
 
-- **Node.js** 22.6+
 - **Node.js** 22.6+
 - One of: **npm** 10+, **pnpm**, **Yarn**, or **Bun**
 - **Claude Code CLI** (optional, for `claude-cli` provider) — [Install](https://docs.anthropic.com/en/docs/claude-code/overview)
@@ -117,7 +140,7 @@ curl -fsSL https://raw.githubusercontent.com/swarmclawai/swarmclaw/main/install.
 ```
 
 The installer resolves the latest stable release tag and installs that version by default.
-To pin a version: `SWARMCLAW_VERSION=v0.7.5 curl ... | bash`
+To pin a version: `SWARMCLAW_VERSION=v0.7.6 curl ... | bash`
 
 Or run locally from the repo (friendly for non-technical users):
 
@@ -670,7 +693,7 @@ npm run update:easy     # safe update helper for local installs
 SwarmClaw uses tag-based releases (`vX.Y.Z`) as the stable channel.
 
 ```bash
-# example patch release (v0.7.5 style)
+# example patch release (v0.7.6 style)
 npm version patch
 git push origin main --follow-tags
 ```
@@ -680,15 +703,15 @@ On `v*` tags, GitHub Actions will:
 2. Create a GitHub Release
 3. Build and publish Docker images to `ghcr.io/swarmclawai/swarmclaw` (`:vX.Y.Z`, `:latest`, `:sha-*`)
 
-#### v0.7.5 Release Readiness Notes
+#### v0.7.6 Release Readiness Notes
 
-Before shipping `v0.7.5`, confirm the following user-facing changes are reflected in docs:
+Before shipping `v0.7.6`, confirm the following user-facing changes are reflected in docs:
 
 1. Sandbox docs are updated everywhere to reflect the current Deno-only `sandbox_exec` behavior and the guidance to prefer `http_request` for simple API calls.
-2. OpenClaw docs cover the current gateway/runtime behavior, including per-agent gateway routing, control-plane actions, and inspector-side advanced controls.
-3. Site and README install/version strings are updated to `v0.7.5`, including install snippets, release notes index text, and sidebar/footer labels.
-4. Release notes summarize the user-visible setup/auth/runtime changes from the current worktree, especially gateway/external-agent/setup flow improvements.
-5. CLI and tool docs do not reference removed or non-functional surfaces such as the old `openclaw_sandbox` bridge.
+2. OpenClaw docs cover the current gateway/runtime behavior, including Smart Deploy, official-only Docker/repo paths, local one-click startup, and the main-provider-screen deploy entry points.
+3. Site and README install/version strings are updated to `v0.7.6`, including install snippets, release notes index text, and sidebar/footer labels.
+4. Release notes summarize the user-visible setup/auth/runtime changes from the current worktree, especially Smart Deploy, VPS presets, and onboarding/provider-screen improvements.
+5. CLI and tool docs include the new `openclaw deploy-*` surfaces and do not reference removed or non-functional bridges.
 
 ## CLI
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "Self-hosted AI agent orchestration dashboard — manage LLM providers, orchestrate agent swarms, schedule tasks, and bridge agents to chat platforms.",
   "license": "MIT",
   "publishConfig": {
@@ -57,7 +57,7 @@
     "lint:baseline:update": "node ./scripts/lint-baseline.mjs update",
     "cli": "node ./bin/swarmclaw.js",
     "test:cli": "node --test src/cli/*.test.js bin/*.test.js",
-    "test:openclaw": "tsx --test src/lib/openclaw-agent-id.test.ts src/lib/openclaw-endpoint.test.ts src/lib/server/agent-runtime-config.test.ts src/lib/server/build-llm.test.ts src/lib/server/connectors/connector-routing.test.ts src/lib/server/connectors/openclaw.test.ts src/lib/server/gateway/protocol.test.ts src/lib/server/llm-response-cache.test.ts src/lib/server/mcp-conformance.test.ts src/lib/server/openclaw-agent-resolver.test.ts src/lib/server/openclaw-skills-normalize.test.ts src/lib/server/session-tools/openclaw-nodes.test.ts src/lib/server/task-quality-gate.test.ts src/lib/server/task-validation.test.ts src/lib/server/tool-capability-policy.test.ts",
+    "test:openclaw": "tsx --test src/lib/openclaw-agent-id.test.ts src/lib/openclaw-endpoint.test.ts src/lib/server/agent-runtime-config.test.ts src/lib/server/build-llm.test.ts src/lib/server/connectors/connector-routing.test.ts src/lib/server/connectors/openclaw.test.ts src/lib/server/gateway/protocol.test.ts src/lib/server/llm-response-cache.test.ts src/lib/server/mcp-conformance.test.ts src/lib/server/openclaw-agent-resolver.test.ts src/lib/server/openclaw-deploy.test.ts src/lib/server/openclaw-skills-normalize.test.ts src/lib/server/session-tools/openclaw-nodes.test.ts src/lib/server/task-quality-gate.test.ts src/lib/server/task-validation.test.ts src/lib/server/tool-capability-policy.test.ts",
     "test:mcp:conformance": "node --import tsx ./scripts/mcp-conformance-check.ts",
     "postinstall": "node ./scripts/postinstall.mjs"
   },

package/src/app/api/openclaw/deploy/route.ts

@@ -0,0 +1,101 @@
+import { NextResponse } from 'next/server'
+import {
+  buildOpenClawDeployBundle,
+  getOpenClawLocalDeployStatus,
+  startOpenClawLocalDeploy,
+  stopOpenClawLocalDeploy,
+  type OpenClawRemoteDeployProvider,
+  type OpenClawRemoteDeployTemplate,
+} from '@/lib/server/openclaw-deploy'
+
+export const dynamic = 'force-dynamic'
+
+function parsePort(value: unknown): number | undefined {
+  const parsed = typeof value === 'number'
+    ? value
+    : typeof value === 'string'
+      ? Number.parseInt(value, 10)
+      : Number.NaN
+  return Number.isFinite(parsed) ? parsed : undefined
+}
+
+function parseTemplate(value: unknown): OpenClawRemoteDeployTemplate | undefined {
+  if (value === 'docker' || value === 'render' || value === 'fly' || value === 'railway') {
+    return value
+  }
+  return undefined
+}
+
+function parseProvider(value: unknown): OpenClawRemoteDeployProvider | undefined {
+  if (
+    value === 'hetzner'
+    || value === 'digitalocean'
+    || value === 'vultr'
+    || value === 'linode'
+    || value === 'lightsail'
+    || value === 'gcp'
+    || value === 'azure'
+    || value === 'oci'
+    || value === 'generic'
+  ) {
+    return value
+  }
+  return undefined
+}
+
+export async function GET() {
+  return NextResponse.json({
+    local: getOpenClawLocalDeployStatus(),
+  })
+}
+
+export async function POST(req: Request) {
+  const body = await req.json().catch(() => ({}))
+  const action = typeof body?.action === 'string' ? body.action : ''
+
+  try {
+    if (action === 'start-local') {
+      const result = await startOpenClawLocalDeploy({
+        port: parsePort(body.port),
+        token: typeof body.token === 'string' ? body.token : null,
+      })
+      return NextResponse.json({
+        ok: true,
+        local: result.local,
+        token: result.token,
+      })
+    }
+
+    if (action === 'stop-local') {
+      return NextResponse.json({
+        ok: true,
+        local: stopOpenClawLocalDeploy(),
+      })
+    }
+
+    if (action === 'bundle') {
+      const bundle = buildOpenClawDeployBundle({
+        template: parseTemplate(body.template),
+        target: typeof body.target === 'string' ? body.target : null,
+        token: typeof body.token === 'string' ? body.token : null,
+        scheme: body.scheme === 'http' ? 'http' : 'https',
+        port: parsePort(body.port),
+        provider: parseProvider(body.provider),
+      })
+      return NextResponse.json({
+        ok: true,
+        bundle,
+      })
+    }
+
+    return NextResponse.json({ ok: false, error: 'Unknown deploy action.' }, { status: 400 })
+  } catch (err: unknown) {
+    return NextResponse.json(
+      {
+        ok: false,
+        error: err instanceof Error ? err.message : 'OpenClaw deploy action failed.',
+      },
+      { status: 500 },
+    )
+  }
+}

package/src/cli/index.js

@@ -310,6 +310,19 @@ const COMMAND_GROUPS = [
     description: 'OpenClaw discovery, gateway control, and runtime APIs',
     commands: [
       cmd('discover', 'GET', '/openclaw/discover', 'Discover OpenClaw gateways'),
+      cmd('deploy-status', 'GET', '/openclaw/deploy', 'Get managed OpenClaw deploy status'),
+      cmd('deploy-local-start', 'POST', '/openclaw/deploy', 'Start a managed local OpenClaw deployment (use --data JSON for port/token overrides)', {
+        expectsJsonBody: true,
+        defaultBody: { action: 'start-local' },
+      }),
+      cmd('deploy-local-stop', 'POST', '/openclaw/deploy', 'Stop the managed local OpenClaw deployment', {
+        expectsJsonBody: true,
+        defaultBody: { action: 'stop-local' },
+      }),
+      cmd('deploy-bundle', 'POST', '/openclaw/deploy', 'Generate an OpenClaw remote deployment bundle (use --data JSON for template/target/token)', {
+        expectsJsonBody: true,
+        defaultBody: { action: 'bundle' },
+      }),
       cmd('directory', 'GET', '/openclaw/directory', 'List directory entries from running OpenClaw connectors'),
       cmd('gateway-status', 'GET', '/openclaw/gateway', 'Check OpenClaw gateway connection status'),
       cmd('gateway', 'POST', '/openclaw/gateway', 'Call OpenClaw gateway RPC/control action', { expectsJsonBody: true }),

package/src/cli/index.test.js

@@ -163,6 +163,40 @@ test('runCli sends authenticated request and emits compact JSON when --json is s
   assert.equal(stderr.toString(), '')
 })
 
+test('openclaw deploy bundle command merges action with provided JSON body', async () => {
+  const stdout = makeWritable()
+  const stderr = makeWritable()
+  const calls = []
+
+  const fetchImpl = async (url, init) => {
+    calls.push({ url: String(url), init })
+    return jsonResponse({ ok: true, bundle: { template: 'docker' } })
+  }
+
+  const exitCode = await runCli(
+    ['openclaw', 'deploy-bundle', '--data', '{"template":"docker","target":"openclaw.example.com"}', '--json'],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: process.cwd(),
+    }
+  )
+
+  assert.equal(exitCode, 0)
+  assert.equal(calls.length, 1)
+  assert.match(calls[0].url, /\/api\/openclaw\/deploy$/)
+  assert.equal(calls[0].init.method, 'POST')
+  assert.deepEqual(JSON.parse(String(calls[0].init.body)), {
+    action: 'bundle',
+    template: 'docker',
+    target: 'openclaw.example.com',
+  })
+  assert.equal(stdout.toString().trim(), '{"ok":true,"bundle":{"template":"docker"}}')
+  assert.equal(stderr.toString(), '')
+})
+
 test('runCli falls back to platform-api-key.txt when env key is missing', async () => {
   const stdout = makeWritable()
   const stderr = makeWritable()

package/src/cli/spec.js

@@ -211,6 +211,25 @@ const COMMAND_GROUPS = {
     description: 'OpenClaw discovery, gateway control, and runtime APIs',
     commands: {
       discover: { description: 'Discover OpenClaw gateways', method: 'GET', path: '/openclaw/discover' },
+      'deploy-status': { description: 'Get managed OpenClaw deploy status', method: 'GET', path: '/openclaw/deploy' },
+      'deploy-local-start': {
+        description: 'Start a managed local OpenClaw deployment (use --data JSON for port/token overrides)',
+        method: 'POST',
+        path: '/openclaw/deploy',
+        staticBody: { action: 'start-local' },
+      },
+      'deploy-local-stop': {
+        description: 'Stop the managed local OpenClaw deployment',
+        method: 'POST',
+        path: '/openclaw/deploy',
+        staticBody: { action: 'stop-local' },
+      },
+      'deploy-bundle': {
+        description: 'Generate an OpenClaw remote deployment bundle (use --data JSON for template/target/token)',
+        method: 'POST',
+        path: '/openclaw/deploy',
+        staticBody: { action: 'bundle' },
+      },
       directory: { description: 'List directory entries from running OpenClaw connectors', method: 'GET', path: '/openclaw/directory' },
       'gateway-status': { description: 'Check OpenClaw gateway connection status', method: 'GET', path: '/openclaw/gateway' },
       gateway: { description: 'Call OpenClaw gateway RPC/control action', method: 'POST', path: '/openclaw/gateway' },

package/src/components/auth/setup-wizard.tsx

@@ -2,6 +2,7 @@
 
 import { useMemo, useState } from 'react'
 import { api } from '@/lib/api-client'
+import { OpenClawDeployPanel } from '@/components/openclaw/openclaw-deploy-panel'
 import { useAppStore } from '@/stores/use-app-store'
 import type { ProviderType, Credential, GatewayProfile } from '@/types'
 import {
@@ -142,12 +143,6 @@ function isLocalOpenClawEndpoint(value: string | null | undefined): boolean {
   return host === 'localhost' || host === '127.0.0.1' || host === '::1' || host === '0.0.0.0'
 }
 
-function resolveOpenClawPort(value: string | null | undefined): number {
-  const parsed = parseProviderUrl(value)
-  const port = parsed ? Number(parsed.port) : NaN
-  return Number.isFinite(port) && port > 0 ? port : 18789
-}
-
 function resolveOpenClawDashboardUrl(value: string | null | undefined): string {
   const parsed = parseProviderUrl(value)
   if (!parsed) return 'http://localhost:18789'
@@ -342,7 +337,6 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
   const [checkErrorCode, setCheckErrorCode] = useState<string | null>(null)
   const [openclawDeviceId, setOpenclawDeviceId] = useState<string | null>(null)
   const [providerSuggestedModel, setProviderSuggestedModel] = useState('')
-  const [commandCopyState, setCommandCopyState] = useState<'idle' | 'copied' | 'failed'>('idle')
 
   const [doctorState, setDoctorState] = useState<'idle' | 'checking' | 'done' | 'error'>('idle')
   const [doctorError, setDoctorError] = useState('')
@@ -381,9 +375,6 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
     ? resolveOpenClawDashboardUrl(openClawEndpointValue)
     : null
   const openClawLocal = provider === 'openclaw' ? isLocalOpenClawEndpoint(openClawEndpointValue) : false
-  const openClawPort = provider === 'openclaw' ? resolveOpenClawPort(openClawEndpointValue) : 18789
-  const openClawLocalCommand = `npx openclaw gateway run --bind loopback --port ${openClawPort} --verbose`
-  const openClawLocalCommandPnpm = `pnpm openclaw gateway run --bind loopback --port ${openClawPort} --verbose`
 
   const resetProviderForm = () => {
     setProvider(null)
@@ -396,7 +387,6 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
     setCheckErrorCode(null)
     setOpenclawDeviceId(null)
     setProviderSuggestedModel('')
-    setCommandCopyState('idle')
     setError('')
   }
 
@@ -447,11 +437,31 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
     setCheckErrorCode(null)
     setOpenclawDeviceId(null)
     setProviderSuggestedModel(getDefaultModelForProvider(nextProvider))
-    setCommandCopyState('idle')
     setError('')
     setStep('connect')
   }
 
+  const applyOpenClawDeployPatch = (patch: {
+    endpoint?: string
+    token?: string
+    name?: string
+  }) => {
+    if (patch.endpoint) {
+      setEndpoint(patch.endpoint)
+    }
+    if (patch.token) {
+      setApiKey(patch.token)
+      setCredentialId(null)
+    }
+    if (patch.name && (!providerLabel.trim() || providerLabel.trim() === (selectedProvider?.name || ''))) {
+      setProviderLabel(patch.name)
+    }
+    setCheckState('idle')
+    setCheckMessage('')
+    setCheckErrorCode(null)
+    setError('')
+  }
+
   const runConnectionCheck = async (): Promise<boolean> => {
     if (!provider || !selectedProvider) return false
     if (requiresKey && !apiKey.trim()) {
@@ -603,17 +613,6 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
     }))
   }
 
-  const copyOpenClawLocalCommand = async () => {
-    try {
-      await navigator.clipboard.writeText(openClawLocalCommand)
-      setCommandCopyState('copied')
-      window.setTimeout(() => setCommandCopyState('idle'), 1200)
-    } catch {
-      setCommandCopyState('failed')
-      window.setTimeout(() => setCommandCopyState('idle'), 1800)
-    }
-  }
-
   const createAgentsAndFinish = async () => {
     const enabledDrafts = draftAgents.filter((draft) => draft.enabled)
     if (enabledDrafts.some((draft) => !draft.provider)) {
@@ -1063,6 +1062,16 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
 
               {provider === 'openclaw' && (
                 <div className="rounded-[14px] border border-white/[0.08] bg-surface p-4 space-y-4">
+                  <OpenClawDeployPanel
+                    compact
+                    endpoint={openClawEndpointValue}
+                    token={apiKey}
+                    suggestedName={providerLabel || selectedProvider.name}
+                    title="Smart Deploy OpenClaw"
+                    description="Launch the bundled official OpenClaw gateway locally, or generate an official-image VPS bundle for major providers without relying on third-party deployment services."
+                    onApply={applyOpenClawDeployPatch}
+                  />
+
                   <div className="grid gap-3 md:grid-cols-2">
                     <div className="rounded-[12px] border border-white/[0.06] bg-bg px-4 py-3">
                       <div className="text-[12px] uppercase tracking-[0.08em] text-text-3 mb-2">Remote gateway</div>
@@ -1077,37 +1086,12 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
                       </p>
                     </div>
                     <div className="rounded-[12px] border border-white/[0.06] bg-bg px-4 py-3">
-                      <div className="text-[12px] uppercase tracking-[0.08em] text-text-3 mb-2">Run locally</div>
+                      <div className="text-[12px] uppercase tracking-[0.08em] text-text-3 mb-2">Safe defaults</div>
                       <p className="text-[13px] text-text-2 leading-relaxed">
-                        Use this when SwarmClaw and OpenClaw are on the same host. <code className="text-text-2">localhost</code> always refers to the SwarmClaw host.
+                        Smart Deploy generates a gateway token for you, defaults to the standard OpenClaw ports, and prefills this setup form automatically.
                       </p>
-                      <div className="mt-3 rounded-[10px] border border-white/[0.06] bg-surface px-3 py-2">
-                        <code className="block overflow-x-auto whitespace-nowrap text-[12px] text-text-2">
-                          {openClawLocalCommand}
-                        </code>
-                      </div>
-                      <div className="mt-2 flex items-center gap-2">
-                        <button
-                          type="button"
-                          onClick={copyOpenClawLocalCommand}
-                          className="px-3 py-2 rounded-[10px] border border-white/[0.08] bg-white/[0.03] text-[12px] text-text cursor-pointer hover:bg-white/[0.06] transition-all duration-200"
-                        >
-                          {commandCopyState === 'copied'
-                            ? 'Copied'
-                            : commandCopyState === 'failed'
-                              ? 'Copy failed'
-                              : 'Copy command'}
-                        </button>
-                        <button
-                          type="button"
-                          onClick={() => { setEndpoint(selectedProvider.defaultEndpoint || 'http://localhost:18789/v1'); setCheckState('idle'); setCheckMessage(''); setCheckErrorCode(null) }}
-                          className="px-3 py-2 rounded-[10px] border border-white/[0.08] bg-white/[0.03] text-[12px] text-text cursor-pointer hover:bg-white/[0.06] transition-all duration-200"
-                        >
-                          Use local default
-                        </button>
-                      </div>
-                      <p className="mt-2 text-[11px] text-text-3">
-                        In a source checkout, use <code className="text-text-2">{openClawLocalCommandPnpm}</code>.
+                      <p className="mt-2 text-[12px] text-text-3 leading-relaxed">
+                        Local quickstart uses the bundled official OpenClaw CLI. Remote quickstart uses the official OpenClaw Docker image or the official repo for managed hosts.
                       </p>
                     </div>
                   </div>

package/src/components/gateways/gateway-sheet.tsx

@@ -2,10 +2,17 @@
 
 import { useEffect, useState } from 'react'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
+import { OpenClawDeployPanel } from '@/components/openclaw/openclaw-deploy-panel'
 import { useAppStore } from '@/stores/use-app-store'
 import { api } from '@/lib/api-client'
 import { toast } from 'sonner'
-import type { OpenClawDevicePairRequest, OpenClawNode, OpenClawNodePairRequest, OpenClawPairedDevice } from '@/types'
+import type {
+  Credential,
+  OpenClawDevicePairRequest,
+  OpenClawNode,
+  OpenClawNodePairRequest,
+  OpenClawPairedDevice,
+} from '@/types'
 
 interface DiscoveryResult {
   host: string
@@ -46,6 +53,7 @@ export function GatewaySheet() {
   const [name, setName] = useState('')
   const [endpoint, setEndpoint] = useState('http://localhost:18789')
   const [credentialId, setCredentialId] = useState<string | null>(null)
+  const [tokenDraft, setTokenDraft] = useState('')
   const [notes, setNotes] = useState('')
   const [tags, setTags] = useState('')
   const [isDefault, setIsDefault] = useState(false)
@@ -81,6 +89,7 @@ export function GatewaySheet() {
       setName(editing.name)
       setEndpoint(editing.endpoint)
       setCredentialId(editing.credentialId || null)
+      setTokenDraft('')
       setNotes(editing.notes || '')
       setTags((editing.tags || []).join(', '))
       setIsDefault(editing.isDefault === true)
@@ -89,6 +98,7 @@ export function GatewaySheet() {
     setName('')
     setEndpoint('http://localhost:18789')
     setCredentialId(null)
+    setTokenDraft('')
     setNotes('')
     setTags('')
     setIsDefault(gatewayProfiles.length === 0)
@@ -157,10 +167,19 @@ export function GatewaySheet() {
   const handleSave = async () => {
     setSaving(true)
     try {
+      let nextCredentialId = credentialId
+      if (tokenDraft.trim()) {
+        const created = await api<Credential>('POST', '/credentials', {
+          provider: 'openclaw',
+          name: `${name.trim() || 'OpenClaw Gateway'} token`,
+          apiKey: tokenDraft.trim(),
+        })
+        nextCredentialId = created.id
+      }
       const payload = {
         name: name.trim() || 'OpenClaw Gateway',
         endpoint: endpoint.trim() || 'http://localhost:18789',
-        credentialId: credentialId || null,
+        credentialId: nextCredentialId || null,
         notes: notes.trim() || null,
         tags: tags.split(',').map((item) => item.trim()).filter(Boolean),
         isDefault,
@@ -172,7 +191,7 @@ export function GatewaySheet() {
         await api('POST', '/gateways', payload)
         toast.success('Gateway added')
       }
-      await loadGatewayProfiles()
+      await Promise.all([loadGatewayProfiles(), loadCredentials()])
       onClose()
     } catch (err: unknown) {
       toast.error(err instanceof Error ? err.message : 'Failed to save gateway')
@@ -188,6 +207,7 @@ export function GatewaySheet() {
       const params = new URLSearchParams()
       params.set('endpoint', endpoint.trim() || 'http://localhost:18789')
       if (credentialId) params.set('credentialId', credentialId)
+      if (tokenDraft.trim()) params.set('token', tokenDraft.trim())
       const result = await api<{ ok: boolean; models: string[]; error?: string; hint?: string }>('GET', `/providers/openclaw/health?${params.toString()}`)
       if (result.ok) {
         setCheckMessage(`Connected. ${result.models?.length ? `${result.models.length} model${result.models.length === 1 ? '' : 's'} visible.` : 'Gateway responded normally.'}`)
@@ -278,6 +298,23 @@ export function GatewaySheet() {
 
   const inputClass = 'w-full px-4 py-3.5 rounded-[14px] border border-white/[0.08] bg-surface text-text text-[15px] outline-none transition-all duration-200 placeholder:text-text-3/50 focus-glow'
 
+  const applyDeployPatch = (patch: { endpoint?: string; token?: string; name?: string; notes?: string }) => {
+    if (patch.endpoint) {
+      setEndpoint(patch.endpoint)
+      setCheckMessage('')
+    }
+    if (patch.token) {
+      setTokenDraft(patch.token)
+      setCredentialId(null)
+    }
+    if (patch.name && !name.trim()) {
+      setName(patch.name)
+    }
+    if (patch.notes && !notes.trim()) {
+      setNotes(patch.notes)
+    }
+  }
+
   return (
     <BottomSheet open={open} onClose={onClose} wide>
       <div className="mb-10">
@@ -309,6 +346,17 @@ export function GatewaySheet() {
         <p className="text-[11px] text-text-3/60 mt-2">Remote HTTPS URLs and local loopback endpoints are both supported.</p>
       </div>
 
+      <div className="mb-6">
+        <OpenClawDeployPanel
+          endpoint={endpoint}
+          token={tokenDraft}
+          suggestedName={name || null}
+          title="Deploy OpenClaw From SwarmClaw"
+          description="Use official OpenClaw sources only. Start it on this host, or generate a pre-configured remote bundle for VPS and hosted deployments."
+          onApply={applyDeployPatch}
+        />
+      </div>
+
       {discoveries.length > 0 && (
         <div className="mb-6">
           <div className="text-[12px] text-text-3/70 mb-2">Detected healthy gateways</div>
@@ -342,6 +390,18 @@ export function GatewaySheet() {
             <option key={item.id} value={item.id}>{item.name}</option>
           ))}
         </select>
+        <input
+          value={tokenDraft}
+          onChange={(e) => {
+            setTokenDraft(e.target.value)
+            if (e.target.value) setCredentialId(null)
+          }}
+          placeholder="Or paste/generate a new gateway token"
+          className={`${inputClass} mt-3 font-mono text-[13px]`}
+        />
+        <p className="mt-2 text-[11px] text-text-3/60">
+          A pasted token is stored as a new encrypted OpenClaw credential when you save this gateway.
+        </p>
       </div>
 
       <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">