@openhands/agent-canvas 1.4.0 → 1.5.1

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

@@ -3,27 +3,28 @@ 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 { buildAuthHeaders as a } from "./backend-registry/auth.js";
-import { ACP_SETTINGS_KEYS as o } from "../node_modules/@openhands/typescript-client/dist/models/acp.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 "../node_modules/@openhands/typescript-client/dist/index.js";
-import { getStoredConversationMetadata as s } from "./conversation-metadata-store.js";
-import c from "../node_modules/@openhands/extensions/skills/index.js";
-import { DEFAULT_SETTINGS as l } from "../services/settings.js";
-import { getAcpPreferredDefaultModel as u, getAcpProvider as d, resolveEffectiveAcpModel as f } from "../constants/acp-providers.js";
-import p from "./settings-service/settings-service.api.js";
-import { LLM_AUTH_TYPE_SUBSCRIPTION as ee, OPENAI_SUBSCRIPTION_VENDOR as m, isSubscriptionLlmConfig as h } from "../constants/llm-subscription.js";
-import g from "./llm-subscription-service.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 h from "./settings-service/settings-service.api.js";
+import { LLM_AUTH_TYPE_SUBSCRIPTION as g, OPENAI_SUBSCRIPTION_VENDOR as _, isSubscriptionLlmConfig as v } from "../constants/llm-subscription.js";
+import y from "./llm-subscription-service.js";
+import { CANVAS_UI_CLIENT_TOOL as b } from "./canvas-ui-client-tool.js";
 //#region src/api/agent-server-adapter.ts
