@better-openclaw/core 1.0.16 → 1.0.18

package/src/generators/openclaw-json.ts

@@ -1,4 +1,10 @@
-import type { AiProvider, ResolverOutput } from "../types.js";
+import type { AiProvider, DeploymentType, ResolverOutput } from "../types.js";
+
+export interface OpenClawConfigOptions {
+	deploymentType: DeploymentType;
+	gatewayPort: number;
+	openclawVersion: string;
+}
 
 const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 	openai: {
@@ -8,8 +14,8 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		apiKey: "${OPENAI_API_KEY}",
 		models: [
 			{
-				id: "gpt-4o",
-				name: "GPT-4o",
+				id: "gpt-5",
+				name: "GPT-5",
 				api: "openai-completions",
 				reasoning: false,
 				input: ["text", "image"],
@@ -18,8 +24,18 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 				maxTokens: 16384,
 			},
 			{
-				id: "gpt-4o-mini",
-				name: "GPT-4o Mini",
+				id: "o4-mini",
+				name: "o4-mini",
+				api: "openai-completions",
+				reasoning: true,
+				input: ["text"],
+				cost: { input: 1.1, output: 4.4, cacheRead: 0.55, cacheWrite: 1.1 },
+				contextWindow: 200000,
+				maxTokens: 100000,
+			},
+			{
+				id: "gpt-5-mini",
+				name: "GPT-5 Mini",
 				api: "openai-completions",
 				reasoning: false,
 				input: ["text", "image"],
@@ -36,24 +52,24 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		apiKey: "${ANTHROPIC_API_KEY}",
 		models: [
 			{
-				id: "claude-3-5-sonnet-latest",
-				name: "Claude 3.5 Sonnet",
+				id: "claude-opus-4-6",
+				name: "Claude 4.6 Opus",
 				api: "anthropic-messages",
-				reasoning: false,
+				reasoning: true,
 				input: ["text", "image"],
-				cost: { input: 3.0, output: 15.0, cacheRead: 0.3, cacheWrite: 3.75 },
-				contextWindow: 200000,
-				maxTokens: 8192,
+				cost: { input: 15.0, output: 75.0, cacheRead: 1.5, cacheWrite: 18.75 },
+				contextWindow: 1000000,
+				maxTokens: 128000,
 			},
 			{
-				id: "claude-3-5-haiku-latest",
-				name: "Claude 3.5 Haiku",
+				id: "claude-sonnet-4-6",
+				name: "Claude 4.6 Sonnet",
 				api: "anthropic-messages",
-				reasoning: false,
+				reasoning: true,
 				input: ["text", "image"],
-				cost: { input: 0.8, output: 4.0, cacheRead: 0.08, cacheWrite: 1.0 },
-				contextWindow: 200000,
-				maxTokens: 8192,
+				cost: { input: 3.0, output: 15.0, cacheRead: 0.3, cacheWrite: 3.75 },
+				contextWindow: 1000000,
+				maxTokens: 128000,
 			},
 		],
 	},
@@ -64,18 +80,18 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		apiKey: "${GOOGLE_API_KEY}",
 		models: [
 			{
-				id: "gemini-2.5-pro",
-				name: "Gemini 2.5 Pro",
+				id: "gemini-3.1-pro-preview",
+				name: "Gemini 3.1 Pro",
 				api: "openai-completions",
-				reasoning: false,
+				reasoning: true,
 				input: ["text", "image"],
 				cost: { input: 2.0, output: 8.0, cacheRead: 0.5, cacheWrite: 2.0 },
 				contextWindow: 2000000,
 				maxTokens: 8192,
 			},
 			{
-				id: "gemini-2.5-flash",
-				name: "Gemini 2.5 Flash",
+				id: "gemini-3-flash-preview",
+				name: "Gemini 3 Flash",
 				api: "openai-completions",
 				reasoning: false,
 				input: ["text", "image"],
@@ -92,13 +108,13 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		apiKey: "${XAI_API_KEY}",
 		models: [
 			{
-				id: "grok-2-latest",
-				name: "Grok 2",
+				id: "grok-4-fast",
+				name: "Grok 4 Fast",
 				api: "openai-completions",
 				reasoning: false,
 				input: ["text", "image"],
 				cost: { input: 2.0, output: 10.0, cacheRead: 1.0, cacheWrite: 2.0 },
-				contextWindow: 131072,
+				contextWindow: 256000,
 				maxTokens: 32768,
 			},
 		],
@@ -138,14 +154,14 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		apiKey: "${GROQ_API_KEY}",
 		models: [
 			{
-				id: "llama3-70b-8192",
-				name: "LLaMA3 70B (Groq)",
+				id: "llama-4-maverick",
+				name: "LLaMA 4 Maverick (Groq)",
 				api: "openai-completions",
 				reasoning: false,
-				input: ["text"],
+				input: ["text", "image"],
 				cost: { input: 0.59, output: 0.79 },
-				contextWindow: 8192,
-				maxTokens: 8192,
+				contextWindow: 1000000,
+				maxTokens: 32768,
 			},
 		],
 	},
@@ -156,14 +172,14 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		apiKey: "${OPENROUTER_API_KEY}",
 		models: [
 			{
-				id: "anthropic/claude-3.5-sonnet",
-				name: "Claude 3.5 Sonnet (OpenRouter)",
+				id: "anthropic/claude-opus-4-6",
+				name: "Claude 4.6 Opus (OpenRouter)",
 				api: "openai-completions",
-				reasoning: false,
+				reasoning: true,
 				input: ["text", "image"],
-				cost: { input: 3.0, output: 15.0 },
-				contextWindow: 200000,
-				maxTokens: 8192,
+				cost: { input: 15.0, output: 75.0 },
+				contextWindow: 1000000,
+				maxTokens: 128000,
 			},
 		],
 	},
@@ -192,19 +208,19 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		apiKey: "${TOGETHER_API_KEY}",
 		models: [
 			{
-				id: "meta-llama/Llama-3.3-70B-Instruct-Turbo",
-				name: "LLaMA 3.3 70B (Together)",
+				id: "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8", // "meta-llama/Llama-4-Maverick-Instruct-Turbo",
+				name: "LLaMA 4 Maverick (Together)",
 				api: "openai-completions",
 				reasoning: false,
-				input: ["text"],
+				input: ["text", "image"],
 				cost: { input: 0.88, output: 0.88 },
-				contextWindow: 131072,
-				maxTokens: 4096,
+				contextWindow: 1000000,
+				maxTokens: 32768,
 			},
 		],
 	},
 	ollama: {
-		baseUrl: "http://host.docker.internal:11434/v1",
+		baseUrl: null, // dynamic: resolved at generation time based on deployment type
 		api: "openai-completions",
 		auth: "none",
 		models: [
@@ -230,8 +246,66 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 			},
 		],
 	},
