@openhands/agent-canvas 1.13.0 → 1.15.0

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

@@ -6,34 +6,35 @@ import { getEffectiveLocalBackend as r } from "./backend-registry/active-store.j
 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 { LAUNCH_CHILD_CONVERSATION_TOOL_NAME as ee } from "../constants/child-conversation.js";
-import { getStoredConversationMetadata as l } from "./conversation-metadata-store.js";
-import { ACP_SETTINGS_KEYS as u } from "../node_modules/@openhands/typescript-client/dist/models/acp.js";
+import { LAUNCH_CHILD_CONVERSATION_TOOL_NAME as l } from "../constants/child-conversation.js";
+import { getStoredConversationMetadata as u } from "./conversation-metadata-store.js";
+import { ACP_SETTINGS_KEYS as d } from "../node_modules/@openhands/typescript-client/dist/models/acp.js";
 import "../node_modules/@openhands/typescript-client/dist/index.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 te } from "./backend-registry/auth.js";
-import g from "./settings-service/settings-service.api.js";
+import f from "../node_modules/@openhands/extensions/skills/index.js";
+import { DEFAULT_SETTINGS as p } from "../services/settings.js";
+import { getAcpPreferredDefaultModel as m, getAcpProvider as h, resolveEffectiveAcpModel as g } from "../constants/acp-providers.js";
+import { buildAuthHeaders as ee } from "./backend-registry/auth.js";
+import { combineUsageMetrics as te } from "../utils/conversation-metrics.js";
+import ne from "./settings-service/settings-service.api.js";
 import { LLM_AUTH_TYPE_SUBSCRIPTION as _, OPENAI_SUBSCRIPTION_VENDOR as v, isSubscriptionLlmConfig as y } from "../constants/llm-subscription.js";
 import b from "./llm-subscription-service.js";
-import { CANVAS_UI_CLIENT_TOOL as ne } from "./canvas-ui-client-tool.js";
-import { LAUNCH_CHILD_CONVERSATION_CLIENT_TOOL as x } from "./launch-child-conversation-client-tool.js";
+import { CANVAS_UI_CLIENT_TOOL as x } from "./canvas-ui-client-tool.js";
+import { LAUNCH_CHILD_CONVERSATION_CLIENT_TOOL as S } from "./launch-child-conversation-client-tool.js";
 //#region src/api/agent-server-adapter.ts
