@axhub/acp 0.1.0 → 0.1.2-beta.0

package/dist/components/assistant-ui/threadlist-sidebar.mjs

@@ -25,8 +25,8 @@ function getPathBasename(path) {
     return (_a = parts[parts.length - 1]) !== null && _a !== void 0 ? _a : normalizedPath;
 }
 export function ThreadListSidebar(_a) {
-    var { workspacePath, workspaceTitle } = _a, props = __rest(_a, ["workspacePath", "workspaceTitle"]);
+    var { workspacePath, workspaceTitle, openInNewWindowHref, localNewThreadHref, onNewThreadClick } = _a, props = __rest(_a, ["workspacePath", "workspaceTitle", "openInNewWindowHref", "localNewThreadHref", "onNewThreadClick"]);
     const projectPath = (workspacePath === null || workspacePath === void 0 ? void 0 : workspacePath.trim()) || "当前项目";
     const projectTitle = (workspaceTitle === null || workspaceTitle === void 0 ? void 0 : workspaceTitle.trim()) || getPathBasename(projectPath);
-    return (_jsxs(Sidebar, Object.assign({}, props, { children: [_jsx(SidebarHeader, { className: "aui-sidebar-header mb-2 border-b", children: _jsxs("div", { className: "aui-sidebar-header-content flex items-center justify-between", children: [_jsx(SidebarMenu, { className: "min-w-0 flex-1", children: _jsx(SidebarMenuItem, { children: _jsx(SidebarMenuButton, { size: "lg", asChild: true, children: _jsxs("div", { children: [_jsx(FolderIcon, { className: "aui-sidebar-header-icon size-4" }), _jsxs("div", { className: "aui-sidebar-header-heading me-2 min-w-0 space-y-1 leading-none", children: [_jsx("span", { className: "aui-sidebar-header-title block min-w-0 truncate font-semibold", title: projectTitle, children: projectTitle }), _jsx("span", { className: "aui-sidebar-header-description block min-w-0 truncate text-sidebar-foreground/60 text-xs", title: projectPath, children: projectPath })] })] }) }) }) }), _jsx(ThemeToggle, {})] }) }), _jsx(SidebarContent, { className: "aui-sidebar-content overflow-hidden px-0", children: _jsx(ScrollArea, { className: "aui-thread-list-scroll-area min-h-0 flex-1", children: _jsx("div", { className: "aui-thread-list-scroll-content w-full min-w-0 px-2", children: _jsx(ThreadList, {}) }) }) }), _jsx(SidebarRail, {})] })));
+    return (_jsxs(Sidebar, Object.assign({}, props, { children: [_jsx(SidebarHeader, { className: "aui-sidebar-header mb-2 border-b", children: _jsxs("div", { className: "aui-sidebar-header-content flex items-center justify-between", children: [_jsx(SidebarMenu, { className: "min-w-0 flex-1", children: _jsx(SidebarMenuItem, { children: _jsx(SidebarMenuButton, { size: "lg", asChild: true, children: _jsxs("div", { children: [_jsx(FolderIcon, { className: "aui-sidebar-header-icon size-4" }), _jsxs("div", { className: "aui-sidebar-header-heading me-2 min-w-0 space-y-1 leading-none", children: [_jsx("span", { className: "aui-sidebar-header-title block min-w-0 truncate font-semibold", title: projectTitle, children: projectTitle }), _jsx("span", { className: "aui-sidebar-header-description block min-w-0 truncate text-sidebar-foreground/60 text-xs", title: projectPath, children: projectPath })] })] }) }) }) }), _jsx(ThemeToggle, {})] }) }), _jsx(SidebarContent, { className: "aui-sidebar-content overflow-hidden px-0", children: _jsx(ScrollArea, { className: "aui-thread-list-scroll-area min-h-0 flex-1", children: _jsx("div", { className: "aui-thread-list-scroll-content w-full min-w-0 px-2", children: _jsx(ThreadList, { openInNewWindowHref: openInNewWindowHref, localNewThreadHref: localNewThreadHref, onNewThreadClick: onNewThreadClick }) }) }) }), _jsx(SidebarRail, {})] })));
 }

package/dist/components/assistant-ui/tool-fallback.d.ts

@@ -1,4 +1,4 @@
-import { type ToolCallMessagePartComponent, type ToolCallMessagePartStatus } from "@assistant-ui/react";
+import type { ToolCallMessagePartComponent, ToolCallMessagePartStatus } from "@assistant-ui/react";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "../ui/collapsible";
 export type ToolFallbackRootProps = Omit<React.ComponentProps<typeof Collapsible>, "open" | "onOpenChange"> & {
     open?: boolean;

package/dist/components/assistant-ui/tool-fallback.mjs

@@ -11,30 +11,67 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useScrollLock, } from "@assistant-ui/react";
 import { AlertCircleIcon, CheckIcon, ChevronDownIcon, LoaderIcon, XCircleIcon, } from "lucide-react";