+	"ollama-cloud": {
+		baseUrl: "https://ollama.com/v1",
+		api: "openai-completions",
+		auth: "api-key",
+		apiKey: "${OLLAMA_API_KEY}",
+		models: [
+			{
+				id: "qwen3.5:397b-cloud",
+				name: "Qwen 3.5 397B (Cloud)",
+				api: "openai-completions",
+				reasoning: false,
+				input: ["text"],
+				cost: { input: 0, output: 0 },
+				contextWindow: 131072,
+				maxTokens: 32768,
+			},
+			{
+				id: "glm-5:cloud",
+				name: "GLM-5 (Cloud)",
+				api: "openai-completions",
+				reasoning: false,
+				input: ["text"],
+				cost: { input: 0, output: 0 },
+				contextWindow: 131072,
+				maxTokens: 32768,
+			},
+			{
+				id: "minimax-m2.5:cloud",
+				name: "MiniMax M2.5 (Cloud)",
+				api: "openai-completions",
+				reasoning: false,
+				input: ["text"],
+				cost: { input: 0, output: 0 },
+				contextWindow: 131072,
+				maxTokens: 32768,
+			},
+			{
+				id: "kimi-k2.5:cloud",
+				name: "Kimi K2.5 (Cloud)",
+				api: "openai-completions",
+				reasoning: false,
+				input: ["text"],
+				cost: { input: 0, output: 0 },
+				contextWindow: 131072,
+				maxTokens: 32768,
+			},
+			{
+				id: "gemini-3-flash-preview:cloud",
+				name: "Gemini 3 Flash (Cloud)",
+				api: "openai-completions",
+				reasoning: false,
+				input: ["text", "image"],
+				cost: { input: 0, output: 0 },
+				contextWindow: 1000000,
+				maxTokens: 8192,
+			},
+		],
+	},
 	lmstudio: {
-		baseUrl: "http://host.docker.internal:1234/v1",
+		baseUrl: null, // dynamic: resolved at generation time based on deployment type
 		api: "openai-completions",
 		auth: "none",
 		models: [
@@ -248,7 +322,7 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 		],
 	},
 	vllm: {
-		baseUrl: "http://host.docker.internal:8000/v1",
+		baseUrl: null, // dynamic: resolved at generation time based on deployment type
 		api: "openai-completions",
 		auth: "none",
 		models: [
@@ -266,11 +340,27 @@ const PROVIDER_CONFIGS: Record<AiProvider, any> = {
 	},
 };
 
+/** Default ports for local inference providers (ollama, lmstudio, vllm). */
+const LOCAL_PROVIDER_PORTS: Record<string, number> = {
+	ollama: 11434,
+	lmstudio: 1234,
+	vllm: 8000,
+};
+
 /**
  * Generates a default `openclaw/config/openclaw.json` tailored
  * to the services installed in the stack.
  */
-export function generateOpenClawConfig(resolved: ResolverOutput): string {
+export function generateOpenClawConfig(
+	resolved: ResolverOutput,
+	options: OpenClawConfigOptions,
+): string {
+	const isDocker = options.deploymentType === "docker";
+	// Docker containers reach host services via host.docker.internal; bare-metal uses localhost
+	const localInferenceHost = isDocker ? "host.docker.internal" : "localhost";
+	// Docker: bind to all interfaces (0.0.0.0) so port mapping works from host
+	// Bare-metal/local: bind to loopback (127.0.0.1) for security, Tailscale can expose if needed
+	const gatewayBind = isDocker ? "lan" : "loopback";
 	const defaultSkills: Record<string, { enabled: boolean }> = {};
 
 	// Auto-enable any OpenClaw skills attached to installed companion services
@@ -296,8 +386,12 @@ export function generateOpenClawConfig(resolved: ResolverOutput): string {
 		const meta = PROVIDER_CONFIGS[provider];
 		if (!meta) continue;
 
+		// Local inference providers have null baseUrl — resolve dynamically based on deployment type
+		const baseUrl =
+			meta.baseUrl ?? `http://${localInferenceHost}:${LOCAL_PROVIDER_PORTS[provider] ?? 8000}/v1`;
+
 		providers[provider] = {
-			baseUrl: meta.baseUrl,
+			baseUrl,
 			api: meta.api,
 			auth: meta.auth,
 			...(meta.apiKey ? { apiKey: meta.apiKey } : {}),
@@ -327,12 +421,28 @@ export function generateOpenClawConfig(resolved: ResolverOutput): string {
 	}
 
 	const config = {
+		meta: {
+			lastTouchedVersion: options.openclawVersion,
+			lastTouchedAt: new Date().toISOString(),
+		},
+		env: {
+			shellEnv: {
+				enabled: true,
+			},
+			vars: {},
+		},
 		wizard: {
 			lastRunAt: new Date().toISOString(),
-			lastRunVersion: "2026.2.23",
+			lastRunVersion: options.openclawVersion,
 			lastRunCommand: "auto-generated-by-better-openclaw",
 			lastRunMode: "local",
 		},
+		logging: {
+			redactSensitive: "tools",
+		},
+		update: {
+			checkOnStart: true,
+		},
 		auth: {
 			profiles: authProfiles,
 		},
@@ -346,7 +456,7 @@ export function generateOpenClawConfig(resolved: ResolverOutput): string {
 					primary: primaryModel,
 				},
 				models: agentsModels,
-				workspace: "/home/node/.openclaw/workspace",
+				workspace: isDocker ? "/home/node/.openclaw/workspace" : "./workspace",
 				compaction: { mode: "safeguard" },
 				maxConcurrent: 4,
 				subagents: { maxConcurrent: 8 },
@@ -359,6 +469,9 @@ export function generateOpenClawConfig(resolved: ResolverOutput): string {
 			native: "auto",
 			nativeSkills: "auto",
 		},
+		cron: {
+			enabled: true,
+		},
 		hooks: {
 			internal: {
 				enabled: true,
@@ -370,36 +483,60 @@ export function generateOpenClawConfig(resolved: ResolverOutput): string {
 				},
 			},
 		},
+		web: {
+			enabled: true,
+		},
+		discovery: {
+			wideArea: {
+				enabled: true,
+			},
+		},
+		canvasHost: {
+			enabled: true,
+			liveReload: true,
+		},
 		channels: {},
 		gateway: {
-			port: 18791,
+			port: options.gatewayPort,
 			mode: "local",
-			bind: "loopback",
+			bind: gatewayBind,
+			controlUi: {
+				enabled: true,
+				// Docker NAT makes browser connections appear external — skip device pairing, use token-only auth
+				...(isDocker ? { allowInsecureAuth: true } : {}),
+				// Non-loopback binds need explicit origin allowlist for control UI CORS
+				// Reference: docker-setup.sh ensure_control_ui_allowed_origins()
+				...(gatewayBind !== "loopback"
+					? { allowedOrigins: [`http://127.0.0.1:${options.gatewayPort}`] }
+					: {}),
+			},
 			auth: {
 				mode: "token",
 				token: "${OPENCLAW_GATEWAY_TOKEN}",
+				...(isDocker ? {} : { allowTailscale: true }),
 			},
-			tailscale: {
-				mode: "serve",
-				resetOnExit: true,
-			},
+			// Tailscale serve only works on bare-metal/local (not inside Docker containers)
+			...(isDocker ? {} : { tailscale: { mode: "serve", resetOnExit: true } }),
 			nodes: {
 				denyCommands: ["camera.snap", "camera.clip", "screen.record"],
 			},
 		},
 		skills: {
 			install: { nodeManager: "pnpm" },
+			load: {
+				watch: true,
+			},
 			...(Object.keys(defaultSkills).length > 0 ? { entries: defaultSkills } : {}),
 		},
 		plugins: {
+			enabled: true,
 			entries: {
+				telegram: { enabled: true },
+				whatsapp: { enabled: true },
+				discord: { enabled: true },
 				"memory-core": { enabled: true },
 			},
 		},
-		meta: {
-			lastTouchedVersion: "2026.2.23",
-			lastTouchedAt: new Date().toISOString(),
-		},
 	};
 
 	return JSON.stringify(config, null, 2);

package/src/generators/postgres-init.ts

@@ -35,6 +35,17 @@ const DB_REQUIREMENTS: Record<string, Omit<DbRequirement, "serviceId" | "service
 	umami: { dbName: "umami", dbUser: "umami", passwordEnvVar: "UMAMI_DB_PASSWORD" },
 	matomo: { dbName: "matomo", dbUser: "matomo", passwordEnvVar: "MATOMO_DB_PASSWORD" },
 	mixpost: { dbName: "mixpost", dbUser: "mixpost", passwordEnvVar: "MIXPOST_DB_PASSWORD" },
+	"cal-com": { dbName: "calcom", dbUser: "calcom", passwordEnvVar: "CALCOM_DB_PASSWORD" },
+	immich: { dbName: "immich", dbUser: "immich", passwordEnvVar: "IMMICH_DB_PASSWORD" },
+	authentik: { dbName: "authentik", dbUser: "authentik", passwordEnvVar: "AUTHENTIK_DB_PASSWORD" },
+	"lasuite-meet-backend": {
+		dbName: "meet",
+		dbUser: "meet",
+		passwordEnvVar: "LASUITE_MEET_DB_PASSWORD",
+	},
+	openpanel: { dbName: "openpanel", dbUser: "openpanel", passwordEnvVar: "OPENPANEL_DB_PASSWORD" },
+	usesend: { dbName: "usesend", dbUser: "usesend", passwordEnvVar: "USESEND_DB_PASSWORD" },
+	nextcloud: { dbName: "nextcloud", dbUser: "nextcloud", passwordEnvVar: "NEXTCLOUD_DB_PASSWORD" },
 };
 
 /**

package/src/generators/readme.ts

@@ -8,9 +8,11 @@ export interface ReadmeOptions {
 	domain?: string;
 	proxy?: string;
 	/** When "bare-metal", the stack uses native + Docker hybrid. */
-	deploymentType?: "docker" | "bare-metal";
+	deploymentType?: "docker" | "bare-metal" | "local";
 	/** True when some services run natively on the host (bare-metal only). */
 	hasNativeServices?: boolean;
+	/** How OpenClaw itself is installed: docker (container) or direct (host). */
+	openclawInstallMethod?: "docker" | "direct";
 }
 
 /**
@@ -20,7 +22,9 @@ export interface ReadmeOptions {
  * service URLs, skill packs, and scripts documentation.
  */
 export function generateReadme(resolved: ResolverOutput, options: ReadmeOptions): string {
-	const { projectName, domain, proxy, deploymentType, hasNativeServices } = options;
+	const { projectName, domain, proxy, deploymentType, hasNativeServices, openclawInstallMethod } =
+		options;
+	const isDirectInstall = openclawInstallMethod === "direct";
 	const sections: string[] = [];
 
 	// ── Title & Description ─────────────────────────────────────────────────
@@ -29,7 +33,7 @@ export function generateReadme(resolved: ResolverOutput, options: ReadmeOptions)
 
 > Self-hosted AI agent infrastructure powered by [OpenClaw](https://openclaw.dev).
 
-This project provides a fully configured Docker Compose stack with ${resolved.services.length} services, ready to deploy on any server.
+This project provides a fully configured Docker Compose stack with ${resolved.services.length} services, ready to deploy on any server.${isDirectInstall ? " OpenClaw itself runs directly on the host (not in Docker)." : ""}
 ${deploymentType === "bare-metal" && hasNativeServices ? "\n\n**Bare-metal (native + Docker):** Some services run natively on the host; the rest (including the OpenClaw gateway) run in Docker. Use the top-level `install.sh` or `install.ps1` to install/start native services first, then start the Docker stack." : ""}
 
 ---`);
@@ -64,6 +68,7 @@ ${serviceRows}
 - [Docker](https://docs.docker.com/get-docker/) (v24+)
 - [Docker Compose](https://docs.docker.com/compose/install/) (v2+)
 - At least ${Math.ceil(resolved.estimatedMemoryMB / 1024)}GB of RAM available
+${isDirectInstall ? "- Node.js 22+ (installed automatically by the OpenClaw installer)" : ""}
 
 ### 1. Extract the ZIP
 
@@ -79,7 +84,31 @@ cp .env.example .env
 \`\`\`
 
 Edit \`.env\` and update any values as needed. Secret values have been pre-generated — review and change them for production use.
+${
+	isDirectInstall
+		? `
+### 3. Install OpenClaw on the Host
 
+\`\`\`bash
+chmod +x scripts/install-openclaw.sh
+./scripts/install-openclaw.sh
+\`\`\`
+
+This downloads and runs the official installer, which sets up Node.js 22+ and OpenClaw globally.
+
+### 4. Start Companion Services
+
+\`\`\`bash
+docker compose up -d
+\`\`\`
+
+### 5. Run Onboarding
+
+\`\`\`bash
+openclaw onboard
+\`\`\`
+`
+		: `
 ### 3. Start Services
 
 \`\`\`bash
@@ -104,7 +133,8 @@ docker compose ps
 \`\`\`bash
 docker compose logs -f openclaw-gateway
 \`\`\`
-
+`
+}
 All services should show a healthy status within 1–2 minutes.
 `);
 
@@ -188,6 +218,75 @@ Skills are located in \`openclaw/workspace/skills/\`. Each skill provides a \`SK
 `);
 	}
 
+	// ── Onboarding & Channels ──────────────────────────────────────────────
+	// Based on openclaw_docker-setup.sh post-deploy instructions
+
+	if (isDirectInstall) {
+		sections.push(`## OpenClaw Setup
+
+OpenClaw is installed directly on the host (not in Docker). After running the install script:\n
+\`\`\`bash
+# Run onboarding to configure the gateway
+openclaw onboard
+
+# Launch the dashboard
+openclaw dashboard
+\`\`\`
+
+When prompted during onboarding:
+- **Gateway bind:** \`lan\`
+- **Gateway auth:** \`token\`
+- **Gateway token:** (use the value from \`.env\` → \`OPENCLAW_GATEWAY_TOKEN\`)
+
+### Connect Messaging Channels (optional)
+
+\`\`\`bash
+# WhatsApp (scan QR code)
+openclaw channels login
+
+# Telegram
+openclaw channels add --channel telegram --token <BOT_TOKEN>
+
+# Discord
+openclaw channels add --channel discord --token <BOT_TOKEN>
+\`\`\`
+
+See [Channel Docs](https://docs.openclaw.ai/channels) for more providers.
+`);
+	} else {
+		sections.push(`## Onboarding & Channel Setup
+
+After starting the stack, complete the gateway onboarding:
+
+\`\`\`bash
+# Interactive onboarding (sets up gateway auth and config)
+docker compose run --rm openclaw-cli onboard --no-install-daemon
+\`\`\`
+
+When prompted:
+- **Gateway bind:** \`lan\`
+- **Gateway auth:** \`token\`
+- **Gateway token:** (use the value from \`.env\` → \`OPENCLAW_GATEWAY_TOKEN\`)
+- **Tailscale exposure:** Off
+- **Install Gateway daemon:** No
+
+### Connect Messaging Channels (optional)
+
+\`\`\`bash
+# WhatsApp (scan QR code)
+docker compose run --rm openclaw-cli channels login
+
+# Telegram
+docker compose run --rm openclaw-cli channels add --channel telegram --token <BOT_TOKEN>
+
+# Discord
+docker compose run --rm openclaw-cli channels add --channel discord --token <BOT_TOKEN>
+\`\`\`
+
+See [Channel Docs](https://docs.openclaw.ai/channels) for more providers.
+`);
+	}
+
 	// ── Proxy Configuration ─────────────────────────────────────────────────
 
 	if (proxy && proxy !== "none") {