@openhands/agent-canvas 1.8.0 → 1.10.0

package/dist/api/agent-server-adapter.d.ts

@@ -59,20 +59,59 @@ export interface DirectConversationInfo {
         revision: number;
     } | null;
 }
+/**
+ * Shape of the runtime services info served by Agent Canvas backends in
+ * `/server_info.runtime_services`. All URLs are written from the agent's point of
+ * view, not the browser's. The block is rendered into the agent's system prompt
+ * via `AgentContext.system_message_suffix` so the agent knows what's reachable
+ * from inside its sandbox without having to probe.
+ */
+export interface RuntimeServicesInfo {
+    mode?: string;
+    agent_host_alias?: string;
+    services?: {
+        agent_server?: {
+            description?: string;
+            url_from_agent?: string;
+        };
+        ingress?: {
+            description?: string;
+            url_from_agent?: string;
+        };
+        frontend?: {
+            kind?: "vite" | "static";
+            description?: string;
+            url_from_agent?: string;
+        };
+        vite?: {
+            description?: string;
+            url_from_agent?: string;
+        };
+        automation?: {
+            description?: string;
+            url_from_agent?: string;
+            api_prefix?: string;
+            docs_url?: string;
+            openapi_url?: string;
+            auth_env_var?: string;
+        };
+    };
+}
+export declare function parseRuntimeServicesInfo(value: unknown): RuntimeServicesInfo | null;
+export declare function fetchBackendRuntimeServicesInfo(): Promise<RuntimeServicesInfo | null>;
 /**
  * Return the deployment mode from the runtime services info, e.g. "docker",
- * "dev:automation", etc. Returns `null` when no runtime info is configured.
+ * "dev:automation", etc. Returns `null` when no runtime info is supplied.
  */
-export declare function getDeploymentMode(): string | null;
+export declare function getDeploymentMode(runtimeServicesInfo?: RuntimeServicesInfo | null): string | null;
 /**
  * Render the runtime services info into a markdown block suitable for
  * appending to the system prompt via `AgentContext.system_message_suffix`.
  *
- * Returns `undefined` when no runtime info is configured, so callers can
- * safely omit the field on production builds (where the launcher doesn't
- * set `VITE_RUNTIME_SERVICES_INFO`).
+ * Returns `undefined` when no runtime info is available, so callers can safely
+ * omit the field when the selected backend does not advertise runtime services.
  */
-export declare function buildRuntimeServicesSystemSuffix(): string | undefined;
+export declare function buildRuntimeServicesSystemSuffix(runtimeServicesInfo?: RuntimeServicesInfo | null): string | undefined;
 export declare function toConversationUrl(conversationId: string): string;
 export declare function getDefaultConversationTitle(conversationId: string): string;
 export declare function toAppConversation(info: DirectConversationInfo): AppConversation;
@@ -158,6 +197,7 @@ export interface StartConversationOptions {
     agentProfileId?: string;
     agentProfileKind?: AgentKind;
     titleLlmProfile?: string;
+    runtimeServicesInfo?: RuntimeServicesInfo | null;
 }
 export declare function buildStartConversationRequest(options: StartConversationOptions): StartConversationPayload;
 export declare const SUBSCRIPTION_LOGIN_REQUIRED_ERROR = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";

package/dist/api/agent-server-adapter.js

@@ -1,121 +1,135 @@
 import { ExecutionStatus as e } from "../types/agent-server/core/base/common.js";
