@alfe.ai/gateway 0.7.3 → 0.8.0

package/dist/health.js

@@ -1,4 +1,5 @@
 import { n as logger$1 } from "./logger.js";
+import { a as captureFatal, c as captureRuntimeCrash, d as initAgentSentry, f as setAgentContext, l as captureRuntimeErrorOutput, o as captureIntegrationFailure, s as captureMcpFailure, u as flushSentry } from "./sentry.js";
 import { createRequire } from "node:module";
 import { mkdir, readFile, rename, stat, unlink, writeFile } from "node:fs/promises";
 import { execFile, execSync, spawn } from "node:child_process";
@@ -7,12 +8,12 @@ import { dirname, join } from "node:path";
 import { homedir } from "node:os";
 import pino from "pino";
 import { chmodSync, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { getEndpointFromToken, readConfig, resolveConfig } from "@alfe.ai/config";
+import { getEndpointFromToken, readConfig } from "@alfe.ai/config";
 import crypto from "crypto";
 import { parse } from "smol-toml";
 import WebSocket from "ws";
 import { createConnection, createServer } from "node:net";
-import { HermesApplier, HermesMcpSync, IntegrationManager, IntegrationManagerAdapter, McpApplier, NoopOpenClawCliLock, OpenClawApplier, SerialOpenClawCliLock } from "@alfe.ai/integrations";
+import { ClaudeCodeApplier, ClaudeCodeMcpSync, HermesApplier, HermesMcpSync, IntegrationManager, IntegrationManagerAdapter, McpApplier, NoopOpenClawCliLock, OpenClawApplier, SerialOpenClawCliLock } from "@alfe.ai/integrations";
 import { AgentApiClient } from "@alfe.ai/agent-api-client";
 import { Manager, McpBundler, defaultConnect } from "@alfe.ai/mcp-bundler";
 import stream, { Readable } from "stream";
@@ -551,6 +552,29 @@ var AuthService = class {
 			body: JSON.stringify(input)
 		});
 	}
