@hachej/boring-agent 0.1.63 → 0.1.65

package/dist/front/index.js

@@ -4,7 +4,6 @@ import {
 } from "../chunk-DGRKMMXO.js";
 import {
   CommandReceiptSchema,
-  ErrorCode,
   FollowUpReceiptSchema,
   PiChatSnapshotSchema,
   PiChatStreamFrameSchema,
@@ -13,7 +12,10 @@ import {
   StopReceiptSchema,
   extractToolUiMetadata,
   sanitizeToolUiMetadata
-} from "../chunk-G6YPXDHR.js";
+} from "../chunk-4LXA7OOV.js";
+import {
+  ErrorCode
+} from "../chunk-XZKU7FBV.js";
 import {
   DebugDrawer,
   cn,
@@ -1534,7 +1536,7 @@ function toHeaderProps(part) {
     toolName: part.toolName
   };
 }
-function PathLabel({ path }) {
+function PathLabel({ path, filesystem }) {
   const onOpen = useOpenArtifact();
   if (!onOpen) {
     return /* @__PURE__ */ jsx11("span", { className: "font-mono text-[12.5px] text-foreground/85", children: path });
@@ -1542,7 +1544,8 @@ function PathLabel({ path }) {
   const open = (e) => {
     e.preventDefault();
     e.stopPropagation();
-    onOpen(path);
+    if (filesystem) onOpen(path, { filesystem });
+    else onOpen(path);
   };
   const handleKeyDown = (e) => {
     if (e.key === "Enter" || e.key === " ") open(e);
@@ -1603,11 +1606,11 @@ function renderRuntimeNotReady(part) {
 function renderReadinessBlock(part) {
   return renderWorkspaceNotReady(part) ?? renderRuntimeNotReady(part);
 }
-function pathTitle(prefix, path) {
+function pathTitle(prefix, path, filesystem) {
   return /* @__PURE__ */ jsxs10("span", { className: "flex min-w-0 items-center gap-1.5", children: [
     /* @__PURE__ */ jsx11("span", { className: "text-muted-foreground", children: prefix }),
     /* @__PURE__ */ jsx11("span", { className: "text-muted-foreground/40", "aria-hidden": "true", children: "\xB7" }),
-    /* @__PURE__ */ jsx11(PathLabel, { path })
+    /* @__PURE__ */ jsx11(PathLabel, { path, filesystem })
   ] });
 }
 function renderBash2(part) {
@@ -1649,10 +1652,11 @@ function renderRead2(part) {
   const input = asRecord2(part.input);
   const output = asRecord2(part.output);
   const path = typeof input.path === "string" ? input.path : "";
+  const filesystem = typeof input.filesystem === "string" ? input.filesystem : void 0;
   const content = extractTextContent(output);
   const lang = langFromPath(path);
   return /* @__PURE__ */ jsxs10(Tool2, { children: [
-    /* @__PURE__ */ jsx11(ToolHeader, { icon: /* @__PURE__ */ jsx11(FileTextIcon, { className: "size-4 text-muted-foreground" }), title: pathTitle("read", path), ...toHeaderProps(part) }),
+    /* @__PURE__ */ jsx11(ToolHeader, { icon: /* @__PURE__ */ jsx11(FileTextIcon, { className: "size-4 text-muted-foreground" }), title: pathTitle("read", path, filesystem), ...toHeaderProps(part) }),
     /* @__PURE__ */ jsxs10(ToolContent, { children: [
       /* @__PURE__ */ jsx11(ToolInput, { input }),
       content && /* @__PURE__ */ jsxs10("section", { className: "space-y-2", children: [
@@ -1667,11 +1671,12 @@ function renderWrite2(part) {
   if (readiness) return readiness;
   const input = asRecord2(part.input);
   const path = typeof input.path === "string" ? input.path : "";
+  const filesystem = typeof input.filesystem === "string" ? input.filesystem : void 0;
   const content = typeof input.content === "string" ? input.content : "";
   const bytes = content.length;
   const lang = langFromPath(path);
   return /* @__PURE__ */ jsxs10(Tool2, { children: [
-    /* @__PURE__ */ jsx11(ToolHeader, { icon: /* @__PURE__ */ jsx11(FilePlus2Icon, { className: "size-4 text-muted-foreground" }), title: pathTitle("write", path), ...toHeaderProps(part) }),
+    /* @__PURE__ */ jsx11(ToolHeader, { icon: /* @__PURE__ */ jsx11(FilePlus2Icon, { className: "size-4 text-muted-foreground" }), title: pathTitle("write", path, filesystem), ...toHeaderProps(part) }),
     /* @__PURE__ */ jsx11(ToolContent, { children: /* @__PURE__ */ jsxs10(Artifact, { className: "rounded-none border-0 bg-transparent shadow-none", children: [
       /* @__PURE__ */ jsxs10(ArtifactHeader, { className: "border-0 px-0 pt-0 pb-2", children: [
         /* @__PURE__ */ jsxs10("div", { children: [
@@ -1728,10 +1733,11 @@ function renderEdit2(part) {
   if (readiness) return readiness;
   const input = asRecord2(part.input);
   const path = typeof input.path === "string" ? input.path : "";
+  const filesystem = typeof input.filesystem === "string" ? input.filesystem : void 0;
   const oldString = typeof input.oldString === "string" ? input.oldString : "";
   const newString = typeof input.newString === "string" ? input.newString : "";
   return /* @__PURE__ */ jsxs10(Tool2, { children: [
-    /* @__PURE__ */ jsx11(ToolHeader, { icon: /* @__PURE__ */ jsx11(FileDiffIcon, { className: "size-4 text-muted-foreground" }), title: pathTitle("edit", path), ...toHeaderProps(part) }),
+    /* @__PURE__ */ jsx11(ToolHeader, { icon: /* @__PURE__ */ jsx11(FileDiffIcon, { className: "size-4 text-muted-foreground" }), title: pathTitle("edit", path, filesystem), ...toHeaderProps(part) }),
     /* @__PURE__ */ jsxs10(ToolContent, { children: [
       /* @__PURE__ */ jsxs10("section", { className: "space-y-2", children: [
         /* @__PURE__ */ jsx11("h4", { className: "font-medium text-muted-foreground text-xs uppercase tracking-wide", children: "Diff" }),
@@ -2658,7 +2664,17 @@ function useChatModelSelection({
     setModelState(next);
     writePiComposerModelSelection(next, { storageScope, storage });
   }, [storage, storageScope]);
+  const discoveryKey = useMemo2(
+    () => JSON.stringify({
+      apiBaseUrl: apiBaseUrl ?? "",
+      headers: Object.entries(requestHeaders ?? {}).sort(([a], [b]) => a.localeCompare(b)),
+      storageScope: storageScope ?? ""
+    }),
+    [apiBaseUrl, requestHeaders, storageScope]
+  );
   const [availableModels, setAvailableModels] = useState7([]);
+  const [loaded, setLoaded] = useState7(!enabled);
+  const [loadedDiscoveryKey, setLoadedDiscoveryKey] = useState7(enabled ? null : discoveryKey);
   useEffect5(() => {
     if (loadedSettingsSourceRef.current.storage !== storage || loadedSettingsSourceRef.current.storageScope !== storageScope) return;
     if (!userSelectedModel || !model) return;
@@ -2676,14 +2692,31 @@ function useChatModelSelection({
     setModelState(defaultModel);
   }, [defaultModel]);
   useEffect5(() => {
-    if (!enabled) return;
+    if (!enabled) {
+      setLoaded(true);
+      setLoadedDiscoveryKey(discoveryKey);
+      return;
+    }
     let aborted = false;
+    setLoaded(false);
     const nextFetch = fetchImpl ?? globalThis.fetch.bind(globalThis);
     nextFetch(agentResourceUrl(apiBaseUrl, "/api/v1/agent/models"), {
       headers: scopedHeaders2(requestHeaders, storageScope)
     }).then((res) => res.ok ? res.json() : null).then((payload) => {
-      if (aborted || !payload?.models) return;
+      if (aborted) return;
+      if (!payload?.models) {
+        userSelectedModelRef.current = false;
+        setUserSelectedModel(false);
+        setAvailableModels([]);
+        setModelState(null);
+        writePiComposerModelSelection(null, { storageScope, storage });
+        setLoadedDiscoveryKey(discoveryKey);
+        setLoaded(true);
+        return;
+      }
       setAvailableModels(payload.models);
+      setLoadedDiscoveryKey(discoveryKey);
+      setLoaded(true);
       const available = payload.models.filter((m) => m.available);
       setModelState((current) => {
         const currentAvailable = current ? available.some((m) => m.provider === current.provider && m.id === current.id) : false;
@@ -2691,14 +2724,24 @@ function useChatModelSelection({
         userSelectedModelRef.current = false;
         setUserSelectedModel(false);
         writePiComposerModelSelection(null, { storageScope, storage });
-        return payload.defaultModel ? { provider: payload.defaultModel.provider, id: payload.defaultModel.id } : null;
+        if (payload.defaultModel) return { provider: payload.defaultModel.provider, id: payload.defaultModel.id };
+        const firstAvailable = available[0];
+        return firstAvailable ? { provider: firstAvailable.provider, id: firstAvailable.id } : null;
       });
     }).catch(() => {
+      if (aborted) return;
+      userSelectedModelRef.current = false;
+      setUserSelectedModel(false);
+      setAvailableModels([]);
+      setModelState(null);
+      writePiComposerModelSelection(null, { storageScope, storage });
+      setLoadedDiscoveryKey(discoveryKey);
+      setLoaded(true);
     });
     return () => {
       aborted = true;
     };
-  }, [apiBaseUrl, enabled, fetchImpl, requestHeaders, storage, storageScope]);
+  }, [apiBaseUrl, discoveryKey, enabled, fetchImpl, requestHeaders, storage, storageScope]);
   useEffect5(() => {
     const onChange = (event) => {
       const next = parseModelSelection(event.detail);
@@ -2707,7 +2750,10 @@ function useChatModelSelection({
     globalThis.addEventListener?.("boring:model-change", onChange);
     return () => globalThis.removeEventListener?.("boring:model-change", onChange);
   }, [setModel]);
-  return { availableModels, model, setModel };
+  const currentDiscoveryLoaded = !enabled || loaded && loadedDiscoveryKey === discoveryKey;
+  const currentAvailableModels = currentDiscoveryLoaded ? availableModels : [];
+  const currentModel = currentDiscoveryLoaded ? model : null;
+  return { availableModels: currentAvailableModels, loaded: currentDiscoveryLoaded, model: currentModel, setModel };
 }
 function agentResourceUrl(apiBaseUrl, path) {
   const base = apiBaseUrl?.replace(/\/$/, "") ?? "";
@@ -2723,6 +2769,11 @@ function scopedHeaders2(headers, storageScope) {
 
 // src/front/hooks/useServerCommands.ts
 import { useEffect as useEffect6, useRef as useRef7, useState as useState8 } from "react";
+function serverCommandErrorMessage(body, fallback) {
+  if (typeof body.error === "string") return body.error;
+  if (body.error && typeof body.error === "object" && typeof body.error.message === "string") return body.error.message;
+  return fallback;
+}
 function toSlashCommand(command, getSessionId, apiBaseUrl, requestHeaders, fetchImpl) {
   return {
     name: command.name,
@@ -2743,7 +2794,7 @@ function toSlashCommand(command, getSessionId, apiBaseUrl, requestHeaders, fetch
           const body = await res.json().catch(() => ({}));
           if (typeof globalThis.dispatchEvent === "function") {
             globalThis.dispatchEvent(new CustomEvent(WORKSPACE_COMMAND_NOTIFY_EVENT, {
-              detail: { message: body.error ?? `/${command.name} failed`, tone: "error", command: command.name }
+              detail: { message: serverCommandErrorMessage(body, `/${command.name} failed`), tone: "error", command: command.name }
             }));
           }
         }
@@ -5663,7 +5714,7 @@ function sortByUpdatedDesc(a, b) {
   return a.id.localeCompare(b.id);
 }
 
-// ../../node_modules/.pnpm/@earendil-works+pi-tui@0.75.5/node_modules/@earendil-works/pi-tui/dist/fuzzy.js
+// ../../node_modules/.pnpm/@earendil-works+pi-tui@0.80.3/node_modules/@earendil-works/pi-tui/dist/fuzzy.js
 function fuzzyMatch(query, text) {
   const queryLower = query.toLowerCase();
   const textLower = text.toLowerCase();
@@ -6082,7 +6133,7 @@ function ComposerBlockerNotice({
     {
       role: "status",
       "aria-live": "polite",
-      className: noticeSurfaceClass("info", "mx-auto mb-2 w-full max-w-3xl text-xs"),
+      className: noticeSurfaceClass("info", "relative z-20 mx-auto mb-2 w-full max-w-3xl text-xs"),
       children: [
         /* @__PURE__ */ jsx16("span", { children: label }),
         blocker?.actions?.map((action) => {
@@ -7046,7 +7097,8 @@ function PiTimelineMessage({ message, isLast, isStreaming, showThoughts, toolRen
                     const canOpen = Boolean(openArtifact && openPath);
                     const openAttachment = () => {
                       if (!openPath) return;
-                      openArtifact?.(openPath);
+                      if (file.filesystem) openArtifact?.(openPath, { filesystem: file.filesystem });
+                      else openArtifact?.(openPath);
                     };
                     const openAttachmentFromKeyboard = (event) => {
                       if (event.key !== "Enter" && event.key !== " ") return;
@@ -9149,7 +9201,7 @@ function PiChatComposerSurface({
   useLayoutEffect2(() => {
     resizeTextarea(textareaRef.current);
   }, [draft, resizeTextarea, textareaRef]);
-  return /* @__PURE__ */ jsxs30("div", { className: cn(chrome ? "px-4 pb-4 pt-2 sm:px-6 sm:pb-5" : "px-3 pb-2 pt-1"), children: [
+  return /* @__PURE__ */ jsxs30("div", { className: cn("relative z-20", chrome ? "px-4 pb-4 pt-2 sm:px-6 sm:pb-5" : "px-3 pb-2 pt-1"), children: [
     /* @__PURE__ */ jsx32(
       "div",
       {
@@ -9733,6 +9785,7 @@ function PiChatPanel({
   const selectedPiSession = selectedChatState ? activePiSession : void 0;
   const chatStatePending = Boolean(activeSessionId && chatState && chatState.sessionId !== activeSessionId);
   const selectedSessionPending = Boolean(activeSessionId && !selectedChatState);
+  const modelDiscoveryEnabled = serverResourcesEnabled && availableModels === void 0;
   const modelDiscovery = useChatModelSelection({
     apiBaseUrl,
     defaultModel,
@@ -9740,13 +9793,19 @@ function PiChatPanel({
     requestHeaders: normalizedRequestHeaders,
     storage,
     storageScope,
-    enabled: serverResourcesEnabled && availableModels === void 0
+    enabled: modelDiscoveryEnabled
   });
   const selectedModel = model === void 0 ? modelDiscovery.model : model;
   const modelOptions = useMemo13(
     () => modelOptionsForSelection(availableModels ?? modelDiscovery.availableModels, selectedModel),
     [availableModels, modelDiscovery.availableModels, selectedModel]
   );
+  const selectedModelAuthorizedByDiscovery = !modelDiscoveryEnabled || Boolean(selectedModel && modelDiscovery.availableModels.some(
+    (modelOption) => modelOption.available && modelOption.provider === selectedModel.provider && modelOption.id === selectedModel.id
+  ));
+  const serverModelSelectionPending = modelDiscoveryEnabled && !modelDiscovery.loaded;
+  const serverModelSelectionUnavailable = modelDiscoveryEnabled && modelDiscovery.loaded && !selectedModelAuthorizedByDiscovery;
+  const serverModelSelectionReady = !serverModelSelectionPending && !serverModelSelectionUnavailable;
   const [storedThinkingLevel, setStoredThinkingLevel] = useState20(
     () => thinkingControl ? readPiComposerSettings({ storageScope, storage }).thinkingLevel : DEFAULT_THINKING
   );
@@ -10077,7 +10136,7 @@ function PiChatPanel({
     insertSlashCommand(name);
   }, [dismissSlash, insertSlashCommand, openModelPicker, openThinkingPicker, setComposerDraft]);
   const policy = useMemo13(() => {
-    if (!selectedPiSession || !activeChatSessionId) return void 0;
+    if (!selectedPiSession || !activeChatSessionId || !serverModelSelectionReady) return void 0;
     const policySession = {
       getState: () => {
         const state = selectedPiSession.getState();
@@ -10142,7 +10201,7 @@ function PiChatPanel({
         onMentionedFilesConsumed?.();
       }
     });
-  }, [activeChatSessionId, addLocalNotice, allowPromptDuringInitialHydration, clearMentionedFiles, composerBlocked, composerBlockerLabel, effectiveMentionedFiles, markLocalSubmitted, onBeforeSubmit, onCommandResult, onComposerWarning, onMentionedFilesConsumed, onPromptSubmitStarted, openModelPicker, openThinkingPicker, registry, reloadAgentPlugins, resetSession, runPluginUpdate, selectComposerModel, selectComposerThinking, selectedModel, selectedPiSession, selectedThinking, setComposerDraft, submitThinkingControl, suppressPreSubmitCancelledWarning]);
+  }, [activeChatSessionId, addLocalNotice, allowPromptDuringInitialHydration, clearMentionedFiles, composerBlocked, composerBlockerLabel, effectiveMentionedFiles, markLocalSubmitted, onBeforeSubmit, onCommandResult, onComposerWarning, onMentionedFilesConsumed, onPromptSubmitStarted, openModelPicker, openThinkingPicker, registry, reloadAgentPlugins, resetSession, runPluginUpdate, selectComposerModel, selectComposerThinking, selectedModel, selectedPiSession, selectedThinking, serverModelSelectionReady, setComposerDraft, submitThinkingControl, suppressPreSubmitCancelledWarning]);
   const surfaceRunRejected = useCallback18((error) => {
     const errorCode = piChatErrorCode(error);
     dropLocalNotice(RUN_REJECTED_NOTICE_ID);
@@ -10287,10 +10346,12 @@ function PiChatPanel({
   const initialHydrationPromptAllowed = Boolean(
     allowPromptDuringInitialHydration && selectedChatState && selectedChatState.status === "hydrating" && !selectedChatState.hydrated && selectedChatState.history.messageCount === 0 && selectedChatState.committedMessages.length === 0 && selectedChatState.queue.followUps.length === 0 && Object.keys(selectedChatState.optimisticOutbox).length === 0 && !selectedChatState.streamingMessage
   );
+  const noDiscoveredModelAvailable = modelDiscoveryEnabled && modelDiscovery.loaded && modelDiscovery.availableModels.every((modelOption) => !modelOption.available);
+  const modelSelectionBlocked = serverModelSelectionPending || serverModelSelectionUnavailable || noDiscoveredModelAvailable;
   const disabled = !policy || sessionsLoading || composerBlocked;
   const isStreaming = isPiBusyStatus(status);
   const submitStatus = initialHydrationPromptAllowed ? "ready" : toPromptSubmitStatus(status);
-  const submitDisabled = !policy || sessionsLoading || composerBlocked && !isStreaming;
+  const submitDisabled = !policy || sessionsLoading || modelSelectionBlocked || composerBlocked && !isStreaming;
   const mergedToolRenderers = useMemo13(() => mergeShadcnToolRenderers(toolRenderers), [toolRenderers]);
   const debugMessages = useMemo13(() => messages.map(toDebugUiMessage), [messages]);
   const onTextareaChange = useCallback18((event) => {
@@ -10309,13 +10370,6 @@ function PiChatPanel({
     window.dispatchEvent(new CustomEvent("boring:chat-session-status", {
       detail: { sessionId: activeChatSessionId, working: isStreaming }
     }));
-    if (!isStreaming) return;
-    const sessionId2 = activeChatSessionId;
-    return () => {
-      window.dispatchEvent(new CustomEvent("boring:chat-session-status", {
-        detail: { sessionId: sessionId2, working: false }
-      }));
-    };
   }, [activeChatSessionId, isStreaming]);
   const onTextareaKeyDown = useCallback18((event) => {
     if (event.key === "Escape" && isStreaming) {