-import { getAgentServerWorkingDir as t } from "./agent-server-config.js";
-import { getEffectiveLocalBackend as n } from "./backend-registry/active-store.js";
-import { getAgentServerClientOptions as r } from "./agent-server-client-options.js";
-import { isAgentServerToolAvailable as i } from "./agent-server-compatibility.js";
-import { CANVAS_UI_CLIENT_TOOL_NAME as a, LEGACY_CANVAS_UI_TOOL_NAME as o } from "../constants/canvas-ui.js";
-import { ACP_SETTINGS_KEYS as s } from "../node_modules/@openhands/typescript-client/dist/models/acp.js";
+import { ServerClient as t } from "../node_modules/@openhands/typescript-client/dist/client/server-client.js";
+import "../node_modules/@openhands/typescript-client/dist/clients.js";
+import { getAgentServerWorkingDir as n } from "./agent-server-config.js";
+import { getEffectiveLocalBackend as r } from "./backend-registry/active-store.js";
+import { getAgentServerClientOptions as i } from "./agent-server-client-options.js";
+import { getCachedAgentServerInfo as a, isAgentServerToolAvailable as o } from "./agent-server-compatibility.js";
+import { CANVAS_UI_CLIENT_TOOL_NAME as s, LEGACY_CANVAS_UI_TOOL_NAME as c } from "../constants/canvas-ui.js";
+import { ACP_SETTINGS_KEYS as l } from "../node_modules/@openhands/typescript-client/dist/models/acp.js";
 import "../node_modules/@openhands/typescript-client/dist/index.js";
-import { getStoredConversationMetadata as c } from "./conversation-metadata-store.js";
-import l from "../node_modules/@openhands/extensions/skills/index.js";
-import { DEFAULT_SETTINGS as u } from "../services/settings.js";
-import { getAcpPreferredDefaultModel as d, getAcpProvider as f, resolveEffectiveAcpModel as p } from "../constants/acp-providers.js";
-import { buildAuthHeaders as m } from "./backend-registry/auth.js";
-import ee from "./settings-service/settings-service.api.js";
-import { LLM_AUTH_TYPE_SUBSCRIPTION as h, OPENAI_SUBSCRIPTION_VENDOR as g, isSubscriptionLlmConfig as _ } from "../constants/llm-subscription.js";
-import v from "./llm-subscription-service.js";
-import { CANVAS_UI_CLIENT_TOOL as y } from "./canvas-ui-client-tool.js";
+import { getStoredConversationMetadata as u } from "./conversation-metadata-store.js";
+import d from "../node_modules/@openhands/extensions/skills/index.js";
+import { DEFAULT_SETTINGS as f } from "../services/settings.js";
+import { getAcpPreferredDefaultModel as p, getAcpProvider as m, resolveEffectiveAcpModel as h } from "../constants/acp-providers.js";
+import { buildAuthHeaders as g } from "./backend-registry/auth.js";
+import _ from "./settings-service/settings-service.api.js";
+import { LLM_AUTH_TYPE_SUBSCRIPTION as v, OPENAI_SUBSCRIPTION_VENDOR as y, isSubscriptionLlmConfig as b } from "../constants/llm-subscription.js";
+import x from "./llm-subscription-service.js";
+import { CANVAS_UI_CLIENT_TOOL as S } from "./canvas-ui-client-tool.js";
 //#region src/api/agent-server-adapter.ts
