@openhands/agent-canvas 1.10.0 → 1.11.0

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

@@ -6,32 +6,34 @@ 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 { ACP_SETTINGS_KEYS as l } from "../node_modules/@openhands/typescript-client/dist/models/acp.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 "../node_modules/@openhands/typescript-client/dist/index.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";
+import { buildAuthHeaders as te } from "./backend-registry/auth.js";
+import g 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";
 //#region src/api/agent-server-adapter.ts
-var C = [
+var S = [
 	"terminal",
 	"file_editor",
 	"task_tracker"
-], w = "browser_tool_set", T = "task_tool_set";
-function E() {
+], C = "browser_tool_set", w = "task_tool_set";
+function T() {
 	return !0;
 }
-function D(e) {
+function E(e) {
 	if (typeof e == "string") {
 		let t = e.trim();
 		if (!t) return null;
 		try {
-			return D(JSON.parse(t));
+			return E(JSON.parse(t));
 		} catch {
 			return null;
 		}
@@ -40,23 +42,23 @@ function D(e) {
 	let t = e;
 	return !t.services || typeof t.services != "object" ? null : t;
 }
-async function O() {
+async function D() {
 	let e;
 	try {
 		e = i({ timeout: 3e3 });
 	} catch {
 		return null;
 	}
-	let n = D(a({ host: e.host })?.runtime_services);
+	let n = E(a({ host: e.host })?.runtime_services);
 	if (n) return n;
 	try {
-		return D((await new t(e).getServerInfo()).runtime_services);
+		return E((await new t(e).getServerInfo()).runtime_services);
 	} catch {
 		return null;
 	}
 }
-function k(e) {
-	let t = D(e);
+function re(e) {
+	let t = E(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).", "");
@@ -65,15 +67,15 @@ function k(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 ee(e) {
+function ie(e) {
 	let { host: t } = i();
 	return `${t}/api/conversations/${e}`;
 }
-function A(e) {
+function O(e) {
 	return `Conversation ${e.slice(0, 5)}`;
 }
-function j(t) {
-	let r = u(t.id), a = t.agent?.kind === "ACPAgent", o = a ? t.tags?.acpserver ?? t.agent?.acp_server ?? null : null;
+function k(t) {
+	let r = l(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,
@@ -82,7 +84,7 @@ function j(t) {
 		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),
+		title: t.title?.trim() ? t.title : O(t.id),
 		trigger: null,
 		pr_number: [],
 		agent_kind: a ? "acp" : "openhands",
@@ -111,7 +113,7 @@ function j(t) {
 		updated_at: t.updated_at,
 		execution_status: t.execution_status ?? e.IDLE,
 		sandbox_status: t.sandbox_status ?? null,
-		conversation_url: ee(t.id),
+		conversation_url: ie(t.id),
 		session_api_key: i().apiKey ?? null,
 		sandbox_id: null,
 		workspace: { working_dir: t.workspace?.working_dir ?? n() },
@@ -119,17 +121,44 @@ function j(t) {
 		sub_conversation_ids: []
 	};
 }
-function M(e) {
+function A(e) {
 	return {
-		items: e.items.map(j),
+		items: e.items.map(k),
 		next_page_id: e.next_page_id ?? null
 	};
 }
-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 j = "acpserver", M = "automationtrigger", N = "automationid", P = "automationname", F = "automationrunid", I = [
+	M,
+	N,
+	P,
+	F
+], L = new Set([
+	j,
+	N,
+	F,
+	"title",
+	"git_provider",
+	"repo_name",
+	"repo",
+	"repository",
+	"selected_branch",
+	"branch",
+	"archiveworkspacepath",
+	"workspace",
+	"working_dir"
+]), R = ["origin"];
+function z(e) {
+	if (!e) return [];
+	let t = (e) => {
+		let t = R.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]) => {
+		let r = t(e), i = t(n);
+		return r === i ? e.localeCompare(n) : r - i;
+	});
 }
-var I = "gAAAAA", L = new Set([
+var B = "gAAAAA", V = new Set([
 	"schema_version",
 	"agent_settings",
 	"workspace",
@@ -137,31 +166,31 @@ var I = "gAAAAA", L = new Set([
 	"initial_message",
 	"plugins"
 ]);
-function R(e) {
+function H(e) {
 	return !e || typeof e != "object" || Array.isArray(e) ? {} : structuredClone(e);
 }
-function z(e) {
+function U(e) {
 	if (typeof e != "string") return;
 	let t = e.trim();
 	return t.length > 0 ? t : void 0;
 }
-function B(e) {
+function W(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e);
 }
-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 G(e) {
+	return typeof e == "string" ? e.startsWith(B) : Array.isArray(e) ? e.some(G) : W(e) ? Object.values(e).some(G) : !1;
 }
-function H(e) {
-	return B(e) ? Object.values(e).some(V) : !1;
+function K(e) {
+	return W(e) ? Object.values(e).some(G) : !1;
 }
-function U(e) {
+function q(e) {
 	return e.confirmation_mode === !0 ? e.security_analyzer === "llm" ? {
 		kind: "ConfirmRisky",
 		threshold: "HIGH",
 		confirm_unknown: !0
 	} : { kind: "AlwaysConfirm" } : { kind: "NeverConfirm" };
 }
-function W(e) {
+function J(e) {
 	switch (e.security_analyzer) {
 		case "llm": return { kind: "LLMSecurityAnalyzer" };
 		case "pattern": return { kind: "PatternSecurityAnalyzer" };
@@ -169,30 +198,30 @@ function W(e) {
 		default: return;
 	}
 }
-function te(e) {
+function Y(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e) && typeof e.name == "string";
 }
-function G(e, t) {
-	return e === w ? E() && o(e) : e === T ? t.enable_sub_agents === !0 && o(e) : !0;
+function X(e, t) {
+	return e === C ? T() && o(e) : e === w ? t.enable_sub_agents === !0 && o(e) : !0;
 }
-function K(e) {
+function ae(e) {
 	let t = /* @__PURE__ */ new Map();
-	for (let n of C) G(n, e) && t.set(n, {
+	for (let n of S) X(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
-	for (let n of [w, T]) G(n, e) && t.set(n, {
+	for (let n of [C, w]) X(n, e) && t.set(n, {
 		name: n,
 		params: {}
 	});
 	let n = e.tools;
-	if (Array.isArray(n) && n.every((e) => te(e))) for (let r of n) G(r.name, e) && t.set(r.name, {
+	if (Array.isArray(n) && n.every((e) => Y(e))) for (let r of n) X(r.name, e) && t.set(r.name, {
 		name: r.name,
-		params: R(r.params)
+		params: H(r.params)
 	});
 	return Array.from(t.values());
 }
-function q(e, t) {
+function oe(e, t) {
 	let n = [e?.trim(), t?.trim()].filter(Boolean);
 	return n.length === 0 ? null : {
 		role: "user",
@@ -203,7 +232,7 @@ function q(e, t) {
 		run: !0
 	};
 }
-function J() {
+function se() {
 	return d.map((e) => {
 		let t = e.triggers?.length > 0 ? {
 			type: "keyword",
@@ -221,8 +250,8 @@ function J() {
 		};
 	});
 }
-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));
+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));
 	return {
 		...i,
 		skills: s,
@@ -232,30 +261,30 @@ function Y(e, t, n = []) {
 		...r ? { system_message_suffix: r } : {}
 	};
 }
-function X(e) {
-	return R(e.agent_settings).agent_kind === "acp";
+function Q(e) {
+	return H(e.agent_settings).agent_kind === "acp";
 }
-function Z(e) {
-	let t = R(e.agent_settings).acp_server;
+function ce(e) {
+	let t = H(e.agent_settings).acp_server;
 	return typeof t == "string" && t.length > 0 ? t : void 0;
 }
-function Q(e) {
+function le(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);
 	return n ? [...n.default_command] : t;
 }
-function ne(e, t) {
-	let n = R(e.agent_settings), r = {
+function ue(e, t) {
+	let n = H(e.agent_settings), r = {
 		agent_kind: "acp",
-		agent_context: Y(n, t, e.disabled_skills)
+		agent_context: Z(n, t, e.disabled_skills)
 	};
-	for (let e of l) {
+	for (let e of u) {
 		if (e === "acp_model" || e === "acp_env") continue;
-		let t = e === "acp_command" ? Q(n) : n[e];
+		let t = e === "acp_command" ? le(n) : n[e];
 		t != null && (r[e] = t);
 	}
-	let i = R(n.mcp_config);
+	let i = H(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,
@@ -263,29 +292,29 @@ function ne(e, t) {
 	});
 	return o && (r.acp_model = o), r;
 }
-function re(e, t) {
-	let n = R(e.agent_settings), r = R(n.llm);
+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 = z(r.api_key);
+	let i = U(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);
+	let a = U(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);
 	Object.keys(o).length === 0 && delete n.mcp_config, delete n.acp_server;
-	for (let e of l) delete n[e];
+	for (let e of u) delete n[e];
 	return delete n.acp_env, {
 		...n,
 		llm: r,
-		agent_context: Y(n, t, e.disabled_skills),
-		tools: K(n)
+		agent_context: Z(n, t, e.disabled_skills),
+		tools: ae(n)
 	};
 }
-function ie(e, t) {
-	return X(e) ? ne(e, t) : re(e, t);
+function fe(e, t) {
+	return Q(e) ? ue(e, t) : de(e, t);
 }
-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]), {
+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]), {
 		...s,
 		workspace: {
 			kind: "LocalWorkspace",
@@ -299,11 +328,11 @@ function ae(e) {
 		})) } : {}
 	};
 }
-function oe(e) {
+function me(e) {
 	let t = e.encryptedAgentSettings ? {
 		...e.settings,
 		agent_settings: e.encryptedAgentSettings
-	} : 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, 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: {
 			...e.settings,
@@ -312,20 +341,20 @@ function oe(e) {
 	} : e), u = {
 		...e.agentProfileId ? { agent_profile_id: e.agentProfileId } : { agent_settings: a },
 		workspace: l.workspace,
-		client_tools: i === "openhands" ? [S] : [],
-		confirmation_policy: U(l),
+		client_tools: i === "openhands" ? [ne, x] : [],
+		confirmation_policy: q(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 && 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);
+	!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], 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 = {};
+	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 = {};
 		for (let t of e.customSecrets) {
 			let e = {
 				kind: "LookupSecret",
@@ -338,17 +367,17 @@ function oe(e) {
 	}
 	return u;
 }
-var se = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
+var he = "Connect your ChatGPT subscription before starting a conversation with this LLM profile.";
 async function $(e) {
-	if (b(R(e.llm)) && !(await x.getOpenAIStatus()).connected) throw Error(se);
+	if (y(H(e.llm)) && !(await b.getOpenAIStatus()).connected) throw Error(he);
 }
-async function ce(e) {
+async function ge(e) {
 	let { SecretsService: t } = await import("./secrets-service.js"), [n, r, i] = await Promise.all([
-		_.getSettingsForConversation(),
+		g.getSettingsForConversation(),
 		t.getSecrets(),
-		O()
+		D()
 	]), { agentSettings: a, conversationSettings: o, secretsEncrypted: s } = n;
-	return e.agentProfileId || await $(a), oe({
+	return e.agentProfileId || await $(a), me({
 		...e,
 		encryptedAgentSettings: a,
 		encryptedConversationSettings: o,
@@ -357,10 +386,10 @@ async function ce(e) {
 		runtimeServicesInfo: i
 	});
 }
-function le() {
+function _e() {
 	return { hooks: [] };
 }
 //#endregion
-export { $ as assertSubscriptionAuthReady, ce as buildStartConversationRequestWithEncryptedSettings, le as emptyHooksResponse, A as getDefaultConversationTitle, F as getDisplayConversationTags, j as toAppConversation, M as toConversationPage };
+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 };
 
 //# sourceMappingURL=agent-server-adapter.js.map