-import { memo, useCallback, useRef, useState } from "react";
+import { memo, useCallback, useEffect, useRef, useState, } from "react";
 import { AcpToolContentBlocks } from "./acp-tool-content.mjs";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger, } from "../ui/collapsible.mjs";
 import { cn } from "../../lib/utils.mjs";
 const ANIMATION_DURATION = 200;
+function useScrollPositionLock(animatedElementRef, animationDuration) {
+    const scrollContainerRef = useRef(null);
+    const cleanupRef = useRef(null);
+    useEffect(() => {
+        return () => { var _a; return (_a = cleanupRef.current) === null || _a === void 0 ? void 0 : _a.call(cleanupRef); };
+    }, []);
+    return useCallback(() => {
+        var _a;
+        (_a = cleanupRef.current) === null || _a === void 0 ? void 0 : _a.call(cleanupRef);
+        if (!scrollContainerRef.current) {
+            let element = animatedElementRef.current;
+            while (element) {
+                const { overflowY } = getComputedStyle(element);
+                if (overflowY === "auto" || overflowY === "scroll") {
+                    scrollContainerRef.current = element;
+                    break;
+                }
+                element = element.parentElement;
+            }
+        }
+        const scrollContainer = scrollContainerRef.current;
+        if (!scrollContainer)
+            return;
+        const scrollPosition = scrollContainer.scrollTop;
+        const resetPosition = () => {
+            scrollContainer.scrollTop = scrollPosition;
+        };
+        scrollContainer.addEventListener("scroll", resetPosition);
+        const timeoutId = window.setTimeout(() => {
+            scrollContainer.removeEventListener("scroll", resetPosition);
+            cleanupRef.current = null;
+        }, animationDuration);
+        cleanupRef.current = () => {
+            window.clearTimeout(timeoutId);
+            scrollContainer.removeEventListener("scroll", resetPosition);
+        };
+    }, [animatedElementRef, animationDuration]);
+}
 function ToolFallbackRoot(_a) {
     var { className, open: controlledOpen, onOpenChange: controlledOnOpenChange, defaultOpen = false, children } = _a, props = __rest(_a, ["className", "open", "onOpenChange", "defaultOpen", "children"]);
     const collapsibleRef = useRef(null);
     const [uncontrolledOpen, setUncontrolledOpen] = useState(defaultOpen);
-    const lockScroll = useScrollLock(collapsibleRef, ANIMATION_DURATION);
+    const lockScrollPosition = useScrollPositionLock(collapsibleRef, ANIMATION_DURATION);
     const isControlled = controlledOpen !== undefined;
     const isOpen = isControlled ? controlledOpen : uncontrolledOpen;
     const handleOpenChange = useCallback((open) => {
         if (!open) {
-            lockScroll();
+            lockScrollPosition();
         }
         if (!isControlled) {
             setUncontrolledOpen(open);
         }
         controlledOnOpenChange === null || controlledOnOpenChange === void 0 ? void 0 : controlledOnOpenChange(open);
-    }, [lockScroll, isControlled, controlledOnOpenChange]);
-    return (_jsx(Collapsible, Object.assign({ ref: collapsibleRef, "data-slot": "tool-fallback-root", open: isOpen, onOpenChange: handleOpenChange, className: cn("aui-tool-fallback-root group/tool-fallback-root my-2.5 w-full rounded-lg border py-3 first:mt-0 last:mb-0", className), style: {
+    }, [lockScrollPosition, isControlled, controlledOnOpenChange]);
+    return (_jsx(Collapsible, Object.assign({ ref: collapsibleRef, "data-slot": "tool-fallback-root", open: isOpen, onOpenChange: handleOpenChange, className: cn("aui-tool-fallback-root group/tool-fallback-root my-2 w-full rounded-lg border py-2.5 first:mt-0 last:mb-0 md:my-2.5 md:py-3", className), style: {
             "--animation-duration": `${ANIMATION_DURATION}ms`,
         } }, props, { children: children })));
 }
@@ -59,23 +96,23 @@ function ToolFallbackTrigger(_a) {
     const Icon = statusIconMap[statusType];
     const label = isCancelled ? "已取消工具" : "已使用工具";
     const toolLabel = _jsx("b", { children: toolName });
-    return (_jsxs(CollapsibleTrigger, Object.assign({ "data-slot": "tool-fallback-trigger", "aria-label": `${label}: ${toolName}`, className: cn("aui-tool-fallback-trigger group/trigger flex w-full items-center gap-2 px-4 text-sm transition-colors", className) }, props, { children: [_jsx(Icon, { "data-slot": "tool-fallback-trigger-icon", className: cn("aui-tool-fallback-trigger-icon size-4 shrink-0", isCancelled && "text-muted-foreground", isRunning && "animate-spin") }), _jsxs("span", { "data-slot": "tool-fallback-trigger-label", className: cn("aui-tool-fallback-trigger-label-wrapper relative min-w-0 flex-1 text-start leading-snug", isCancelled && "text-muted-foreground line-through"), title: toolName, children: [_jsx("span", { className: "aui-tool-fallback-trigger-label line-clamp-2 break-words", children: toolLabel }), isRunning && (_jsx("span", { "aria-hidden": true, "data-slot": "tool-fallback-trigger-shimmer", className: "aui-tool-fallback-trigger-shimmer shimmer pointer-events-none absolute inset-0 line-clamp-2 break-words motion-reduce:animate-none", children: toolLabel }))] }), _jsx(ChevronDownIcon, { "data-slot": "tool-fallback-trigger-chevron", className: cn("aui-tool-fallback-trigger-chevron size-4 shrink-0", "transition-transform duration-(--animation-duration) ease-out", "group-data-[state=closed]/trigger:-rotate-90", "group-data-[state=open]/trigger:rotate-0") })] })));
+    return (_jsxs(CollapsibleTrigger, Object.assign({ "data-slot": "tool-fallback-trigger", "aria-label": `${label}: ${toolName}`, className: cn("aui-tool-fallback-trigger group/trigger flex w-full items-center gap-2 px-3 text-[13px] transition-colors md:px-4 md:text-sm", className) }, props, { children: [_jsx(Icon, { "data-slot": "tool-fallback-trigger-icon", className: cn("aui-tool-fallback-trigger-icon size-3.5 shrink-0 md:size-4", isCancelled && "text-muted-foreground", isRunning && "animate-spin") }), _jsxs("span", { "data-slot": "tool-fallback-trigger-label", className: cn("aui-tool-fallback-trigger-label-wrapper relative min-w-0 flex-1 text-start leading-snug", isCancelled && "text-muted-foreground line-through"), title: toolName, children: [_jsx("span", { className: "aui-tool-fallback-trigger-label line-clamp-2 break-words", children: toolLabel }), isRunning && (_jsx("span", { "aria-hidden": true, "data-slot": "tool-fallback-trigger-shimmer", className: "aui-tool-fallback-trigger-shimmer shimmer pointer-events-none absolute inset-0 line-clamp-2 break-words motion-reduce:animate-none", children: toolLabel }))] }), _jsx(ChevronDownIcon, { "data-slot": "tool-fallback-trigger-chevron", className: cn("aui-tool-fallback-trigger-chevron size-3.5 shrink-0 md:size-4", "transition-transform duration-(--animation-duration) ease-out", "group-data-[state=closed]/trigger:-rotate-90", "group-data-[state=open]/trigger:rotate-0") })] })));
 }
 function ToolFallbackContent(_a) {
     var { className, children } = _a, props = __rest(_a, ["className", "children"]);
-    return (_jsx(CollapsibleContent, Object.assign({ "data-slot": "tool-fallback-content", className: cn("aui-tool-fallback-content relative overflow-hidden text-sm outline-none", "group/collapsible-content ease-out", "data-[state=closed]:animate-collapsible-up", "data-[state=open]:animate-collapsible-down", "data-[state=closed]:fill-mode-forwards", "data-[state=closed]:pointer-events-none", "data-[state=open]:duration-(--animation-duration)", "data-[state=closed]:duration-(--animation-duration)", className) }, props, { children: _jsx("div", { className: "mt-3 flex flex-col gap-2 border-t pt-2", children: children }) })));
+    return (_jsx(CollapsibleContent, Object.assign({ "data-slot": "tool-fallback-content", className: cn("aui-tool-fallback-content relative overflow-hidden text-[13px] outline-none md:text-sm", "group/collapsible-content ease-out", "data-[state=closed]:animate-collapsible-up", "data-[state=open]:animate-collapsible-down", "data-[state=closed]:fill-mode-forwards", "data-[state=closed]:pointer-events-none", "data-[state=open]:duration-(--animation-duration)", "data-[state=closed]:duration-(--animation-duration)", className) }, props, { children: _jsx("div", { className: "mt-2.5 flex flex-col gap-2 border-t pt-2 md:mt-3", children: children }) })));
 }
 function ToolFallbackArgs(_a) {
     var { argsText, className } = _a, props = __rest(_a, ["argsText", "className"]);
     if (!argsText)
         return null;
-    return (_jsx("div", Object.assign({ "data-slot": "tool-fallback-args", className: cn("aui-tool-fallback-args px-4", className) }, props, { children: _jsx("pre", { className: "aui-tool-fallback-args-value max-h-40 overflow-auto rounded-md bg-muted/30 px-3 py-2 font-mono text-xs leading-relaxed whitespace-pre-wrap break-words", children: argsText }) })));
+    return (_jsx("div", Object.assign({ "data-slot": "tool-fallback-args", className: cn("aui-tool-fallback-args px-3 md:px-4", className) }, props, { children: _jsx("pre", { className: "aui-tool-fallback-args-value max-h-40 overflow-auto rounded-md bg-muted/30 px-3 py-2 font-mono text-xs leading-relaxed whitespace-pre-wrap break-words", children: argsText }) })));
 }
 function ToolFallbackResult(_a) {
     var { result, className } = _a, props = __rest(_a, ["result", "className"]);
     if (result === undefined)
         return null;
-    return (_jsxs("div", Object.assign({ "data-slot": "tool-fallback-result", className: cn("aui-tool-fallback-result border-t border-dashed px-4 pt-2", className) }, props, { children: [_jsx("p", { className: "aui-tool-fallback-result-header font-semibold", children: "\u7ED3\u679C\uFF1A" }), _jsx("pre", { className: "aui-tool-fallback-result-content max-h-56 overflow-auto rounded-md bg-muted/30 px-3 py-2 font-mono text-xs leading-relaxed whitespace-pre-wrap break-words", children: result === null
+    return (_jsxs("div", Object.assign({ "data-slot": "tool-fallback-result", className: cn("aui-tool-fallback-result border-t border-dashed px-3 pt-2 md:px-4", className) }, props, { children: [_jsx("p", { className: "aui-tool-fallback-result-header font-semibold", children: "\u7ED3\u679C\uFF1A" }), _jsx("pre", { className: "aui-tool-fallback-result-content max-h-56 overflow-auto rounded-md bg-muted/30 px-3 py-2 font-mono text-xs leading-relaxed whitespace-pre-wrap break-words", children: result === null
                     ? "无结构化结果"
                     : typeof result === "string"
                         ? result
@@ -95,7 +132,7 @@ function ToolFallbackError(_a) {
         return null;
     const isCancelled = status.reason === "cancelled";
     const headerText = isCancelled ? "取消原因：" : "错误：";
-    return (_jsxs("div", Object.assign({ "data-slot": "tool-fallback-error", className: cn("aui-tool-fallback-error px-4", className) }, props, { children: [_jsx("p", { className: "aui-tool-fallback-error-header font-semibold text-muted-foreground", children: headerText }), _jsx("p", { className: "aui-tool-fallback-error-reason text-muted-foreground", children: errorText })] })));
+    return (_jsxs("div", Object.assign({ "data-slot": "tool-fallback-error", className: cn("aui-tool-fallback-error px-3 md:px-4", className) }, props, { children: [_jsx("p", { className: "aui-tool-fallback-error-header font-semibold text-muted-foreground", children: headerText }), _jsx("p", { className: "aui-tool-fallback-error-reason text-muted-foreground", children: errorText })] })));
 }
 const ToolFallbackImpl = ({ toolName, argsText, result, status, toolCallId, }) => {
     const effectiveStatus = getEffectiveToolStatus(status, result);

package/dist/components/tool-ui/option-list.d.ts

@@ -29,6 +29,7 @@ export type OptionListProps = {
     isActionDisabled?: (actionId: string, value: string | string[] | null) => boolean;
     allowCustomInput?: boolean;
     customInputLabel?: string;
+    showRecommendedBadge?: boolean;
     className?: string;
 };
-export declare function OptionList({ id, options, selectionMode, value, defaultValue, choice, minSelections, maxSelections, actions, onChange, onAction, onBeforeAction, isActionDisabled, allowCustomInput, customInputLabel, className, }: OptionListProps): import("react/jsx-runtime").JSX.Element;
+export declare function OptionList({ id, options, selectionMode, value, defaultValue, choice, minSelections, maxSelections, actions, onChange, onAction, onBeforeAction, isActionDisabled, allowCustomInput, customInputLabel, showRecommendedBadge, className, }: OptionListProps): import("react/jsx-runtime").JSX.Element;

package/dist/components/tool-ui/option-list.mjs

@@ -18,9 +18,9 @@ function arrayToValue(value, selectionMode) {
     return (_a = value[0]) !== null && _a !== void 0 ? _a : null;
 }
 export function OptionList({ id, options, selectionMode = "multi", value, defaultValue, choice, minSelections = 1, maxSelections, actions = [
-    { id: "confirm", label: "确认" },
     { id: "cancel", label: "取消", variant: "outline" },
-], onChange, onAction, onBeforeAction, isActionDisabled, allowCustomInput = false, customInputLabel = "自定义", className, }) {
+    { id: "confirm", label: "确认" },
+], onChange, onAction, onBeforeAction, isActionDisabled, allowCustomInput = false, customInputLabel = "自定义", showRecommendedBadge = true, className, }) {
     const isControlled = value !== undefined;
     const isReceipt = choice !== undefined;
     const [internalValue, setInternalValue] = useState(valueToArray(defaultValue));
@@ -152,10 +152,10 @@ export function OptionList({ id, options, selectionMode = "multi", value, defaul
                             : "border-border bg-card hover:bg-muted/60", (option.disabled || isReceipt) &&
                             "cursor-default opacity-80 hover:bg-card", hasDescription ? "items-start" : "items-center"), children: [_jsx("span", { className: cn("flex size-4 shrink-0 items-center justify-center rounded-full border", selected
                                     ? "border-primary bg-primary text-primary-foreground"
-                                    : "border-muted-foreground/30 text-transparent", hasDescription && "mt-0.5"), children: _jsx(CheckIcon, { className: "size-3" }) }), option.icon && (_jsx("span", { className: cn("shrink-0 text-muted-foreground", hasDescription && "mt-0.5"), children: option.icon })), _jsxs("span", { className: "min-w-0 flex-1", children: [_jsx("span", { className: "block break-words font-medium leading-5", children: option.label }), option.description && (_jsx("span", { className: "mt-0.5 block break-words text-muted-foreground text-xs leading-5", children: option.description })), option.recommended && (_jsx("span", { className: "mt-1 inline-flex rounded-sm bg-primary/10 px-1.5 py-0.5 font-medium text-primary text-xs", children: "\u63A8\u8350" }))] })] }, option.id));
+                                    : "border-muted-foreground/30 text-transparent", hasDescription && "mt-0.5"), children: _jsx(CheckIcon, { className: "size-3" }) }), option.icon && (_jsx("span", { className: cn("shrink-0 text-muted-foreground", hasDescription && "mt-0.5"), children: option.icon })), _jsxs("span", { className: "min-w-0 flex-1", children: [_jsx("span", { className: "block break-words font-medium leading-5", children: option.label }), option.description && (_jsx("span", { className: "mt-0.5 block break-words text-muted-foreground text-xs leading-5", children: option.description })), showRecommendedBadge && option.recommended && (_jsx("span", { className: "mt-1 inline-flex rounded-sm bg-primary/10 px-1.5 py-0.5 font-medium text-primary text-xs", children: "\u63A8\u8350" }))] })] }, option.id));
                 }) }), allowCustomInput && selectedSet.has(CUSTOM_OPTION_ID) && !isReceipt && (_jsx(Input, { className: "mt-2", placeholder: customInputLabel, value: customText, onChange: handleCustomTextChange })), !isReceipt && actions.length > 0 && (_jsx("div", { className: "mt-3 flex flex-wrap justify-end gap-2", children: actions.map((action) => {
                     var _a;
-                    const selectedValue = arrayToValue(selectedIds, selectionMode);
+                    const selectedValue = actionValue;
                     return (_jsx(Button, { type: "button", size: "sm", variant: (_a = action.variant) !== null && _a !== void 0 ? _a : "default", disabled: action.disabled ||
                             (action.id === "confirm" && !isValidSelection) ||
                             (isActionDisabled === null || isActionDisabled === void 0 ? void 0 : isActionDisabled(action.id, selectedValue)), onClick: () => void handleAction(action), children: action.label }, action.id));

package/dist/lib/acp2aisdk/client-context.d.ts

@@ -1,7 +1,9 @@
 import { type PropsWithChildren } from "react";
 import type { AcpBuiltinToolSettings, AcpProviderKey } from "./";
 import { type ContextBundleV2, type ContextItem, type ContextItemKind, type ContextOperationResult } from "./context";
+import { type ImageGenerationRuntimeSettings } from "../../tools/image-generation/shared";
 type BuiltinToolSettingsUpdater = unknown | ((current: unknown) => unknown);
+type ImageGenerationSettingsUpdater = ImageGenerationRuntimeSettings | null | ((current: ImageGenerationRuntimeSettings | null) => ImageGenerationRuntimeSettings | null);
 export type AcpUiRuntimeContext = {
     provider: AcpProviderKey;
     model: string | null;
@@ -13,12 +15,16 @@ export type AcpUiRuntimeContext = {
     permissionMode: string;
     workspacePath: string | null;
     builtinToolSettings: AcpBuiltinToolSettings;
+    runtimeBuiltinToolSettings: AcpBuiltinToolSettings;
+    hostImageGenerationSettings: ImageGenerationRuntimeSettings | null;
     contextBundle: ContextBundleV2;
     setProvider: (value: string | null) => void;
     setModel: (value: string | null) => void;
     setModeId: (value: string | null) => void;
     setThoughtLevel: (value: string | null) => void;
     setBuiltinToolSettings: (toolId: string, value: BuiltinToolSettingsUpdater) => void;
+    setHostImageGenerationSettings: (value: ImageGenerationSettingsUpdater) => ImageGenerationRuntimeSettings | null;
+    clearHostImageGenerationSettings: () => ImageGenerationRuntimeSettings | null;
     syncModel: (value: string | null) => void;
     syncModeId: (value: string | null) => void;
     syncThoughtLevel: (value: string | null) => void;

package/dist/lib/acp2aisdk/client-context.mjs

@@ -4,6 +4,7 @@ import { createContext, useCallback, useContext, useEffect, useMemo, useRef, use
 import { createContextBundle, filterContextBundle, } from "./context.mjs";
 import { normalizeAcpProvider } from "./provider-registry.mjs";
 import { readStoredBuiltinToolSettings, storeBuiltinToolSettings, updateClientBuiltinToolSettings, } from "../../tools/client-registry.mjs";
+import { IMAGE_GENERATION_TOOL_ID, mergeImageGenerationRuntimeSettings, normalizeImageGenerationRuntimeSettings, } from "../../tools/image-generation/shared.mjs";
 const DEFAULT_PROVIDER = "codex";
 const DEFAULT_PERMISSION_MODE = "bypassPermissions";
 const AcpUiContext = createContext(null);
@@ -51,6 +52,14 @@ function emitContextChanged(context, change) {
         detail: { context, change },
     }));
 }
+function mergeHostBuiltinToolSettings(storedSettings, hostImageGenerationSettings) {
+    if (!hostImageGenerationSettings)
+        return storedSettings;
+    return updateClientBuiltinToolSettings(storedSettings, IMAGE_GENERATION_TOOL_ID, (current) => {
+        var _a;
+        return (_a = mergeImageGenerationRuntimeSettings(current, hostImageGenerationSettings)) !== null && _a !== void 0 ? _a : current;
+    });
+}
 export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
     const [provider, setProviderState] = useState(() => normalizeAcpProvider(defaultProvider !== null && defaultProvider !== void 0 ? defaultProvider : DEFAULT_PROVIDER));
     const [model, setModelState] = useState(null);
@@ -60,14 +69,19 @@ export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
     const [explicitModeId, setExplicitModeIdState] = useState(null);
     const [explicitThoughtLevel, setExplicitThoughtLevelState] = useState(null);
     const [builtinToolSettings, setBuiltinToolSettingsState] = useState({});
+    const [hostImageGenerationSettings, setHostImageGenerationSettingsState] = useState(null);
     const [contextBundle, setContextBundleState] = useState(() => createContextBundle());
     const contextBundleRef = useRef(contextBundle);
+    const builtinToolSettingsRef = useRef(builtinToolSettings);
+    const hostImageGenerationSettingsRef = useRef(hostImageGenerationSettings);
     const setContextBundle = useCallback((next) => {
         contextBundleRef.current = next;
         setContextBundleState(next);
     }, []);
     useEffect(() => {
-        setBuiltinToolSettingsState(readStoredBuiltinToolSettings());
+        const stored = readStoredBuiltinToolSettings();
+        builtinToolSettingsRef.current = stored;
+        setBuiltinToolSettingsState(stored);
     }, []);
     const normalize = useCallback((value) => {
         const normalized = String(value !== null && value !== void 0 ? value : "").trim();
@@ -103,11 +117,24 @@ export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
         setExplicitThoughtLevelState(normalized);
     }, [normalize]);
     const setBuiltinToolSettings = useCallback((toolId, next) => {
-        setBuiltinToolSettingsState((current) => {
-            const updated = updateClientBuiltinToolSettings(current, toolId, next);
-            storeBuiltinToolSettings(updated);
-            return updated;
-        });
+        const updated = updateClientBuiltinToolSettings(builtinToolSettingsRef.current, toolId, next);
+        builtinToolSettingsRef.current = updated;
+        storeBuiltinToolSettings(updated);
+        setBuiltinToolSettingsState(updated);
+    }, []);
+    const setHostImageGenerationSettings = useCallback((next) => {
+        const rawNext = typeof next === "function"
+            ? next(hostImageGenerationSettingsRef.current)
+            : next;
+        const normalized = normalizeImageGenerationRuntimeSettings(rawNext);
+        hostImageGenerationSettingsRef.current = normalized;
+        setHostImageGenerationSettingsState(normalized);
+        return normalized;
+    }, []);
+    const clearHostImageGenerationSettings = useCallback(() => {
+        hostImageGenerationSettingsRef.current = null;
+        setHostImageGenerationSettingsState(null);
+        return null;
     }, []);
     const syncModel = useCallback((next) => setModelState(normalize(next)), [normalize]);
     const syncModeId = useCallback((next) => setModeIdState(normalize(next)), [normalize]);
@@ -174,7 +201,7 @@ export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
         if (current.items.length === 0)
             return null;
         const consumed = current;
-        const next = createChangedBundle([]);
+        const next = createChangedBundle(consumed.items.filter((item) => item.pinned === true));
         setContextBundle(next);
         emitContextChanged(next, {
             operation: "consume",
@@ -183,6 +210,7 @@ export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
         });
         return consumed;
     }, [setContextBundle]);
+    const mergedBuiltinToolSettings = useMemo(() => mergeHostBuiltinToolSettings(builtinToolSettings, hostImageGenerationSettings), [builtinToolSettings, hostImageGenerationSettings]);
     const value = useMemo(() => ({
         provider,
         model,
@@ -194,12 +222,16 @@ export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
         permissionMode: DEFAULT_PERMISSION_MODE,
         workspacePath: normalize(workspacePath !== null && workspacePath !== void 0 ? workspacePath : null),
         builtinToolSettings,
+        runtimeBuiltinToolSettings: mergedBuiltinToolSettings,
+        hostImageGenerationSettings,
         contextBundle,
         setProvider,
         setModel,
         setModeId,
         setThoughtLevel,
         setBuiltinToolSettings,
+        setHostImageGenerationSettings,
+        clearHostImageGenerationSettings,
         syncModel,
         syncModeId,
         syncThoughtLevel,
@@ -215,10 +247,13 @@ export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
         consumeContextBundle,
         contextBundle,
         builtinToolSettings,
+        clearHostImageGenerationSettings,
         explicitModeId,
         explicitModel,
         explicitThoughtLevel,
         getContextBundle,
+        hostImageGenerationSettings,
+        mergedBuiltinToolSettings,
         model,
         modeId,
         normalize,
@@ -229,6 +264,7 @@ export function AcpUiProvider({ children, workspacePath, defaultProvider, }) {
         setModel,
         setProvider,
         setBuiltinToolSettings,
+        setHostImageGenerationSettings,
         syncModeId,
         syncModel,
         syncThoughtLevel,

package/dist/lib/acp2aisdk/commands.mjs

@@ -1,10 +1,5 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
-const SKILL_ROOTS = [
-    { scope: "user", relativePath: [".codex", "skills"] },
-    { scope: "system", relativePath: [".codex", "skills", ".system"] },
-];
 function normalizeText(value) {
     return typeof value === "string" ? value.trim() : "";
 }
@@ -102,20 +97,10 @@ async function listSkillsFromRoot(rootPath, scope) {
 }
 export async function listAcpUiCommands({ workspacePath, } = {}) {
     const normalizedWorkspacePath = normalizeText(workspacePath);
-    const roots = [
-        ...(normalizedWorkspacePath
-            ? [
-                {
-                    rootPath: path.join(normalizedWorkspacePath, ".codex", "skills"),
-                    scope: "project",
-                },
-            ]
-            : []),
-        ...SKILL_ROOTS.map((root) => ({
-            rootPath: path.join(os.homedir(), ...root.relativePath),
-            scope: root.scope,
-        })),
-    ];
-    const commandGroups = await Promise.all(roots.map((root) => listSkillsFromRoot(root.rootPath, root.scope)));
+    if (!normalizedWorkspacePath)
+        return [];
+    const commandGroups = await Promise.all([
+        listSkillsFromRoot(path.join(normalizedWorkspacePath, ".agents", "skills"), "project"),
+    ]);
     return uniqueCommands(commandGroups.flat()).sort((left, right) => left.name.localeCompare(right.name));
 }

package/dist/lib/acp2aisdk/context.d.ts

@@ -20,6 +20,8 @@ export type TextRange = {
 export type ContextFileItem = {
     kind: "file";
     id?: string;
+    hidden?: boolean;
+    pinned?: boolean;
     path: string;
     name?: string;
     mimeType?: string;
@@ -58,6 +60,8 @@ export type ContextAnnotationTarget = {
 export type ContextAnnotationItem = {
     kind: "annotation";
     id?: string;
+    hidden?: boolean;
+    pinned?: boolean;
     body: string;
     target: ContextAnnotationTarget;
     title?: string;

package/dist/lib/acp2aisdk/errors.d.ts

@@ -0,0 +1,2 @@
+export declare function sanitizeAcpErrorMessage(message: string): string;
+export declare function acpErrorToMessage(error: unknown): string;

package/dist/lib/acp2aisdk/errors.mjs

@@ -0,0 +1,37 @@
+const AGENT_STDERR_MARKER = "\n[agent stderr]\n";
+const LEADING_AGENT_STDERR_MARKER = "[agent stderr]\n";
+const CODEX_MCP_STARTUP_UNKNOWN_SUBMISSION_RE = /\bWARN\s+codex_acp::thread:\s+Received event for unknown submission ID:\s*(?:[0-9a-f-]+)?\s*McpStartup(?:Update|Complete)\(/;
+function isIgnoredAgentStderrLine(line) {
+    return CODEX_MCP_STARTUP_UNKNOWN_SUBMISSION_RE.test(line);
+}
+function filterAgentStderr(stderrText) {
+    return stderrText
+        .split("\n")
+        .filter((line) => !isIgnoredAgentStderrLine(line))
+        .join("\n")
+        .trim();
+}
+export function sanitizeAcpErrorMessage(message) {
+    const normalized = message.replace(/\r\n/g, "\n");
+    let prefix = normalized;
+    let stderrText = null;
+    const markerIndex = normalized.indexOf(AGENT_STDERR_MARKER);
+    if (markerIndex >= 0) {
+        prefix = normalized.slice(0, markerIndex);
+        stderrText = normalized.slice(markerIndex + AGENT_STDERR_MARKER.length);
+    }
+    else if (normalized.startsWith(LEADING_AGENT_STDERR_MARKER)) {
+        prefix = "";
+        stderrText = normalized.slice(LEADING_AGENT_STDERR_MARKER.length);
+    }
+    if (stderrText === null)
+        return normalized;
+    const filteredStderr = filterAgentStderr(stderrText);
+    const trimmedPrefix = prefix.trim();
+    if (!filteredStderr)
+        return trimmedPrefix || "Internal error";
+    return `${trimmedPrefix}\n[agent stderr]\n${filteredStderr}`.trim();
+}
+export function acpErrorToMessage(error) {
+    return sanitizeAcpErrorMessage(error instanceof Error ? error.message : String(error));
+}

package/dist/lib/acp2aisdk/index.d.ts

@@ -2,11 +2,18 @@ import type { AcpChatRequest, AcpRuntimeMetadata, AcpSessionLookupRequest, AcpSt
 export type { AcpBuiltinToolSettings, AcpCapabilitySnapshot, AcpChatRequest, AcpCleanupResult, AcpPermissionMode, AcpProviderKey, AcpRunState, AcpRuntimeMetadata, AcpSessionLookupRequest, } from "./types";
 export declare function getAcpSessionMetadata(request: AcpSessionLookupRequest): AcpRuntimeMetadata | null;
 export declare function listAcpSessionMetadata(): AcpRuntimeMetadata[];
+export declare function reconcileAcpSessionWithRuntimeMessages(request: AcpSessionLookupRequest): Promise<AcpRuntimeMetadata | null>;
 export declare function cleanupAcpSession(request: AcpSessionLookupRequest): Promise<{
     cleaned: boolean;
     metadata: AcpRuntimeMetadata | null;
     remainingSessions: AcpRuntimeMetadata[];
 }>;
+export declare function cancelAcpSession(request: AcpSessionLookupRequest): Promise<{
+    cancelled: boolean;
+    cleaned: boolean;
+    metadata: AcpRuntimeMetadata | null;
+    remainingSessions: AcpRuntimeMetadata[];
+}>;
 export declare function streamAcpChat(request: AcpChatRequest, options?: {
     abortSignal?: AbortSignal;
 }): Promise<AcpStreamChatResult>;