+	/**
+	* Change a personal (individual-tier) subscriber's platform plan in place on
+	* their existing Stripe subscription — no second Checkout, no duplicate sub,
+	* no double charge. Upgrades prorate immediately; downgrades apply with no
+	* immediate charge/refund. Returns the updated subscription.
+	*/
+	changePlatformPlan(input) {
+		return this.client.request(`${this.prefix}/subscription/change`, {
+			method: "POST",
+			body: JSON.stringify(input)
+		});
+	}
+	/**
+	* Preview the proration cost for changing a personal (individual-tier)
+	* subscriber's platform plan — read-only companion to `changePlatformPlan`.
+	* Nothing is charged.
+	*/
+	previewPlatformPlanChange(input) {
+		return this.client.request(`${this.prefix}/subscription/change/preview`, {
+			method: "POST",
+			body: JSON.stringify(input)
+		});
+	}
 	updateSeats(seats) {
 		return this.client.request(`${this.prefix}/subscription/seats`, {
 			method: "POST",
@@ -687,6 +711,15 @@ var IntegrationsService = class {
 	reinstallIntegration(agentId, integrationId) {
 		return this.client.request(`/integrations/agents/${agentId}/${integrationId}/reinstall`, { method: "POST" });
 	}
+	/**
+	* Upgrade an integration to the registry's latest version via the fast,
+	* diff-based daemon path (bumps `version` without `reinstallRequestedAt`).
+	* The agent stays online — no destructive teardown. Distinct from
+	* {@link reinstallIntegration}, which is the destructive repair path.
+	*/
+	upgradeIntegration(agentId, integrationId) {
+		return this.client.request(`/integrations/agents/${agentId}/${integrationId}/upgrade`, { method: "POST" });
+	}
 	getRegistry() {
 		return this.client.request("/integrations/registry");
 	}
@@ -4487,6 +4520,7 @@ enumValues({
 	IndividualPro: "individual_pro",
 	IndividualMax: "individual_max",
 	OrgFree: "org_free",
+	OrgStartup: "org_startup",
 	OrgProfessional: "org_professional",
 	OrgEnterprise: "org_enterprise"
 });
@@ -4523,7 +4557,8 @@ enumValues({
 enumValues({
 	OpenClaw: "openclaw",
 	NanoClaw: "nanoclaw",
-	Hermes: "hermes"
+	Hermes: "hermes",
+	ClaudeCode: "claude-code"
 });
 const TTS_MODELS = enumValues({
 	ElevenLabsTurbo: "elevenlabs-turbo",
@@ -4664,9 +4699,10 @@ enumValues({
 const AnthropicModel = {
 	Opus48: "claude-opus-4-8",
 	Opus47: "claude-opus-4-7",
-	Opus: "claude-opus-4-6",
-	Sonnet: "claude-sonnet-4-6",
-	Haiku: "claude-haiku-4-5"
+	Opus46: "claude-opus-4-6",
+	Sonnet5: "claude-sonnet-5",
+	Sonnet46: "claude-sonnet-4-6",
+	Haiku45: "claude-haiku-4-5"
 };
 const ANTHROPIC_MODELS = enumValues(AnthropicModel);
 const OpenAIModel = {
@@ -4681,9 +4717,14 @@ const OpenAIModel = {
 	GPT54Nano: "gpt-5.4-nano",
 	GPT54Pro: "gpt-5.4-pro",
 	GPT55: "gpt-5.5",
+	GPT55Pro: "gpt-5.5-pro",
+	GPT56Sol: "gpt-5.6-sol",
+	GPT56Terra: "gpt-5.6-terra",
+	GPT56Luna: "gpt-5.6-luna",
 	O3Mini: "o3-mini",
 	O4Mini: "o4-mini",
-	TextEmbedding3Small: "text-embedding-3-small"
+	TextEmbedding3Small: "text-embedding-3-small",
+	TextEmbedding3Large: "text-embedding-3-large"
 };
 const OPENAI_MODELS = enumValues(OpenAIModel);
 const DeepSeekModel = {
@@ -4707,16 +4748,25 @@ const MiniMaxModel = {
 	M3: "MiniMax-M3",
 	M27: "MiniMax-M2.7",
 	M27HighSpeed: "MiniMax-M2.7-highspeed",
-	M25: "MiniMax-M2.5"
+	M25: "MiniMax-M2.5",
+	M21: "MiniMax-M2.1",
+	M2: "MiniMax-M2"
 };
 const MINIMAX_MODELS = enumValues(MiniMaxModel);
 const MistralModel = {
 	Large: "mistral-large-latest",
+	Medium: "mistral-medium-latest",
 	Small: "mistral-small-latest",
-	Codestral: "codestral-latest"
+	Codestral: "codestral-latest",
+	Ministral8b: "ministral-8b-latest",
+	Ministral3b: "ministral-3b-latest",
+	MagistralMedium: "magistral-medium-latest",
+	MagistralSmall: "magistral-small-latest",
+	DevstralMedium: "devstral-medium-latest"
 };
 const MISTRAL_MODELS = enumValues(MistralModel);
 const XAIModel = {
+	Grok45: "grok-4.5",
 	Grok43: "grok-4.3",
 	Grok4: "grok-4",
 	Grok41Fast: "grok-4.1-fast"
@@ -4725,10 +4775,12 @@ const XAI_MODELS = enumValues(XAIModel);
 const ZhipuModel = {
 	GLM52: "glm-5.2",
 	GLM51: "glm-5.1",
-	GLM51Air: "glm-5.1-air"
+	GLM46: "glm-4.6",
+	GLM45: "glm-4.5",
+	GLM45Air: "glm-4.5-air"
 };
 const ZHIPU_MODELS = enumValues(ZhipuModel);
-AnthropicModel.Opus48;
+AnthropicModel.Sonnet5;
 [
 	...ANTHROPIC_MODELS,
 	...OPENAI_MODELS,
@@ -4748,8 +4800,8 @@ _enum(MISTRAL_MODELS);
 _enum(XAI_MODELS);
 _enum(ZHIPU_MODELS);
 string().min(1);
-AnthropicModel.Opus48, AnthropicModel.Opus47, AnthropicModel.Opus, AnthropicModel.Sonnet, AnthropicModel.Haiku, OpenAIModel.GPT4o, OpenAIModel.GPT4oMini, OpenAIModel.O3, OpenAIModel.GPT41, OpenAIModel.GPT41Mini, OpenAIModel.GPT41Nano, OpenAIModel.GPT54, OpenAIModel.GPT54Mini, OpenAIModel.GPT54Nano, OpenAIModel.GPT54Pro, OpenAIModel.GPT55, OpenAIModel.O3Mini, OpenAIModel.O4Mini, OpenAIModel.TextEmbedding3Small, DeepSeekModel.Chat, DeepSeekModel.Reasoner, DeepSeekModel.V4Flash, DeepSeekModel.V4Pro, GoogleModel.Gemini35Flash, GoogleModel.Gemini31Pro, GoogleModel.Gemini31FlashLite, GoogleModel.Gemini25Pro, GoogleModel.Gemini25Flash, GoogleModel.Gemini25FlashLite, GoogleModel.Gemini20Flash, MiniMaxModel.M3, MiniMaxModel.M27, MiniMaxModel.M27HighSpeed, MiniMaxModel.M25, MistralModel.Large, MistralModel.Small, MistralModel.Codestral, XAIModel.Grok43, XAIModel.Grok4, XAIModel.Grok41Fast, ZhipuModel.GLM52, ZhipuModel.GLM51, ZhipuModel.GLM51Air;
-AnthropicModel.Opus48, AnthropicModel.Opus47, AnthropicModel.Opus, AnthropicModel.Sonnet, AnthropicModel.Haiku, OpenAIModel.GPT4o, OpenAIModel.GPT4oMini, OpenAIModel.O3, OpenAIModel.GPT41, OpenAIModel.GPT41Mini, OpenAIModel.GPT41Nano, OpenAIModel.GPT54, OpenAIModel.GPT54Mini, OpenAIModel.GPT54Nano, OpenAIModel.GPT54Pro, OpenAIModel.GPT55, OpenAIModel.O3Mini, OpenAIModel.O4Mini, OpenAIModel.TextEmbedding3Small, DeepSeekModel.Chat, DeepSeekModel.Reasoner, DeepSeekModel.V4Flash, DeepSeekModel.V4Pro, GoogleModel.Gemini35Flash, GoogleModel.Gemini31Pro, GoogleModel.Gemini31FlashLite, GoogleModel.Gemini25Pro, GoogleModel.Gemini25Flash, GoogleModel.Gemini25FlashLite, GoogleModel.Gemini20Flash, MiniMaxModel.M3, MiniMaxModel.M27, MiniMaxModel.M27HighSpeed, MiniMaxModel.M25, MistralModel.Large, MistralModel.Small, MistralModel.Codestral, XAIModel.Grok43, XAIModel.Grok4, XAIModel.Grok41Fast, ZhipuModel.GLM52, ZhipuModel.GLM51, ZhipuModel.GLM51Air;
+AnthropicModel.Opus48, AnthropicModel.Opus47, AnthropicModel.Opus46, AnthropicModel.Sonnet5, AnthropicModel.Sonnet46, AnthropicModel.Haiku45, OpenAIModel.GPT4o, OpenAIModel.GPT4oMini, OpenAIModel.O3, OpenAIModel.GPT41, OpenAIModel.GPT41Mini, OpenAIModel.GPT41Nano, OpenAIModel.GPT54, OpenAIModel.GPT54Mini, OpenAIModel.GPT54Nano, OpenAIModel.GPT54Pro, OpenAIModel.GPT55, OpenAIModel.GPT55Pro, OpenAIModel.GPT56Sol, OpenAIModel.GPT56Terra, OpenAIModel.GPT56Luna, OpenAIModel.O3Mini, OpenAIModel.O4Mini, OpenAIModel.TextEmbedding3Small, OpenAIModel.TextEmbedding3Large, DeepSeekModel.Chat, DeepSeekModel.Reasoner, DeepSeekModel.V4Flash, DeepSeekModel.V4Pro, GoogleModel.Gemini35Flash, GoogleModel.Gemini31Pro, GoogleModel.Gemini31FlashLite, GoogleModel.Gemini25Pro, GoogleModel.Gemini25Flash, GoogleModel.Gemini25FlashLite, GoogleModel.Gemini20Flash, MiniMaxModel.M3, MiniMaxModel.M27, MiniMaxModel.M27HighSpeed, MiniMaxModel.M25, MiniMaxModel.M21, MiniMaxModel.M2, MistralModel.Large, MistralModel.Medium, MistralModel.Small, MistralModel.Codestral, MistralModel.Ministral8b, MistralModel.Ministral3b, MistralModel.MagistralMedium, MistralModel.MagistralSmall, MistralModel.DevstralMedium, XAIModel.Grok45, XAIModel.Grok43, XAIModel.Grok4, XAIModel.Grok41Fast, ZhipuModel.GLM52, ZhipuModel.GLM51, ZhipuModel.GLM46, ZhipuModel.GLM45, ZhipuModel.GLM45Air;
+AnthropicModel.Opus48, AnthropicModel.Opus47, AnthropicModel.Opus46, AnthropicModel.Sonnet5, AnthropicModel.Sonnet46, AnthropicModel.Haiku45, OpenAIModel.GPT4o, OpenAIModel.GPT4oMini, OpenAIModel.O3, OpenAIModel.GPT41, OpenAIModel.GPT41Mini, OpenAIModel.GPT41Nano, OpenAIModel.GPT54, OpenAIModel.GPT54Mini, OpenAIModel.GPT54Nano, OpenAIModel.GPT54Pro, OpenAIModel.GPT55, OpenAIModel.GPT55Pro, OpenAIModel.GPT56Sol, OpenAIModel.GPT56Terra, OpenAIModel.GPT56Luna, OpenAIModel.O3Mini, OpenAIModel.O4Mini, OpenAIModel.TextEmbedding3Small, OpenAIModel.TextEmbedding3Large, DeepSeekModel.Chat, DeepSeekModel.Reasoner, DeepSeekModel.V4Flash, DeepSeekModel.V4Pro, GoogleModel.Gemini35Flash, GoogleModel.Gemini31Pro, GoogleModel.Gemini31FlashLite, GoogleModel.Gemini25Pro, GoogleModel.Gemini25Flash, GoogleModel.Gemini25FlashLite, GoogleModel.Gemini20Flash, MiniMaxModel.M3, MiniMaxModel.M27, MiniMaxModel.M27HighSpeed, MiniMaxModel.M25, MiniMaxModel.M21, MiniMaxModel.M2, MistralModel.Large, MistralModel.Medium, MistralModel.Small, MistralModel.Codestral, MistralModel.Ministral8b, MistralModel.Ministral3b, MistralModel.MagistralMedium, MistralModel.MagistralSmall, MistralModel.DevstralMedium, XAIModel.Grok45, XAIModel.Grok43, XAIModel.Grok4, XAIModel.Grok41Fast, ZhipuModel.GLM52, ZhipuModel.GLM51, ZhipuModel.GLM46, ZhipuModel.GLM45, ZhipuModel.GLM45Air;
 enumValues({
 	PendingChallenge: "pending_challenge",
 	Creating: "creating",
@@ -4825,6 +4877,7 @@ const NotificationType = {
 	AutoRechargeFailed: "auto-recharge.failed",
 	SubscriptionCreated: "subscription.created",
 	SubscriptionCancelled: "subscription.cancelled",
+	StartupGrantEnded: "startup.grant_ended",
 	SubscriptionPastDue: "subscription.past_due",
 	BalanceThresholdWarning: "balance.threshold.warning",
 	PlatformTierPriceIncrease: "platform.tier_price_increase",
@@ -4849,7 +4902,7 @@ const RecipientStrategy = {
 	TenantAdmins: "tenant_admins",
 	SpecificUser: "specific_user"
 };
-NotificationType.PaymentSucceeded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PaymentFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.TopUpCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AutoRechargeCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AutoRechargeFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.SubscriptionCreated, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.SubscriptionCancelled, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.SubscriptionPastDue, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.BalanceThresholdWarning, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PlatformTierPriceIncrease, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AgentCreated, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentProvisionFailed, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentBillingSuspended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentDisconnectedExtended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.BrowserTakeoverRequested, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.InviteCreated, NotificationCategory.System, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationType.OrgClaimed, NotificationCategory.System, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.TeamMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.ProjectMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.IntegrationInstalled, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.IntegrationRemoved, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push;
+NotificationType.PaymentSucceeded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PaymentFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.TopUpCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AutoRechargeCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AutoRechargeFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.SubscriptionCreated, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.SubscriptionCancelled, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.StartupGrantEnded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.SubscriptionPastDue, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.BalanceThresholdWarning, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PlatformTierPriceIncrease, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AgentCreated, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentProvisionFailed, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentBillingSuspended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentDisconnectedExtended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.BrowserTakeoverRequested, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.InviteCreated, NotificationCategory.System, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationType.OrgClaimed, NotificationCategory.System, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.TeamMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.ProjectMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.IntegrationInstalled, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.IntegrationRemoved, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push;
 //#endregion
 //#region src/config.ts
 /**
@@ -4965,6 +5018,7 @@ function deriveGatewayWsUrl(apiEndpoint) {
 */
 function deriveAgentWorkspace(runtime, home) {
 	if (runtime === "openclaw") return join(home, "workspace");
+	if (runtime === "claude-code") return join(home, "workspace");
 	return home;
 }
 async function loadRuntimeConfigs() {
@@ -5313,7 +5367,7 @@ function isIPCResponse(msg) {
 const PROTOCOL_VERSION = 1;
 //#endregion
 //#region src/runtime-gate.ts
-const log$5 = logger$1.child({ component: "RuntimeGate" });
+const log$6 = logger$1.child({ component: "RuntimeGate" });
 var RuntimeGate = class {
 	depth = 0;
 	wasRunning = false;
@@ -5331,8 +5385,8 @@ var RuntimeGate = class {
 		const rp = this.getRuntime();
 		this.wasRunning = rp?.isRunning ?? false;
 		if (rp && this.wasRunning) {
-			log$5.info("Suspending runtime for mutating reconcile (avoid concurrent SQLite writers)");
-			await rp.stop();
+			log$6.info("Suspending runtime for mutating reconcile (avoid concurrent SQLite writers)");
+			await rp.stopWhenIdle();
 		}
 	}
 	/**
@@ -5346,7 +5400,7 @@ var RuntimeGate = class {
 		if (this.depth < 0) this.depth = 0;
 		const rp = this.getRuntime();
 		if (rp && this.wasRunning) {
-			log$5.info("Resuming runtime after mutating reconcile");
+			log$6.info("Resuming runtime after mutating reconcile");
 			rp.resume();
 		}
 		this.wasRunning = false;
@@ -5361,12 +5415,12 @@ var RuntimeGate = class {
 	*/
 	requestRestart() {
 		if (this.depth > 0) {
-			log$5.info("Runtime restart requested while suspended — deferring to pending resume");
+			log$6.info("Runtime restart requested while suspended — deferring to pending resume");
 			return;
 		}
 		const rp = this.getRuntime();
 		if (rp) rp.restart().catch((err) => {
-			log$5.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to restart runtime");
+			log$6.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to restart runtime");
 		});
 	}
 };
@@ -5385,392 +5439,8 @@ var NoopRuntimeGate = class {
 	requestRestart() {}
 };
 //#endregion
-//#region src/sentry.ts
-/**
-* Agent-side error reporting (Sentry) for the Alfe CLI + gateway daemon.
-*
-* This module is the single Sentry bootstrap shared by both published
-* agent-side packages — `@alfe.ai/gateway` (the daemon) and `@alfe.ai/cli`
-* (which re-imports these helpers from `@alfe.ai/gateway`). It exists so
-* integration-installation failures on customer/managed VMs surface centrally
-* instead of silently rotting until someone SSHes into the box.
-*
-* Design constraints (see packages/gateway/DEVELOPING.md → "Error reporting"):
-*   - Errors only. No tracing/profiling (`tracesSampleRate: 0`, `sampleRate: 1`).
-*   - `@sentry/node` is lazy-imported so `alfe --version` doesn't pay for it.
-*   - Sentry can NEVER break the CLI/daemon — every entry point is try/catch'd.
-*   - The DSNs are baked as constants: published tarballs run on agent VMs and
-*     cannot read the repo's `config/config.ts`. That file's `SENTRY_DSNS`
-*     registry (keys `agentDaemon` + `cli`) mirrors them as the human reference.
-*   - Secrets are scrubbed in `beforeSend`; request/env payloads are dropped.
-*   - Opt-out via `ALFE_ERROR_REPORTING=0|false` or `errorReporting = false`
-*     in `~/.alfe/config.toml`. Default ON.
-*/
-/**
-* Baked per-surface Sentry DSNs (org `alfe-ai`). DSNs are public by design
-* (they only permit event ingestion). Mirrors of `config/config.ts` →
-* `SENTRY_DSNS.agentDaemon` / `SENTRY_DSNS.cli`. If you rotate a DSN, update
-* both places.
-*/
-const AGENT_DAEMON_SENTRY_DSN = "https://a47f010d8d39fb4350f913492189f283@o4511008239452160.ingest.us.sentry.io/4511679448547328";
-const CLI_SENTRY_DSN = "https://82dde4631336561f2fcc89d7531623de@o4511008239452160.ingest.us.sentry.io/4511679411191808";
-/**
-* Dedicated project for errors emitted BY the agent runtime child process
-* (OpenClaw/Hermes) — crashes, spawn failures, and error-looking output. Kept
-* separate from `agent-daemon` so runtime noise never drowns daemon issues.
-* Mirrors `SENTRY_DSNS.agentRuntime` in `config/config.ts`.
-*/
-const AGENT_RUNTIME_SENTRY_DSN = "https://feb7fb2e3b8e723aec518e74715bfa6d@o4511008239452160.ingest.us.sentry.io/4511683667558400";
-/**
-* MCP tool/server failures on agent VMs — reported by the daemon-hosted MCP
-* bundler (tool errors, child crashes, stderr output). Dedicated `local-mcp`
-* project for the locally-installed MCP surface: the cloud MCP Fly service
-* keeps the `mcp` project (`SENTRY_DSNS.mcp`), so planned daemon restarts
-* tearing down MCP children never pollute the remote service's signal.
-* The `source: agent-daemon` + `agentId` tags are kept for continuity.
-*/
-const AGENT_MCP_SENTRY_DSN = "https://b4c4b4e19135692206bacabcd12a7fd3@o4511008239452160.ingest.us.sentry.io/4511697094377472";
-/** Surface → Sentry project: `cli` and `agent-daemon` respectively. */
-const SURFACE_DSNS = {
-	cli: CLI_SENTRY_DSN,
-	daemon: AGENT_DAEMON_SENTRY_DSN
-};
-/** Held after a successful init so the capture helpers can run synchronously. */
-let sentry = null;
-/**
-* Additional bound clients (daemon surface only). The default client keeps the
-* daemon's own DSN; runtime child-process events and MCP failures are routed
-* to their own projects via explicitly-bound Scopes — the documented
-* multi-client pattern. `null` until `initAgentSentry({ surface: "daemon" })`
-* succeeds.
-*/
-let runtimeClient = null;
-let runtimeScope = null;
-let mcpClient = null;
-let mcpScope = null;
-/**
-* Map the configured API URL to a coarse environment tag. Best-effort — returns
-* `"unknown"` when no config is present yet (e.g. `alfe login` pre-setup).
-*/
-function deriveEnvironment() {
-	try {
-		const { apiUrl } = resolveConfig();
-		if (apiUrl.includes("api.dev.alfe.ai") || apiUrl.includes("dev.alfe.ai")) return "dev";
-		if (apiUrl.includes("api.test.alfe.ai")) return "test";
-		if (apiUrl.includes("api.demo.alfe.ai")) return "demo";
-		if (apiUrl.includes("api.alfe.ai")) return "prod";
-	} catch {}
-	return "unknown";
-}
-/** Active runtime (`openclaw`/`hermes`) from config, or undefined if unknown. */
-function deriveRuntime() {
-	try {
-		return resolveConfig().runtime;
-	} catch {
-		return;
-	}
-}
-/** True when the operator has opted out of error reporting. */
-function errorReportingDisabled() {
-	const env = process.env.ALFE_ERROR_REPORTING?.trim().toLowerCase();
-	if (env === "0" || env === "false") return true;
-	try {
-		if (readConfig().errorReporting === false) return true;
-	} catch {}
-	return false;
-}
-const KV_SECRET_RE = /(?<![A-Za-z0-9])([A-Za-z0-9_-]*(?:authorization|api[_-]?key|apikey|token|secret|password|passwd|bearer|credential)s?)(\s*[:=]\s*|\s+)("?)([^\s"']+)\3/gi;
-const URL_QUERY_SECRET_RE = /([?&](?:[A-Za-z0-9_-]*(?:token|secret|key|signature|credential|password)|sig|code|x-amz-[a-z-]+)=)[^&\s"']+/gi;
-const MIN_BARE_SECRET_LEN = 16;
-const ALFE_TOKEN_RE = /alfe_(?:dev|test|demo|live)_[A-Za-z0-9._-]+/g;
-const BEARER_RE = /\bbearer\s+[A-Za-z0-9._\-+/=]+/gi;
-function scrubString(value) {
-	return value.replace(BEARER_RE, "Bearer [REDACTED]").replace(URL_QUERY_SECRET_RE, "$1[REDACTED]").replace(KV_SECRET_RE, (match, label, sep, _q, secret) => {
-		if (!/[:=]/.test(sep) && secret.length < MIN_BARE_SECRET_LEN) return match;
-		return `${label}${sep}[REDACTED]`;
-	}).replace(ALFE_TOKEN_RE, "alfe_[REDACTED]");
-}
-/** Scrub secrets from a breadcrumb's message + string data values in place. */
-function scrubBreadcrumb(b) {
-	if (typeof b.message === "string") b.message = scrubString(b.message);
-	const data = b.data;
-	if (data) for (const k of Object.keys(data)) {
-		const dv = data[k];
-		if (typeof dv === "string") data[k] = scrubString(dv);
-	}
-	return b;
-}
-/**
-* Scrub secrets and drop request/env payloads before an event is sent.
-* Generic so it preserves the caller's exact event subtype (`beforeSend`
-* receives — and must return — an `ErrorEvent`, not a widened `Event`).
-*/
-function scrubEvent(event) {
-	delete event.request;
-	if (event.contexts) delete event.contexts.runtime;
-	delete event.extra;
-	delete event.server_name;
-	if (typeof event.message === "string") event.message = scrubString(event.message);
-	const values = event.exception?.values;
-	if (values) {
-		for (const v of values) if (typeof v.value === "string") v.value = scrubString(v.value);
-	}
-	if (event.breadcrumbs) for (const b of event.breadcrumbs) scrubBreadcrumb(b);
-	return event;
-}
-/**
-* Initialise Sentry for the agent-side CLI/daemon. Idempotent, best-effort, and
-* a no-op when opted out or when the baked DSN is empty. Never throws.
-*/
-async function initAgentSentry(options) {
-	try {
-		if (sentry) return;
-		if (errorReportingDisabled()) return;
-		const dsn = SURFACE_DSNS[options.surface].trim();
-		if (!dsn) return;
-		const mod = await import("@sentry/node");
-		if (options.surface === "daemon") {
-			const buildBoundScope = (dsn, extraTags) => {
-				try {
-					if (!dsn.trim()) return null;
-					const client = new mod.NodeClient({
-						dsn: dsn.trim(),
-						environment: deriveEnvironment(),
-						...options.release ? { release: options.release } : {},
-						sampleRate: 1,
-						tracesSampleRate: 0,
-						sendDefaultPii: false,
-						transport: mod.makeNodeTransport,
-						stackParser: mod.defaultStackParser,
-						integrations: [],
-						beforeSend: (event) => scrubEvent(event)
-					});
-					client.init();
-					const scope = new mod.Scope();
-					scope.setClient(client);
-					const runtime = deriveRuntime();
-					if (runtime) scope.setTag("runtime", runtime);
-					for (const [k, v] of Object.entries(extraTags)) scope.setTag(k, v);
-					return {
-						client,
-						scope
-					};
-				} catch {
-					return null;
-				}
-			};
-			if (!runtimeScope) {
-				const bound = buildBoundScope(AGENT_RUNTIME_SENTRY_DSN, {});
-				runtimeClient = bound?.client ?? null;
-				runtimeScope = bound?.scope ?? null;
-			}
-			if (!mcpScope) {
-				const bound = buildBoundScope(AGENT_MCP_SENTRY_DSN, { source: "agent-daemon" });
-				mcpClient = bound?.client ?? null;
-				mcpScope = bound?.scope ?? null;
-			}
-		}
-		if (mod.getClient()) {
-			sentry = mod;
-			return;
-		}
-		mod.init({
-			dsn,
-			environment: deriveEnvironment(),
-			...options.release ? { release: options.release } : {},
-			sampleRate: 1,
-			tracesSampleRate: 0,
-			sendDefaultPii: false,
-			...options.surface === "daemon" ? { integrations: (defaults) => defaults.filter((i) => i.name !== "OnUncaughtException" && i.name !== "OnUnhandledRejection") } : {},
-			beforeSend: (event) => scrubEvent(event),
-			beforeBreadcrumb: (breadcrumb) => scrubBreadcrumb(breadcrumb)
-		});
-		sentry = mod;
-		mod.setTag("surface", options.surface);
-		const runtime = deriveRuntime();
-		if (runtime) mod.setTag("runtime", runtime);
-	} catch {
-		sentry = null;
-	}
-}
-/**
-* Attach the resolved agent identity to all subsequent events. Called by the
-* daemon once `loadDaemonConfig()` has resolved `agentId`/`runtime`.
-*/
-function setAgentContext(context) {
-	if (!sentry) return;
-	try {
-		for (const scope of [
-			sentry,
-			runtimeScope,
-			mcpScope
-		]) {
-			if (!scope) continue;
-			if (context.agentId) scope.setTag("agentId", context.agentId);
-			if (context.runtime) scope.setTag("runtime", context.runtime);
-		}
-	} catch {}
-}
-/**
-* Capture an integration lifecycle failure (install/activate/reinstall/remove)
-* with `{ integration, phase }` tags. Accepts an `Error` (captured with stack)
-* or a plain message string (captured as an error-level message). No-op when
-* Sentry is not initialised.
-*/
-function captureIntegrationFailure(integration, phase, cause) {
-	if (!sentry) return;
-	try {
-		if (cause instanceof Error) sentry.captureException(cause, { tags: {
-			integration,
-			phase
-		} });
-		else sentry.captureMessage(String(cause), {
-			level: "error",
-			tags: {
-				integration,
-				phase
-			}
-		});
-	} catch {}
-}
-/**
-* Capture a generic CLI failure with a `{ context }` tag. The CLI counterpart
-* to `captureIntegrationFailure` — used by `exitWithError` at the handled-error
-* `process.exit()` sites in `@alfe.ai/cli`'s commands, which otherwise report
-* nothing (the error was caught, never thrown). Accepts an `Error` (captured
-* with stack), a defined non-Error value (captured as an error-level message),
-* or nothing (the `context` string itself becomes the message). No-op when
-* Sentry is not initialised. Never throws.
-*/
-function captureCliFailure(context, cause) {
-	if (!sentry) return;
-	try {
-		if (cause instanceof Error) sentry.captureException(cause, { tags: { context } });
-		else if (cause === void 0) sentry.captureMessage(context, { level: "error" });
-		else sentry.captureMessage(String(cause), {
-			level: "error",
-			tags: { context }
-		});
-	} catch {}
-}
-/**
-* Capture a runtime child-process crash (non-graceful exit) or spawn failure
-* into the dedicated `agent-runtime` project. Recent output travels as
-* breadcrumbs — NEVER `extra`, which `scrubEvent` (the runtime client's
-* `beforeSend`) deletes. Throttling is the caller's job (`CaptureThrottle` in
-* `runtime-output-monitor.ts`). No-op when the runtime client is not
-* initialised. Never throws.
-*/
-function captureRuntimeCrash(opts) {
-	if (!runtimeScope) return;
-	try {
-		const scope = runtimeScope.clone();
-		for (const { stream, line } of opts.recentOutput) scope.addBreadcrumb({
-			category: `runtime.${stream}`,
-			level: stream === "stderr" ? "warning" : "info",
-			message: line
-		});
-		const crashKey = opts.spawnError ? `spawn:${opts.spawnError.code ?? "error"}` : String(opts.code ?? opts.signal ?? "unknown");
-		scope.setFingerprint([
-			"runtime-crash",
-			opts.runtime,
-			crashKey
-		]);
-		scope.setTags({
-			runtime: opts.runtime,
-			exitCode: String(opts.code),
-			signal: String(opts.signal),
-			crashesSuppressed: String(opts.crashesSuppressed ?? 0)
-		});
-		if (opts.spawnError) scope.captureException(opts.spawnError);
-		else scope.captureMessage(`Runtime ${opts.runtime} crashed (code=${String(opts.code)}, signal=${String(opts.signal)})`, "error");
-	} catch {}
-}
-/**
-* Capture an error-looking block of runtime output (stack trace, Python
-* traceback, or ERROR-level log line) detected while the child is running.
-* The block lines travel as breadcrumbs; the head line is the message.
-* Throttling/dedupe is the caller's job. No-op when Sentry is not initialised.
-* Never throws.
-*/
-function captureRuntimeErrorOutput(opts) {
-	if (!runtimeScope) return;
-	try {
-		const scope = runtimeScope.clone();
-		for (const line of opts.lines) scope.addBreadcrumb({
-			category: `runtime.${opts.stream}`,
-			level: "error",
-			message: line
-		});
-		scope.setFingerprint([
-			"runtime-output",
-			opts.runtime,
-			opts.kind,
-			opts.fingerprintKey
-		]);
-		scope.setTags({
-			runtime: opts.runtime,
-			stream: opts.stream,
-			kind: opts.kind,
-			suppressedCount: String(opts.suppressedCount ?? 0)
-		});
-		scope.captureMessage(opts.lines[0].slice(0, 300), "error");
-	} catch {}
-}
-/**
-* Capture an MCP failure (tool error, server crash, or error-looking stderr
-* output) into the `mcp` project via the daemon's bound MCP client. Throttling
-* is the caller's job (`mcp-error-capture.ts`). No-op when the MCP client is
-* not initialised. Never throws.
-*/
-function captureMcpFailure(opts) {
-	if (!mcpScope) return;
-	try {
-		const scope = mcpScope.clone();
-		for (const line of opts.lines ?? []) scope.addBreadcrumb({
-			category: `mcp.${opts.server}`,
-			level: "error",
-			message: line
-		});
-		scope.setFingerprint([
-			"agent-mcp",
-			opts.server,
-			opts.kind,
-			...opts.tool ? [opts.tool] : []
-		]);
-		scope.setTags({
-			server: opts.server,
-			kind: opts.kind,
-			...opts.tool ? { tool: opts.tool } : {},
-			suppressedCount: String(opts.suppressedCount ?? 0)
-		});
-		scope.captureMessage(`MCP ${opts.server}${opts.tool ? `.${opts.tool}` : ""} ${opts.kind}: ${opts.message.slice(0, 300)}`, "error");
-	} catch {}
-}
-/** Flush queued events (small timeout) so short-lived commands deliver them. */
-async function flushSentry(timeoutMs = 2e3) {
-	for (const client of [runtimeClient, mcpClient]) try {
-		if (client) await client.flush(timeoutMs);
-	} catch {}
-	if (!sentry) return;
-	try {
-		await sentry.flush(timeoutMs);
-	} catch {}
-}
-/**
-* Capture a fatal error — for the CLI's top-level catch. Does NOT flush: the
-* caller's `finally { await flushSentry() }` delivers it (flushing here too
-* doubled the worst-case exit delay on a failing command).
-*/
-function captureFatal(cause) {
-	if (!sentry) return;
-	try {
-		sentry.captureException(cause);
-	} catch {}
-}
-//#endregion
 //#region src/reconciliation.ts
-const log$4 = logger$1.child({ component: "Reconciliation" });
+const log$5 = logger$1.child({ component: "Reconciliation" });
 /**
 * How many times reconcile will re-attempt activation of an intact integration
 * stuck in `error` (with no reinstall requested) before giving up and waiting
@@ -5840,7 +5510,7 @@ var ReconciliationEngine = class {
 		try {
 			localIntegrations = await this.manager.getInstalledIntegrations();
 		} catch (err) {
-			log$4.error({ err }, "Failed to get local integrations");
+			log$5.error({ err }, "Failed to get local integrations");
 			localIntegrations = [];
 		}
 		const localMap = new Map(localIntegrations.map((i) => [i.id, i]));
@@ -5859,10 +5529,10 @@ var ReconciliationEngine = class {
 		try {
 			if (!local) {
 				await this.ensureSuspended();
-				log$4.info(`Installing ${id}@${desired.version}`);
+				log$5.info(`Installing ${id}@${desired.version}`);
 				await this.manager.install(id, desired.version, desired.config, desired.customSource);
 				report.installed.push(id);
-				log$4.info(`Activating ${id}`);
+				log$5.info(`Activating ${id}`);
 				if ((await this.manager.activate(id)).configApplied) report.configApplied = true;
 				report.activated.push(id);
 				report.results.push({
@@ -5875,7 +5545,7 @@ var ReconciliationEngine = class {
 			if (local.version !== desired.version && desired.version !== "" && local.version !== "unknown") {
 				if (desired.reinstallRequestedAt && local.installedAt && desired.reinstallRequestedAt > local.installedAt) {
 					await this.ensureSuspended();
-					log$4.info(`Reinstalling ${id} on version change (reinstall requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt}): ${local.version} → ${desired.version}`);
+					log$5.info(`Reinstalling ${id} on version change (reinstall requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt}): ${local.version} → ${desired.version}`);
 					this.manager.resetReinstallAttempts(id);
 					this.activateAttempts.delete(id);
 					if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -5888,7 +5558,7 @@ var ReconciliationEngine = class {
 					});
 					return;
 				}
-				log$4.info(`Upgrading ${id} in place: ${local.version} → ${desired.version}`);
+				log$5.info(`Upgrading ${id} in place: ${local.version} → ${desired.version}`);
 				try {
 					if ((await this.manager.upgrade(id, desired.version, desired.config, desired.customSource, { onBeforeRuntimeMutation: () => this.ensureSuspended() })).configApplied) report.configApplied = true;
 					this.manager.resetReinstallAttempts(id);
@@ -5902,7 +5572,7 @@ var ReconciliationEngine = class {
 					});
 				} catch (upgradeErr) {
 					const upgradeMsg = upgradeErr instanceof Error ? upgradeErr.message : String(upgradeErr);
-					log$4.error({ err: upgradeErr }, `Upgrade failed for ${id}`);
+					log$5.error({ err: upgradeErr }, `Upgrade failed for ${id}`);
 					captureIntegrationFailure(id, "upgrade", upgradeErr);
 					report.errors.push({
 						integrationId: id,
@@ -5920,7 +5590,7 @@ var ReconciliationEngine = class {
 			if (local.status === "error") {
 				if (desired.reinstallRequestedAt && local.installedAt && desired.reinstallRequestedAt > local.installedAt) {
 					await this.ensureSuspended();
-					log$4.info(`Reinstalling ${id} from error state (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
+					log$5.info(`Reinstalling ${id} from error state (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
 					this.manager.resetReinstallAttempts(id);
 					this.activateAttempts.delete(id);
 					if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -5936,7 +5606,7 @@ var ReconciliationEngine = class {
 				if (!await this.manager.isInstallIntact(id)) {
 					const attempts = this.manager.getReinstallAttempts(id);
 					if (attempts >= 3) {
-						log$4.error(`Auto-reinstall blocked for ${id} — ${String(attempts)} consecutive failures. Manual reinstall required.`);
+						log$5.error(`Auto-reinstall blocked for ${id} — ${String(attempts)} consecutive failures. Manual reinstall required.`);
 						captureIntegrationFailure(id, "reinstall", `Max auto-reinstall attempts (${String(attempts)}) reached — manual reinstall required`);
 						report.errors.push({
 							integrationId: id,
@@ -5951,7 +5621,7 @@ var ReconciliationEngine = class {
 						return;
 					}
 					await this.ensureSuspended();
-					log$4.info(`Auto-reinstalling ${id} — install directory is corrupted or missing (attempt ${String(attempts + 1)}/3)`);
+					log$5.info(`Auto-reinstalling ${id} — install directory is corrupted or missing (attempt ${String(attempts + 1)}/3)`);
 					this.manager.incrementReinstallAttempts(id);
 					try {
 						if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -5966,7 +5636,7 @@ var ReconciliationEngine = class {
 						});
 					} catch (reinstallErr) {
 						const reinstallMsg = reinstallErr instanceof Error ? reinstallErr.message : String(reinstallErr);
-						log$4.error({ err: reinstallErr }, `Auto-reinstall failed for ${id}`);
+						log$5.error({ err: reinstallErr }, `Auto-reinstall failed for ${id}`);
 						captureIntegrationFailure(id, "reinstall", reinstallErr);
 						report.errors.push({
 							integrationId: id,
@@ -5985,7 +5655,7 @@ var ReconciliationEngine = class {
 				if (activateAttempts < MAX_ERROR_ACTIVATE_ATTEMPTS) {
 					this.activateAttempts.set(id, activateAttempts + 1);
 					await this.ensureSuspended();
-					log$4.info(`Re-activating ${id} from error state (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)})`);
+					log$5.info(`Re-activating ${id} from error state (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)})`);
 					try {
 						if ((await this.manager.activate(id, { forcePlugins: true })).configApplied) report.configApplied = true;
 						this.activateAttempts.delete(id);
@@ -5998,7 +5668,7 @@ var ReconciliationEngine = class {
 						return;
 					} catch (reactivateErr) {
 						const reactivateMsg = reactivateErr instanceof Error ? reactivateErr.message : String(reactivateErr);
-						log$4.warn(`Re-activation of ${id} from error state failed (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)}): ${reactivateMsg}`);
+						log$5.warn(`Re-activation of ${id} from error state failed (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)}): ${reactivateMsg}`);
 						captureIntegrationFailure(id, "reactivate", reactivateErr);
 						report.errors.push({
 							integrationId: id,
@@ -6013,7 +5683,7 @@ var ReconciliationEngine = class {
 						return;
 					}
 				}
-				log$4.warn(`Integration ${id} is in error state — re-activation exhausted, waiting for reinstall request`);
+				log$5.warn(`Integration ${id} is in error state — re-activation exhausted, waiting for reinstall request`);
 				captureIntegrationFailure(id, "reactivate", `Integration ${id} stuck in error state — re-activation attempts exhausted`);
 				report.errors.push({
 					integrationId: id,
@@ -6030,7 +5700,7 @@ var ReconciliationEngine = class {
 			if (local.status === "installing") {
 				if (desired.reinstallRequestedAt && local.installedAt && desired.reinstallRequestedAt > local.installedAt) {
 					await this.ensureSuspended();
-					log$4.info(`Reinstalling ${id} from stale installing state (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
+					log$5.info(`Reinstalling ${id} from stale installing state (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
 					this.manager.resetReinstallAttempts(id);
 					this.activateAttempts.delete(id);
 					if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -6046,7 +5716,7 @@ var ReconciliationEngine = class {
 				const attempts = this.manager.getReinstallAttempts(id);
 				if (attempts >= 3) {
 					const errorMessage = `Stale installing state — max auto-reinstall attempts (${String(attempts)}) reached — manual reinstall required`;
-					log$4.error(`Auto-reinstall blocked for ${id} — stuck in "installing", ${String(attempts)} consecutive failures. Manual reinstall required.`);
+					log$5.error(`Auto-reinstall blocked for ${id} — stuck in "installing", ${String(attempts)} consecutive failures. Manual reinstall required.`);
 					captureIntegrationFailure(id, "reinstall", errorMessage);
 					report.errors.push({
 						integrationId: id,
@@ -6061,7 +5731,7 @@ var ReconciliationEngine = class {
 					return;
 				}
 				await this.ensureSuspended();
-				log$4.info(`Recovering ${id} from stale installing state via reinstall (attempt ${String(attempts + 1)}/3)`);
+				log$5.info(`Recovering ${id} from stale installing state via reinstall (attempt ${String(attempts + 1)}/3)`);
 				this.manager.incrementReinstallAttempts(id);
 				try {
 					if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -6076,7 +5746,7 @@ var ReconciliationEngine = class {
 					});
 				} catch (reinstallErr) {
 					const reinstallMsg = reinstallErr instanceof Error ? reinstallErr.message : String(reinstallErr);
-					log$4.error({ err: reinstallErr }, `Reinstall from stale installing state failed for ${id}`);
+					log$5.error({ err: reinstallErr }, `Reinstall from stale installing state failed for ${id}`);
 					captureIntegrationFailure(id, "reinstall", reinstallErr);
 					report.errors.push({
 						integrationId: id,
@@ -6093,7 +5763,7 @@ var ReconciliationEngine = class {
 			}
 			if (local.status !== "active") {
 				await this.ensureSuspended();
-				log$4.info(`Activating ${id}`);
+				log$5.info(`Activating ${id}`);
 				if ((await this.manager.activate(id, { forcePlugins: true })).configApplied) report.configApplied = true;
 				report.activated.push(id);
 				report.results.push({
@@ -6105,7 +5775,7 @@ var ReconciliationEngine = class {
 			}
 			if (desired.reinstallRequestedAt && local.installedAt && desired.reinstallRequestedAt > local.installedAt) {
 				await this.ensureSuspended();
-				log$4.info(`Reinstall requested for ${id} (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
+				log$5.info(`Reinstall requested for ${id} (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
 				this.manager.resetReinstallAttempts(id);
 				this.activateAttempts.delete(id);
 				if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -6126,7 +5796,7 @@ var ReconciliationEngine = class {
 			});
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			log$4.error({ err }, `Error reconciling ${id}`);
+			log$5.error({ err }, `Error reconciling ${id}`);
 			captureIntegrationFailure(id, "reconcile_active", err);
 			report.errors.push({
 				integrationId: id,
@@ -6151,7 +5821,7 @@ var ReconciliationEngine = class {
 		}
 		try {
 			await this.ensureSuspended();
-			log$4.info(`Removing ${id}`);
+			log$5.info(`Removing ${id}`);
 			if (local.status === "active") {
 				await this.manager.deactivate(id);
 				report.deactivated.push(id);
@@ -6165,7 +5835,7 @@ var ReconciliationEngine = class {
 			});
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			log$4.error({ err }, `Error removing ${id}`);
+			log$5.error({ err }, `Error removing ${id}`);
 			captureIntegrationFailure(id, "reconcile_removed", err);
 			report.errors.push({
 				integrationId: id,
@@ -6548,7 +6218,7 @@ var CloudClient = class {
 };
 //#endregion
 //#region src/config-reconciler.ts
-const log$3 = logger$1.child({ component: "ConfigReconciler" });
+const log$4 = logger$1.child({ component: "ConfigReconciler" });
 const DEFAULT_VERIFY_RETRIES = 3;
 const DEFAULT_VERIFY_RETRY_DELAY_MS = 750;
 const delay = (ms) => new Promise((resolve) => {
@@ -6570,7 +6240,7 @@ var ConfigReconciler = class {
 	async reconcile(desired) {
 		const applier = this.getApplier();
 		if (!applier?.setConfigRaw) {
-			log$3.debug("No applier with setConfigRaw — skipping config reconcile");
+			log$4.debug("No applier with setConfigRaw — skipping config reconcile");
 			return null;
 		}
 		const setConfigRaw = applier.setConfigRaw.bind(applier);
@@ -6584,7 +6254,7 @@ var ConfigReconciler = class {
 		for (const [key, want] of entries) try {
 			if (getConfigRaw) {
 				if (await getConfigRaw(key) === want) {
-					log$3.debug({ key }, "Config already at desired value — no-op");
+					log$4.debug({ key }, "Config already at desired value — no-op");
 					continue;
 				}
 			}
@@ -6594,12 +6264,19 @@ var ConfigReconciler = class {
 			}
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
+			if (getConfigRaw && await this.verify(getConfigRaw, key, want)) {
+				log$4.warn({
+					key,
+					err: msg
+				}, "config set errored but value landed — treating as applied");
+				continue;
+			}
 			failures.push(`${key}: ${msg}`);
 		}
 		if (failures.length > 0) {
 			const joined = failures.join("; ");
 			const reason = joined.length > 480 ? `${joined.slice(0, 480)}… (truncated)` : joined;
-			log$3.warn({
+			log$4.warn({
 				version: desired.version,
 				reason
 			}, "Config reconcile failed");
@@ -6609,7 +6286,7 @@ var ConfigReconciler = class {
 				reason
 			};
 		}
-		log$3.info({
+		log$4.info({
 			version: desired.version,
 			keys: entries.length
 		}, "Config reconcile applied");
@@ -7080,6 +6757,14 @@ var CommandQueue = class {
 */
 const LAUNCHD_LABEL = "ai.alfe.gateway";
 const SYSTEMD_SERVICE = "alfe-gateway";
+/**
+* On-disk path for the boot-time self-heal guard script (Linux only).
+* Written next to the systemd unit at setup time and invoked via
+* `ExecStartPre=` — see `writeGuardScript` and `generateSystemdUnit`.
+*/
+function getGuardScriptPath() {
+	return isRootUser() ? "/usr/local/lib/alfe/alfe-cli-guard.sh" : join(homedir(), ".alfe", "alfe-cli-guard.sh");
+}
 function isRootUser() {
 	return process.getuid?.() === 0;
 }
@@ -7155,16 +6840,108 @@ function generateLaunchdPlist() {
 </plist>`;
 }
 /**
+* Boot-time self-heal guard (Linux only).
+*
+* Runs as an `ExecStartPre=` BEFORE the daemon launches, OUTSIDE the
+* (possibly-broken) `alfe` binary. It exists for the case defense #1
+* (verify-before-exit in `upgrade.ts`) structurally cannot cover: the daemon
+* is KILLED during `npm install -g @alfe.ai/cli` (reboot / OOM), leaving the
+* package with deps but no `dist/` and a dangling `/usr/bin/alfe` symlink.
+* systemd then execs a dangling binary forever → 203/EXEC crash-loop, a
+* permanent brick with no automatic recovery (real prod incident,
+* ~13,570 restarts over 2 days).
+*
+* The guard:
+*   - checks the CLI is intact: the symlink target (`dist/index.js`) exists AND
+*     `alfe --version` exits 0;
+*   - if broken, reinstalls `@alfe.ai/cli@$ALFE_CLI_VERSION` (the exact version
+*     baked into the unit's `Environment=`; falls back to `@latest` when
+*     unset), so the daemon then execs a working binary;
+*   - is idempotent + fast (no-op when healthy) and NEVER wedges boot: any of
+*     its own failures log + `exit 0` so a human can still SSH in.
+*
+* POSIX sh (dash-safe): the box may not have bash. Keep the two intactness
+* checks in lockstep with `verifyCliInstall` in `verify-cli-install.ts`.
+*/
+/** @internal exported for unit tests; not re-exported from the barrel. */
+function generateGuardScript() {
+	const version = process.env.ALFE_CLI_VERSION;
+	return `#!/bin/sh
+# Alfe CLI boot-time self-heal guard. Auto-generated by 'alfe setup' — do not edit.
+# Repairs an interrupted 'npm install -g @alfe.ai/cli' before the daemon starts,
+# so a mid-install reboot can't brick the agent with a 203/EXEC crash-loop.
+# Must never wedge boot: every failure path logs and exits 0.
+set -u
+
+TARGET='${version && version.length > 0 ? `@alfe.ai/cli@${version}` : "@alfe.ai/cli@latest"}'
+log() { echo "[alfe-cli-guard] $*" >&2; }
+
+# Resolve the alfe bin and its real target (dist/index.js). readlink -f follows
+# the whole symlink chain; fall back to the bin path itself if unavailable.
+BIN="$(command -v alfe 2>/dev/null || true)"
+if [ -n "$BIN" ]; then
+  ENTRY="$(readlink -f "$BIN" 2>/dev/null || echo "$BIN")"
+else
+  ENTRY=""
+fi
+
+healthy=1
+if [ -z "$ENTRY" ] || [ ! -f "$ENTRY" ]; then
+  healthy=0
+  log "CLI entry missing (bin=\${BIN:-<none>} entry=\${ENTRY:-<none>})"
+elif ! alfe --version >/dev/null 2>&1; then
+  healthy=0
+  log "alfe --version failed"
+fi
+
+if [ "$healthy" -eq 1 ]; then
+  exit 0
+fi
+
+log "CLI install looks broken — reinstalling $TARGET"
+# Blow away a partial tree first so npm re-materialises dist/ cleanly. Best-effort.
+GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"
+if [ -n "$GLOBAL_ROOT" ] && [ -d "$GLOBAL_ROOT/@alfe.ai/cli" ]; then
+  rm -rf "$GLOBAL_ROOT/@alfe.ai/cli" 2>/dev/null || true
+fi
+
+# Bound the reinstall so a slow/unreachable registry at boot can't stall the
+# ExecStartPre up to systemd's DefaultTimeoutStartSec (~90s). Two layers:
+#   - npm --fetch-timeout/--fetch-retries cap per-request/hung-socket time;
+#   - a wall-clock 'timeout' wrapper caps the whole install when present
+#     ('timeout' isn't guaranteed, so fall back to a bare install).
+# stdout->stderr ('>&2') so npm's chatter lands in the journal, not on fd1.
+if command -v timeout >/dev/null 2>&1; then
+  timeout 120 npm install -g "$TARGET" --fetch-timeout=60000 --fetch-retries=2 >&2
+  rc=$?
+else
+  npm install -g "$TARGET" --fetch-timeout=60000 --fetch-retries=2 >&2
+  rc=$?
+fi
+if [ "$rc" -eq 0 ]; then
+  log "reinstall succeeded"
+else
+  log "reinstall FAILED (rc=$rc) — daemon start may still fail; a human can SSH in to repair"
+fi
+
+# Always exit 0: even a failed repair must not block the unit from attempting
+# ExecStart (which then fails visibly) rather than wedging silently in pre-start.
+exit 0
+`;
+}
+/**
 * Generate a systemd unit for Linux.
 * Root users get a system-level unit; non-root get a user-level unit.
 */
+/** @internal exported for unit tests; not re-exported from the barrel. */
 function generateSystemdUnit() {
 	const alfeBin = getAlfeBinPath();
 	const root = isRootUser();
 	const envLines = [
 		"ALFE_MANAGED",
 		"ALFE_API_KEY",
-		"LOG_LEVEL"
+		"LOG_LEVEL",
+		"ALFE_CLI_VERSION"
 	].filter((key) => process.env[key]).map((key) => `Environment=${key}=${process.env[key] ?? ""}`).join("\n");
 	return `[Unit]
 Description=Alfe Gateway Daemon
@@ -7173,6 +6950,7 @@ Wants=network-online.target
 
 [Service]
 Type=simple
+ExecStartPre=-/bin/sh ${getGuardScriptPath()}
 ExecStart=${alfeBin} gateway daemon
 Restart=always
 RestartSec=10
@@ -7189,6 +6967,19 @@ ${envLines}
 WantedBy=${root ? "multi-user.target" : "default.target"}`;
 }
 /**
+* Write the boot-time self-heal guard script to disk (Linux only) and make it
+* executable. Called from `installSystemd` before the unit is written.
+*/
+async function writeGuardScript() {
+	const guardPath = getGuardScriptPath();
+	await mkdir(dirname(guardPath), { recursive: true });
+	await writeFile(guardPath, generateGuardScript(), {
+		encoding: "utf-8",
+		mode: 493
+	});
+	logger$1.info({ path: guardPath }, "Wrote CLI self-heal guard script");
+}
+/**
 * Install the service unit for the current platform.
 */
 async function installService() {
@@ -7250,6 +7041,7 @@ async function installSystemd() {
 	const dir = root ? "/etc/systemd/system" : join(homedir(), ".config", "systemd", "user");
 	const ctl = root ? "systemctl" : "systemctl --user";
 	if (!root) await mkdir(dir, { recursive: true });
+	await writeGuardScript();
 	await writeFile(unitPath, generateSystemdUnit(), "utf-8");
 	logger$1.info({
 		path: unitPath,
@@ -7272,6 +7064,9 @@ async function uninstallSystemd() {
 	try {
 		await unlink(unitPath);
 	} catch {}
+	try {
+		await unlink(getGuardScriptPath());
+	} catch {}
 	try {
 		execSync(`${ctl} daemon-reload`, { stdio: "pipe" });
 	} catch {}
@@ -22585,13 +22380,21 @@ var CaptureThrottle = class {
 * Spawns the runtime binary, pipes stdout/stderr to the daemon logger,
 * and restarts on crash with exponential backoff.
 */
-const log$2 = createLogger("RuntimeProcess");
+const log$3 = createLogger("RuntimeProcess");
 /** Quiet-period flush for a pending multi-line error block (e.g. a traceback
 * followed by silence — no closing line ever arrives to complete it). */
 const DETECTOR_FLUSH_DEBOUNCE_MS = 1500;
 const BACKOFF_INITIAL_MS = 1e3;
 const BACKOFF_MAX_MS = 3e4;
 const STABLE_UPTIME_MS = 6e4;
+/**
+* Max time a NON-crash restart waits for an in-flight chat turn to finish
+* before it forces the stop anyway. A turn that outlives this is almost
+* certainly wedged; a real reply streams in far less. Long enough to cover a
+* normal multi-tool turn, short enough that a stuck turn doesn't block a
+* platform-pushed `daemon.update` indefinitely.
+*/
+const DRAIN_GRACE_MS = 45e3;
 var RuntimeProcess = class {
 	child = null;
 	stopped = false;
@@ -22602,10 +22405,20 @@ var RuntimeProcess = class {
 	detector = new ErrorLineDetector();
 	throttle = new CaptureThrottle(STABLE_UPTIME_MS);
 	detectorFlushTimer = null;
+	turnActivityProbe = null;
 	constructor(options) {
 		this.options = options;
 	}
 	/**
+	* Attach the turn-activity probe used by drained restarts. The daemon calls
+	* this after the IPC server is up (plugins register there). Without it,
+	* {@link stopWhenIdle} and drained {@link restart} fall back to an immediate
+	* stop — safe, just not turn-aware.
+	*/
+	setTurnActivityProbe(probe) {
+		this.turnActivityProbe = probe;
+	}
+	/**
 	* Resolve the binary command and args for a given runtime type.
 	*/
 	resolveCommand() {
@@ -22622,6 +22435,10 @@ var RuntimeProcess = class {
 				command: "hermes",
 				args: ["gateway", "run"]
 			};
+			case "claude-code": return {
+				command: "alfe-claude-host",
+				args: ["run"]
+			};
 			default: throw new Error(`Unsupported runtime: ${this.options.runtime}`);
 		}
 	}
@@ -22632,7 +22449,7 @@ var RuntimeProcess = class {
 		if (this.stopped) return;
 		const { command, args } = this.resolveCommand();
 		this.lastStartTime = Date.now();
-		log$2.info({
+		log$3.info({
 			runtime: this.options.runtime,
 			command,
 			args,
@@ -22653,7 +22470,7 @@ var RuntimeProcess = class {
 		this.child.stdout?.on("data", (data) => {
 			const lines = data.toString().trim().split("\n");
 			for (const line of lines) {
-				log$2.info({
+				log$3.info({
 					runtime: this.options.runtime,
 					stream: "stdout"
 				}, line);
@@ -22663,7 +22480,7 @@ var RuntimeProcess = class {
 		this.child.stderr?.on("data", (data) => {
 			const lines = data.toString().trim().split("\n");
 			for (const line of lines) {
-				log$2.warn({
+				log$3.warn({
 					runtime: this.options.runtime,
 					stream: "stderr"
 				}, line);
@@ -22673,7 +22490,7 @@ var RuntimeProcess = class {
 		this.child.on("exit", (code, signal) => {
 			this.child = null;
 			if (this.stopped) {
-				log$2.info({
+				log$3.info({
 					runtime: this.options.runtime,
 					code,
 					signal
@@ -22681,7 +22498,7 @@ var RuntimeProcess = class {
 				return;
 			}
 			if (code === 0 && signal == null) {
-				log$2.info({
+				log$3.info({
 					runtime: this.options.runtime,
 					code
 				}, "Runtime exited gracefully — restarting");
@@ -22691,7 +22508,7 @@ var RuntimeProcess = class {
 				}, 500);
 				return;
 			}
-			log$2.warn({
+			log$3.warn({
 				runtime: this.options.runtime,
 				code,
 				signal,
@@ -22712,7 +22529,7 @@ var RuntimeProcess = class {
 				recentOutput: this.ringBuffer.snapshot(),
 				crashesSuppressed: crash.suppressedCount
 			});
-			else log$2.debug({
+			else log$3.debug({
 				runtime: this.options.runtime,
 				suppressed: crash.suppressedCount
 			}, "Crash capture suppressed by throttle");
@@ -22724,7 +22541,7 @@ var RuntimeProcess = class {
 			this.backoffMs = Math.min(this.backoffMs * 2, BACKOFF_MAX_MS);
 		});
 		this.child.on("error", (err) => {
-			log$2.error({
+			log$3.error({
 				runtime: this.options.runtime,
 				err: err.message
 			}, "Runtime process error");
@@ -22763,7 +22580,7 @@ var RuntimeProcess = class {
 				this.emitErrorBlock(this.detector.flush());
 			}, DETECTOR_FLUSH_DEBOUNCE_MS);
 		} catch (err) {
-			log$2.debug({
+			log$3.debug({
 				runtime: this.options.runtime,
 				err: err instanceof Error ? err.message : String(err)
 			}, "Runtime output observation failed");
@@ -22774,7 +22591,7 @@ var RuntimeProcess = class {
 		if (!block) return;
 		const { allow, suppressedCount } = this.throttle.allowErrorCapture(block.fingerprintKey);
 		if (!allow) {
-			log$2.debug({
+			log$3.debug({
 				runtime: this.options.runtime,
 				kind: block.kind,
 				suppressed: suppressedCount
@@ -22808,7 +22625,7 @@ var RuntimeProcess = class {
 		if (!child) return;
 		return new Promise((resolve) => {
 			const killTimer = setTimeout(() => {
-				log$2.warn({ runtime: this.options.runtime }, "Runtime did not exit in time — sending SIGKILL");
+				log$3.warn({ runtime: this.options.runtime }, "Runtime did not exit in time — sending SIGKILL");
 				child.kill("SIGKILL");
 			}, 5e3);
 			child.on("exit", () => {
@@ -22819,6 +22636,54 @@ var RuntimeProcess = class {
 		});
 	}
 	/**
+	* Stop the runtime, but first wait for any in-flight chat turn to finish
+	* (up to a grace deadline). This is the entry point for NON-crash restarts —
+	* a mid-turn SIGTERM turns a healthy reply into an "unknown error" for the
+	* user, so a planned stop drains first.
+	*
+	* Semantics:
+	*  - No probe attached, or probe reports idle up-front → stops immediately
+	*    (no added latency for the common case).
+	*  - A turn is in flight → polls the probe every {@link DRAIN_POLL_INTERVAL_MS}
+	*    until it reports idle, then stops.
+	*  - The turn never ends within `graceMs` → logs and forces the stop anyway
+	*    (a wedged turn must not block a platform-pushed restart forever).
+	*
+	* Crash restarts must NOT call this — the child is already dead/broken and
+	* the probe would just burn the grace window. They keep using {@link stop}.
+	*/
+	async stopWhenIdle(opts) {
+		const probe = opts?.probe ?? this.turnActivityProbe;
+		const graceMs = opts?.graceMs ?? 45e3;
+		if (!this.child || !probe) {
+			await this.stop();
+			return;
+		}
+		const deadline = Date.now() + graceMs;
+		let deferred = false;
+		for (;;) {
+			if (!await probe.isTurnActive()) break;
+			if (Date.now() >= deadline) {
+				log$3.warn({
+					runtime: this.options.runtime,
+					graceMs
+				}, "Runtime still mid-turn at drain grace deadline — forcing stop");
+				break;
+			}
+			if (!deferred) {
+				deferred = true;
+				log$3.info({
+					runtime: this.options.runtime,
+					graceMs
+				}, "Runtime is mid-turn — deferring planned stop until idle");
+			}
+			await new Promise((resolve) => setTimeout(resolve, 500));
+			if (!this.isRunning) return;
+		}
+		if (deferred) log$3.info({ runtime: this.options.runtime }, "Runtime idle — proceeding with planned stop");
+		await this.stop();
+	}
+	/**
 	* Resume after a suspend (stop). `start()` alone is a no-op while stopped
 	* because `stop()` latches `this.stopped = true`; resume clears that latch,
 	* resets the crash backoff, and re-spawns. Used by the RuntimeGate to bring
@@ -22831,10 +22696,20 @@ var RuntimeProcess = class {
 	}
 	/**
 	* Restart the runtime process (stop then start with fresh backoff).
+	*
+	* This is a PLANNED restart (`runtime.restart`, post-upgrade cycle, gate
+	* request), so by default it drains any in-flight chat turn before stopping
+	* — see {@link stopWhenIdle}. Pass `{ drain: false }` to force an immediate
+	* stop (e.g. when the caller has already established the child is unhealthy).
 	*/
-	async restart() {
-		log$2.info({ runtime: this.options.runtime }, "Restarting runtime...");
-		await this.stop();
+	async restart(opts) {
+		const drain = opts?.drain ?? true;
+		log$3.info({
+			runtime: this.options.runtime,
+			drain
+		}, "Restarting runtime...");
+		if (drain) await this.stopWhenIdle();
+		else await this.stop();
 		this.stopped = false;
 		this.backoffMs = BACKOFF_INITIAL_MS;
 		this.start();
@@ -22847,6 +22722,78 @@ var RuntimeProcess = class {
 	}
 };
 //#endregion
+//#region src/turn-activity.ts
+/**
+* Turn-activity probe — lets a NON-crash runtime restart wait for the runtime
+* to finish any in-flight chat turn before the child is SIGTERM'd.
+*
+* ## Why this exists
+*
+* Every non-crash restart path (`runtime.restart`, `daemon.update`,
+* `daemon.restart`, the RuntimeGate resume after a mutating reconcile) used to
+* route straight into {@link RuntimeProcess.stop}, which is SIGTERM →
+* SIGKILL-after-5s with zero turn-awareness. A platform-pushed `daemon.update`
+* that landed mid-turn killed the runtime child while it was streaming a reply,
+* and the user saw an "unknown error" for a turn that was otherwise healthy.
+*
+* The fix is a small "is a turn active?" signal that the daemon can consult
+* before a *planned* stop, deferring the SIGTERM until the runtime reports idle
+* (or a grace deadline elapses). Crash restarts do NOT consult it — the child is
+* already dead or wedged, so there is nothing to drain.
+*
+* ## The runtime-side contract (the boundary)
+*
+* The runtime's activity is a property of the chat plugin's active-turn state,
+* which lives INSIDE the runtime child (e.g. `openclaw-chat`'s per-turn run
+* gate). The daemon cannot see it directly. The daemon reaches it over the same
+* IPC socket the plugin already uses to register:
+*
+*   daemon → plugin request:  { method: 'runtime.activity' }
+*   plugin → daemon response: { ok: true, payload: { active: boolean } }
+*
+* `runtime.activity` is on the daemon→plugin method allowlist (see
+* protocol.ts). A plugin answers `active: true` while it is dispatching a turn
+* and `active: false` otherwise. This is the ONE thing the runtime must provide;
+* everything else in the drain lives on the gateway side.
+*
+* ## Fail-open to idle
+*
+* If NO connected plugin answers `runtime.activity` (older plugin build, the
+* chat plugin isn't loaded, the request times out), the probe reports **idle**.
+* A planned restart must never hang forever waiting on a signal that will never
+* arrive — the grace deadline is a backstop, but fail-open-to-idle means the
+* common "nothing to drain" case restarts immediately with no added latency.
+*/
+const log$2 = logger$1.child({ component: "TurnActivity" });
+/** The IPC method the daemon calls on plugins to ask "is a turn active?". */
+const RUNTIME_ACTIVITY_METHOD = "runtime.activity";
+/**
+* IPC-backed probe. Broadcasts `runtime.activity` to every registered plugin
+* and reports active if ANY plugin claims an in-flight turn. Fails open to idle
+* on any error / timeout / non-answer so a planned restart is never wedged.
+*/
+var IpcTurnActivityProbe = class {
+	constructor(getIpcServer, probeTimeoutMs = 2e3) {
+		this.getIpcServer = getIpcServer;
+		this.probeTimeoutMs = probeTimeoutMs;
+	}
+	async isTurnActive() {
+		const ipc = this.getIpcServer();
+		if (!ipc || ipc.registeredCount === 0) return false;
+		try {
+			const responses = await ipc.broadcastRequest(RUNTIME_ACTIVITY_METHOD, {}, this.probeTimeoutMs);
+			for (const [pluginId, res] of responses) if (res.ok && res.payload != null && typeof res.payload === "object" && res.payload.active === true) {
+				log$2.debug({ pluginId }, "Plugin reports an in-flight turn");
+				return true;
+			}
+			return false;
+		} catch (err) {
+			log$2.debug({ err: err instanceof Error ? err.message : String(err) }, "Turn-activity probe failed — assuming idle");
+			return false;
+		}
+	}
+};
+//#endregion
 //#region src/command-registry.ts
 /**
 * Command Registry — maps integration command names to local handler files.
@@ -23475,8 +23422,16 @@ let mcpManagerRef = null;
 * and for managed/self-hosted runtimes other than hermes.
 */
 let hermesMcpSync = null;
+/**
+* claude-code-only MCP store consumer. Mirrors the runtime-agnostic MCP store
+* into the host's `--mcp-config` JSON (~/.claude-code/mcp-config.json), injecting
+* ALFE_API_KEY into every stdio server's env. Null for every other runtime
+* (never constructed) — same shape/role as {@link hermesMcpSync}.
+*/
+let claudeCodeMcpSync = null;
 let aiProxyServer = null;
 let runtimeProcess = null;
+let turnActivityProbe = null;
 let aiProxyUrl = null;
 let aiProxyRunning = false;
 let cloudConnected = false;
@@ -23587,6 +23542,10 @@ const RUNTIME_VERSION_COMMANDS = {
 	hermes: {
 		command: "hermes",
 		args: ["version"]
+	},
+	"claude-code": {
+		command: "alfe-claude-host",
+		args: ["--version"]
 	}
 };
 /**
@@ -23770,6 +23729,7 @@ async function startDaemon() {
 	logger$1.debug({ socketPath: config.socketPath }, "Starting IPC server...");
 	ipcServer = new IPCServer(config.socketPath);
 	ipcServer.setRequestHandler(handlePluginRequest);
+	turnActivityProbe = new IpcTurnActivityProbe(() => ipcServer);
 	try {
 		await ipcServer.start();
 		logger$1.debug("IPC server started");
@@ -23824,6 +23784,13 @@ async function startDaemon() {
 			runtime: name,
 			home: runtimeCfg.workspace
 		}, "Registered Hermes runtime applier");
+	} else if (name === "claude-code") {
+		runtimeAppliers.set(name, new ClaudeCodeApplier({ home: runtimeCfg.workspace }));
+		logger$1.info({
+			runtime: name,
+			home: runtimeCfg.workspace,
+			agentWorkspace: runtimeCfg.agentWorkspace
+		}, "Registered Claude Code runtime applier");
 	} else logger$1.warn({ runtime: name }, "Unknown runtime type — skipping");
 	runtimeAppliersRef = runtimeAppliers;
 	const integrationsService = new IntegrationsService(new AlfeApiClient({
@@ -23842,7 +23809,7 @@ async function startDaemon() {
 		idleTtlMs: 0,
 		...mcpErrorHooks
 	}, { connect: defaultConnect });
-	if (config.runtime === "hermes") logger$1.info("Hermes runtime — daemon MCP bundler left idle (store mirrored to config.yaml by HermesMcpSync)");
+	if (config.runtime === "hermes" || config.runtime === "claude-code") logger$1.info({ runtime: config.runtime }, "MCP store mirrored into runtime config by the runtime MCP sync — daemon MCP bundler left idle");
 	else {
 		await mcpManager.loadIntoBundler(mcpBundler);
 		const warmBundler = (reason) => {
@@ -23901,6 +23868,18 @@ async function startDaemon() {
 			hermesMcpSync.start();
 		}
 	}
+	if (config.runtime === "claude-code") {
+		const ccCfg = config.runtimes[config.runtime];
+		if (ccCfg) {
+			claudeCodeMcpSync = new ClaudeCodeMcpSync({
+				manager: mcpManager,
+				home: ccCfg.workspace,
+				apiKey: config.apiKey,
+				requestRestart: requestRuntimeRestart
+			});
+			claudeCodeMcpSync.start();
+		}
+	}
 	cloudClient.setOnReconciliationComplete(() => {
 		try {
 			const activeCommands = integrationManager.getActiveCommands();
@@ -23933,6 +23912,7 @@ async function startDaemon() {
 				workspace: runtimeCfg.workspace,
 				env: {}
 			});
+			runtimeProcess.setTurnActivityProbe(turnActivityProbe);
 			runtimeProcess.start();
 			logger$1.debug("Runtime process started");
 			if (config.runtime === "openclaw") {
@@ -23963,6 +23943,10 @@ async function startDaemon() {
 			hermesMcpSync.stop();
 			hermesMcpSync = null;
 		}
+		if (claudeCodeMcpSync) {
+			claudeCodeMcpSync.stop();
+			claudeCodeMcpSync = null;
+		}
 		if (mcpBundler) {
 			logger$1.debug("Stopping MCP bundler...");
 			await mcpBundler.dispose();
@@ -24038,11 +24022,46 @@ async function handleCloudCommand(command) {
 	}
 	return ack;
 }
+/**
+* Wait for any in-flight chat turn to finish before a daemon PROCESS exit
+* (daemon.update / daemon.restart). Those paths don't stop the runtime via
+* `RuntimeProcess.stop` — they exit the daemon, and systemd/launchd cgroup-kill
+* the runtime child underneath. That kill is just as turn-destroying as a
+* SIGTERM, so we drain here too. Grace-deadline backstopped; fails open to
+* "proceed" so a wedged turn can't strand a platform-pushed update.
+*/
+async function drainRuntimeBeforeExit(reason) {
+	const probe = turnActivityProbe;
+	if (!probe || !runtimeProcess?.isRunning) return;
+	const deadline = Date.now() + DRAIN_GRACE_MS;
+	let deferred = false;
+	while (Date.now() < deadline) {
+		let active;
+		try {
+			active = await probe.isTurnActive();
+		} catch {
+			return;
+		}
+		if (!active) {
+			if (deferred) logger$1.info({ reason }, "Runtime idle — proceeding with planned daemon exit");
+			return;
+		}
+		if (!deferred) {
+			deferred = true;
+			logger$1.info({ reason }, "Runtime is mid-turn — deferring planned daemon exit until idle");
+		}
+		await new Promise((resolve) => setTimeout(resolve, 500));
+	}
+	logger$1.warn({
+		reason,
+		graceMs: DRAIN_GRACE_MS
+	}, "Runtime still mid-turn at drain grace deadline — proceeding with daemon exit");
+}
 async function executeCloudCommand(command) {
 	if (command.command === "daemon.update") {
 		const version = command.payload?.version ?? "latest";
 		setTimeout(() => {
-			import("./upgrade.js").then(({ upgradeAndExit }) => upgradeAndExit(version)).catch((err) => {
+			drainRuntimeBeforeExit("daemon.update").then(() => import("./upgrade.js")).then(({ upgradeAndExit }) => upgradeAndExit(version)).catch((err) => {
 				logger$1.error({ err: err instanceof Error ? err.message : String(err) }, "Upgrade failed");
 				process.exit(1);
 			});
@@ -24060,7 +24079,9 @@ async function executeCloudCommand(command) {
 	if (command.command === "daemon.restart") {
 		logger$1.info("Restart requested — exiting for systemd restart");
 		setTimeout(() => {
-			process.exit(0);
+			drainRuntimeBeforeExit("daemon.restart").then(() => {
+				process.exit(0);
+			});
 		}, 500);
 		return {
 			type: "COMMAND_ACK",
@@ -24437,17 +24458,41 @@ function handleMcpListServers(manager = mcpManagerRef) {
 			message: "MCP manager not initialized"
 		}
 	};
+	const statuses = manager.serverStatuses ? manager.serverStatuses() : [];
+	const byName = new Map(statuses.map((s) => [s.name, s]));
 	return {
 		ok: true,
-		payload: { servers: manager.listServers() }
+		payload: { servers: manager.listServers().map(({ id, entry }) => ({
+			id,
+			entry,
+			status: byName.get(id) ?? {
+				name: id,
+				connected: false,
+				toolCount: 0,
+				consecutiveFailures: 0
+			}
+		})) }
 	};
 }
 /**
-* Register a new MCP server in the alfe bundler store on behalf of the
-* agent. Owned as `'manual'` so the agent can later remove it without
-* an expectedOwner conflict — matches what `alfe mcp add` does from the
-* CLI. The daemon's bundler will pick the change up via the manager's
-* store watcher and spawn the child on the next tool-factory call.
+* How long the add-confirm probe waits for the freshly-added server to
+* connect before replying. This is effectively the whole budget for
+* `bundler.warmServer`: the `Manager.warmServer` pre-reconcile is cheap here
+* because `addServer` already queued the Connection object into the store +
+* bundler before we probe, so `reconcileBundler()` finds no diff and returns
+* fast. Kept well under the plugin caller's 30s IPC timeout. A slower server
+* still connects in the background and surfaces on the next
+* `alfe_mcp_list_tools` — the probe just reports what it saw within the window.
+*/
+const MCP_ADD_WARM_TIMEOUT_MS = 12e3;
+/**
+* Register a new MCP server in the alfe bundler store on behalf of the agent,
+* then CONFIRM the connect before replying so the agent learns whether the
+* server actually works. Owned as `'manual'` so the agent can later remove it
+* without an expectedOwner conflict — matches what `alfe mcp add` does from the
+* CLI. Registration is durable regardless of the probe outcome: a probe
+* failure (or a runtime with no daemon bundler, e.g. hermes) still returns
+* `ok` with `connected: false`; the store watcher / runtime picks the entry up.
 */
 async function handleMcpAddServer(params, manager = mcpManagerRef) {
 	if (!manager) return {
@@ -24478,10 +24523,6 @@ async function handleMcpAddServer(params, manager = mcpManagerRef) {
 			id: p.id,
 			owner: "manual"
 		});
-		return {
-			ok: true,
-			payload: { id: p.id }
-		};
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		logger$1.warn({
@@ -24496,6 +24537,24 @@ async function handleMcpAddServer(params, manager = mcpManagerRef) {
 			}
 		};
 	}
+	let status = null;
+	if (manager.warmServer) try {
+		status = await manager.warmServer(p.id, MCP_ADD_WARM_TIMEOUT_MS);
+	} catch (err) {
+		logger$1.warn({
+			id: p.id,
+			err: err instanceof Error ? err.message : String(err)
+		}, "mcp.add_server warm probe threw");
+	}
+	return {
+		ok: true,
+		payload: {
+			id: p.id,
+			connected: status?.connected ?? false,
+			toolCount: status?.toolCount ?? 0,
+			...status?.lastError !== void 0 ? { error: status.lastError } : {}
+		}
+	};
 }
 function buildServerConfig(p) {
 	if (typeof p.command === "string" && p.command.length > 0) {
@@ -24721,4 +24780,4 @@ function formatDuration(ms) {
 	return `${String(Math.round(seconds / 3600))}h`;
 }
 //#endregion
-export { PID_PATH as C, resolveAgentIdentity as D, loadDaemonConfig as E, PINNED_OPENCLAW_VERSION as O, ALFE_DIR as S, fetchAgentConfig as T, captureRuntimeErrorOutput as _, installService as a, setAgentContext as b, uninstallService as c, AGENT_RUNTIME_SENTRY_DSN as d, captureCliFailure as f, captureRuntimeCrash as g, captureMcpFailure as h, checkExistingDaemon as i, AGENT_DAEMON_SENTRY_DSN as l, captureIntegrationFailure as m, queryDaemonHealth as n, startService as o, captureFatal as p, startDaemon as r, stopExistingDaemon as s, formatHealthReport as t, AGENT_MCP_SENTRY_DSN as u, flushSentry as v, SOCKET_PATH as w, PROTOCOL_VERSION as x, initAgentSentry as y };
+export { installService as a, uninstallService as c, PID_PATH as d, SOCKET_PATH as f, PINNED_OPENCLAW_VERSION as g, resolveAgentIdentity as h, checkExistingDaemon as i, PROTOCOL_VERSION as l, loadDaemonConfig as m, queryDaemonHealth as n, startService as o, fetchAgentConfig as p, startDaemon as r, stopExistingDaemon as s, formatHealthReport as t, ALFE_DIR as u };