@openhands/agent-canvas 1.4.0 → 1.5.0

package/dist/components/features/diff-viewer/file-diff-viewer.js

@@ -72,103 +72,104 @@ var x = [
 		}
 	});
 };
-function T({ path: c, type: l }) {
-	let { t: u } = e("openhands"), [d, f] = v.useState(!0), [p, T] = v.useState(400), [E, D] = v.useState("diff"), O = v.useRef(null), k = v.useRef(null), A = l === "A" || l === "U", j = l === "D", M = v.useMemo(() => {
+function T({ path: c, type: l, commit: u }) {
+	let { t: d } = e("openhands"), [f, p] = v.useState(!0), [T, E] = v.useState(400), [D, O] = v.useState("diff"), k = v.useRef(null), A = v.useRef(null), j = l === "A" || l === "U", M = l === "D", N = v.useMemo(() => {
 		if (l === "R") {
 			let e = c.split(/\s+/).slice(1);
 			return e[e.length - 1];
 		}
 		return c;
-	}, [c, l]), { data: N, isLoading: P, isSuccess: F, isRefetching: I } = h({
-		filePath: M,
+	}, [c, l]), { data: P, isLoading: F, isSuccess: I, isRefetching: L } = h({
+		filePath: N,
 		type: l,
-		enabled: !d
-	}), L = v.useCallback(() => {
-		if (!O.current) return;
-		let e = O.current.getOriginalEditor(), t = O.current.getModifiedEditor();
-		e && t && T(Math.max(e.getContentHeight(), t.getContentHeight()) + 20);
-	}, []), R = v.useCallback(() => {
-		k.current && T(k.current.getContentHeight() + 20);
-	}, []), z = (e) => {
-		O.current = e, L(), e.getOriginalEditor().onDidContentSizeChange(L), e.getModifiedEditor().onDidContentSizeChange(L);
-	}, B = (e) => {
-		k.current = e, R(), e.onDidContentSizeChange(R);
-	}, V = (l === "U" ? C.A : C[l]) || "?", H = typeof V == "string" ? /* @__PURE__ */ y(i.Text, { children: V }) : v.createElement(V, { className: "w-5 h-5" }), U = P || I, W = a(M), G = W === "markdown", K = E === "old" ? N?.original ?? "" : N?.modified ?? "";
+		enabled: !f,
+		commit: u
+	}), R = v.useCallback(() => {
+		if (!k.current) return;
+		let e = k.current.getOriginalEditor(), t = k.current.getModifiedEditor();
+		e && t && E(Math.max(e.getContentHeight(), t.getContentHeight()) + 20);
+	}, []), z = v.useCallback(() => {
+		A.current && E(A.current.getContentHeight() + 20);
+	}, []), B = (e) => {
+		k.current = e, R(), e.getOriginalEditor().onDidContentSizeChange(R), e.getModifiedEditor().onDidContentSizeChange(R);
+	}, V = (e) => {
+		A.current = e, z(), e.onDidContentSizeChange(z);
+	}, H = (l === "U" ? C.A : C[l]) || "?", U = typeof H == "string" ? /* @__PURE__ */ y(i.Text, { children: H }) : v.createElement(H, { className: "w-5 h-5" }), W = F || L, G = a(N), K = G === "markdown", q = D === "old" ? P?.original ?? "" : P?.modified ?? "";
 	return /* @__PURE__ */ b("div", {
 		"data-testid": "file-diff-viewer-outer",
 		className: "w-full flex flex-col",
 		children: [
 			/* @__PURE__ */ y("div", {
 				className: "flex justify-between items-center px-3 py-2.5 border-b border-[var(--oh-border)] hover:cursor-pointer",
-				onClick: () => f((e) => !e),
+				onClick: () => p((e) => !e),
 				children: /* @__PURE__ */ b("span", {
 					className: "text-sm w-full text-content flex items-center gap-2",
 					children: [
-						U ? /* @__PURE__ */ y(g, { className: "w-4 h-4" }) : H,
+						W ? /* @__PURE__ */ y(g, { className: "w-4 h-4" }) : U,
 						/* @__PURE__ */ y("strong", {
 							className: "w-full truncate font-medium",
-							children: M
+							children: N
 						}),
-						!d && !j && /* @__PURE__ */ y("span", {
+						!f && !M && /* @__PURE__ */ y("span", {
 							className: "flex items-center gap-0.5 shrink-0",
 							onClick: (e) => e.stopPropagation(),
 							children: x.map(({ mode: e, icon: t }) => /* @__PURE__ */ y("button", {
 								"data-testid": `view-mode-${e}`,
 								type: "button",
-								"aria-pressed": E === e,
-								onClick: () => D(e),
-								className: n("p-1 rounded transition-colors cursor-pointer", E === e ? "bg-[var(--oh-interactive-hover)] text-white" : "text-[var(--oh-muted)] hover:bg-[var(--oh-interactive-hover)] hover:text-white"),
+								"aria-pressed": D === e,
+								onClick: () => O(e),
+								className: n("p-1 rounded transition-colors cursor-pointer", D === e ? "bg-[var(--oh-interactive-hover)] text-white" : "text-[var(--oh-muted)] hover:bg-[var(--oh-interactive-hover)] hover:text-white"),
 								children: /* @__PURE__ */ y(t, { className: "w-4 h-4" })
 							}, e))
 						}),
 						/* @__PURE__ */ y("button", {
 							"data-testid": "collapse",
 							type: "button",
-							children: /* @__PURE__ */ y(m, { className: n("w-4 h-4 transition-transform", d && "transform rotate-180") })
+							children: /* @__PURE__ */ y(m, { className: n("w-4 h-4 transition-transform", f && "transform rotate-180") })
 						})
 					]
 				})
 			}),
-			!d && j && /* @__PURE__ */ y("div", {
+			!f && M && !u && /* @__PURE__ */ y("div", {
 				"data-testid": "file-deleted-message",
 				className: "w-full border-b border-[var(--oh-border)] p-4 bg-base text-[var(--oh-text-dim)] text-sm",
-				children: u(t.DIFF_VIEWER$FILE_DELETED)
+				children: d(t.DIFF_VIEWER$FILE_DELETED)
 			}),
-			!d && !j && F && (E === "diff" ? /* @__PURE__ */ y(_, {
-				height: p,
+			!f && (!M || !!u) && I && (D === "diff" ? /* @__PURE__ */ y(_, {
+				height: T,
 				children: /* @__PURE__ */ y(s, {
 					"data-testid": "file-diff-viewer",
 					className: "w-full h-full",
-					language: W,
-					original: A ? "" : N?.original ?? "",
-					modified: j ? "" : N?.modified ?? "",
+					language: G,
+					original: j ? "" : P?.original ?? "",
+					modified: M ? "" : P?.modified ?? "",
 					theme: "custom-diff-theme",
-					onMount: z,
+					onMount: B,
 					beforeMount: w,
 					options: {
 						...S,
-						renderSideBySide: !A && !j,
+						renderSideBySide: !j && !M,
 						hideUnchangedRegions: { enabled: !0 }
 					}
 				})
-			}) : G ? /* @__PURE__ */ y("div", {
+			}) : K ? /* @__PURE__ */ y("div", {
 				className: "w-full border-b border-[var(--oh-border)] overflow-auto p-4 bg-base prose prose-invert max-w-none",
 				"data-testid": "markdown-preview",
 				children: /* @__PURE__ */ y(r, {
-					content: K,
+					content: q,
 					includeStandard: !0,
 					includeHeadings: !0
 				})
 			}) : /* @__PURE__ */ y(_, {
-				height: p,
+				height: T,
 				children: /* @__PURE__ */ y(o, {
 					"data-testid": "file-single-viewer",
 					className: "w-full h-full",
-					language: W,
-					value: K,
+					language: G,
+					value: q,
 					theme: "custom-diff-theme",
 					beforeMount: w,
-					onMount: B,
+					onMount: V,
 					options: S
 				})
 			}))

package/dist/components/features/diff-viewer/file-diff-viewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-diff-viewer.js","names":[],"sources":["../../../../src/components/features/diff-viewer/file-diff-viewer.tsx"],"sourcesContent":["import { DiffEditor, Editor, Monaco } from \"@monaco-editor/react\";\nimport React from \"react\";\nimport { editor as editor_t } from \"monaco-editor\";\nimport { useTranslation } from \"react-i18next\";\nimport {\n  LuFileDiff,\n  LuFileMinus,\n  LuFilePlus,\n  LuHistory,\n  LuGitCompareArrows,\n  LuFileCheck,\n} from \"react-icons/lu\";\nimport { IconType } from \"react-icons/lib\";\nimport { GitChangeStatus } from \"#/api/open-hands.types\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { getLanguageFromPath } from \"#/utils/get-language-from-path\";\nimport { cn } from \"#/utils/utils\";\nimport ChevronUp from \"#/icons/chveron-up.svg?react\";\nimport { useUnifiedGitDiff } from \"#/hooks/query/use-unified-git-diff\";\nimport { MarkdownRenderer } from \"#/components/features/markdown/markdown-renderer\";\nimport { Typography } from \"#/ui/typography\";\nimport { LoadingSpinner } from \"./loading-spinner\";\nimport { EditorContainer } from \"./editor-container\";\n\ntype ViewMode = \"diff\" | \"old\" | \"new\";\n\nconst VIEW_MODES: { mode: ViewMode; icon: IconType }[] = [\n  { mode: \"old\", icon: LuHistory },\n  { mode: \"diff\", icon: LuGitCompareArrows },\n  { mode: \"new\", icon: LuFileCheck },\n];\n\nconst SHARED_EDITOR_OPTIONS: editor_t.IEditorOptions = {\n  renderValidationDecorations: \"off\",\n  readOnly: true,\n  scrollBeyondLastLine: false,\n  minimap: { enabled: false },\n  automaticLayout: true,\n  scrollbar: { alwaysConsumeMouseWheel: false },\n};\n\nconst STATUS_MAP: Record<GitChangeStatus, string | IconType> = {\n  A: LuFilePlus,\n  D: LuFileMinus,\n  M: LuFileDiff,\n  R: \"Renamed\",\n  U: \"Untracked\",\n};\n\nconst beforeMount = (monaco: Monaco) => {\n  monaco.editor.defineTheme(\"custom-diff-theme\", {\n    base: \"vs-dark\",\n    inherit: true,\n    rules: [\n      { token: \"comment\", foreground: \"6a9955\" },\n      { token: \"keyword\", foreground: \"569cd6\" },\n      { token: \"string\", foreground: \"ce9178\" },\n      { token: \"number\", foreground: \"b5cea8\" },\n    ],\n    colors: {\n      \"diffEditor.insertedTextBackground\": \"#014b01AA\",\n      \"diffEditor.removedTextBackground\": \"#750000AA\",\n      \"diffEditor.insertedLineBackground\": \"#003f00AA\",\n      \"diffEditor.removedLineBackground\": \"#5a0000AA\",\n      \"diffEditor.border\": \"var(--oh-border-subtle)\",\n      \"editorUnnecessaryCode.border\": \"#00000000\",\n      \"editorUnnecessaryCode.opacity\": \"rgba(0, 0, 0, 0.467)\",\n    },\n  });\n};\n\nexport interface FileDiffViewerProps {\n  path: string;\n  type: GitChangeStatus;\n}\n\nexport function FileDiffViewer({ path, type }: FileDiffViewerProps) {\n  const { t } = useTranslation(\"openhands\");\n  const [isCollapsed, setIsCollapsed] = React.useState(true);\n  const [editorHeight, setEditorHeight] = React.useState(400);\n  const [viewMode, setViewMode] = React.useState<ViewMode>(\"diff\");\n  const diffEditorRef = React.useRef<editor_t.IStandaloneDiffEditor>(null);\n  const singleEditorRef = React.useRef<editor_t.IStandaloneCodeEditor>(null);\n\n  const isAdded = type === \"A\" || type === \"U\";\n  const isDeleted = type === \"D\";\n\n  const filePath = React.useMemo(() => {\n    if (type === \"R\") {\n      const parts = path.split(/\\s+/).slice(1);\n      return parts[parts.length - 1];\n    }\n    return path;\n  }, [path, type]);\n\n  const {\n    data: diff,\n    isLoading,\n    isSuccess,\n    isRefetching,\n  } = useUnifiedGitDiff({\n    filePath,\n    type,\n    enabled: !isCollapsed,\n  });\n\n  const updateEditorHeight = React.useCallback(() => {\n    if (!diffEditorRef.current) return;\n    const originalEditor = diffEditorRef.current.getOriginalEditor();\n    const modifiedEditor = diffEditorRef.current.getModifiedEditor();\n    if (originalEditor && modifiedEditor) {\n      setEditorHeight(\n        Math.max(\n          originalEditor.getContentHeight(),\n          modifiedEditor.getContentHeight(),\n        ) + 20,\n      );\n    }\n  }, []);\n\n  const updateSingleEditorHeight = React.useCallback(() => {\n    if (singleEditorRef.current) {\n      setEditorHeight(singleEditorRef.current.getContentHeight() + 20);\n    }\n  }, []);\n\n  const handleDiffEditorMount = (editor: editor_t.IStandaloneDiffEditor) => {\n    diffEditorRef.current = editor;\n    updateEditorHeight();\n    editor.getOriginalEditor().onDidContentSizeChange(updateEditorHeight);\n    editor.getModifiedEditor().onDidContentSizeChange(updateEditorHeight);\n  };\n\n  const handleSingleEditorMount = (editor: editor_t.IStandaloneCodeEditor) => {\n    singleEditorRef.current = editor;\n    updateSingleEditorHeight();\n    editor.onDidContentSizeChange(updateSingleEditorHeight);\n  };\n\n  const status = (type === \"U\" ? STATUS_MAP.A : STATUS_MAP[type]) || \"?\";\n  const statusIcon =\n    typeof status === \"string\" ? (\n      <Typography.Text>{status}</Typography.Text>\n    ) : (\n      React.createElement(status, { className: \"w-5 h-5\" })\n    );\n\n  const isFetchingData = isLoading || isRefetching;\n  const language = getLanguageFromPath(filePath);\n  const isMarkdownFile = language === \"markdown\";\n  const singleViewContent =\n    viewMode === \"old\" ? (diff?.original ?? \"\") : (diff?.modified ?? \"\");\n\n  const renderContent = () => {\n    if (viewMode === \"diff\") {\n      return (\n        <EditorContainer height={editorHeight}>\n          <DiffEditor\n            data-testid=\"file-diff-viewer\"\n            className=\"w-full h-full\"\n            language={language}\n            original={isAdded ? \"\" : (diff?.original ?? \"\")}\n            modified={isDeleted ? \"\" : (diff?.modified ?? \"\")}\n            theme=\"custom-diff-theme\"\n            onMount={handleDiffEditorMount}\n            beforeMount={beforeMount}\n            options={{\n              ...SHARED_EDITOR_OPTIONS,\n              renderSideBySide: !isAdded && !isDeleted,\n              hideUnchangedRegions: { enabled: true },\n            }}\n          />\n        </EditorContainer>\n      );\n    }\n\n    if (isMarkdownFile) {\n      return (\n        <div\n          className=\"w-full border-b border-[var(--oh-border)] overflow-auto p-4 bg-base prose prose-invert max-w-none\"\n          data-testid=\"markdown-preview\"\n        >\n          <MarkdownRenderer\n            content={singleViewContent}\n            includeStandard\n            includeHeadings\n          />\n        </div>\n      );\n    }\n\n    return (\n      <EditorContainer height={editorHeight}>\n        <Editor\n          data-testid=\"file-single-viewer\"\n          className=\"w-full h-full\"\n          language={language}\n          value={singleViewContent}\n          theme=\"custom-diff-theme\"\n          beforeMount={beforeMount}\n          onMount={handleSingleEditorMount}\n          options={SHARED_EDITOR_OPTIONS}\n        />\n      </EditorContainer>\n    );\n  };\n\n  return (\n    <div data-testid=\"file-diff-viewer-outer\" className=\"w-full flex flex-col\">\n      <div\n        className=\"flex justify-between items-center px-3 py-2.5 border-b border-[var(--oh-border)] hover:cursor-pointer\"\n        onClick={() => setIsCollapsed((prev) => !prev)}\n      >\n        <span className=\"text-sm w-full text-content flex items-center gap-2\">\n          {isFetchingData ? <LoadingSpinner className=\"w-4 h-4\" /> : statusIcon}\n          <strong className=\"w-full truncate font-medium\">{filePath}</strong>\n          {!isCollapsed && !isDeleted && (\n            <span\n              className=\"flex items-center gap-0.5 shrink-0\"\n              onClick={(e) => e.stopPropagation()}\n            >\n              {VIEW_MODES.map(({ mode, icon: Icon }) => (\n                <button\n                  key={mode}\n                  data-testid={`view-mode-${mode}`}\n                  type=\"button\"\n                  aria-pressed={viewMode === mode}\n                  onClick={() => setViewMode(mode)}\n                  className={cn(\n                    \"p-1 rounded transition-colors cursor-pointer\",\n                    viewMode === mode\n                      ? \"bg-[var(--oh-interactive-hover)] text-white\"\n                      : \"text-[var(--oh-muted)] hover:bg-[var(--oh-interactive-hover)] hover:text-white\",\n                  )}\n                >\n                  <Icon className=\"w-4 h-4\" />\n                </button>\n              ))}\n            </span>\n          )}\n          <button data-testid=\"collapse\" type=\"button\">\n            <ChevronUp\n              className={cn(\n                \"w-4 h-4 transition-transform\",\n                isCollapsed && \"transform rotate-180\",\n              )}\n            />\n          </button>\n        </span>\n      </div>\n\n      {!isCollapsed && isDeleted && (\n        <div\n          data-testid=\"file-deleted-message\"\n          className=\"w-full border-b border-[var(--oh-border)] p-4 bg-base text-[var(--oh-text-dim)] text-sm\"\n        >\n          {t(I18nKey.DIFF_VIEWER$FILE_DELETED)}\n        </div>\n      )}\n\n      {!isCollapsed && !isDeleted && isSuccess && renderContent()}\n    </div>\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"file-diff-viewer.js","names":[],"sources":["../../../../src/components/features/diff-viewer/file-diff-viewer.tsx"],"sourcesContent":["import { DiffEditor, Editor, Monaco } from \"@monaco-editor/react\";\nimport React from \"react\";\nimport { editor as editor_t } from \"monaco-editor\";\nimport { useTranslation } from \"react-i18next\";\nimport {\n  LuFileDiff,\n  LuFileMinus,\n  LuFilePlus,\n  LuHistory,\n  LuGitCompareArrows,\n  LuFileCheck,\n} from \"react-icons/lu\";\nimport { IconType } from \"react-icons/lib\";\nimport { GitChangeStatus } from \"#/api/open-hands.types\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { getLanguageFromPath } from \"#/utils/get-language-from-path\";\nimport { cn } from \"#/utils/utils\";\nimport ChevronUp from \"#/icons/chveron-up.svg?react\";\nimport { useUnifiedGitDiff } from \"#/hooks/query/use-unified-git-diff\";\nimport { MarkdownRenderer } from \"#/components/features/markdown/markdown-renderer\";\nimport { Typography } from \"#/ui/typography\";\nimport { LoadingSpinner } from \"./loading-spinner\";\nimport { EditorContainer } from \"./editor-container\";\n\ntype ViewMode = \"diff\" | \"old\" | \"new\";\n\nconst VIEW_MODES: { mode: ViewMode; icon: IconType }[] = [\n  { mode: \"old\", icon: LuHistory },\n  { mode: \"diff\", icon: LuGitCompareArrows },\n  { mode: \"new\", icon: LuFileCheck },\n];\n\nconst SHARED_EDITOR_OPTIONS: editor_t.IEditorOptions = {\n  renderValidationDecorations: \"off\",\n  readOnly: true,\n  scrollBeyondLastLine: false,\n  minimap: { enabled: false },\n  automaticLayout: true,\n  scrollbar: { alwaysConsumeMouseWheel: false },\n};\n\nconst STATUS_MAP: Record<GitChangeStatus, string | IconType> = {\n  A: LuFilePlus,\n  D: LuFileMinus,\n  M: LuFileDiff,\n  R: \"Renamed\",\n  U: \"Untracked\",\n};\n\nconst beforeMount = (monaco: Monaco) => {\n  monaco.editor.defineTheme(\"custom-diff-theme\", {\n    base: \"vs-dark\",\n    inherit: true,\n    rules: [\n      { token: \"comment\", foreground: \"6a9955\" },\n      { token: \"keyword\", foreground: \"569cd6\" },\n      { token: \"string\", foreground: \"ce9178\" },\n      { token: \"number\", foreground: \"b5cea8\" },\n    ],\n    colors: {\n      \"diffEditor.insertedTextBackground\": \"#014b01AA\",\n      \"diffEditor.removedTextBackground\": \"#750000AA\",\n      \"diffEditor.insertedLineBackground\": \"#003f00AA\",\n      \"diffEditor.removedLineBackground\": \"#5a0000AA\",\n      \"diffEditor.border\": \"var(--oh-border-subtle)\",\n      \"editorUnnecessaryCode.border\": \"#00000000\",\n      \"editorUnnecessaryCode.opacity\": \"rgba(0, 0, 0, 0.467)\",\n    },\n  });\n};\n\nexport interface FileDiffViewerProps {\n  path: string;\n  type: GitChangeStatus;\n  /**\n   * When set, show the file's diff as changed by this commit instead of\n   * the working-tree-vs-base diff. Deleted files render their content in\n   * commit mode (both sides come from git objects).\n   */\n  commit?: string;\n}\n\nexport function FileDiffViewer({ path, type, commit }: FileDiffViewerProps) {\n  const { t } = useTranslation(\"openhands\");\n  const [isCollapsed, setIsCollapsed] = React.useState(true);\n  const [editorHeight, setEditorHeight] = React.useState(400);\n  const [viewMode, setViewMode] = React.useState<ViewMode>(\"diff\");\n  const diffEditorRef = React.useRef<editor_t.IStandaloneDiffEditor>(null);\n  const singleEditorRef = React.useRef<editor_t.IStandaloneCodeEditor>(null);\n\n  const isAdded = type === \"A\" || type === \"U\";\n  const isDeleted = type === \"D\";\n\n  const filePath = React.useMemo(() => {\n    if (type === \"R\") {\n      const parts = path.split(/\\s+/).slice(1);\n      return parts[parts.length - 1];\n    }\n    return path;\n  }, [path, type]);\n\n  const {\n    data: diff,\n    isLoading,\n    isSuccess,\n    isRefetching,\n  } = useUnifiedGitDiff({\n    filePath,\n    type,\n    enabled: !isCollapsed,\n    commit,\n  });\n\n  const updateEditorHeight = React.useCallback(() => {\n    if (!diffEditorRef.current) return;\n    const originalEditor = diffEditorRef.current.getOriginalEditor();\n    const modifiedEditor = diffEditorRef.current.getModifiedEditor();\n    if (originalEditor && modifiedEditor) {\n      setEditorHeight(\n        Math.max(\n          originalEditor.getContentHeight(),\n          modifiedEditor.getContentHeight(),\n        ) + 20,\n      );\n    }\n  }, []);\n\n  const updateSingleEditorHeight = React.useCallback(() => {\n    if (singleEditorRef.current) {\n      setEditorHeight(singleEditorRef.current.getContentHeight() + 20);\n    }\n  }, []);\n\n  const handleDiffEditorMount = (editor: editor_t.IStandaloneDiffEditor) => {\n    diffEditorRef.current = editor;\n    updateEditorHeight();\n    editor.getOriginalEditor().onDidContentSizeChange(updateEditorHeight);\n    editor.getModifiedEditor().onDidContentSizeChange(updateEditorHeight);\n  };\n\n  const handleSingleEditorMount = (editor: editor_t.IStandaloneCodeEditor) => {\n    singleEditorRef.current = editor;\n    updateSingleEditorHeight();\n    editor.onDidContentSizeChange(updateSingleEditorHeight);\n  };\n\n  const status = (type === \"U\" ? STATUS_MAP.A : STATUS_MAP[type]) || \"?\";\n  const statusIcon =\n    typeof status === \"string\" ? (\n      <Typography.Text>{status}</Typography.Text>\n    ) : (\n      React.createElement(status, { className: \"w-5 h-5\" })\n    );\n\n  const isFetchingData = isLoading || isRefetching;\n  const language = getLanguageFromPath(filePath);\n  const isMarkdownFile = language === \"markdown\";\n  const singleViewContent =\n    viewMode === \"old\" ? (diff?.original ?? \"\") : (diff?.modified ?? \"\");\n\n  const renderContent = () => {\n    if (viewMode === \"diff\") {\n      return (\n        <EditorContainer height={editorHeight}>\n          <DiffEditor\n            data-testid=\"file-diff-viewer\"\n            className=\"w-full h-full\"\n            language={language}\n            original={isAdded ? \"\" : (diff?.original ?? \"\")}\n            modified={isDeleted ? \"\" : (diff?.modified ?? \"\")}\n            theme=\"custom-diff-theme\"\n            onMount={handleDiffEditorMount}\n            beforeMount={beforeMount}\n            options={{\n              ...SHARED_EDITOR_OPTIONS,\n              renderSideBySide: !isAdded && !isDeleted,\n              hideUnchangedRegions: { enabled: true },\n            }}\n          />\n        </EditorContainer>\n      );\n    }\n\n    if (isMarkdownFile) {\n      return (\n        <div\n          className=\"w-full border-b border-[var(--oh-border)] overflow-auto p-4 bg-base prose prose-invert max-w-none\"\n          data-testid=\"markdown-preview\"\n        >\n          <MarkdownRenderer\n            content={singleViewContent}\n            includeStandard\n            includeHeadings\n          />\n        </div>\n      );\n    }\n\n    return (\n      <EditorContainer height={editorHeight}>\n        <Editor\n          data-testid=\"file-single-viewer\"\n          className=\"w-full h-full\"\n          language={language}\n          value={singleViewContent}\n          theme=\"custom-diff-theme\"\n          beforeMount={beforeMount}\n          onMount={handleSingleEditorMount}\n          options={SHARED_EDITOR_OPTIONS}\n        />\n      </EditorContainer>\n    );\n  };\n\n  return (\n    <div data-testid=\"file-diff-viewer-outer\" className=\"w-full flex flex-col\">\n      <div\n        className=\"flex justify-between items-center px-3 py-2.5 border-b border-[var(--oh-border)] hover:cursor-pointer\"\n        onClick={() => setIsCollapsed((prev) => !prev)}\n      >\n        <span className=\"text-sm w-full text-content flex items-center gap-2\">\n          {isFetchingData ? <LoadingSpinner className=\"w-4 h-4\" /> : statusIcon}\n          <strong className=\"w-full truncate font-medium\">{filePath}</strong>\n          {!isCollapsed && !isDeleted && (\n            <span\n              className=\"flex items-center gap-0.5 shrink-0\"\n              onClick={(e) => e.stopPropagation()}\n            >\n              {VIEW_MODES.map(({ mode, icon: Icon }) => (\n                <button\n                  key={mode}\n                  data-testid={`view-mode-${mode}`}\n                  type=\"button\"\n                  aria-pressed={viewMode === mode}\n                  onClick={() => setViewMode(mode)}\n                  className={cn(\n                    \"p-1 rounded transition-colors cursor-pointer\",\n                    viewMode === mode\n                      ? \"bg-[var(--oh-interactive-hover)] text-white\"\n                      : \"text-[var(--oh-muted)] hover:bg-[var(--oh-interactive-hover)] hover:text-white\",\n                  )}\n                >\n                  <Icon className=\"w-4 h-4\" />\n                </button>\n              ))}\n            </span>\n          )}\n          <button data-testid=\"collapse\" type=\"button\">\n            <ChevronUp\n              className={cn(\n                \"w-4 h-4 transition-transform\",\n                isCollapsed && \"transform rotate-180\",\n              )}\n            />\n          </button>\n        </span>\n      </div>\n\n      {!isCollapsed && isDeleted && !commit && (\n        <div\n          data-testid=\"file-deleted-message\"\n          className=\"w-full border-b border-[var(--oh-border)] p-4 bg-base text-[var(--oh-text-dim)] text-sm\"\n        >\n          {t(I18nKey.DIFF_VIEWER$FILE_DELETED)}\n        </div>\n      )}\n\n      {!isCollapsed && (!isDeleted || !!commit) && isSuccess && renderContent()}\n    </div>\n  );\n}\n"],"mappings":"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"}

package/dist/components/features/plugins/plugin-detail-modal.d.ts

@@ -8,6 +8,7 @@ interface PluginDetailModalProps {
     onUninstall: () => void;
     onRefresh: () => void;
     onClose: () => void;
+    onStartConversation?: () => void;
 }
-export declare function PluginDetailModal({ plugin, isBusy, isDisabled, onToggle, onInstall, onUninstall, onRefresh, onClose, }: PluginDetailModalProps): import("react/jsx-runtime").JSX.Element;
+export declare function PluginDetailModal({ plugin, isBusy, isDisabled, onToggle, onInstall, onUninstall, onRefresh, onClose, onStartConversation, }: PluginDetailModalProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/shared/modals/settings/settings-modal.cjs

@@ -1,2 +1,2 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../../node_modules/react-i18next/dist/es/useTranslation.cjs`),t=require(`../../../../i18n/declaration.cjs`),n=require(`../../../../utils/utils.cjs`),r=require(`../../../../services/settings.cjs`),i=require(`../modal-backdrop.cjs`),a=require(`../modal-body.cjs`),o=require(`../../../../utils/modal-classes.cjs`),s=require(`../../../../ui/help-link.cjs`),c=require(`./settings-form.cjs`);let l=require(`react/jsx-runtime`);function u({onClose:u,settings:d}){let{t:f}=e.useTranslation(`openhands`);return(0,l.jsx)(i.ModalBackdrop,{children:(0,l.jsxs)(`div`,{"data-testid":`ai-config-modal`,className:n.cn(`bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal`,a.modalWidthClassName(`md`),a.MODAL_MAX_WIDTH_VIEWPORT),children:[(0,l.jsx)(`span`,{className:o.modalTitleClassName,children:f(t.I18nKey.AI_SETTINGS$TITLE)}),(0,l.jsx)(s.HelpLink,{testId:`advanced-settings-link`,text:`${f(t.I18nKey.SETTINGS$DESCRIPTION)}. ${f(t.I18nKey.SETTINGS$FOR_OTHER_OPTIONS)} ${f(t.I18nKey.COMMON$SEE)}`,linkText:f(t.I18nKey.COMMON$ADVANCED_SETTINGS),href:`/settings`,suffix:`.`,size:`settings`,linkColor:`white`,suffixClassName:`text-white`}),(0,l.jsx)(c.SettingsForm,{settings:d||r.DEFAULT_SETTINGS,onClose:u})]})})}exports.SettingsModal=u;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../../node_modules/react-i18next/dist/es/useTranslation.cjs`),t=require(`../../../../i18n/declaration.cjs`),n=require(`../../../../utils/utils.cjs`),r=require(`../../../../utils/base-path.cjs`),i=require(`../../../../services/settings.cjs`),a=require(`../modal-backdrop.cjs`),o=require(`../modal-body.cjs`),s=require(`../../../../utils/modal-classes.cjs`),c=require(`../../../../ui/help-link.cjs`),l=require(`./settings-form.cjs`);let u=require(`react/jsx-runtime`);function d({onClose:d,settings:f}){let{t:p}=e.useTranslation(`openhands`);return(0,u.jsx)(a.ModalBackdrop,{children:(0,u.jsxs)(`div`,{"data-testid":`ai-config-modal`,className:n.cn(`bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal`,o.modalWidthClassName(`md`),o.MODAL_MAX_WIDTH_VIEWPORT),children:[(0,u.jsx)(`span`,{className:s.modalTitleClassName,children:p(t.I18nKey.AI_SETTINGS$TITLE)}),(0,u.jsx)(c.HelpLink,{testId:`advanced-settings-link`,text:`${p(t.I18nKey.SETTINGS$DESCRIPTION)}. ${p(t.I18nKey.SETTINGS$FOR_OTHER_OPTIONS)} ${p(t.I18nKey.COMMON$SEE)}`,linkText:p(t.I18nKey.COMMON$ADVANCED_SETTINGS),href:r.buildAgentCanvasPath(`/settings`),suffix:`.`,size:`settings`,linkColor:`white`,suffixClassName:`text-white`}),(0,u.jsx)(l.SettingsForm,{settings:f||i.DEFAULT_SETTINGS,onClose:d})]})})}exports.SettingsModal=d;
 //# sourceMappingURL=settings-modal.cjs.map

package/dist/components/shared/modals/settings/settings-modal.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"settings-modal.cjs","names":[],"sources":["../../../../../src/components/shared/modals/settings/settings-modal.tsx"],"sourcesContent":["import { useTranslation } from \"react-i18next\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"../modal-backdrop\";\nimport { MODAL_MAX_WIDTH_VIEWPORT, modalWidthClassName } from \"../modal-body\";\nimport { cn } from \"#/utils/utils\";\nimport { SettingsForm } from \"./settings-form\";\nimport { Settings } from \"#/types/settings\";\nimport { DEFAULT_SETTINGS } from \"#/services/settings\";\nimport { HelpLink } from \"#/ui/help-link\";\nimport { modalTitleClassName } from \"#/utils/modal-classes\";\n\ninterface SettingsModalProps {\n  settings?: Settings;\n  onClose: () => void;\n}\n\nexport function SettingsModal({ onClose, settings }: SettingsModalProps) {\n  const { t } = useTranslation(\"openhands\");\n\n  return (\n    <ModalBackdrop>\n      <div\n        data-testid=\"ai-config-modal\"\n        className={cn(\n          \"bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal\",\n          modalWidthClassName(\"md\"),\n          MODAL_MAX_WIDTH_VIEWPORT,\n        )}\n      >\n        <span className={modalTitleClassName}>\n          {t(I18nKey.AI_SETTINGS$TITLE)}\n        </span>\n        <HelpLink\n          testId=\"advanced-settings-link\"\n          text={`${t(I18nKey.SETTINGS$DESCRIPTION)}. ${t(I18nKey.SETTINGS$FOR_OTHER_OPTIONS)} ${t(I18nKey.COMMON$SEE)}`}\n          linkText={t(I18nKey.COMMON$ADVANCED_SETTINGS)}\n          href=\"/settings\"\n          suffix=\".\"\n          size=\"settings\"\n          linkColor=\"white\"\n          suffixClassName=\"text-white\"\n        />\n\n        <SettingsForm\n          settings={settings || DEFAULT_SETTINGS}\n          onClose={onClose}\n        />\n      </div>\n    </ModalBackdrop>\n  );\n}\n"],"mappings":"kfAgBA,SAAgB,EAAc,CAAE,UAAS,YAAgC,CACvE,GAAM,CAAE,KAAM,EAAA,eAAe,YAAY,CAEzC,OACE,EAAA,EAAA,KAAC,EAAA,cAAD,CAAA,UACE,EAAA,EAAA,MAAC,MAAD,CACE,cAAY,kBACZ,UAAW,EAAA,GACT,8HACA,EAAA,oBAAoB,KAAK,CACzB,EAAA,yBACD,UANH,EAQE,EAAA,EAAA,KAAC,OAAD,CAAM,UAAW,EAAA,6BACd,EAAE,EAAA,QAAQ,kBAAkB,CACxB,CAAA,EACP,EAAA,EAAA,KAAC,EAAA,SAAD,CACE,OAAO,yBACP,KAAM,GAAG,EAAE,EAAA,QAAQ,qBAAqB,CAAC,IAAI,EAAE,EAAA,QAAQ,2BAA2B,CAAC,GAAG,EAAE,EAAA,QAAQ,WAAW,GAC3G,SAAU,EAAE,EAAA,QAAQ,yBAAyB,CAC7C,KAAK,YACL,OAAO,IACP,KAAK,WACL,UAAU,QACV,gBAAgB,aAChB,CAAA,EAEF,EAAA,EAAA,KAAC,EAAA,aAAD,CACE,SAAU,GAAY,EAAA,iBACb,UACT,CAAA,CACE,GACQ,CAAA"}
+{"version":3,"file":"settings-modal.cjs","names":[],"sources":["../../../../../src/components/shared/modals/settings/settings-modal.tsx"],"sourcesContent":["import { useTranslation } from \"react-i18next\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"../modal-backdrop\";\nimport { MODAL_MAX_WIDTH_VIEWPORT, modalWidthClassName } from \"../modal-body\";\nimport { cn } from \"#/utils/utils\";\nimport { SettingsForm } from \"./settings-form\";\nimport { Settings } from \"#/types/settings\";\nimport { DEFAULT_SETTINGS } from \"#/services/settings\";\nimport { HelpLink } from \"#/ui/help-link\";\nimport { modalTitleClassName } from \"#/utils/modal-classes\";\nimport { buildAgentCanvasPath } from \"#/utils/base-path\";\n\ninterface SettingsModalProps {\n  settings?: Settings;\n  onClose: () => void;\n}\n\nexport function SettingsModal({ onClose, settings }: SettingsModalProps) {\n  const { t } = useTranslation(\"openhands\");\n\n  return (\n    <ModalBackdrop>\n      <div\n        data-testid=\"ai-config-modal\"\n        className={cn(\n          \"bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal\",\n          modalWidthClassName(\"md\"),\n          MODAL_MAX_WIDTH_VIEWPORT,\n        )}\n      >\n        <span className={modalTitleClassName}>\n          {t(I18nKey.AI_SETTINGS$TITLE)}\n        </span>\n        <HelpLink\n          testId=\"advanced-settings-link\"\n          text={`${t(I18nKey.SETTINGS$DESCRIPTION)}. ${t(I18nKey.SETTINGS$FOR_OTHER_OPTIONS)} ${t(I18nKey.COMMON$SEE)}`}\n          linkText={t(I18nKey.COMMON$ADVANCED_SETTINGS)}\n          href={buildAgentCanvasPath(\"/settings\")}\n          suffix=\".\"\n          size=\"settings\"\n          linkColor=\"white\"\n          suffixClassName=\"text-white\"\n        />\n\n        <SettingsForm\n          settings={settings || DEFAULT_SETTINGS}\n          onClose={onClose}\n        />\n      </div>\n    </ModalBackdrop>\n  );\n}\n"],"mappings":"+hBAiBA,SAAgB,EAAc,CAAE,UAAS,YAAgC,CACvE,GAAM,CAAE,KAAM,EAAA,eAAe,YAAY,CAEzC,OACE,EAAA,EAAA,KAAC,EAAA,cAAD,CAAA,UACE,EAAA,EAAA,MAAC,MAAD,CACE,cAAY,kBACZ,UAAW,EAAA,GACT,8HACA,EAAA,oBAAoB,KAAK,CACzB,EAAA,yBACD,UANH,EAQE,EAAA,EAAA,KAAC,OAAD,CAAM,UAAW,EAAA,6BACd,EAAE,EAAA,QAAQ,kBAAkB,CACxB,CAAA,EACP,EAAA,EAAA,KAAC,EAAA,SAAD,CACE,OAAO,yBACP,KAAM,GAAG,EAAE,EAAA,QAAQ,qBAAqB,CAAC,IAAI,EAAE,EAAA,QAAQ,2BAA2B,CAAC,GAAG,EAAE,EAAA,QAAQ,WAAW,GAC3G,SAAU,EAAE,EAAA,QAAQ,yBAAyB,CAC7C,KAAM,EAAA,qBAAqB,YAAY,CACvC,OAAO,IACP,KAAK,WACL,UAAU,QACV,gBAAgB,aAChB,CAAA,EAEF,EAAA,EAAA,KAAC,EAAA,aAAD,CACE,SAAU,GAAY,EAAA,iBACb,UACT,CAAA,CACE,GACQ,CAAA"}

package/dist/components/shared/modals/settings/settings-modal.js

@@ -1,42 +1,43 @@
 import { useTranslation as e } from "../../../../node_modules/react-i18next/dist/es/useTranslation.js";
 import { I18nKey as t } from "../../../../i18n/declaration.js";
 import { cn as n } from "../../../../utils/utils.js";
-import { DEFAULT_SETTINGS as r } from "../../../../services/settings.js";
-import { ModalBackdrop as i } from "../modal-backdrop.js";
-import { MODAL_MAX_WIDTH_VIEWPORT as a, modalWidthClassName as o } from "../modal-body.js";
-import { modalTitleClassName as s } from "../../../../utils/modal-classes.js";
-import { HelpLink as c } from "../../../../ui/help-link.js";
-import { SettingsForm as l } from "./settings-form.js";
-import { jsx as u, jsxs as d } from "react/jsx-runtime";
+import { buildAgentCanvasPath as r } from "../../../../utils/base-path.js";
+import { DEFAULT_SETTINGS as i } from "../../../../services/settings.js";
+import { ModalBackdrop as a } from "../modal-backdrop.js";
+import { MODAL_MAX_WIDTH_VIEWPORT as o, modalWidthClassName as s } from "../modal-body.js";
+import { modalTitleClassName as c } from "../../../../utils/modal-classes.js";
+import { HelpLink as l } from "../../../../ui/help-link.js";
+import { SettingsForm as u } from "./settings-form.js";
+import { jsx as d, jsxs as f } from "react/jsx-runtime";
 //#region src/components/shared/modals/settings/settings-modal.tsx
-function f({ onClose: f, settings: p }) {
-	let { t: m } = e("openhands");
-	return /* @__PURE__ */ u(i, { children: /* @__PURE__ */ d("div", {
+function p({ onClose: p, settings: m }) {
+	let { t: h } = e("openhands");
+	return /* @__PURE__ */ d(a, { children: /* @__PURE__ */ f("div", {
 		"data-testid": "ai-config-modal",
-		className: n("bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal", o("md"), a),
+		className: n("bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal", s("md"), o),
 		children: [
-			/* @__PURE__ */ u("span", {
-				className: s,
-				children: m(t.AI_SETTINGS$TITLE)
+			/* @__PURE__ */ d("span", {
+				className: c,
+				children: h(t.AI_SETTINGS$TITLE)
 			}),
-			/* @__PURE__ */ u(c, {
+			/* @__PURE__ */ d(l, {
 				testId: "advanced-settings-link",
-				text: `${m(t.SETTINGS$DESCRIPTION)}. ${m(t.SETTINGS$FOR_OTHER_OPTIONS)} ${m(t.COMMON$SEE)}`,
-				linkText: m(t.COMMON$ADVANCED_SETTINGS),
-				href: "/settings",
+				text: `${h(t.SETTINGS$DESCRIPTION)}. ${h(t.SETTINGS$FOR_OTHER_OPTIONS)} ${h(t.COMMON$SEE)}`,
+				linkText: h(t.COMMON$ADVANCED_SETTINGS),
+				href: r("/settings"),
 				suffix: ".",
 				size: "settings",
 				linkColor: "white",
 				suffixClassName: "text-white"
 			}),
-			/* @__PURE__ */ u(l, {
-				settings: p || r,
-				onClose: f
+			/* @__PURE__ */ d(u, {
+				settings: m || i,
+				onClose: p
 			})
 		]
 	}) });
 }
 //#endregion
-export { f as SettingsModal };
+export { p as SettingsModal };
 
 //# sourceMappingURL=settings-modal.js.map

package/dist/components/shared/modals/settings/settings-modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-modal.js","names":[],"sources":["../../../../../src/components/shared/modals/settings/settings-modal.tsx"],"sourcesContent":["import { useTranslation } from \"react-i18next\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"../modal-backdrop\";\nimport { MODAL_MAX_WIDTH_VIEWPORT, modalWidthClassName } from \"../modal-body\";\nimport { cn } from \"#/utils/utils\";\nimport { SettingsForm } from \"./settings-form\";\nimport { Settings } from \"#/types/settings\";\nimport { DEFAULT_SETTINGS } from \"#/services/settings\";\nimport { HelpLink } from \"#/ui/help-link\";\nimport { modalTitleClassName } from \"#/utils/modal-classes\";\n\ninterface SettingsModalProps {\n  settings?: Settings;\n  onClose: () => void;\n}\n\nexport function SettingsModal({ onClose, settings }: SettingsModalProps) {\n  const { t } = useTranslation(\"openhands\");\n\n  return (\n    <ModalBackdrop>\n      <div\n        data-testid=\"ai-config-modal\"\n        className={cn(\n          \"bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal\",\n          modalWidthClassName(\"md\"),\n          MODAL_MAX_WIDTH_VIEWPORT,\n        )}\n      >\n        <span className={modalTitleClassName}>\n          {t(I18nKey.AI_SETTINGS$TITLE)}\n        </span>\n        <HelpLink\n          testId=\"advanced-settings-link\"\n          text={`${t(I18nKey.SETTINGS$DESCRIPTION)}. ${t(I18nKey.SETTINGS$FOR_OTHER_OPTIONS)} ${t(I18nKey.COMMON$SEE)}`}\n          linkText={t(I18nKey.COMMON$ADVANCED_SETTINGS)}\n          href=\"/settings\"\n          suffix=\".\"\n          size=\"settings\"\n          linkColor=\"white\"\n          suffixClassName=\"text-white\"\n        />\n\n        <SettingsForm\n          settings={settings || DEFAULT_SETTINGS}\n          onClose={onClose}\n        />\n      </div>\n    </ModalBackdrop>\n  );\n}\n"],"mappings":";;;;;;;;;;;AAgBA,SAAgB,EAAc,EAAE,YAAS,eAAgC;CACvE,IAAM,EAAE,SAAM,EAAe,YAAY;AAEzC,QACE,kBAAC,GAAD,EAAA,UACE,kBAAC,OAAD;EACE,eAAY;EACZ,WAAW,EACT,+HACA,EAAoB,KAAK,EACzB,EACD;YANH;GAQE,kBAAC,QAAD;IAAM,WAAW;cACd,EAAE,EAAQ,kBAAkB;IACxB,CAAA;GACP,kBAAC,GAAD;IACE,QAAO;IACP,MAAM,GAAG,EAAE,EAAQ,qBAAqB,CAAC,IAAI,EAAE,EAAQ,2BAA2B,CAAC,GAAG,EAAE,EAAQ,WAAW;IAC3G,UAAU,EAAE,EAAQ,yBAAyB;IAC7C,MAAK;IACL,QAAO;IACP,MAAK;IACL,WAAU;IACV,iBAAgB;IAChB,CAAA;GAEF,kBAAC,GAAD;IACE,UAAU,KAAY;IACb;IACT,CAAA;GACE;KACQ,CAAA"}
+{"version":3,"file":"settings-modal.js","names":[],"sources":["../../../../../src/components/shared/modals/settings/settings-modal.tsx"],"sourcesContent":["import { useTranslation } from \"react-i18next\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"../modal-backdrop\";\nimport { MODAL_MAX_WIDTH_VIEWPORT, modalWidthClassName } from \"../modal-body\";\nimport { cn } from \"#/utils/utils\";\nimport { SettingsForm } from \"./settings-form\";\nimport { Settings } from \"#/types/settings\";\nimport { DEFAULT_SETTINGS } from \"#/services/settings\";\nimport { HelpLink } from \"#/ui/help-link\";\nimport { modalTitleClassName } from \"#/utils/modal-classes\";\nimport { buildAgentCanvasPath } from \"#/utils/base-path\";\n\ninterface SettingsModalProps {\n  settings?: Settings;\n  onClose: () => void;\n}\n\nexport function SettingsModal({ onClose, settings }: SettingsModalProps) {\n  const { t } = useTranslation(\"openhands\");\n\n  return (\n    <ModalBackdrop>\n      <div\n        data-testid=\"ai-config-modal\"\n        className={cn(\n          \"bg-[var(--oh-surface)] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal\",\n          modalWidthClassName(\"md\"),\n          MODAL_MAX_WIDTH_VIEWPORT,\n        )}\n      >\n        <span className={modalTitleClassName}>\n          {t(I18nKey.AI_SETTINGS$TITLE)}\n        </span>\n        <HelpLink\n          testId=\"advanced-settings-link\"\n          text={`${t(I18nKey.SETTINGS$DESCRIPTION)}. ${t(I18nKey.SETTINGS$FOR_OTHER_OPTIONS)} ${t(I18nKey.COMMON$SEE)}`}\n          linkText={t(I18nKey.COMMON$ADVANCED_SETTINGS)}\n          href={buildAgentCanvasPath(\"/settings\")}\n          suffix=\".\"\n          size=\"settings\"\n          linkColor=\"white\"\n          suffixClassName=\"text-white\"\n        />\n\n        <SettingsForm\n          settings={settings || DEFAULT_SETTINGS}\n          onClose={onClose}\n        />\n      </div>\n    </ModalBackdrop>\n  );\n}\n"],"mappings":";;;;;;;;;;;;AAiBA,SAAgB,EAAc,EAAE,YAAS,eAAgC;CACvE,IAAM,EAAE,SAAM,EAAe,YAAY;AAEzC,QACE,kBAAC,GAAD,EAAA,UACE,kBAAC,OAAD;EACE,eAAY;EACZ,WAAW,EACT,+HACA,EAAoB,KAAK,EACzB,EACD;YANH;GAQE,kBAAC,QAAD;IAAM,WAAW;cACd,EAAE,EAAQ,kBAAkB;IACxB,CAAA;GACP,kBAAC,GAAD;IACE,QAAO;IACP,MAAM,GAAG,EAAE,EAAQ,qBAAqB,CAAC,IAAI,EAAE,EAAQ,2BAA2B,CAAC,GAAG,EAAE,EAAQ,WAAW;IAC3G,UAAU,EAAE,EAAQ,yBAAyB;IAC7C,MAAM,EAAqB,YAAY;IACvC,QAAO;IACP,MAAK;IACL,WAAU;IACV,iBAAgB;IAChB,CAAA;GAEF,kBAAC,GAAD;IACE,UAAU,KAAY;IACb;IACT,CAAA;GACE;KACQ,CAAA"}

package/dist/config/defaults.cjs

@@ -1,2 +1,2 @@
-require(`../_virtual/_rolldown/runtime.cjs`);var e={_comment:`Single source of truth for version pins, ports, paths, and defaults shared across the npm and Docker install paths. Read by scripts/dev-safe.mjs, scripts/dev-with-automation.mjs, docker/entrypoint.sh (via generated defaults.env), and .github/workflows/docker.yml.`,versions:{agentServer:`1.35.0`,agentCanvas:`1.4.0`,automation:`1.1.6`},compatibility:{minimumAgentServer:`1.28.0`},constraints:{_comment:`Temporary upper bound on the agent-client-protocol (acp) transitive dependency. openhands-sdk 1.35.0 requires agent-client-protocol>=0.10.1 with no upper bound, but acp 0.11.0 reordered the ACP prompt() arguments and breaks the SDK's ACP client (a PromptRequest validation error surfaces as 'ACP error: 2 validation errors for PromptRequest'). Pin acp <0.11 until a fixed openhands-sdk ships. Consumed by scripts/dev-safe.mjs (agent-server uvx install) and .github/workflows/mock-llm-e2e.yml (mock ACP server venv).`,agentClientProtocol:`agent-client-protocol<0.11`},images:{agentServer:`ghcr.io/openhands/agent-server`,agentCanvas:`ghcr.io/openhands/agent-canvas`},ports:{agentServer:18e3,automation:18001,proxy:8e3},paths:{stateSubdir:`agent-canvas`,conversations:`agent-canvas/conversations`,bashEvents:`agent-canvas/bash_events`,automationDb:`automation/automations.db`},packages:{agentServer:`openhands-agent-server`,automation:`openhands-automation`,tools:`openhands-tools`,workspace:`openhands-workspace`}};exports.default=e;
+require(`../_virtual/_rolldown/runtime.cjs`);var e={_comment:`Single source of truth for version pins, ports, paths, and defaults shared across the npm and Docker install paths. Read by scripts/dev-safe.mjs, scripts/dev-with-automation.mjs, docker/entrypoint.sh (via generated defaults.env), and .github/workflows/docker.yml.`,versions:{agentServer:`1.36.1`,agentCanvas:`1.5.0`,automation:`1.1.7`},compatibility:{minimumAgentServer:`1.28.0`},constraints:{_comment:`Temporary upper bound on the agent-client-protocol (acp) transitive dependency. openhands-sdk 1.35.0 requires agent-client-protocol>=0.10.1 with no upper bound, but acp 0.11.0 reordered the ACP prompt() arguments and breaks the SDK's ACP client (a PromptRequest validation error surfaces as 'ACP error: 2 validation errors for PromptRequest'). Pin acp <0.11 until a fixed openhands-sdk ships. Consumed by scripts/dev-safe.mjs (agent-server uvx install) and .github/workflows/mock-llm-e2e.yml (mock ACP server venv).`,agentClientProtocol:`agent-client-protocol<0.11`},images:{agentServer:`ghcr.io/openhands/agent-server`,agentCanvas:`ghcr.io/openhands/agent-canvas`},ports:{agentServer:18e3,automation:18001,proxy:8e3},paths:{stateSubdir:`agent-canvas`,conversations:`agent-canvas/conversations`,bashEvents:`agent-canvas/bash_events`,automationDb:`automation/automations.db`,canvasBasePath:`/canvas`},packages:{agentServer:`openhands-agent-server`,automation:`openhands-automation`,tools:`openhands-tools`,workspace:`openhands-workspace`}};exports.default=e;
 //# sourceMappingURL=defaults.cjs.map

package/dist/config/defaults.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.cjs","names":[],"sources":["../../config/defaults.json"],"sourcesContent":["{\n  \"_comment\": \"Single source of truth for version pins, ports, paths, and defaults shared across the npm and Docker install paths. Read by scripts/dev-safe.mjs, scripts/dev-with-automation.mjs, docker/entrypoint.sh (via generated defaults.env), and .github/workflows/docker.yml.\",\n  \"versions\": {\n    \"agentServer\": \"1.35.0\",\n    \"agentCanvas\": \"1.4.0\",\n    \"automation\": \"1.1.6\"\n  },\n  \"compatibility\": {\n    \"minimumAgentServer\": \"1.28.0\"\n  },\n  \"constraints\": {\n    \"_comment\": \"Temporary upper bound on the agent-client-protocol (acp) transitive dependency. openhands-sdk 1.35.0 requires agent-client-protocol>=0.10.1 with no upper bound, but acp 0.11.0 reordered the ACP prompt() arguments and breaks the SDK's ACP client (a PromptRequest validation error surfaces as 'ACP error: 2 validation errors for PromptRequest'). Pin acp <0.11 until a fixed openhands-sdk ships. Consumed by scripts/dev-safe.mjs (agent-server uvx install) and .github/workflows/mock-llm-e2e.yml (mock ACP server venv).\",\n    \"agentClientProtocol\": \"agent-client-protocol<0.11\"\n  },\n  \"images\": {\n    \"agentServer\": \"ghcr.io/openhands/agent-server\",\n    \"agentCanvas\": \"ghcr.io/openhands/agent-canvas\"\n  },\n  \"ports\": {\n    \"agentServer\": 18000,\n    \"automation\": 18001,\n    \"proxy\": 8000\n  },\n  \"paths\": {\n    \"stateSubdir\": \"agent-canvas\",\n    \"conversations\": \"agent-canvas/conversations\",\n    \"bashEvents\": \"agent-canvas/bash_events\",\n    \"automationDb\": \"automation/automations.db\"\n  },\n  \"packages\": {\n    \"agentServer\": \"openhands-agent-server\",\n    \"automation\": \"openhands-automation\",\n    \"tools\": \"openhands-tools\",\n    \"workspace\": \"openhands-workspace\"\n  }\n}\n"],"mappings":""}
+{"version":3,"file":"defaults.cjs","names":[],"sources":["../../config/defaults.json"],"sourcesContent":["{\n  \"_comment\": \"Single source of truth for version pins, ports, paths, and defaults shared across the npm and Docker install paths. Read by scripts/dev-safe.mjs, scripts/dev-with-automation.mjs, docker/entrypoint.sh (via generated defaults.env), and .github/workflows/docker.yml.\",\n  \"versions\": {\n    \"agentServer\": \"1.36.1\",\n    \"agentCanvas\": \"1.5.0\",\n    \"automation\": \"1.1.7\"\n  },\n  \"compatibility\": {\n    \"minimumAgentServer\": \"1.28.0\"\n  },\n  \"constraints\": {\n    \"_comment\": \"Temporary upper bound on the agent-client-protocol (acp) transitive dependency. openhands-sdk 1.35.0 requires agent-client-protocol>=0.10.1 with no upper bound, but acp 0.11.0 reordered the ACP prompt() arguments and breaks the SDK's ACP client (a PromptRequest validation error surfaces as 'ACP error: 2 validation errors for PromptRequest'). Pin acp <0.11 until a fixed openhands-sdk ships. Consumed by scripts/dev-safe.mjs (agent-server uvx install) and .github/workflows/mock-llm-e2e.yml (mock ACP server venv).\",\n    \"agentClientProtocol\": \"agent-client-protocol<0.11\"\n  },\n  \"images\": {\n    \"agentServer\": \"ghcr.io/openhands/agent-server\",\n    \"agentCanvas\": \"ghcr.io/openhands/agent-canvas\"\n  },\n  \"ports\": {\n    \"agentServer\": 18000,\n    \"automation\": 18001,\n    \"proxy\": 8000\n  },\n  \"paths\": {\n    \"stateSubdir\": \"agent-canvas\",\n    \"conversations\": \"agent-canvas/conversations\",\n    \"bashEvents\": \"agent-canvas/bash_events\",\n    \"automationDb\": \"automation/automations.db\",\n    \"canvasBasePath\": \"/canvas\"\n  },\n  \"packages\": {\n    \"agentServer\": \"openhands-agent-server\",\n    \"automation\": \"openhands-automation\",\n    \"tools\": \"openhands-tools\",\n    \"workspace\": \"openhands-workspace\"\n  }\n}\n"],"mappings":""}

package/dist/config/defaults.js

@@ -1,9 +1,9 @@
 var e = {
 	_comment: "Single source of truth for version pins, ports, paths, and defaults shared across the npm and Docker install paths. Read by scripts/dev-safe.mjs, scripts/dev-with-automation.mjs, docker/entrypoint.sh (via generated defaults.env), and .github/workflows/docker.yml.",
 	versions: {
-		agentServer: "1.35.0",
-		agentCanvas: "1.4.0",
-		automation: "1.1.6"
+		agentServer: "1.36.1",
+		agentCanvas: "1.5.0",
+		automation: "1.1.7"
 	},
 	compatibility: { minimumAgentServer: "1.28.0" },
 	constraints: {
@@ -23,7 +23,8 @@ var e = {
 		stateSubdir: "agent-canvas",
 		conversations: "agent-canvas/conversations",
 		bashEvents: "agent-canvas/bash_events",
-		automationDb: "automation/automations.db"
+		automationDb: "automation/automations.db",
+		canvasBasePath: "/canvas"
 	},
 	packages: {
 		agentServer: "openhands-agent-server",

package/dist/config/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","names":[],"sources":["../../config/defaults.json"],"sourcesContent":["{\n  \"_comment\": \"Single source of truth for version pins, ports, paths, and defaults shared across the npm and Docker install paths. Read by scripts/dev-safe.mjs, scripts/dev-with-automation.mjs, docker/entrypoint.sh (via generated defaults.env), and .github/workflows/docker.yml.\",\n  \"versions\": {\n    \"agentServer\": \"1.35.0\",\n    \"agentCanvas\": \"1.4.0\",\n    \"automation\": \"1.1.6\"\n  },\n  \"compatibility\": {\n    \"minimumAgentServer\": \"1.28.0\"\n  },\n  \"constraints\": {\n    \"_comment\": \"Temporary upper bound on the agent-client-protocol (acp) transitive dependency. openhands-sdk 1.35.0 requires agent-client-protocol>=0.10.1 with no upper bound, but acp 0.11.0 reordered the ACP prompt() arguments and breaks the SDK's ACP client (a PromptRequest validation error surfaces as 'ACP error: 2 validation errors for PromptRequest'). Pin acp <0.11 until a fixed openhands-sdk ships. Consumed by scripts/dev-safe.mjs (agent-server uvx install) and .github/workflows/mock-llm-e2e.yml (mock ACP server venv).\",\n    \"agentClientProtocol\": \"agent-client-protocol<0.11\"\n  },\n  \"images\": {\n    \"agentServer\": \"ghcr.io/openhands/agent-server\",\n    \"agentCanvas\": \"ghcr.io/openhands/agent-canvas\"\n  },\n  \"ports\": {\n    \"agentServer\": 18000,\n    \"automation\": 18001,\n    \"proxy\": 8000\n  },\n  \"paths\": {\n    \"stateSubdir\": \"agent-canvas\",\n    \"conversations\": \"agent-canvas/conversations\",\n    \"bashEvents\": \"agent-canvas/bash_events\",\n    \"automationDb\": \"automation/automations.db\"\n  },\n  \"packages\": {\n    \"agentServer\": \"openhands-agent-server\",\n    \"automation\": \"openhands-automation\",\n    \"tools\": \"openhands-tools\",\n    \"workspace\": \"openhands-workspace\"\n  }\n}\n"],"mappings":""}
+{"version":3,"file":"defaults.js","names":[],"sources":["../../config/defaults.json"],"sourcesContent":["{\n  \"_comment\": \"Single source of truth for version pins, ports, paths, and defaults shared across the npm and Docker install paths. Read by scripts/dev-safe.mjs, scripts/dev-with-automation.mjs, docker/entrypoint.sh (via generated defaults.env), and .github/workflows/docker.yml.\",\n  \"versions\": {\n    \"agentServer\": \"1.36.1\",\n    \"agentCanvas\": \"1.5.0\",\n    \"automation\": \"1.1.7\"\n  },\n  \"compatibility\": {\n    \"minimumAgentServer\": \"1.28.0\"\n  },\n  \"constraints\": {\n    \"_comment\": \"Temporary upper bound on the agent-client-protocol (acp) transitive dependency. openhands-sdk 1.35.0 requires agent-client-protocol>=0.10.1 with no upper bound, but acp 0.11.0 reordered the ACP prompt() arguments and breaks the SDK's ACP client (a PromptRequest validation error surfaces as 'ACP error: 2 validation errors for PromptRequest'). Pin acp <0.11 until a fixed openhands-sdk ships. Consumed by scripts/dev-safe.mjs (agent-server uvx install) and .github/workflows/mock-llm-e2e.yml (mock ACP server venv).\",\n    \"agentClientProtocol\": \"agent-client-protocol<0.11\"\n  },\n  \"images\": {\n    \"agentServer\": \"ghcr.io/openhands/agent-server\",\n    \"agentCanvas\": \"ghcr.io/openhands/agent-canvas\"\n  },\n  \"ports\": {\n    \"agentServer\": 18000,\n    \"automation\": 18001,\n    \"proxy\": 8000\n  },\n  \"paths\": {\n    \"stateSubdir\": \"agent-canvas\",\n    \"conversations\": \"agent-canvas/conversations\",\n    \"bashEvents\": \"agent-canvas/bash_events\",\n    \"automationDb\": \"automation/automations.db\",\n    \"canvasBasePath\": \"/canvas\"\n  },\n  \"packages\": {\n    \"agentServer\": \"openhands-agent-server\",\n    \"automation\": \"openhands-automation\",\n    \"tools\": \"openhands-tools\",\n    \"workspace\": \"openhands-workspace\"\n  }\n}\n"],"mappings":""}

package/dist/constants/acp-providers.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"acp-providers.cjs","names":[],"sources":["../../src/constants/acp-providers.ts"],"sourcesContent":["import { getAcpProvider as getClientAcpProvider } from \"@openhands/typescript-client\";\nimport { I18nKey } from \"#/i18n/declaration\";\n\n/** Upstream registry fields not yet on the pinned client's exported type. */\ntype ClientAcpProviderRegistry = NonNullable<\n  ReturnType<typeof getClientAcpProvider>\n> & {\n  available_models?: Array<{ id: string; label: string }>;\n  default_model?: string;\n};\n\nexport type ACPProviderIcon =\n  | \"claude-code\"\n  | \"codex\"\n  | \"gemini\"\n  | \"cli-generic\";\n\nexport const ACP_PROVIDER_FALLBACK_ICON: ACPProviderIcon = \"cli-generic\";\n\n// Sentinel ``agent.llm.model`` returned by older SDKs for ACP conversations\n// in lieu of a real model. Suppressed at every consumer that resolves a\n// display string.\n//\n// NB: ``\"default\"`` is NOT a placeholder. claude-agent-acp 0.44+ exposes\n// ``default`` (\"Default (recommended)\") as a real, selectable model in its\n// configOptions select — the server reports it as ``currentModelId`` and lists\n// it in ``availableModels`` — so it must surface like any other model id.\nexport const ACP_MANAGED_SENTINEL = \"acp-managed\";\n\n/**\n * Filter for \"real\" ACP model strings — non-empty and not the legacy\n * ``acp-managed`` sentinel. Returns the trimmed value on success, ``null``\n * otherwise.\n */\nfunction realAcpModel(value: unknown): string | null {\n  if (typeof value !== \"string\") return null;\n  const trimmed = value.trim();\n  if (!trimmed) return null;\n  if (trimmed === ACP_MANAGED_SENTINEL) return null;\n  return trimmed;\n}\n\n/**\n * Single source of truth for resolving the model string to surface for an\n * ACP conversation/settings context. Consumed by the conversation adapter\n * (chip text), the conversation-creation path (concrete ``acp_model``\n * payload), the Settings → Agent form (initial value), and the chat-input\n * model label.\n *\n * Precedence: SDK runtime fields → user-configured ``acp_model`` →\n * legacy ``agent.llm.model`` → provider default (when ``providerDefault``\n * is passed). Pass ``providerDefault`` only on surfaces that should\n * silently substitute the registry default; omit it for the conversation\n * chip, which must distinguish \"no concrete model\" from \"default\".\n */\nexport function resolveEffectiveAcpModel(inputs: {\n  runtimeName?: string | null;\n  runtimeId?: string | null;\n  configured?: string | null;\n  sdkLlm?: string | null;\n  providerDefault?: string | null;\n}): string | null {\n  for (const candidate of [\n    inputs.runtimeName,\n    inputs.runtimeId,\n    inputs.configured,\n    inputs.sdkLlm,\n  ]) {\n    const value = realAcpModel(candidate);\n    if (value) return value;\n  }\n  return inputs.providerDefault ?? null;\n}\n\n/**\n * Shape of a built-in ACP (Agent Client Protocol) provider as Canvas consumes\n * it. The data fields (display name, launch command, model picker + default)\n * are sourced at module load from ``@openhands/typescript-client``'s ACP\n * registry — the generated mirror of the Python source of truth\n * ``openhands.sdk.settings.acp_providers``. This config only adds the\n * Canvas-specific UI fields ({@link ACPProviderConfig.icon} +\n * {@link ACPProviderConfig.description_key}); see {@link ACP_PROVIDER_UI}.\n */\nexport interface ACPProviderConfig {\n  /** Stable registry key, also stored on conversations as ``tags.acpserver``. */\n  key: string;\n  /** Human-readable name shown in dropdowns and conversation chips. */\n  display_name: string;\n  /**\n   * Tokens passed to the agent-server as ``acp_command`` when this preset\n   * is picked. Each entry must be a real ACP-protocol stdio server — the\n   * SDK validates this against the {@link ACPProviderConfig.key}.\n   *\n   * NB: ``npx -y @openai/codex acp`` looks plausible but is **not** an\n   * ACP server — the codex CLI has no ``acp`` subcommand and exits with\n   * ``Error: stdin is not a terminal`` when spawned without a TTY, which\n   * silently deadlocks the agent-server's ACP handshake. Use\n   * ``@zed-industries/codex-acp`` (the Zed-shipped wrapper) instead.\n   */\n  default_command: string[];\n  /**\n   * Suggested ACP model IDs for the provider's picker, sourced from the\n   * typescript-client registry. Not authoritative access checks; users can\n   * still enter a custom override in Settings -> Agent.\n   */\n  available_models?: ACPModelOption[];\n  /** Model ID preselected for built-in providers so Canvas never saves blank. */\n  default_model?: string;\n  /**\n   * i18n key for the one-line provider description rendered under the\n   * onboarding tile. Stored on the registry so adding a new ACP\n   * provider only requires editing this file (not the onboarding tile\n   * list separately).\n   */\n  description_key: I18nKey;\n  /**\n   * Serializable icon key used by UI surfaces that render provider\n   * choices. Kept as a string so the SDK mirror check can continue to\n   * parse this registry without importing React components.\n   */\n  icon?: ACPProviderIcon;\n}\n\nexport interface ACPModelOption {\n  /** Exact model ID sent as ``acp_model``. */\n  id: string;\n  /** Human-readable label shown in Settings -> Agent. */\n  label: string;\n}\n\n// Canvas-only UI metadata per built-in provider, keyed by the ACP registry\n// key. Everything else — display name, launch command, model picker list and\n// default — comes from the typescript-client registry below. Adding a model\n// or a provider happens upstream in the SDK; Canvas only owns the brand icon\n// and the onboarding-tile description here. A provider with no entry here is\n// intentionally not surfaced in the UI.\nconst ACP_PROVIDER_UI: Record<\n  string,\n  { icon: ACPProviderIcon; description_key: I18nKey }\n> = {\n  \"claude-code\": {\n    icon: \"claude-code\",\n    description_key: I18nKey.ONBOARDING$AGENT_CLAUDE_CODE_DESCRIPTION,\n  },\n  codex: {\n    icon: \"codex\",\n    description_key: I18nKey.ONBOARDING$AGENT_CODEX_DESCRIPTION,\n  },\n  \"gemini-cli\": {\n    icon: \"gemini\",\n    description_key: I18nKey.ONBOARDING$AGENT_GEMINI_CLI_DESCRIPTION,\n  },\n};\n\n// Built-in ACP providers Canvas surfaces, built by enriching each upstream\n// registry record (``@openhands/typescript-client`` → Python SDK) with the\n// Canvas UI metadata above. Model lists + defaults are no longer hand-kept\n// here (closes agent-canvas#740) — they track the SDK via the pinned client.\nexport const ACP_PROVIDERS: ACPProviderConfig[] = Object.entries(\n  ACP_PROVIDER_UI,\n).map(([key, ui]) => {\n  const info = getClientAcpProvider(key) as ClientAcpProviderRegistry | null;\n  return {\n    key,\n    display_name: info?.display_name ?? key,\n    default_command: info ? [...info.default_command] : [],\n    available_models: info?.available_models?.map((model) => ({\n      id: model.id,\n      label: model.label,\n    })),\n    default_model: info?.default_model ?? undefined,\n    description_key: ui.description_key,\n    icon: ui.icon,\n  };\n});\n\nexport const ACP_CUSTOM_PRESET_KEY = \"custom\";\n\n/**\n * A credential an ACP provider authenticates with, surfaced during onboarding\n * so the user can populate it without leaving the flow. The {@link name} is\n * both the global-secret name and the environment variable the agent-server\n * exports into the ACP subprocess — keeping them identical is what makes a\n * saved secret actually reach the provider CLI.\n */\nexport interface ACPProviderSecretField {\n  /** Secret name and env var (e.g. ``\"ANTHROPIC_API_KEY\"``). Must satisfy the\n   * secret-name pattern ``^[a-zA-Z][a-zA-Z0-9_]{0,63}$``. */\n  name: string;\n  /** Render as a masked password input (API keys, OAuth tokens, credential\n   * blobs) rather than a plain-text input (base URLs, project IDs). Doubles as\n   * \"this is an actual credential\": when the onboarding step is required, only\n   * a ``secret`` field satisfies it — a base URL or GCP scalar alone can't\n   * authenticate anything. */\n  secret?: boolean;\n  /** Render as a multi-line textarea rather than a single-line input. Set for\n   * file-content credentials the user pastes verbatim (Codex ``auth.json``,\n   * Gemini Vertex service-account / ADC JSON) — the ones the SDK materialises\n   * to disk, which a cloud backend can't consume yet (agent-canvas#1016). */\n  multiline?: boolean;\n  /** i18n key for the one-line helper text under the field. */\n  hint_key: I18nKey;\n  /**\n   * Interpolation values for {@link hint_key} (e.g. ``{ file: \"~/.codex/auth.json\" }``\n   * for the shared \"paste the file contents\" hint). Omitted for hints that\n   * take no parameters.\n   */\n  hint_values?: Record<string, string>;\n}\n\n/**\n * Container credentials — beyond the registry's API key / base URL — that\n * canvas collects per provider so a *containerized* agent-server (no host login\n * state) can authenticate the ACP CLI: subscription tokens plus the file-content\n * blobs and Vertex config the SDK's ``acp_file_secrets`` materialisation\n * consumes (agent-canvas#1013/#1014). They have no registry env-var entry\n * because they're a deployment concern, not a model registry field. The Gemini\n * project/location/flag are plain config, not secrets — grouped here because\n * they travel with the SA blob.\n *\n * The blob *names* (``CODEX_AUTH_JSON`` / ``GOOGLE_APPLICATION_CREDENTIALS_JSON``)\n * duplicate the SDK registry's ``file_secrets`` specs; derive them from the\n * client registry once the pinned ``@openhands/typescript-client`` mirrors that\n * field (same bump that unblocks ``acp_isolate_data_dir``, see #1019).\n */\nconst ACP_RESERVED_CREDENTIALS: Record<string, ACPProviderSecretField[]> = {\n  codex: [\n    {\n      name: \"CODEX_AUTH_JSON\",\n      secret: true,\n      multiline: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_FILE_BLOB_HINT,\n      hint_values: { file: \"~/.codex/auth.json\" },\n    },\n  ],\n  \"claude-code\": [\n    {\n      name: \"CLAUDE_CODE_OAUTH_TOKEN\",\n      secret: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_OAUTH_TOKEN_HINT,\n    },\n  ],\n  \"gemini-cli\": [\n    {\n      name: \"GOOGLE_APPLICATION_CREDENTIALS_JSON\",\n      secret: true,\n      multiline: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_FILE_BLOB_HINT,\n      hint_values: {\n        file: \"~/.config/gcloud/application_default_credentials.json\",\n      },\n    },\n    {\n      name: \"GOOGLE_CLOUD_PROJECT\",\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_GCP_PROJECT_HINT,\n    },\n    {\n      name: \"GOOGLE_CLOUD_LOCATION\",\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_GCP_LOCATION_HINT,\n    },\n    {\n      name: \"GOOGLE_GENAI_USE_VERTEXAI\",\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_VERTEXAI_FLAG_HINT,\n    },\n  ],\n};\n\n/**\n * Credential pairs that break each other at runtime, keyed by provider —\n * mirrors the SDK's ``_ENV_CONFLICT_MAP`` (software-agent-sdk#3588). Claude's\n * OAuth token (``CLAUDE_CODE_OAUTH_TOKEN``) authenticates against Anthropic\n * directly, so when it is set the SDK strips:\n *   - ``ANTHROPIC_API_KEY``  — otherwise it takes precedence and silently\n *     bypasses the subscription;\n *   - ``ANTHROPIC_BASE_URL`` — otherwise it proxies the bearer to an endpoint\n *     that rejects it (see docs/ACP_AGENTS.md).\n * Either one set alongside the token is silently ignored at runtime, so warn.\n */\nconst ACP_CREDENTIAL_CONFLICTS: Record<string, Array<[string, string]>> = {\n  \"claude-code\": [\n    [\"CLAUDE_CODE_OAUTH_TOKEN\", \"ANTHROPIC_API_KEY\"],\n    [\"CLAUDE_CODE_OAUTH_TOKEN\", \"ANTHROPIC_BASE_URL\"],\n  ],\n};\n\n/**\n * The ``[credential, conflicting]`` pairs the user currently has set for\n * ``providerKey``. ``hasValue`` should cover both typed and already-saved\n * values, since a previously saved secret conflicts just the same.\n */\nexport function getAcpCredentialConflicts(\n  key: string | null | undefined,\n  hasValue: (name: string) => boolean,\n): Array<[string, string]> {\n  if (!key) return [];\n  return (ACP_CREDENTIAL_CONFLICTS[key] ?? []).filter(\n    ([credential, conflicting]) =>\n      hasValue(credential) && hasValue(conflicting),\n  );\n}\n\n/**\n * Vertex AI-safe ``acp_model`` for Gemini.\n *\n * Left unset, gemini-cli falls back to its own internal default — a preview\n * flash model that 404s on Google Cloud projects without preview access. And a\n * ``*-flash`` id is no safer to pin: gemini-cli re-resolves flash ids at\n * generation time to its *current default* flash (software-agent-sdk#3532), so\n * a pinned ``gemini-2.5-flash`` still ran ``gemini-3-flash``. Only a non-flash\n * id sticks; ``gemini-2.5-pro`` is broadly available on Vertex and the\n * API-key / Google-login paths, so canvas preselects it. Kept as a named\n * constant so every model-default consumer agrees.\n */\nexport const ACP_VERTEX_SAFE_MODEL = \"gemini-2.5-pro\";\n\n/**\n * The default ``acp_model`` canvas substitutes for ``providerKey`` wherever no\n * concrete model is configured — settings seeding (onboarding, Settings →\n * Agent), the {@link buildAcpAgentSettingsDiff} fallback, and the start-request\n * fallback for a saved ``null``. Overrides only Gemini (→\n * {@link ACP_VERTEX_SAFE_MODEL}, see why above); every other provider keeps its\n * registry {@link ACPProviderConfig.default_model}. Returns ``null`` when\n * there's no override and no registry default, letting the ACP server pick its\n * own.\n *\n * Distinct from {@link ACPProviderConfig.default_model} (which mirrors the SDK\n * registry verbatim, closing agent-canvas#740): this is the *preferred* default,\n * deliberately diverging for Gemini where the registry value isn't safe on\n * every backend — so every default-model surface must route through this, not\n * read ``default_model`` directly.\n */\nexport function getAcpPreferredDefaultModel(\n  key: string | null | undefined,\n): string | null {\n  if (key === \"gemini-cli\") return ACP_VERTEX_SAFE_MODEL;\n  return getAcpProvider(key)?.default_model ?? null;\n}\n\n/**\n * List the credentials Canvas should prompt for when onboarding the given ACP\n * provider. The API-key and base-URL field *names* track the SDK registry's\n * ``api_key_env_var`` / ``base_url_env_var`` (mirrored via\n * ``@openhands/typescript-client``) so they can't drift as providers are added\n * or renamed; the per-provider container credentials (subscription / Vertex\n * blobs) come from {@link ACP_RESERVED_CREDENTIALS}, since those are a\n * containerized-deployment concern with no model-registry entry. Each field\n * name equals the env var the agent-server exports into the provider subprocess\n * (which is what makes a saved secret reach the CLI). On the wire none of this\n * is special — every saved credential travels uniformly as a ``LookupSecret``.\n *\n * Field order is: container subscription/Vertex credentials → API key →\n * optional base URL. Every field is optional at the UI level — the step is\n * skippable, and a subscription / OAuth login on the backend takes precedence\n * over a key at runtime. (Whether the *step* is required is a\n * backend-capability decision the onboarding modal makes; see\n * ``backendRequiresAcpCredentials``.)\n *\n * NB: the base URL is rendered plain-text (not ``secret``), so it never counts\n * toward a required credential step — setting ``ANTHROPIC_BASE_URL`` alongside\n * a ``CLAUDE_CODE_OAUTH_TOKEN`` breaks the token's bearer auth, which the forms\n * surface via {@link getAcpCredentialConflicts}.\n *\n * Returns ``[]`` for OpenHands, the ``\"custom\"`` preset, any unknown key, and a\n * future OAuth-only provider whose registry entry has no ``api_key_env_var`` —\n * callers treat an empty list as \"no credentials step for this provider\".\n */\nexport function getAcpProviderSecrets(\n  key: string | null | undefined,\n): ACPProviderSecretField[] {\n  if (!key) return [];\n  const info = getClientAcpProvider(key);\n  if (!info) return [];\n  // Subscription / Vertex credentials first — they're the primary auth path for\n  // ACP providers (Claude Pro/Max OAuth token, Codex ChatGPT auth.json), with\n  // the API key as the fallback below.\n  const fields: ACPProviderSecretField[] = [\n    ...(ACP_RESERVED_CREDENTIALS[key] ?? []),\n  ];\n  if (info.api_key_env_var) {\n    fields.push({\n      name: info.api_key_env_var,\n      secret: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_API_KEY_HINT,\n    });\n  }\n  if (info.base_url_env_var) {\n    fields.push({\n      name: info.base_url_env_var,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_BASE_URL_HINT,\n    });\n  }\n  return fields;\n}\n\n/**\n * Look up a built-in ACP provider config by its registry key.\n *\n * Returns ``undefined`` for an empty / null key, for the ``\"custom\"`` preset\n * (which has no registry entry), and for any forward-compatible key Canvas's\n * registry doesn't know about yet. Centralizes the ``ACP_PROVIDERS.find(...)``\n * lookup shared by the resolvers below and by the adapter / settings surfaces\n * so the key-comparison shape lives in one place.\n */\nexport function getAcpProvider(\n  key: string | null | undefined,\n): ACPProviderConfig | undefined {\n  if (!key) return undefined;\n  return ACP_PROVIDERS.find((provider) => provider.key === key);\n}\n\n/**\n * Resolve an ACP provider registry key (the value stored under\n * ``tags.acpserver`` on a conversation) to a human display name for the\n * sidebar chip.\n *\n * Returns ``null`` for an empty / null key and for keys not in\n * {@link ACP_PROVIDERS} — most notably ``\"custom\"`` (the user-supplied\n * command preset has no canonical brand name) and any forward-compatible\n * value Canvas's registry doesn't know about yet. Callers should fall\n * back to a generic ``\"ACP\"`` label in that case so the chip still\n * communicates \"this is an ACP conversation\".\n *\n * Kept separate from {@link buildAcpAgentSettingsDiff}'s lookup so the\n * conversation-card render path can resolve display names without\n * importing the settings-payload builder.\n */\nexport function getAcpProviderDisplayName(\n  key: string | null | undefined,\n): string | null {\n  const found = getAcpProvider(key);\n  return found ? found.display_name : null;\n}\n\n/**\n * Resolve an ACP provider registry key to the icon discriminator the\n * conversation chip should render alongside the model text.\n *\n * Falls back to {@link ACP_PROVIDER_FALLBACK_ICON} for ``\"custom\"``,\n * unknown keys, or a missing key — the chip then shows a neutral\n * terminal glyph that still communicates \"this is an ACP conversation\"\n * without claiming a brand identity we don't know.\n */\nexport function resolveAcpProviderIcon(\n  key: string | null | undefined,\n): ACPProviderIcon {\n  return getAcpProvider(key)?.icon ?? ACP_PROVIDER_FALLBACK_ICON;\n}\n\n/**\n * Resolve a raw ``acp_model`` ID to the human-readable label the provider's\n * picker shows for it (e.g. ``\"claude-opus-4-7\"`` → ``\"Claude Opus 4.7\"``).\n *\n * Falls back to the raw ID when the provider is unknown or the ID isn't one\n * of its registered {@link ACPModelOption}s — so a user's custom override\n * still renders something meaningful rather than nothing. Returns ``null``\n * only when there is no model to show, letting the conversation chip decide\n * to display the provider name instead.\n */\nexport function labelForAcpModel(\n  serverKey: string | null | undefined,\n  modelId: string | null | undefined,\n): string | null {\n  if (!modelId) return null;\n  const provider = getAcpProvider(serverKey);\n  const match = provider?.available_models?.find((m) => m.id === modelId);\n  return match?.label ?? modelId;\n}\n\n/**\n * Build the ``agent_settings_diff`` payload PATCH /api/settings expects\n * for the agent-kind/provider choice the user just made.\n *\n * Used by both the Settings → Agent page and the onboarding \"choose\n * agent\" step — keeping the shape in one helper means a future change\n * (e.g. always seeding ``acp_command`` from the registry instead of\n * sending ``[]``, or adding new ``acp_*`` reset fields) lands in both\n * surfaces atomically.\n *\n * Returns ``null`` for an unknown ACP provider key by default — the\n * caller can skip the save (the UI shouldn't surface unknown options,\n * but the defensive path keeps a buggy preset list from corrupting\n * settings).\n *\n * Pass ``allowUnknownServer: true`` to opt into pass-through for keys\n * that aren't in {@link ACP_PROVIDERS} or ``ACP_CUSTOM_PRESET_KEY``.\n * The Settings → Agent page uses this when the user opens settings\n * that already carry an ``acp_server`` value canvas's registry\n * doesn't know about (e.g. set out-of-band via the API for a provider\n * we haven't mirrored yet) and saves without changing the command —\n * otherwise the original key would be silently demoted to ``\"custom\"``.\n */\nexport function buildAcpAgentSettingsDiff(\n  providerKey: string,\n  options: {\n    command?: string[];\n    model?: string | null;\n    allowUnknownServer?: boolean;\n  } = {},\n): Record<string, unknown> | null {\n  if (providerKey === \"openhands\") {\n    // Switching back to OpenHands. The agent-server's ``Settings.update``\n    // applies a fresh ``{'agent_kind': ...}`` base whenever the kind\n    // flips, so any ``acp_*`` fields would be discarded before\n    // validation. Send the kind alone.\n    return { agent_kind: \"openhands\" };\n  }\n\n  const isCustom = providerKey === ACP_CUSTOM_PRESET_KEY;\n  const provider = isCustom ? undefined : getAcpProvider(providerKey);\n  if (!isCustom && !provider && !options.allowUnknownServer) {\n    return null;\n  }\n\n  // Undefined model → the *preferred* default (Vertex-safe for Gemini), not\n  // the raw registry default — see getAcpPreferredDefaultModel.\n  const model =\n    options.model === undefined\n      ? getAcpPreferredDefaultModel(providerKey)\n      : options.model;\n\n  // ``acp_args: []`` resets any API-set ``acp_args`` that would\n  // otherwise survive and concatenate to ``acp_command`` at spawn time\n  // (the agent-server merges the two before exec). Callers building the\n  // payload from a textarea that already shows the merged command\n  // (Settings → Agent) round-trip correctly — the merged tokens land in\n  // ``acp_command`` here, so no args are lost.\n  return {\n    agent_kind: \"acp\",\n    acp_server: providerKey,\n    acp_command: options.command ?? [],\n    acp_args: [],\n    acp_model: model ?? null,\n  };\n}\n"],"mappings":"6OAkCA,SAAS,EAAa,EAA+B,CACnD,GAAI,OAAO,GAAU,SAAU,OAAO,KACtC,IAAM,EAAU,EAAM,MAAM,CAG5B,MAFI,CAAC,GACD,IAAA,cAAyC,KACtC,EAgBT,SAAgB,EAAyB,EAMvB,CAChB,IAAK,IAAM,IAAa,CACtB,EAAO,YACP,EAAO,UACP,EAAO,WACP,EAAO,OACR,CAAE,CACD,IAAM,EAAQ,EAAa,EAAU,CACrC,GAAI,EAAO,OAAO,EAEpB,OAAO,EAAO,iBAAmB,KAiEnC,IAAM,EAGF,CACF,cAAe,CACb,KAAM,cACN,gBAAiB,EAAA,QAAQ,yCAC1B,CACD,MAAO,CACL,KAAM,QACN,gBAAiB,EAAA,QAAQ,mCAC1B,CACD,aAAc,CACZ,KAAM,SACN,gBAAiB,EAAA,QAAQ,wCAC1B,CACF,CAMY,EAAqC,OAAO,QACvD,EACD,CAAC,KAAK,CAAC,EAAK,KAAQ,CACnB,IAAM,EAAO,EAAA,eAAqB,EAAI,CACtC,MAAO,CACL,MACA,aAAc,GAAM,cAAgB,EACpC,gBAAiB,EAAO,CAAC,GAAG,EAAK,gBAAgB,CAAG,EAAE,CACtD,iBAAkB,GAAM,kBAAkB,IAAK,IAAW,CACxD,GAAI,EAAM,GACV,MAAO,EAAM,MACd,EAAE,CACH,cAAe,GAAM,eAAiB,IAAA,GACtC,gBAAiB,EAAG,gBACpB,KAAM,EAAG,KACV,EACD,CAyDc,EAAA,QAAQ,qCAQR,EAAA,QAAQ,uCAQR,EAAA,QAAQ,qCAOR,EAAA,QAAQ,uCAIR,EAAA,QAAQ,wCAIR,EAAA,QAAQ,yCAmDxB,IAAa,EAAwB,iBAkBrC,SAAgB,EACd,EACe,CAEf,OADI,IAAQ,aAAqB,EAC1B,EAAe,EAAI,EAAE,eAAiB,KAoE/C,SAAgB,EACd,EAC+B,CAC1B,KACL,OAAO,EAAc,KAAM,GAAa,EAAS,MAAQ,EAAI,CAmB/D,SAAgB,EACd,EACe,CACf,IAAM,EAAQ,EAAe,EAAI,CACjC,OAAO,EAAQ,EAAM,aAAe,KAYtC,SAAgB,EACd,EACiB,CACjB,OAAO,EAAe,EAAI,EAAE,MAAA,cAa9B,SAAgB,EACd,EACA,EACe,CAIf,OAHK,EACY,EAAe,EAClB,EAAU,kBAAkB,KAAM,GAAM,EAAE,KAAO,EAAQ,EACzD,OAAS,EAHF"}
+{"version":3,"file":"acp-providers.cjs","names":[],"sources":["../../src/constants/acp-providers.ts"],"sourcesContent":["import { getAcpProvider as getClientAcpProvider } from \"@openhands/typescript-client\";\nimport { I18nKey } from \"#/i18n/declaration\";\n\n/** Upstream registry fields not yet on the pinned client's exported type. */\ntype ClientAcpProviderRegistry = NonNullable<\n  ReturnType<typeof getClientAcpProvider>\n> & {\n  available_models?: Array<{ id: string; label: string }>;\n  default_model?: string;\n};\n\nexport type ACPProviderIcon =\n  | \"claude-code\"\n  | \"codex\"\n  | \"gemini\"\n  | \"cli-generic\";\n\nexport const ACP_PROVIDER_FALLBACK_ICON: ACPProviderIcon = \"cli-generic\";\n\n// Sentinel ``agent.llm.model`` returned by older SDKs for ACP conversations\n// in lieu of a real model. Suppressed at every consumer that resolves a\n// display string.\n//\n// NB: ``\"default\"`` is NOT a placeholder. claude-agent-acp 0.44+ exposes\n// ``default`` (\"Default (recommended)\") as a real, selectable model in its\n// configOptions select — the server reports it as ``currentModelId`` and lists\n// it in ``availableModels`` — so it must surface like any other model id.\nexport const ACP_MANAGED_SENTINEL = \"acp-managed\";\n\n/**\n * Filter for \"real\" ACP model strings — non-empty and not the legacy\n * ``acp-managed`` sentinel. Returns the trimmed value on success, ``null``\n * otherwise.\n */\nfunction realAcpModel(value: unknown): string | null {\n  if (typeof value !== \"string\") return null;\n  const trimmed = value.trim();\n  if (!trimmed) return null;\n  if (trimmed === ACP_MANAGED_SENTINEL) return null;\n  return trimmed;\n}\n\n/**\n * Single source of truth for resolving the model string to surface for an\n * ACP conversation/settings context. Consumed by the conversation adapter\n * (chip text), the conversation-creation path (concrete ``acp_model``\n * payload), the Settings → Agent form (initial value), and the chat-input\n * model label.\n *\n * Precedence: SDK runtime fields → user-configured ``acp_model`` →\n * legacy ``agent.llm.model`` → provider default (when ``providerDefault``\n * is passed). Pass ``providerDefault`` only on surfaces that should\n * silently substitute the registry default; omit it for the conversation\n * chip, which must distinguish \"no concrete model\" from \"default\".\n */\nexport function resolveEffectiveAcpModel(inputs: {\n  runtimeName?: string | null;\n  runtimeId?: string | null;\n  configured?: string | null;\n  sdkLlm?: string | null;\n  providerDefault?: string | null;\n}): string | null {\n  for (const candidate of [\n    inputs.runtimeName,\n    inputs.runtimeId,\n    inputs.configured,\n    inputs.sdkLlm,\n  ]) {\n    const value = realAcpModel(candidate);\n    if (value) return value;\n  }\n  return inputs.providerDefault ?? null;\n}\n\n/**\n * Shape of a built-in ACP (Agent Client Protocol) provider as Canvas consumes\n * it. The data fields (display name, launch command, model picker + default)\n * are sourced at module load from ``@openhands/typescript-client``'s ACP\n * registry — the generated mirror of the Python source of truth\n * ``openhands.sdk.settings.acp_providers``. This config only adds the\n * Canvas-specific UI fields ({@link ACPProviderConfig.icon} +\n * {@link ACPProviderConfig.description_key}); see {@link ACP_PROVIDER_UI}.\n */\nexport interface ACPProviderConfig {\n  /** Stable registry key, also stored on conversations as ``tags.acpserver``. */\n  key: string;\n  /** Human-readable name shown in dropdowns and conversation chips. */\n  display_name: string;\n  /**\n   * Tokens passed to the agent-server as ``acp_command`` when this preset\n   * is picked. Each entry must be a real ACP-protocol stdio server — the\n   * SDK validates this against the {@link ACPProviderConfig.key}.\n   *\n   * NB: ``npx -y @openai/codex acp`` looks plausible but is **not** an\n   * ACP server — the codex CLI has no ``acp`` subcommand and exits with\n   * ``Error: stdin is not a terminal`` when spawned without a TTY, which\n   * silently deadlocks the agent-server's ACP handshake. Use\n   * ``@agentclientprotocol/codex-acp`` (the codex ACP wrapper) instead.\n   */\n  default_command: string[];\n  /**\n   * Suggested ACP model IDs for the provider's picker, sourced from the\n   * typescript-client registry. Not authoritative access checks; users can\n   * still enter a custom override in Settings -> Agent.\n   */\n  available_models?: ACPModelOption[];\n  /** Model ID preselected for built-in providers so Canvas never saves blank. */\n  default_model?: string;\n  /**\n   * i18n key for the one-line provider description rendered under the\n   * onboarding tile. Stored on the registry so adding a new ACP\n   * provider only requires editing this file (not the onboarding tile\n   * list separately).\n   */\n  description_key: I18nKey;\n  /**\n   * Serializable icon key used by UI surfaces that render provider\n   * choices. Kept as a string so the SDK mirror check can continue to\n   * parse this registry without importing React components.\n   */\n  icon?: ACPProviderIcon;\n}\n\nexport interface ACPModelOption {\n  /** Exact model ID sent as ``acp_model``. */\n  id: string;\n  /** Human-readable label shown in Settings -> Agent. */\n  label: string;\n}\n\n// Canvas-only UI metadata per built-in provider, keyed by the ACP registry\n// key. Everything else — display name, launch command, model picker list and\n// default — comes from the typescript-client registry below. Adding a model\n// or a provider happens upstream in the SDK; Canvas only owns the brand icon\n// and the onboarding-tile description here. A provider with no entry here is\n// intentionally not surfaced in the UI.\nconst ACP_PROVIDER_UI: Record<\n  string,\n  { icon: ACPProviderIcon; description_key: I18nKey }\n> = {\n  \"claude-code\": {\n    icon: \"claude-code\",\n    description_key: I18nKey.ONBOARDING$AGENT_CLAUDE_CODE_DESCRIPTION,\n  },\n  codex: {\n    icon: \"codex\",\n    description_key: I18nKey.ONBOARDING$AGENT_CODEX_DESCRIPTION,\n  },\n  \"gemini-cli\": {\n    icon: \"gemini\",\n    description_key: I18nKey.ONBOARDING$AGENT_GEMINI_CLI_DESCRIPTION,\n  },\n};\n\n// Built-in ACP providers Canvas surfaces, built by enriching each upstream\n// registry record (``@openhands/typescript-client`` → Python SDK) with the\n// Canvas UI metadata above. Model lists + defaults are no longer hand-kept\n// here (closes agent-canvas#740) — they track the SDK via the pinned client.\nexport const ACP_PROVIDERS: ACPProviderConfig[] = Object.entries(\n  ACP_PROVIDER_UI,\n).map(([key, ui]) => {\n  const info = getClientAcpProvider(key) as ClientAcpProviderRegistry | null;\n  return {\n    key,\n    display_name: info?.display_name ?? key,\n    default_command: info ? [...info.default_command] : [],\n    available_models: info?.available_models?.map((model) => ({\n      id: model.id,\n      label: model.label,\n    })),\n    default_model: info?.default_model ?? undefined,\n    description_key: ui.description_key,\n    icon: ui.icon,\n  };\n});\n\nexport const ACP_CUSTOM_PRESET_KEY = \"custom\";\n\n/**\n * A credential an ACP provider authenticates with, surfaced during onboarding\n * so the user can populate it without leaving the flow. The {@link name} is\n * both the global-secret name and the environment variable the agent-server\n * exports into the ACP subprocess — keeping them identical is what makes a\n * saved secret actually reach the provider CLI.\n */\nexport interface ACPProviderSecretField {\n  /** Secret name and env var (e.g. ``\"ANTHROPIC_API_KEY\"``). Must satisfy the\n   * secret-name pattern ``^[a-zA-Z][a-zA-Z0-9_]{0,63}$``. */\n  name: string;\n  /** Render as a masked password input (API keys, OAuth tokens, credential\n   * blobs) rather than a plain-text input (base URLs, project IDs). Doubles as\n   * \"this is an actual credential\": when the onboarding step is required, only\n   * a ``secret`` field satisfies it — a base URL or GCP scalar alone can't\n   * authenticate anything. */\n  secret?: boolean;\n  /** Render as a multi-line textarea rather than a single-line input. Set for\n   * file-content credentials the user pastes verbatim (Codex ``auth.json``,\n   * Gemini Vertex service-account / ADC JSON) — the ones the SDK materialises\n   * to disk, which a cloud backend can't consume yet (agent-canvas#1016). */\n  multiline?: boolean;\n  /** i18n key for the one-line helper text under the field. */\n  hint_key: I18nKey;\n  /**\n   * Interpolation values for {@link hint_key} (e.g. ``{ file: \"~/.codex/auth.json\" }``\n   * for the shared \"paste the file contents\" hint). Omitted for hints that\n   * take no parameters.\n   */\n  hint_values?: Record<string, string>;\n}\n\n/**\n * Container credentials — beyond the registry's API key / base URL — that\n * canvas collects per provider so a *containerized* agent-server (no host login\n * state) can authenticate the ACP CLI: subscription tokens plus the file-content\n * blobs and Vertex config the SDK's ``acp_file_secrets`` materialisation\n * consumes (agent-canvas#1013/#1014). They have no registry env-var entry\n * because they're a deployment concern, not a model registry field. The Gemini\n * project/location/flag are plain config, not secrets — grouped here because\n * they travel with the SA blob.\n *\n * The blob *names* (``CODEX_AUTH_JSON`` / ``GOOGLE_APPLICATION_CREDENTIALS_JSON``)\n * duplicate the SDK registry's ``file_secrets`` specs; derive them from the\n * client registry once the pinned ``@openhands/typescript-client`` mirrors that\n * field (same bump that unblocks ``acp_isolate_data_dir``, see #1019).\n */\nconst ACP_RESERVED_CREDENTIALS: Record<string, ACPProviderSecretField[]> = {\n  codex: [\n    {\n      name: \"CODEX_AUTH_JSON\",\n      secret: true,\n      multiline: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_FILE_BLOB_HINT,\n      hint_values: { file: \"~/.codex/auth.json\" },\n    },\n  ],\n  \"claude-code\": [\n    {\n      name: \"CLAUDE_CODE_OAUTH_TOKEN\",\n      secret: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_OAUTH_TOKEN_HINT,\n    },\n  ],\n  \"gemini-cli\": [\n    {\n      name: \"GOOGLE_APPLICATION_CREDENTIALS_JSON\",\n      secret: true,\n      multiline: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_FILE_BLOB_HINT,\n      hint_values: {\n        file: \"~/.config/gcloud/application_default_credentials.json\",\n      },\n    },\n    {\n      name: \"GOOGLE_CLOUD_PROJECT\",\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_GCP_PROJECT_HINT,\n    },\n    {\n      name: \"GOOGLE_CLOUD_LOCATION\",\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_GCP_LOCATION_HINT,\n    },\n    {\n      name: \"GOOGLE_GENAI_USE_VERTEXAI\",\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_VERTEXAI_FLAG_HINT,\n    },\n  ],\n};\n\n/**\n * Credential pairs that break each other at runtime, keyed by provider —\n * mirrors the SDK's ``_ENV_CONFLICT_MAP`` (software-agent-sdk#3588). Claude's\n * OAuth token (``CLAUDE_CODE_OAUTH_TOKEN``) authenticates against Anthropic\n * directly, so when it is set the SDK strips:\n *   - ``ANTHROPIC_API_KEY``  — otherwise it takes precedence and silently\n *     bypasses the subscription;\n *   - ``ANTHROPIC_BASE_URL`` — otherwise it proxies the bearer to an endpoint\n *     that rejects it (see docs/ACP_AGENTS.md).\n * Either one set alongside the token is silently ignored at runtime, so warn.\n */\nconst ACP_CREDENTIAL_CONFLICTS: Record<string, Array<[string, string]>> = {\n  \"claude-code\": [\n    [\"CLAUDE_CODE_OAUTH_TOKEN\", \"ANTHROPIC_API_KEY\"],\n    [\"CLAUDE_CODE_OAUTH_TOKEN\", \"ANTHROPIC_BASE_URL\"],\n  ],\n};\n\n/**\n * The ``[credential, conflicting]`` pairs the user currently has set for\n * ``providerKey``. ``hasValue`` should cover both typed and already-saved\n * values, since a previously saved secret conflicts just the same.\n */\nexport function getAcpCredentialConflicts(\n  key: string | null | undefined,\n  hasValue: (name: string) => boolean,\n): Array<[string, string]> {\n  if (!key) return [];\n  return (ACP_CREDENTIAL_CONFLICTS[key] ?? []).filter(\n    ([credential, conflicting]) =>\n      hasValue(credential) && hasValue(conflicting),\n  );\n}\n\n/**\n * Vertex AI-safe ``acp_model`` for Gemini.\n *\n * Left unset, gemini-cli falls back to its own internal default — a preview\n * flash model that 404s on Google Cloud projects without preview access. And a\n * ``*-flash`` id is no safer to pin: gemini-cli re-resolves flash ids at\n * generation time to its *current default* flash (software-agent-sdk#3532), so\n * a pinned ``gemini-2.5-flash`` still ran ``gemini-3-flash``. Only a non-flash\n * id sticks; ``gemini-2.5-pro`` is broadly available on Vertex and the\n * API-key / Google-login paths, so canvas preselects it. Kept as a named\n * constant so every model-default consumer agrees.\n */\nexport const ACP_VERTEX_SAFE_MODEL = \"gemini-2.5-pro\";\n\n/**\n * The default ``acp_model`` canvas substitutes for ``providerKey`` wherever no\n * concrete model is configured — settings seeding (onboarding, Settings →\n * Agent), the {@link buildAcpAgentSettingsDiff} fallback, and the start-request\n * fallback for a saved ``null``. Overrides only Gemini (→\n * {@link ACP_VERTEX_SAFE_MODEL}, see why above); every other provider keeps its\n * registry {@link ACPProviderConfig.default_model}. Returns ``null`` when\n * there's no override and no registry default, letting the ACP server pick its\n * own.\n *\n * Distinct from {@link ACPProviderConfig.default_model} (which mirrors the SDK\n * registry verbatim, closing agent-canvas#740): this is the *preferred* default,\n * deliberately diverging for Gemini where the registry value isn't safe on\n * every backend — so every default-model surface must route through this, not\n * read ``default_model`` directly.\n */\nexport function getAcpPreferredDefaultModel(\n  key: string | null | undefined,\n): string | null {\n  if (key === \"gemini-cli\") return ACP_VERTEX_SAFE_MODEL;\n  return getAcpProvider(key)?.default_model ?? null;\n}\n\n/**\n * List the credentials Canvas should prompt for when onboarding the given ACP\n * provider. The API-key and base-URL field *names* track the SDK registry's\n * ``api_key_env_var`` / ``base_url_env_var`` (mirrored via\n * ``@openhands/typescript-client``) so they can't drift as providers are added\n * or renamed; the per-provider container credentials (subscription / Vertex\n * blobs) come from {@link ACP_RESERVED_CREDENTIALS}, since those are a\n * containerized-deployment concern with no model-registry entry. Each field\n * name equals the env var the agent-server exports into the provider subprocess\n * (which is what makes a saved secret reach the CLI). On the wire none of this\n * is special — every saved credential travels uniformly as a ``LookupSecret``.\n *\n * Field order is: container subscription/Vertex credentials → API key →\n * optional base URL. Every field is optional at the UI level — the step is\n * skippable, and a subscription / OAuth login on the backend takes precedence\n * over a key at runtime. (Whether the *step* is required is a\n * backend-capability decision the onboarding modal makes; see\n * ``backendRequiresAcpCredentials``.)\n *\n * NB: the base URL is rendered plain-text (not ``secret``), so it never counts\n * toward a required credential step — setting ``ANTHROPIC_BASE_URL`` alongside\n * a ``CLAUDE_CODE_OAUTH_TOKEN`` breaks the token's bearer auth, which the forms\n * surface via {@link getAcpCredentialConflicts}.\n *\n * Returns ``[]`` for OpenHands, the ``\"custom\"`` preset, any unknown key, and a\n * future OAuth-only provider whose registry entry has no ``api_key_env_var`` —\n * callers treat an empty list as \"no credentials step for this provider\".\n */\nexport function getAcpProviderSecrets(\n  key: string | null | undefined,\n): ACPProviderSecretField[] {\n  if (!key) return [];\n  const info = getClientAcpProvider(key);\n  if (!info) return [];\n  // Subscription / Vertex credentials first — they're the primary auth path for\n  // ACP providers (Claude Pro/Max OAuth token, Codex ChatGPT auth.json), with\n  // the API key as the fallback below.\n  const fields: ACPProviderSecretField[] = [\n    ...(ACP_RESERVED_CREDENTIALS[key] ?? []),\n  ];\n  if (info.api_key_env_var) {\n    fields.push({\n      name: info.api_key_env_var,\n      secret: true,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_API_KEY_HINT,\n    });\n  }\n  if (info.base_url_env_var) {\n    fields.push({\n      name: info.base_url_env_var,\n      hint_key: I18nKey.ONBOARDING$ACP_SECRET_BASE_URL_HINT,\n    });\n  }\n  return fields;\n}\n\n/**\n * Look up a built-in ACP provider config by its registry key.\n *\n * Returns ``undefined`` for an empty / null key, for the ``\"custom\"`` preset\n * (which has no registry entry), and for any forward-compatible key Canvas's\n * registry doesn't know about yet. Centralizes the ``ACP_PROVIDERS.find(...)``\n * lookup shared by the resolvers below and by the adapter / settings surfaces\n * so the key-comparison shape lives in one place.\n */\nexport function getAcpProvider(\n  key: string | null | undefined,\n): ACPProviderConfig | undefined {\n  if (!key) return undefined;\n  return ACP_PROVIDERS.find((provider) => provider.key === key);\n}\n\n/**\n * Resolve an ACP provider registry key (the value stored under\n * ``tags.acpserver`` on a conversation) to a human display name for the\n * sidebar chip.\n *\n * Returns ``null`` for an empty / null key and for keys not in\n * {@link ACP_PROVIDERS} — most notably ``\"custom\"`` (the user-supplied\n * command preset has no canonical brand name) and any forward-compatible\n * value Canvas's registry doesn't know about yet. Callers should fall\n * back to a generic ``\"ACP\"`` label in that case so the chip still\n * communicates \"this is an ACP conversation\".\n *\n * Kept separate from {@link buildAcpAgentSettingsDiff}'s lookup so the\n * conversation-card render path can resolve display names without\n * importing the settings-payload builder.\n */\nexport function getAcpProviderDisplayName(\n  key: string | null | undefined,\n): string | null {\n  const found = getAcpProvider(key);\n  return found ? found.display_name : null;\n}\n\n/**\n * Resolve an ACP provider registry key to the icon discriminator the\n * conversation chip should render alongside the model text.\n *\n * Falls back to {@link ACP_PROVIDER_FALLBACK_ICON} for ``\"custom\"``,\n * unknown keys, or a missing key — the chip then shows a neutral\n * terminal glyph that still communicates \"this is an ACP conversation\"\n * without claiming a brand identity we don't know.\n */\nexport function resolveAcpProviderIcon(\n  key: string | null | undefined,\n): ACPProviderIcon {\n  return getAcpProvider(key)?.icon ?? ACP_PROVIDER_FALLBACK_ICON;\n}\n\n/**\n * Resolve a raw ``acp_model`` ID to the human-readable label the provider's\n * picker shows for it (e.g. ``\"claude-opus-4-7\"`` → ``\"Claude Opus 4.7\"``).\n *\n * Falls back to the raw ID when the provider is unknown or the ID isn't one\n * of its registered {@link ACPModelOption}s — so a user's custom override\n * still renders something meaningful rather than nothing. Returns ``null``\n * only when there is no model to show, letting the conversation chip decide\n * to display the provider name instead.\n */\nexport function labelForAcpModel(\n  serverKey: string | null | undefined,\n  modelId: string | null | undefined,\n): string | null {\n  if (!modelId) return null;\n  const provider = getAcpProvider(serverKey);\n  const match = provider?.available_models?.find((m) => m.id === modelId);\n  return match?.label ?? modelId;\n}\n\n/**\n * Build the ``agent_settings_diff`` payload PATCH /api/settings expects\n * for the agent-kind/provider choice the user just made.\n *\n * Used by both the Settings → Agent page and the onboarding \"choose\n * agent\" step — keeping the shape in one helper means a future change\n * (e.g. always seeding ``acp_command`` from the registry instead of\n * sending ``[]``, or adding new ``acp_*`` reset fields) lands in both\n * surfaces atomically.\n *\n * Returns ``null`` for an unknown ACP provider key by default — the\n * caller can skip the save (the UI shouldn't surface unknown options,\n * but the defensive path keeps a buggy preset list from corrupting\n * settings).\n *\n * Pass ``allowUnknownServer: true`` to opt into pass-through for keys\n * that aren't in {@link ACP_PROVIDERS} or ``ACP_CUSTOM_PRESET_KEY``.\n * The Settings → Agent page uses this when the user opens settings\n * that already carry an ``acp_server`` value canvas's registry\n * doesn't know about (e.g. set out-of-band via the API for a provider\n * we haven't mirrored yet) and saves without changing the command —\n * otherwise the original key would be silently demoted to ``\"custom\"``.\n */\nexport function buildAcpAgentSettingsDiff(\n  providerKey: string,\n  options: {\n    command?: string[];\n    model?: string | null;\n    allowUnknownServer?: boolean;\n  } = {},\n): Record<string, unknown> | null {\n  if (providerKey === \"openhands\") {\n    // Switching back to OpenHands. The agent-server's ``Settings.update``\n    // applies a fresh ``{'agent_kind': ...}`` base whenever the kind\n    // flips, so any ``acp_*`` fields would be discarded before\n    // validation. Send the kind alone.\n    return { agent_kind: \"openhands\" };\n  }\n\n  const isCustom = providerKey === ACP_CUSTOM_PRESET_KEY;\n  const provider = isCustom ? undefined : getAcpProvider(providerKey);\n  if (!isCustom && !provider && !options.allowUnknownServer) {\n    return null;\n  }\n\n  // Undefined model → the *preferred* default (Vertex-safe for Gemini), not\n  // the raw registry default — see getAcpPreferredDefaultModel.\n  const model =\n    options.model === undefined\n      ? getAcpPreferredDefaultModel(providerKey)\n      : options.model;\n\n  // ``acp_args: []`` resets any API-set ``acp_args`` that would\n  // otherwise survive and concatenate to ``acp_command`` at spawn time\n  // (the agent-server merges the two before exec). Callers building the\n  // payload from a textarea that already shows the merged command\n  // (Settings → Agent) round-trip correctly — the merged tokens land in\n  // ``acp_command`` here, so no args are lost.\n  return {\n    agent_kind: \"acp\",\n    acp_server: providerKey,\n    acp_command: options.command ?? [],\n    acp_args: [],\n    acp_model: model ?? null,\n  };\n}\n"],"mappings":"6OAkCA,SAAS,EAAa,EAA+B,CACnD,GAAI,OAAO,GAAU,SAAU,OAAO,KACtC,IAAM,EAAU,EAAM,MAAM,CAG5B,MAFI,CAAC,GACD,IAAA,cAAyC,KACtC,EAgBT,SAAgB,EAAyB,EAMvB,CAChB,IAAK,IAAM,IAAa,CACtB,EAAO,YACP,EAAO,UACP,EAAO,WACP,EAAO,OACR,CAAE,CACD,IAAM,EAAQ,EAAa,EAAU,CACrC,GAAI,EAAO,OAAO,EAEpB,OAAO,EAAO,iBAAmB,KAiEnC,IAAM,EAGF,CACF,cAAe,CACb,KAAM,cACN,gBAAiB,EAAA,QAAQ,yCAC1B,CACD,MAAO,CACL,KAAM,QACN,gBAAiB,EAAA,QAAQ,mCAC1B,CACD,aAAc,CACZ,KAAM,SACN,gBAAiB,EAAA,QAAQ,wCAC1B,CACF,CAMY,EAAqC,OAAO,QACvD,EACD,CAAC,KAAK,CAAC,EAAK,KAAQ,CACnB,IAAM,EAAO,EAAA,eAAqB,EAAI,CACtC,MAAO,CACL,MACA,aAAc,GAAM,cAAgB,EACpC,gBAAiB,EAAO,CAAC,GAAG,EAAK,gBAAgB,CAAG,EAAE,CACtD,iBAAkB,GAAM,kBAAkB,IAAK,IAAW,CACxD,GAAI,EAAM,GACV,MAAO,EAAM,MACd,EAAE,CACH,cAAe,GAAM,eAAiB,IAAA,GACtC,gBAAiB,EAAG,gBACpB,KAAM,EAAG,KACV,EACD,CAyDc,EAAA,QAAQ,qCAQR,EAAA,QAAQ,uCAQR,EAAA,QAAQ,qCAOR,EAAA,QAAQ,uCAIR,EAAA,QAAQ,wCAIR,EAAA,QAAQ,yCAmDxB,IAAa,EAAwB,iBAkBrC,SAAgB,EACd,EACe,CAEf,OADI,IAAQ,aAAqB,EAC1B,EAAe,EAAI,EAAE,eAAiB,KAoE/C,SAAgB,EACd,EAC+B,CAC1B,KACL,OAAO,EAAc,KAAM,GAAa,EAAS,MAAQ,EAAI,CAmB/D,SAAgB,EACd,EACe,CACf,IAAM,EAAQ,EAAe,EAAI,CACjC,OAAO,EAAQ,EAAM,aAAe,KAYtC,SAAgB,EACd,EACiB,CACjB,OAAO,EAAe,EAAI,EAAE,MAAA,cAa9B,SAAgB,EACd,EACA,EACe,CAIf,OAHK,EACY,EAAe,EAClB,EAAU,kBAAkB,KAAM,GAAM,EAAE,KAAO,EAAQ,EACzD,OAAS,EAHF"}

package/dist/constants/acp-providers.d.ts

@@ -45,7 +45,7 @@ export interface ACPProviderConfig {
      * ACP server — the codex CLI has no ``acp`` subcommand and exits with
      * ``Error: stdin is not a terminal`` when spawned without a TTY, which
      * silently deadlocks the agent-server's ACP handshake. Use
-     * ``@zed-industries/codex-acp`` (the Zed-shipped wrapper) instead.
+     * ``@agentclientprotocol/codex-acp`` (the codex ACP wrapper) instead.
      */
     default_command: string[];
     /**