-var _ = "canvas_ui", v = "canvas_ui_tool", y = [
+var x = [
 	"terminal",
 	"file_editor",
-	"task_tracker",
-	_
-], b = "browser_tool_set", x = "task_tool_set";
-function S() {
+	"task_tracker"
+], S = "browser_tool_set", C = "task_tool_set";
+function w() {
 	return !0;
 }
-function C() {
+function T() {
 	let e = (void 0)?.trim();
 	if (e) return e;
 	if (typeof window < "u") {
@@ -32,8 +33,8 @@ function C() {
 	}
 	return null;
 }
-function w() {
-	let e = C();
+function E() {
+	let e = T();
 	if (!e) return null;
 	try {
 		let t = JSON.parse(e);
@@ -42,8 +43,8 @@ function w() {
 		return null;
 	}
 }
-function T() {
-	let e = w();
+function ee() {
+	let e = E();
 	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).", "");
@@ -52,15 +53,15 @@ function T() {
 	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 E(e) {
+function D(e) {
 	let { host: t } = r();
 	return `${t}/api/conversations/${e}`;
 }
-function D(e) {
+function O(e) {
 	return `Conversation ${e.slice(0, 5)}`;
 }
-function O(n) {
-	let i = s(n.id), a = n.agent?.kind === "ACPAgent", o = a ? n.tags?.acpserver ?? n.agent?.acp_server ?? null : null;
+function k(n) {
+	let i = c(n.id), a = n.agent?.kind === "ACPAgent", o = a ? n.tags?.acpserver ?? n.agent?.acp_server ?? null : null;
 	return {
 		id: n.id,
 		created_by_user_id: null,
@@ -69,17 +70,18 @@ function O(n) {
 		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),
+		title: n.title?.trim() ? n.title : O(n.id),
 		trigger: null,
 		pr_number: [],
 		agent_kind: a ? "acp" : "openhands",
 		acp_server: o,
-		llm_model: a ? f({
+		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 ?? l.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,
@@ -96,7 +98,7 @@ function O(n) {
 		updated_at: n.updated_at,
 		execution_status: n.execution_status ?? e.IDLE,
 		sandbox_status: n.sandbox_status ?? null,
-		conversation_url: E(n.id),
+		conversation_url: D(n.id),
 		session_api_key: r().apiKey ?? null,
 		sandbox_id: null,
 		workspace: { working_dir: n.workspace?.working_dir ?? t() },
@@ -104,13 +106,13 @@ function O(n) {
 		sub_conversation_ids: []
 	};
 }
-function k(e) {
+function A(e) {
 	return {
-		items: e.items.map(O),
+		items: e.items.map(k),
 		next_page_id: e.next_page_id ?? null
 	};
 }
-var A = "acpserver", j = "gAAAAA", M = new Set([
+var j = "acpserver", M = "gAAAAA", N = new Set([
 	"schema_version",
 	"agent_settings",
 	"workspace",
@@ -118,31 +120,31 @@ var A = "acpserver", j = "gAAAAA", M = new Set([
 	"initial_message",
 	"plugins"
 ]);
-function N(e) {
+function P(e) {
 	return !e || typeof e != "object" || Array.isArray(e) ? {} : structuredClone(e);
 }
-function P(e) {
+function F(e) {
 	if (typeof e != "string") return;
 	let t = e.trim();
 	return t.length > 0 ? t : void 0;
 }
-function F(e) {
-	return !!e && typeof e == "object" && !Array.isArray(e);
-}
 function I(e) {
-	return typeof e == "string" ? e.startsWith(j) : Array.isArray(e) ? e.some(I) : F(e) ? Object.values(e).some(I) : !1;
+	return !!e && typeof e == "object" && !Array.isArray(e);
 }
 function L(e) {
-	return F(e) ? Object.values(e).some(I) : !1;
+	return typeof e == "string" ? e.startsWith(M) : Array.isArray(e) ? e.some(L) : I(e) ? Object.values(e).some(L) : !1;
 }
 function R(e) {
+	return I(e) ? Object.values(e).some(L) : !1;
+}
+function z(e) {
 	return e.confirmation_mode === !0 ? e.security_analyzer === "llm" ? {
 		kind: "ConfirmRisky",
 		threshold: "HIGH",
 		confirm_unknown: !0
 	} : { kind: "AlwaysConfirm" } : { kind: "NeverConfirm" };
 }
-function z(e) {
+function B(e) {
 	switch (e.security_analyzer) {
 		case "llm": return { kind: "LLMSecurityAnalyzer" };
 		case "pattern": return { kind: "PatternSecurityAnalyzer" };
@@ -150,30 +152,30 @@ function z(e) {
 		default: return;
 	}
 }
-function B(e) {
+function V(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e) && typeof e.name == "string";
 }
-function V(e, t) {
-	return e === _ ? i(e) : e === b ? S() && i(e) : e === x ? t.enable_sub_agents === !0 && i(e) : !0;
+function H(e, t) {
+	return e === S ? w() && i(e) : e === C ? t.enable_sub_agents === !0 && i(e) : !0;
 }
-function H(e) {
+function U(e) {
 	let t = /* @__PURE__ */ new Map();
-	for (let n of y) V(n, e) && t.set(n, {
+	for (let n of x) H(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
-	for (let n of [b, x]) V(n, e) && t.set(n, {
+	for (let n of [S, C]) H(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
 	let n = e.tools;
-	if (Array.isArray(n) && n.every((e) => B(e))) for (let r of n) V(r.name, e) && t.set(r.name, {
+	if (Array.isArray(n) && n.every((e) => V(e))) for (let r of n) H(r.name, e) && t.set(r.name, {
 		name: r.name,
-		params: N(r.params)
+		params: P(r.params)
 	});
 	return Array.from(t.values());
 }
-function U(e, t) {
+function W(e, t) {
 	let n = [e?.trim(), t?.trim()].filter(Boolean);
 	return n.length === 0 ? null : {
 		role: "user",
@@ -184,8 +186,8 @@ function U(e, t) {
 		run: !0
 	};
 }
-function W() {
-	return c.map((e) => {
+function G() {
+	return l.map((e) => {
 		let t = e.triggers?.length > 0 ? {
 			type: "keyword",
 			keywords: e.triggers
@@ -202,8 +204,8 @@ function W() {
 		};
 	});
 }
-function G(e) {
-	let t = T(), n = N(e.agent_context), r = [...Array.isArray(n.skills) ? n.skills : [], ...W()];
+function K(e) {
+	let t = ee(), n = P(e.agent_context), r = [...Array.isArray(n.skills) ? n.skills : [], ...G()];
 	return {
 		...n,
 		skills: r,
@@ -213,60 +215,60 @@ function G(e) {
 		...t ? { system_message_suffix: t } : {}
 	};
 }
-function K(e) {
-	return N(e.agent_settings).agent_kind === "acp";
-}
 function q(e) {
-	let t = N(e.agent_settings).acp_server;
-	return typeof t == "string" && t.length > 0 ? t : void 0;
+	return P(e.agent_settings).agent_kind === "acp";
 }
 function J(e) {
+	let t = P(e.agent_settings).acp_server;
+	return typeof t == "string" && t.length > 0 ? t : void 0;
+}
+function Y(e) {
 	let t = e.acp_command;
 	if (!(Array.isArray(t) && t.length === 0) && t !== void 0) return t;
-	let n = d(typeof e.acp_server == "string" ? e.acp_server : void 0);
+	let n = f(typeof e.acp_server == "string" ? e.acp_server : void 0);
 	return n ? [...n.default_command] : t;
 }
-function Y(e) {
-	let t = N(e.agent_settings), n = {
+function X(e) {
+	let t = P(e.agent_settings), n = {
 		agent_kind: "acp",
-		agent_context: G(t)
+		agent_context: K(t)
 	};
-	for (let e of o) {
+	for (let e of s) {
 		if (e === "acp_model" || e === "acp_env") continue;
-		let r = e === "acp_command" ? J(t) : t[e];
+		let r = e === "acp_command" ? Y(t) : t[e];
 		r != null && (n[e] = r);
 	}
-	let r = N(t.mcp_config);
+	let r = P(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 = f({
+	let i = typeof t.acp_server == "string" ? t.acp_server : void 0, a = p({
 		configured: t.acp_model,
-		providerDefault: u(i)
+		providerDefault: d(i)
 	});
 	return a && (n.acp_model = a), n;
 }
-function X(e) {
-	let t = N(e.agent_settings), n = N(t.llm);
-	n.model = typeof n.model == "string" && n.model.trim().length > 0 ? n.model : l.llm_model, n.stream = !0;
-	let r = P(n.api_key);
+function Z(e) {
+	let t = P(e.agent_settings), n = P(t.llm);
+	n.model = typeof n.model == "string" && n.model.trim().length > 0 ? n.model : u.llm_model, n.stream = !0;
+	let r = F(n.api_key);
 	r ? n.api_key = r : delete n.api_key;
-	let i = P(n.base_url);
-	i ? n.base_url = i : delete n.base_url, h(n) ? (n.auth_type = ee, n.subscription_vendor = m, delete n.api_key, delete n.base_url) : (delete n.auth_type, delete n.subscription_vendor);
-	let a = N(t.mcp_config);
+	let i = F(n.base_url);
+	i ? n.base_url = i : delete n.base_url, v(n) ? (n.auth_type = g, n.subscription_vendor = _, delete n.api_key, delete n.base_url) : (delete n.auth_type, delete n.subscription_vendor);
+	let a = P(t.mcp_config);
 	Object.keys(a).length === 0 && delete t.mcp_config, delete t.acp_server;
-	for (let e of o) delete t[e];
+	for (let e of s) delete t[e];
 	return delete t.acp_env, {
 		...t,
 		llm: n,
-		agent_context: G(t),
-		tools: H(t)
+		agent_context: K(t),
+		tools: U(t)
 	};
 }
-function Z(e) {
-	return K(e) ? Y(e) : X(e);
-}
 function Q(e) {
-	let { settings: n, query: r, conversationInstructions: i, plugins: a, workingDir: o } = e, s = N(n.conversation_settings), c = U(r, i);
-	return M.forEach((e) => delete s[e]), {
+	return q(e) ? X(e) : Z(e);
+}
+function te(e) {
+	let { settings: n, query: r, conversationInstructions: i, plugins: a, workingDir: o } = e, s = P(n.conversation_settings), c = W(r, i);
+	return N.forEach((e) => delete s[e]), {
 		...s,
 		workspace: {
 			kind: "LocalWorkspace",
@@ -280,31 +282,32 @@ function Q(e) {
 		})) } : {}
 	};
 }
-function te(e) {
+function ne(e) {
 	let t = e.encryptedAgentSettings ? {
 		...e.settings,
 		agent_settings: e.encryptedAgentSettings
-	} : e.settings, r = K(t), o = Z(t), s = r ? q(t) : void 0, c = Q(e.encryptedConversationSettings ? {
+	} : e.settings, r = q(t), i = e.agentProfileId ? e.agentProfileKind : r ? "acp" : "openhands", s = Q(t), c = r ? J(t) : void 0, l = te(e.encryptedConversationSettings ? {
 		...e,
 		settings: {
 			...e.settings,
 			conversation_settings: e.encryptedConversationSettings
 		}
-	} : e), l = {
-		...e.agentProfileId ? { agent_profile_id: e.agentProfileId } : { agent_settings: o },
-		workspace: c.workspace,
-		confirmation_policy: R(c),
-		max_iterations: typeof c.max_iterations == "number" ? c.max_iterations : 500,
+	} : e), u = {
+		...e.agentProfileId ? { agent_profile_id: e.agentProfileId } : { agent_settings: s },
+		workspace: l.workspace,
+		client_tools: i === "openhands" ? [b] : [],
+		confirmation_policy: z(l),
+		max_iterations: typeof l.max_iterations == "number" ? l.max_iterations : 500,
 		stuck_detection: !0,
 		autotitle: !0,
 		worktree: e.worktree ?? !0
 	};
-	!e.agentProfileId && s && (l.tags = { [A]: s }), !e.agentProfileId && e.secretsEncrypted && (!r || L(o.mcp_config)) && (l.secrets_encrypted = !0), e.conversationId && (l.conversation_id = e.conversationId);
-	let u = z(c);
-	u && (l.security_analyzer = u), c.initial_message && (l.initial_message = c.initial_message), c.plugins && (l.plugins = c.plugins), c.hook_config && (l.hook_config = c.hook_config);
-	let d = {}, f = i(_);
-	if (f && (d[_] = v), Object.assign(d, c.tool_module_qualnames ?? {}), f || delete d[_], Object.keys(d).length > 0 && (l.tool_module_qualnames = d), c.agent_definitions && (l.agent_definitions = c.agent_definitions), e.customSecrets && e.customSecrets.length > 0) {
-		let t = n(), r = t ? a(t) : {}, i = {};
+	!e.agentProfileId && c && (u.tags = { [j]: c }), !e.agentProfileId && e.secretsEncrypted && (!r || R(s.mcp_config)) && (u.secrets_encrypted = !0), e.conversationId && (u.conversation_id = e.conversationId);
+	let d = B(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 = {};
 		for (let t of e.customSecrets) {
 			let e = {
 				kind: "LookupSecret",
@@ -313,17 +316,17 @@ function te(e) {
 			};
 			Object.keys(r).length > 0 && (e.headers = r), i[t.name] = e;
 		}
-		l.secrets = i;
+		u.secrets = i;
 	}
-	return l;
+	return u;
 }
-var ne = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
+var re = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
 async function $(e) {
-	if (h(N(e.llm)) && !(await g.getOpenAIStatus()).connected) throw Error(ne);
+	if (v(P(e.llm)) && !(await y.getOpenAIStatus()).connected) throw Error(re);
 }
-async function re(e) {
-	let { SecretsService: t } = await import("./secrets-service.js"), [n, r] = await Promise.all([p.getSettingsForConversation(), t.getSecrets()]), { agentSettings: i, conversationSettings: a, secretsEncrypted: o } = n;
-	return e.agentProfileId || await $(i), te({
+async function ie(e) {
+	let { SecretsService: t } = await import("./secrets-service.js"), [n, r] = await Promise.all([h.getSettingsForConversation(), t.getSecrets()]), { agentSettings: i, conversationSettings: a, secretsEncrypted: o } = n;
+	return e.agentProfileId || await $(i), ne({
 		...e,
 		encryptedAgentSettings: i,
 		encryptedConversationSettings: a,
@@ -331,10 +334,10 @@ async function re(e) {
 		customSecrets: r
 	});
 }
-function ie() {
+function ae() {
 	return { hooks: [] };
 }
 //#endregion
-export { $ as assertSubscriptionAuthReady, re as buildStartConversationRequestWithEncryptedSettings, ie as emptyHooksResponse, D as getDefaultConversationTitle, O as toAppConversation, k as toConversationPage };
+export { $ as assertSubscriptionAuthReady, ie as buildStartConversationRequestWithEncryptedSettings, ae as emptyHooksResponse, O as getDefaultConversationTitle, k as toAppConversation, A as toConversationPage };
 
 //# sourceMappingURL=agent-server-adapter.js.map