-var b = [
+var C = [
 	"terminal",
 	"file_editor",
 	"task_tracker"
-], x = "browser_tool_set", S = "task_tool_set";
-function C() {
+], w = "browser_tool_set", T = "task_tool_set";
+function E() {
 	return !0;
 }
-function w() {
-	if (typeof window < "u") {
-		let e = window.__AGENT_CANVAS_RUNTIME_SERVICES_INFO__;
-		if (typeof e == "string") return e.trim() || null;
+function D(e) {
+	if (typeof e == "string") {
+		let t = e.trim();
+		if (!t) return null;
+		try {
+			return D(JSON.parse(t));
+		} catch {
+			return null;
+		}
 	}
-	return null;
+	if (!e || typeof e != "object" || Array.isArray(e)) return null;
+	let t = e;
+	return !t.services || typeof t.services != "object" ? null : t;
 }
-function T() {
-	let e = w();
-	if (!e) return null;
+async function O() {
+	let e;
 	try {
-		let t = JSON.parse(e);
-		return !t || typeof t != "object" ? null : t;
+		e = i({ timeout: 3e3 });
+	} catch {
+		return null;
+	}
+	let n = D(a({ host: e.host })?.runtime_services);
+	if (n) return n;
+	try {
+		return D((await new t(e).getServerInfo()).runtime_services);
 	} catch {
 		return null;
 	}
 }
-function E() {
-	let e = T();
-	if (!e?.services) return;
-	let t = [];
-	t.push("<RUNTIME_SERVICES>"), e.mode ? t.push(`You are running inside an agent-canvas dev stack started in '${e.mode}' mode.`) : t.push("You are running inside an agent-canvas dev stack."), t.push("The following services are reachable from your sandbox. URLs are written", "from your point of view (i.e., as you should curl/fetch them).", "");
-	let { agent_server: n, ingress: r, automation: i } = e.services, { frontend: a } = e.services;
-	n?.url_from_agent && t.push(`* Agent Server (you): ${n.url_from_agent}`, `    ${n.description ?? "The agent-server hosting your tool calls."}`), r?.url_from_agent && t.push(`* Ingress: ${r.url_from_agent}`, `    ${r.description ?? "Unified entry point for browser-facing traffic."}`), a?.url_from_agent && t.push(`* Frontend: ${a.url_from_agent}`, `    ${a.description ?? "Frontend dev server."}`), i?.url_from_agent ? (t.push(`* Automation backend: ${i.url_from_agent}`, `    ${i.description ?? "OpenHands Automations service."}`), i.docs_url && t.push(`    Docs:    ${i.docs_url}`), i.openapi_url && t.push(`    OpenAPI: ${i.openapi_url}`), i.auth_env_var && t.push(`    Auth:    header 'X-Session-API-Key: $${i.auth_env_var}'`)) : t.push("* Automation backend: not running in this dev mode (skip /api/automation calls).");
-	let o = n?.url_from_agent;
-	return t.push("", "Trust this block over guessing: do not assume any other URLs are running."), o && t.push(`In particular, ${o} inside your sandbox is the Agent Server`, "you are running inside of — NOT the automation backend."), t.push("</RUNTIME_SERVICES>"), t.join("\n");
-}
-function te(e) {
-	let { host: t } = r();
+function k(e) {
+	let t = D(e);
+	if (!t?.services) return;
+	let n = [];
+	n.push("<RUNTIME_SERVICES>"), t.mode ? n.push(`You are running inside an agent-canvas dev stack started in '${t.mode}' mode.`) : n.push("You are running inside an agent-canvas dev stack."), n.push("The following services are reachable from your sandbox. URLs are written", "from your point of view (i.e., as you should curl/fetch them).", "");
+	let { agent_server: r, ingress: i, automation: a } = t.services, { frontend: o } = t.services;
+	r?.url_from_agent && n.push(`* Agent Server (you): ${r.url_from_agent}`, `    ${r.description ?? "The agent-server hosting your tool calls."}`), i?.url_from_agent && n.push(`* Ingress: ${i.url_from_agent}`, `    ${i.description ?? "Unified entry point for browser-facing traffic."}`), o?.url_from_agent && n.push(`* Frontend: ${o.url_from_agent}`, `    ${o.description ?? "Frontend dev server."}`), a?.url_from_agent ? (n.push(`* Automation backend: ${a.url_from_agent}`, `    ${a.description ?? "OpenHands Automations service."}`), a.docs_url && n.push(`    Docs:    ${a.docs_url}`), a.openapi_url && n.push(`    OpenAPI: ${a.openapi_url}`), a.auth_env_var && n.push(`    Auth:    header 'X-Session-API-Key: $${a.auth_env_var}'`)) : n.push("* Automation backend: not running in this dev mode (skip /api/automation calls).");
+	let s = r?.url_from_agent;
+	return n.push("", "Trust this block over guessing: do not assume any other URLs are running."), s && n.push(`In particular, ${s} inside your sandbox is the Agent Server`, "you are running inside of — NOT the automation backend."), n.push("</RUNTIME_SERVICES>"), n.join("\n");
+}
+function ee(e) {
+	let { host: t } = i();
 	return `${t}/api/conversations/${e}`;
 }
-function D(e) {
+function A(e) {
 	return `Conversation ${e.slice(0, 5)}`;
 }
-function O(n) {
-	let i = c(n.id), a = n.agent?.kind === "ACPAgent", o = a ? n.tags?.acpserver ?? n.agent?.acp_server ?? null : null;
+function j(t) {
+	let r = u(t.id), a = t.agent?.kind === "ACPAgent", o = a ? t.tags?.acpserver ?? t.agent?.acp_server ?? null : null;
 	return {
-		id: n.id,
+		id: t.id,
 		created_by_user_id: null,
-		selected_repository: i?.selected_repository ?? null,
-		selected_branch: i?.selected_branch ?? null,
-		git_provider: i?.git_provider ?? null,
-		selected_workspace: i?.selected_workspace ?? null,
-		active_profile: i?.active_profile ?? null,
-		title: n.title?.trim() ? n.title : D(n.id),
+		selected_repository: r?.selected_repository ?? null,
+		selected_branch: r?.selected_branch ?? null,
+		git_provider: r?.git_provider ?? null,
+		selected_workspace: r?.selected_workspace ?? null,
+		active_profile: r?.active_profile ?? null,
+		title: t.title?.trim() ? t.title : A(t.id),
 		trigger: null,
 		pr_number: [],
 		agent_kind: a ? "acp" : "openhands",
 		acp_server: o,
-		tags: n.tags ?? null,
-		launched_agent_profile: n.launched_agent_profile ?? null,
-		llm_model: a ? p({
-			runtimeName: n.current_model_name,
-			runtimeId: n.current_model_id,
-			configured: n.agent?.acp_model,
-			sdkLlm: n.agent?.llm?.model
-		}) : n.agent?.llm?.model ?? u.llm_model,
-		metrics: n.metrics ? {
-			accumulated_cost: n.metrics.accumulated_cost ?? null,
-			max_budget_per_task: n.metrics.max_budget_per_task ?? null,
-			accumulated_token_usage: n.metrics.accumulated_token_usage ? {
-				prompt_tokens: n.metrics.accumulated_token_usage.prompt_tokens ?? 0,
-				completion_tokens: n.metrics.accumulated_token_usage.completion_tokens ?? 0,
-				cache_read_tokens: n.metrics.accumulated_token_usage.cache_read_tokens ?? 0,
-				cache_write_tokens: n.metrics.accumulated_token_usage.cache_write_tokens ?? 0,
-				context_window: n.metrics.accumulated_token_usage.context_window ?? 0,
-				per_turn_token: n.metrics.accumulated_token_usage.per_turn_token ?? 0
+		tags: t.tags ?? null,
+		launched_agent_profile: t.launched_agent_profile ?? null,
+		llm_model: a ? h({
+			runtimeName: t.current_model_name,
+			runtimeId: t.current_model_id,
+			configured: t.agent?.acp_model,
+			sdkLlm: t.agent?.llm?.model
+		}) : t.agent?.llm?.model ?? f.llm_model,
+		metrics: t.metrics ? {
+			accumulated_cost: t.metrics.accumulated_cost ?? null,
+			max_budget_per_task: t.metrics.max_budget_per_task ?? null,
+			accumulated_token_usage: t.metrics.accumulated_token_usage ? {
+				prompt_tokens: t.metrics.accumulated_token_usage.prompt_tokens ?? 0,
+				completion_tokens: t.metrics.accumulated_token_usage.completion_tokens ?? 0,
+				cache_read_tokens: t.metrics.accumulated_token_usage.cache_read_tokens ?? 0,
+				cache_write_tokens: t.metrics.accumulated_token_usage.cache_write_tokens ?? 0,
+				context_window: t.metrics.accumulated_token_usage.context_window ?? 0,
+				per_turn_token: t.metrics.accumulated_token_usage.per_turn_token ?? 0
 			} : null
 		} : null,
-		created_at: n.created_at,
-		updated_at: n.updated_at,
-		execution_status: n.execution_status ?? e.IDLE,
-		sandbox_status: n.sandbox_status ?? null,
-		conversation_url: te(n.id),
-		session_api_key: r().apiKey ?? null,
+		created_at: t.created_at,
+		updated_at: t.updated_at,
+		execution_status: t.execution_status ?? e.IDLE,
+		sandbox_status: t.sandbox_status ?? null,
+		conversation_url: ee(t.id),
+		session_api_key: i().apiKey ?? null,
 		sandbox_id: null,
-		workspace: { working_dir: n.workspace?.working_dir ?? t() },
+		workspace: { working_dir: t.workspace?.working_dir ?? n() },
 		public: !1,
 		sub_conversation_ids: []
 	};
 }
-function k(e) {
+function M(e) {
 	return {
-		items: e.items.map(O),
+		items: e.items.map(j),
 		next_page_id: e.next_page_id ?? null
 	};
 }
-var A = "acpserver", j = new Set([A]);
-function M(e) {
-	return e ? Object.entries(e).filter(([e]) => !j.has(e)).sort(([e], [t]) => e.localeCompare(t)) : [];
+var N = "acpserver", P = new Set([N]);
+function F(e) {
+	return e ? Object.entries(e).filter(([e]) => !P.has(e)).sort(([e], [t]) => e.localeCompare(t)) : [];
 }
-var N = "gAAAAA", P = new Set([
+var I = "gAAAAA", L = new Set([
 	"schema_version",
 	"agent_settings",
 	"workspace",
@@ -123,31 +137,31 @@ var N = "gAAAAA", P = new Set([
 	"initial_message",
 	"plugins"
 ]);
-function F(e) {
+function R(e) {
 	return !e || typeof e != "object" || Array.isArray(e) ? {} : structuredClone(e);
 }
-function I(e) {
+function z(e) {
 	if (typeof e != "string") return;
 	let t = e.trim();
 	return t.length > 0 ? t : void 0;
 }
-function L(e) {
+function B(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e);
 }
-function R(e) {
-	return typeof e == "string" ? e.startsWith(N) : Array.isArray(e) ? e.some(R) : L(e) ? Object.values(e).some(R) : !1;
+function V(e) {
+	return typeof e == "string" ? e.startsWith(I) : Array.isArray(e) ? e.some(V) : B(e) ? Object.values(e).some(V) : !1;
 }
-function z(e) {
-	return L(e) ? Object.values(e).some(R) : !1;
+function H(e) {
+	return B(e) ? Object.values(e).some(V) : !1;
 }
-function B(e) {
+function U(e) {
 	return e.confirmation_mode === !0 ? e.security_analyzer === "llm" ? {
 		kind: "ConfirmRisky",
 		threshold: "HIGH",
 		confirm_unknown: !0
 	} : { kind: "AlwaysConfirm" } : { kind: "NeverConfirm" };
 }
-function V(e) {
+function W(e) {
 	switch (e.security_analyzer) {
 		case "llm": return { kind: "LLMSecurityAnalyzer" };
 		case "pattern": return { kind: "PatternSecurityAnalyzer" };
@@ -155,30 +169,30 @@ function V(e) {
 		default: return;
 	}
 }
-function H(e) {
+function te(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e) && typeof e.name == "string";
 }
-function U(e, t) {
-	return e === x ? C() && i(e) : e === S ? t.enable_sub_agents === !0 && i(e) : !0;
+function G(e, t) {
+	return e === w ? E() && o(e) : e === T ? t.enable_sub_agents === !0 && o(e) : !0;
 }
-function W(e) {
+function K(e) {
 	let t = /* @__PURE__ */ new Map();
-	for (let n of b) U(n, e) && t.set(n, {
+	for (let n of C) G(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
-	for (let n of [x, S]) U(n, e) && t.set(n, {
+	for (let n of [w, T]) G(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
 	let n = e.tools;
-	if (Array.isArray(n) && n.every((e) => H(e))) for (let r of n) U(r.name, e) && t.set(r.name, {
+	if (Array.isArray(n) && n.every((e) => te(e))) for (let r of n) G(r.name, e) && t.set(r.name, {
 		name: r.name,
-		params: F(r.params)
+		params: R(r.params)
 	});
 	return Array.from(t.values());
 }
-function G(e, t) {
+function q(e, t) {
 	let n = [e?.trim(), t?.trim()].filter(Boolean);
 	return n.length === 0 ? null : {
 		role: "user",
@@ -189,8 +203,8 @@ function G(e, t) {
 		run: !0
 	};
 }
-function K() {
-	return l.map((e) => {
+function J() {
+	return d.map((e) => {
 		let t = e.triggers?.length > 0 ? {
 			type: "keyword",
 			keywords: e.triggers
@@ -207,75 +221,75 @@ function K() {
 		};
 	});
 }
-function q(e, t = []) {
-	let n = E(), r = F(e.agent_context), i = Array.isArray(r.skills) ? r.skills : [], a = new Set(t), o = [...i, ...K()].filter((e) => typeof e.name != "string" || !a.has(e.name));
+function Y(e, t, n = []) {
+	let r = k(t), i = R(e.agent_context), a = Array.isArray(i.skills) ? i.skills : [], o = new Set(n), s = [...a, ...J()].filter((e) => typeof e.name != "string" || !o.has(e.name));
 	return {
-		...r,
-		skills: o,
+		...i,
+		skills: s,
 		load_public_skills: !1,
 		load_user_skills: !0,
 		load_project_skills: !0,
-		...n ? { system_message_suffix: n } : {}
+		...r ? { system_message_suffix: r } : {}
 	};
 }
-function J(e) {
-	return F(e.agent_settings).agent_kind === "acp";
+function X(e) {
+	return R(e.agent_settings).agent_kind === "acp";
 }
-function Y(e) {
-	let t = F(e.agent_settings).acp_server;
+function Z(e) {
+	let t = R(e.agent_settings).acp_server;
 	return typeof t == "string" && t.length > 0 ? t : void 0;
 }
-function X(e) {
+function Q(e) {
 	let t = e.acp_command;
 	if (!(Array.isArray(t) && t.length === 0) && t !== void 0) return t;
-	let n = f(typeof e.acp_server == "string" ? e.acp_server : void 0);
+	let n = m(typeof e.acp_server == "string" ? e.acp_server : void 0);
 	return n ? [...n.default_command] : t;
 }
-function Z(e) {
-	let t = F(e.agent_settings), n = {
+function ne(e, t) {
+	let n = R(e.agent_settings), r = {
 		agent_kind: "acp",
-		agent_context: q(t, e.disabled_skills)
+		agent_context: Y(n, t, e.disabled_skills)
 	};
-	for (let e of s) {
+	for (let e of l) {
 		if (e === "acp_model" || e === "acp_env") continue;
-		let r = e === "acp_command" ? X(t) : t[e];
-		r != null && (n[e] = r);
+		let t = e === "acp_command" ? Q(n) : n[e];
+		t != null && (r[e] = t);
 	}
-	let r = F(t.mcp_config);
-	Object.keys(r).length > 0 && (n.mcp_config = r);
-	let i = typeof t.acp_server == "string" ? t.acp_server : void 0, a = p({
-		configured: t.acp_model,
-		providerDefault: d(i)
+	let i = R(n.mcp_config);
+	Object.keys(i).length > 0 && (r.mcp_config = i);
+	let a = typeof n.acp_server == "string" ? n.acp_server : void 0, o = h({
+		configured: n.acp_model,
+		providerDefault: p(a)
 	});
-	return a && (n.acp_model = a), n;
-}
-function Q(e) {
-	let t = F(e.agent_settings), n = F(t.llm);
-	n.model = typeof n.model == "string" && n.model.trim().length > 0 ? n.model : u.llm_model, n.stream = !0;
-	let r = I(n.api_key);
-	r ? n.api_key = r : delete n.api_key;
-	let i = I(n.base_url);
-	i ? n.base_url = i : delete n.base_url, _(n) ? (n.auth_type = h, n.subscription_vendor = g, delete n.api_key, delete n.base_url) : (delete n.auth_type, delete n.subscription_vendor);
-	let a = F(t.mcp_config);
-	Object.keys(a).length === 0 && delete t.mcp_config, delete t.acp_server;
-	for (let e of s) delete t[e];
-	return delete t.acp_env, {
-		...t,
-		llm: n,
-		agent_context: q(t, e.disabled_skills),
-		tools: W(t)
+	return o && (r.acp_model = o), r;
+}
+function re(e, t) {
+	let n = R(e.agent_settings), r = R(n.llm);
+	r.model = typeof r.model == "string" && r.model.trim().length > 0 ? r.model : f.llm_model, r.stream = !0;
+	let i = z(r.api_key);
+	i ? r.api_key = i : delete r.api_key;
+	let a = z(r.base_url);
+	a ? r.base_url = a : delete r.base_url, b(r) ? (r.auth_type = v, r.subscription_vendor = y, delete r.api_key, delete r.base_url) : (delete r.auth_type, delete r.subscription_vendor);
+	let o = R(n.mcp_config);
+	Object.keys(o).length === 0 && delete n.mcp_config, delete n.acp_server;
+	for (let e of l) delete n[e];
+	return delete n.acp_env, {
+		...n,
+		llm: r,
+		agent_context: Y(n, t, e.disabled_skills),
+		tools: K(n)
 	};
 }
-function ne(e) {
-	return J(e) ? Z(e) : Q(e);
+function ie(e, t) {
+	return X(e) ? ne(e, t) : re(e, t);
 }
-function re(e) {
-	let { settings: n, query: r, conversationInstructions: i, plugins: a, workingDir: o } = e, s = F(n.conversation_settings), c = G(r, i);
-	return P.forEach((e) => delete s[e]), {
+function ae(e) {
+	let { settings: t, query: r, conversationInstructions: i, plugins: a, workingDir: o } = e, s = R(t.conversation_settings), c = q(r, i);
+	return L.forEach((e) => delete s[e]), {
 		...s,
 		workspace: {
 			kind: "LocalWorkspace",
-			working_dir: o ?? t()
+			working_dir: o ?? n()
 		},
 		...c ? { initial_message: c } : {},
 		...a?.length ? { plugins: a.map((e) => ({
@@ -285,63 +299,68 @@ function re(e) {
 		})) } : {}
 	};
 }
-function ie(e) {
+function oe(e) {
 	let t = e.encryptedAgentSettings ? {
 		...e.settings,
 		agent_settings: e.encryptedAgentSettings
-	} : e.settings, r = J(t), i = e.agentProfileId ? e.agentProfileKind : r ? "acp" : "openhands", s = ne(t), c = r ? Y(t) : void 0, l = re(e.encryptedConversationSettings ? {
+	} : e.settings, n = X(t), i = e.agentProfileId ? e.agentProfileKind : n ? "acp" : "openhands", a = ie(t, e.runtimeServicesInfo), o = n ? Z(t) : void 0, l = ae(e.encryptedConversationSettings ? {
 		...e,
 		settings: {
 			...e.settings,
 			conversation_settings: e.encryptedConversationSettings
 		}
 	} : e), u = {
-		...e.agentProfileId ? { agent_profile_id: e.agentProfileId } : { agent_settings: s },
+		...e.agentProfileId ? { agent_profile_id: e.agentProfileId } : { agent_settings: a },
 		workspace: l.workspace,
-		client_tools: i === "openhands" ? [y] : [],
-		confirmation_policy: B(l),
+		client_tools: i === "openhands" ? [S] : [],
+		confirmation_policy: U(l),
 		max_iterations: typeof l.max_iterations == "number" ? l.max_iterations : 500,
 		stuck_detection: !0,
 		autotitle: !0,
 		...e.titleLlmProfile ? { title_llm_profile: e.titleLlmProfile } : {},
 		worktree: e.worktree ?? !0
 	};
-	!e.agentProfileId && c && (u.tags = { [A]: c }), !e.agentProfileId && e.secretsEncrypted && (!r || z(s.mcp_config)) && (u.secrets_encrypted = !0), e.conversationId && (u.conversation_id = e.conversationId);
-	let d = V(l);
+	!e.agentProfileId && o && (u.tags = { [N]: o }), !e.agentProfileId && e.secretsEncrypted && (!n || H(a.mcp_config)) && (u.secrets_encrypted = !0), e.conversationId && (u.conversation_id = e.conversationId);
+	let d = W(l);
 	d && (u.security_analyzer = d), l.initial_message && (u.initial_message = l.initial_message), l.plugins && (u.plugins = l.plugins), l.hook_config && (u.hook_config = l.hook_config);
 	let f = { ...l.tool_module_qualnames ?? {} };
-	if (delete f[o], delete f[a], Object.keys(f).length > 0 && (u.tool_module_qualnames = f), l.agent_definitions && (u.agent_definitions = l.agent_definitions), e.customSecrets && e.customSecrets.length > 0) {
-		let t = n(), r = t ? m(t) : {}, i = {};
+	if (delete f[c], delete f[s], Object.keys(f).length > 0 && (u.tool_module_qualnames = f), l.agent_definitions && (u.agent_definitions = l.agent_definitions), e.customSecrets && e.customSecrets.length > 0) {
+		let t = r(), n = t ? g(t) : {}, i = {};
 		for (let t of e.customSecrets) {
 			let e = {
 				kind: "LookupSecret",
 				url: `/api/settings/secrets/${encodeURIComponent(t.name)}`,
 				description: t.description
 			};
-			Object.keys(r).length > 0 && (e.headers = r), i[t.name] = e;
+			Object.keys(n).length > 0 && (e.headers = n), i[t.name] = e;
 		}
 		u.secrets = i;
 	}
 	return u;
 }
-var ae = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
+var se = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
 async function $(e) {
-	if (_(F(e.llm)) && !(await v.getOpenAIStatus()).connected) throw Error(ae);
-}
-async function oe(e) {
-	let { SecretsService: t } = await import("./secrets-service.js"), [n, r] = await Promise.all([ee.getSettingsForConversation(), t.getSecrets()]), { agentSettings: i, conversationSettings: a, secretsEncrypted: o } = n;
-	return e.agentProfileId || await $(i), ie({
+	if (b(R(e.llm)) && !(await x.getOpenAIStatus()).connected) throw Error(se);
+}
+async function ce(e) {
+	let { SecretsService: t } = await import("./secrets-service.js"), [n, r, i] = await Promise.all([
+		_.getSettingsForConversation(),
+		t.getSecrets(),
+		O()
+	]), { agentSettings: a, conversationSettings: o, secretsEncrypted: s } = n;
+	return e.agentProfileId || await $(a), oe({
 		...e,
-		encryptedAgentSettings: i,
-		encryptedConversationSettings: a,
-		secretsEncrypted: o,
-		customSecrets: r
+		encryptedAgentSettings: a,
+		encryptedConversationSettings: o,
+		secretsEncrypted: s,
+		customSecrets: r,
+		runtimeServicesInfo: i
 	});
 }
-function se() {
+function le() {
 	return { hooks: [] };
 }
 //#endregion
-export { $ as assertSubscriptionAuthReady, oe as buildStartConversationRequestWithEncryptedSettings, se as emptyHooksResponse, D as getDefaultConversationTitle, M as getDisplayConversationTags, O as toAppConversation, k as toConversationPage };
+export { $ as assertSubscriptionAuthReady, ce as buildStartConversationRequestWithEncryptedSettings, le as emptyHooksResponse, A as getDefaultConversationTitle, F as getDisplayConversationTags, j as toAppConversation, M as toConversationPage };
 
 //# sourceMappingURL=agent-server-adapter.js.map