-var S = [
+var C = [
 	"terminal",
 	"file_editor",
 	"task_tracker"
-], C = "browser_tool_set", w = "task_tool_set";
-function T() {
+], w = "browser_tool_set", T = "task_tool_set";
+function E() {
 	return !0;
 }
-function E(e) {
+function D(e) {
 	if (typeof e == "string") {
 		let t = e.trim();
 		if (!t) return null;
 		try {
-			return E(JSON.parse(t));
+			return D(JSON.parse(t));
 		} catch {
 			return null;
 		}
@@ -42,23 +43,23 @@ function E(e) {
 	let t = e;
 	return !t.services || typeof t.services != "object" ? null : t;
 }
-async function D() {
+async function re() {
 	let e;
 	try {
 		e = i({ timeout: 3e3 });
 	} catch {
 		return null;
 	}
-	let n = E(a({ host: e.host })?.runtime_services);
+	let n = D(a({ host: e.host })?.runtime_services);
 	if (n) return n;
 	try {
-		return E((await new t(e).getServerInfo()).runtime_services);
+		return D((await new t(e).getServerInfo()).runtime_services);
 	} catch {
 		return null;
 	}
 }
-function re(e) {
-	let t = E(e);
+function ie(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).", "");
@@ -67,7 +68,7 @@ function re(e) {
 	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 ie(e) {
+function ae(e) {
 	let { host: t } = i();
 	return `${t}/api/conversations/${e}`;
 }
@@ -75,7 +76,7 @@ function O(e) {
 	return `Conversation ${e.slice(0, 5)}`;
 }
 function k(t) {
-	let r = l(t.id), a = t.agent?.kind === "ACPAgent", o = a ? t.tags?.acpserver ?? t.agent?.acp_server ?? null : null;
+	let r = u(t.id), a = t.agent?.kind === "ACPAgent", o = a ? t.tags?.acpserver ?? t.agent?.acp_server ?? null : null;
 	return {
 		id: t.id,
 		created_by_user_id: null,
@@ -91,12 +92,12 @@ function k(t) {
 		acp_server: o,
 		tags: t.tags ?? null,
 		launched_agent_profile: t.launched_agent_profile ?? null,
-		llm_model: a ? h({
+		llm_model: a ? g({
 			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,
+		}) : t.agent?.llm?.model ?? p.llm_model,
 		metrics: t.metrics ? {
 			accumulated_cost: t.metrics.accumulated_cost ?? null,
 			max_budget_per_task: t.metrics.max_budget_per_task ?? null,
@@ -108,12 +109,12 @@ function k(t) {
 				context_window: t.metrics.accumulated_token_usage.context_window ?? 0,
 				per_turn_token: t.metrics.accumulated_token_usage.per_turn_token ?? 0
 			} : null
-		} : null,
+		} : te(t.stats),
 		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: ie(t.id),
+		conversation_url: ae(t.id),
 		session_api_key: i().apiKey ?? null,
 		sandbox_id: null,
 		workspace: { working_dir: t.workspace?.working_dir ?? n() },
@@ -127,15 +128,16 @@ function A(e) {
 		next_page_id: e.next_page_id ?? null
 	};
 }
-var j = "acpserver", M = "automationtrigger", N = "automationid", P = "automationname", F = "automationrunid", I = [
-	M,
-	N,
+var j = "acpserver", M = "clientsource", N = "agentcanvas", P = "automationtrigger", F = "automationid", I = "automationname", L = "automationrunid", R = [
 	P,
-	F
-], L = new Set([
+	F,
+	I,
+	L
+], z = new Set([
 	j,
-	N,
+	M,
 	F,
+	L,
 	"title",
 	"git_provider",
 	"repo_name",
@@ -146,19 +148,19 @@ var j = "acpserver", M = "automationtrigger", N = "automationid", P = "automatio
 	"archiveworkspacepath",
 	"workspace",
 	"working_dir"
-]), R = ["origin"];
-function z(e) {
+]), B = ["origin"];
+function V(e) {
 	if (!e) return [];
 	let t = (e) => {
-		let t = R.indexOf(e.trim().toLowerCase());
+		let t = B.indexOf(e.trim().toLowerCase());
 		return t === -1 ? Infinity : t;
 	};
-	return Object.entries(e).filter(([e, t]) => !L.has(e.trim().toLowerCase()) && typeof t == "string" && t.trim().length > 0).sort(([e], [n]) => {
+	return Object.entries(e).filter(([e, t]) => !z.has(e.trim().toLowerCase()) && typeof t == "string" && t.trim().length > 0).sort(([e], [n]) => {
 		let r = t(e), i = t(n);
 		return r === i ? e.localeCompare(n) : r - i;
 	});
 }
-var B = "gAAAAA", V = new Set([
+var H = "gAAAAA", U = new Set([
 	"schema_version",
 	"agent_settings",
 	"workspace",
@@ -166,31 +168,31 @@ var B = "gAAAAA", V = new Set([
 	"initial_message",
 	"plugins"
 ]);
-function H(e) {
+function W(e) {
 	return !e || typeof e != "object" || Array.isArray(e) ? {} : structuredClone(e);
 }
-function U(e) {
+function G(e) {
 	if (typeof e != "string") return;
 	let t = e.trim();
 	return t.length > 0 ? t : void 0;
 }
-function W(e) {
+function K(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e);
 }
-function G(e) {
-	return typeof e == "string" ? e.startsWith(B) : Array.isArray(e) ? e.some(G) : W(e) ? Object.values(e).some(G) : !1;
+function q(e) {
+	return typeof e == "string" ? e.startsWith(H) : Array.isArray(e) ? e.some(q) : K(e) ? Object.values(e).some(q) : !1;
 }
-function K(e) {
-	return W(e) ? Object.values(e).some(G) : !1;
+function J(e) {
+	return K(e) ? Object.values(e).some(q) : !1;
 }
-function q(e) {
+function oe(e) {
 	return e.confirmation_mode === !0 ? e.security_analyzer === "llm" ? {
 		kind: "ConfirmRisky",
 		threshold: "HIGH",
 		confirm_unknown: !0
 	} : { kind: "AlwaysConfirm" } : { kind: "NeverConfirm" };
 }
-function J(e) {
+function se(e) {
 	switch (e.security_analyzer) {
 		case "llm": return { kind: "LLMSecurityAnalyzer" };
 		case "pattern": return { kind: "PatternSecurityAnalyzer" };
@@ -198,30 +200,30 @@ function J(e) {
 		default: return;
 	}
 }
-function Y(e) {
+function ce(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e) && typeof e.name == "string";
 }
-function X(e, t) {
-	return e === C ? T() && o(e) : e === w ? t.enable_sub_agents === !0 && o(e) : !0;
+function Y(e, t) {
+	return e === w ? E() && o(e) : e === T ? t.enable_sub_agents === !0 && o(e) : !0;
 }
-function ae(e) {
+function le(e) {
 	let t = /* @__PURE__ */ new Map();
-	for (let n of S) X(n, e) && t.set(n, {
+	for (let n of C) Y(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
-	for (let n of [C, w]) X(n, e) && t.set(n, {
+	for (let n of [w, T]) Y(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
 	let n = e.tools;
-	if (Array.isArray(n) && n.every((e) => Y(e))) for (let r of n) X(r.name, e) && t.set(r.name, {
+	if (Array.isArray(n) && n.every((e) => ce(e))) for (let r of n) Y(r.name, e) && t.set(r.name, {
 		name: r.name,
-		params: H(r.params)
+		params: W(r.params)
 	});
 	return Array.from(t.values());
 }
-function oe(e, t) {
+function ue(e, t) {
 	let n = [e?.trim(), t?.trim()].filter(Boolean);
 	return n.length === 0 ? null : {
 		role: "user",
@@ -232,8 +234,8 @@ function oe(e, t) {
 		run: !0
 	};
 }
-function se() {
-	return d.map((e) => {
+function de() {
+	return f.map((e) => {
 		let t = e.triggers?.length > 0 ? {
 			type: "keyword",
 			keywords: e.triggers
@@ -250,8 +252,8 @@ function se() {
 		};
 	});
 }
-function Z(e, t, n = []) {
-	let r = re(t), i = H(e.agent_context), a = Array.isArray(i.skills) ? i.skills : [], o = new Set(n), s = [...a, ...se()].filter((e) => typeof e.name != "string" || !o.has(e.name));
+function X(e, t, n = []) {
+	let r = ie(t), i = W(e.agent_context), a = Array.isArray(i.skills) ? i.skills : [], o = new Set(n), s = [...a, ...de()].filter((e) => typeof e.name != "string" || !o.has(e.name));
 	return {
 		...i,
 		skills: s,
@@ -261,60 +263,60 @@ function Z(e, t, n = []) {
 		...r ? { system_message_suffix: r } : {}
 	};
 }
-function Q(e) {
-	return H(e.agent_settings).agent_kind === "acp";
+function Z(e) {
+	return W(e.agent_settings).agent_kind === "acp";
 }
-function ce(e) {
-	let t = H(e.agent_settings).acp_server;
+function fe(e) {
+	let t = W(e.agent_settings).acp_server;
 	return typeof t == "string" && t.length > 0 ? t : void 0;
 }
-function le(e) {
+function pe(e) {
 	let t = e.acp_command;
 	if (!(Array.isArray(t) && t.length === 0) && t !== void 0) return t;
-	let n = m(typeof e.acp_server == "string" ? e.acp_server : void 0);
+	let n = h(typeof e.acp_server == "string" ? e.acp_server : void 0);
 	return n ? [...n.default_command] : t;
 }
-function ue(e, t) {
-	let n = H(e.agent_settings), r = {
+function me(e, t) {
+	let n = W(e.agent_settings), r = {
 		agent_kind: "acp",
-		agent_context: Z(n, t, e.disabled_skills)
+		agent_context: X(n, t, e.disabled_skills)
 	};
-	for (let e of u) {
+	for (let e of d) {
 		if (e === "acp_model" || e === "acp_env") continue;
-		let t = e === "acp_command" ? le(n) : n[e];
+		let t = e === "acp_command" ? pe(n) : n[e];
 		t != null && (r[e] = t);
 	}
-	let i = H(n.mcp_config);
+	let i = W(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({
+	let a = typeof n.acp_server == "string" ? n.acp_server : void 0, o = g({
 		configured: n.acp_model,
-		providerDefault: p(a)
+		providerDefault: m(a)
 	});
 	return o && (r.acp_model = o), r;
 }
-function de(e, t) {
-	let n = H(e.agent_settings), r = H(n.llm);
-	r.model = typeof r.model == "string" && r.model.trim().length > 0 ? r.model : f.llm_model, r.stream = !0;
-	let i = U(r.api_key);
+function he(e, t) {
+	let n = W(e.agent_settings), r = W(n.llm);
+	r.model = typeof r.model == "string" && r.model.trim().length > 0 ? r.model : p.llm_model, r.stream = !0;
+	let i = G(r.api_key);
 	i ? r.api_key = i : delete r.api_key;
-	let a = U(r.base_url);
+	let a = G(r.base_url);
 	a ? r.base_url = a : delete r.base_url, y(r) ? (r.auth_type = _, r.subscription_vendor = v, delete r.api_key, delete r.base_url) : (delete r.auth_type, delete r.subscription_vendor);
-	let o = H(n.mcp_config);
+	let o = W(n.mcp_config);
 	Object.keys(o).length === 0 && delete n.mcp_config, delete n.acp_server;
-	for (let e of u) delete n[e];
+	for (let e of d) delete n[e];
 	return delete n.acp_env, {
 		...n,
 		llm: r,
-		agent_context: Z(n, t, e.disabled_skills),
-		tools: ae(n)
+		agent_context: X(n, t, e.disabled_skills),
+		tools: le(n)
 	};
 }
-function fe(e, t) {
-	return Q(e) ? ue(e, t) : de(e, t);
+function ge(e, t) {
+	return Z(e) ? me(e, t) : he(e, t);
 }
-function pe(e) {
-	let { settings: t, query: r, conversationInstructions: i, plugins: a, workingDir: o } = e, s = H(t.conversation_settings), c = oe(r, i);
-	return V.forEach((e) => delete s[e]), {
+function _e(e) {
+	let { settings: t, query: r, conversationInstructions: i, plugins: a, workingDir: o } = e, s = W(t.conversation_settings), c = ue(r, i);
+	return U.forEach((e) => delete s[e]), {
 		...s,
 		workspace: {
 			kind: "LocalWorkspace",
@@ -328,33 +330,36 @@ function pe(e) {
 		})) } : {}
 	};
 }
-function me(e) {
+function Q(e) {
 	let t = e.encryptedAgentSettings ? {
 		...e.settings,
 		agent_settings: e.encryptedAgentSettings
-	} : e.settings, n = Q(t), i = e.agentProfileId ? e.agentProfileKind : n ? "acp" : "openhands", a = fe(t, e.runtimeServicesInfo), o = n ? ce(t) : void 0, l = pe(e.encryptedConversationSettings ? {
+	} : e.settings, n = Z(t), i = e.agentProfileId ? e.agentProfileKind : n ? "acp" : "openhands", a = ge(t, e.runtimeServicesInfo), o = n ? fe(t) : void 0, u = _e(e.encryptedConversationSettings ? {
 		...e,
 		settings: {
 			...e.settings,
 			conversation_settings: e.encryptedConversationSettings
 		}
-	} : e), u = {
+	} : e), d = {
 		...e.agentProfileId ? { agent_profile_id: e.agentProfileId } : { agent_settings: a },
-		workspace: l.workspace,
-		client_tools: i === "openhands" ? [ne, x] : [],
-		confirmation_policy: q(l),
-		max_iterations: typeof l.max_iterations == "number" ? l.max_iterations : 500,
+		workspace: u.workspace,
+		client_tools: i === "openhands" ? [x, S] : [],
+		confirmation_policy: oe(u),
+		max_iterations: typeof u.max_iterations == "number" ? u.max_iterations : 500,
 		stuck_detection: !0,
 		autotitle: !0,
 		...e.titleLlmProfile ? { title_llm_profile: e.titleLlmProfile } : {},
 		worktree: e.worktree ?? !0
 	};
-	!e.agentProfileId && o && (u.tags = { [j]: o }), !e.agentProfileId && e.secretsEncrypted && (!n || K(a.mcp_config)) && (u.secrets_encrypted = !0), e.conversationId && (u.conversation_id = e.conversationId), e.parentConversationId && (u.parent_conversation_id = e.parentConversationId);
-	let d = J(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[c], delete f[s], delete f[ee], 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 ? te(t) : {}, i = {};
+	!e.agentProfileId && o ? d.tags = {
+		[j]: o,
+		[M]: N
+	} : d.tags = { [M]: N }, !e.agentProfileId && e.secretsEncrypted && (!n || J(a.mcp_config)) && (d.secrets_encrypted = !0), e.conversationId && (d.conversation_id = e.conversationId), e.parentConversationId && (d.parent_conversation_id = e.parentConversationId);
+	let f = se(u);
+	f && (d.security_analyzer = f), u.initial_message && (d.initial_message = u.initial_message), u.plugins && (d.plugins = u.plugins), u.hook_config && (d.hook_config = u.hook_config);
+	let p = { ...u.tool_module_qualnames ?? {} };
+	if (delete p[c], delete p[s], delete p[l], Object.keys(p).length > 0 && (d.tool_module_qualnames = p), u.agent_definitions && (d.agent_definitions = u.agent_definitions), e.customSecrets && e.customSecrets.length > 0) {
+		let t = r(), n = t ? ee(t) : {}, i = {};
 		for (let t of e.customSecrets) {
 			let e = {
 				kind: "LookupSecret",
@@ -363,21 +368,21 @@ function me(e) {
 			};
 			Object.keys(n).length > 0 && (e.headers = n), i[t.name] = e;
 		}
-		u.secrets = i;
+		d.secrets = i;
 	}
-	return u;
+	return d;
 }
-var he = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
+var ve = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
 async function $(e) {
-	if (y(H(e.llm)) && !(await b.getOpenAIStatus()).connected) throw Error(he);
+	if (y(W(e.llm)) && !(await b.getOpenAIStatus()).connected) throw Error(ve);
 }
-async function ge(e) {
+async function ye(e) {
 	let { SecretsService: t } = await import("./secrets-service.js"), [n, r, i] = await Promise.all([
-		g.getSettingsForConversation(),
+		ne.getSettingsForConversation(),
 		t.getSecrets(),
-		D()
+		re()
 	]), { agentSettings: a, conversationSettings: o, secretsEncrypted: s } = n;
-	return e.agentProfileId || await $(a), me({
+	return e.agentProfileId || await $(a), Q({
 		...e,
 		encryptedAgentSettings: a,
 		encryptedConversationSettings: o,
@@ -386,10 +391,10 @@ async function ge(e) {
 		runtimeServicesInfo: i
 	});
 }
-function _e() {
+function be() {
 	return { hooks: [] };
 }
 //#endregion
-export { P as AUTOMATION_NAME_TAG_KEY, I as AUTOMATION_TAG_KEYS, $ as assertSubscriptionAuthReady, ge as buildStartConversationRequestWithEncryptedSettings, _e as emptyHooksResponse, O as getDefaultConversationTitle, z as getDisplayConversationTags, k as toAppConversation, A as toConversationPage };
+export { I as AUTOMATION_NAME_TAG_KEY, R as AUTOMATION_TAG_KEYS, $ as assertSubscriptionAuthReady, ye as buildStartConversationRequestWithEncryptedSettings, be as emptyHooksResponse, O as getDefaultConversationTitle, V as getDisplayConversationTags, k as toAppConversation, A as toConversationPage };
 
 //# sourceMappingURL=agent-server-adapter.js.map