@dxos/plugin-search 0.8.2-staging.7ac8446 → 0.8.2

package/dist/lib/browser/{react-surface-QBBLEI2Q.mjs → react-surface-UJOSZGP5.mjs}

@@ -4,151 +4,173 @@ import {
   useGlobalSearch,
   useGlobalSearchResults,
   useSearchResults
-} from "./chunk-NFZSXZMP.mjs";
+} from "./chunk-CKQAVN5U.mjs";
 import {
   SEARCH_PLUGIN,
   SEARCH_RESULT
-} from "./chunk-J6YWSQTW.mjs";
+} from "./chunk-ARZYMSFF.mjs";
 
 // packages/plugins/plugin-search/src/capabilities/react-surface.tsx
 import React5 from "react";
-import { Capabilities, contributes, createSurface, useLayout as useLayout2, useAppGraph as useAppGraph2 } from "@dxos/app-framework";
-import { getActiveSpace } from "@dxos/plugin-space";
+import { Capabilities, contributes, createSurface } from "@dxos/app-framework";
+import { useActiveSpace } from "@dxos/plugin-space";
 import { isSpace } from "@dxos/react-client/echo";
 
 // packages/plugins/plugin-search/src/components/Searchbar/Searchbar.tsx
+import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
 import { MagnifyingGlass } from "@phosphor-icons/react";
 import React, { useEffect, useRef, useState } from "react";
 import { Input } from "@dxos/react-ui";
 import { getSize, mx } from "@dxos/react-ui-theme";
 var Searchbar = ({ classes, variant, placeholder, value, onChange, onSubmit }) => {
-  const inputRef = useRef(null);
-  const [text, setText] = useState(value);
-  useEffect(() => {
-    setText(value);
-  }, [
-    value
-  ]);
-  const handleChange = (text2) => {
-    setText(text2);
-    onChange?.(text2);
-  };
-  const handleReset = () => {
-    handleChange(void 0);
-    inputRef.current?.focus();
-  };
-  const handleKeyDown = (event) => {
-    switch (event.key) {
-      case "Enter":
-        onSubmit?.(text);
-        break;
-      case "Escape":
-        handleReset();
-        break;
-    }
-  };
-  return /* @__PURE__ */ React.createElement("div", {
-    className: "flex shrink-0w-full items-center pli-1 pbs-1"
-  }, /* @__PURE__ */ React.createElement(Input.Root, null, /* @__PURE__ */ React.createElement(Input.TextInput, {
-    ref: inputRef,
-    placeholder,
-    variant,
-    value: text ?? "",
-    classNames: mx("pl-3 pr-10", classes?.input),
-    onChange: ({ target }) => handleChange(target.value),
-    onKeyDown: handleKeyDown
-  }), /* @__PURE__ */ React.createElement("div", {
-    role: "button",
-    className: "-ml-7 p-0 cursor-pointer",
-    onClick: handleReset
-  }, /* @__PURE__ */ React.createElement(MagnifyingGlass, {
-    className: getSize(5)
-  }))));
+  var _effect = _useSignals();
+  try {
+    const inputRef = useRef(null);
+    const [text, setText] = useState(value);
+    useEffect(() => {
+      setText(value);
+    }, [
+      value
+    ]);
+    const handleChange = (text2) => {
+      setText(text2);
+      onChange?.(text2);
+    };
+    const handleReset = () => {
+      handleChange(void 0);
+      inputRef.current?.focus();
+    };
+    const handleKeyDown = (event) => {
+      switch (event.key) {
+        case "Enter":
+          onSubmit?.(text);
+          break;
+        case "Escape":
+          handleReset();
+          break;
+      }
+    };
+    return /* @__PURE__ */ React.createElement("div", {
+      className: "flex shrink-0w-full items-center pli-1 pbs-1"
+    }, /* @__PURE__ */ React.createElement(Input.Root, null, /* @__PURE__ */ React.createElement(Input.TextInput, {
+      ref: inputRef,
+      placeholder,
+      variant,
+      value: text ?? "",
+      classNames: mx("pl-3 pr-10", classes?.input),
+      onChange: ({ target }) => handleChange(target.value),
+      onKeyDown: handleKeyDown
+    }), /* @__PURE__ */ React.createElement("div", {
+      role: "button",
+      className: "-ml-7 p-0 cursor-pointer",
+      onClick: handleReset
+    }, /* @__PURE__ */ React.createElement(MagnifyingGlass, {
+      className: getSize(5)
+    }))));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/plugins/plugin-search/src/components/SearchMain.tsx
+import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
 import React3, { useState as useState3 } from "react";
 import { log as log3 } from "@dxos/log";
 import { useClient } from "@dxos/react-client";
 import { Filter, useQuery } from "@dxos/react-client/echo";
 import { useTranslation } from "@dxos/react-ui";
-import { groupSurface, mx as mx3 } from "@dxos/react-ui-theme";
+import { activeSurface, mx as mx3 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-search/src/components/SearchResults/SearchResults.tsx
+import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
 import React2, { forwardRef } from "react";
 import { Card } from "@dxos/react-ui-card";
 import { ghostHover, mx as mx2 } from "@dxos/react-ui-theme";
 var Snippet = ({ text, match }) => {
-  let content = /* @__PURE__ */ React2.createElement(React2.Fragment, null, text);
-  if (match) {
-    const result = text.match(match);
-    if (result?.index !== void 0) {
-      const maxOffset = 16;
-      let before = text.slice(0, result.index);
-      if (before.length > maxOffset) {
-        const idx = before.indexOf(" ", result.index - maxOffset);
-        before = "\u2026 " + before.slice(idx);
+  var _effect = _useSignals2();
+  try {
+    let content = /* @__PURE__ */ React2.createElement(React2.Fragment, null, text);
+    if (match) {
+      const result = text.match(match);
+      if (result?.index !== void 0) {
+        const maxOffset = 16;
+        let before = text.slice(0, result.index);
+        if (before.length > maxOffset) {
+          const idx = before.indexOf(" ", result.index - maxOffset);
+          before = "\u2026 " + before.slice(idx);
+        }
+        const after = text.slice(result.index + result[0].length);
+        content = /* @__PURE__ */ React2.createElement(React2.Fragment, null, before, /* @__PURE__ */ React2.createElement("span", {
+          className: "text-blue-500"
+        }, result[0]), after);
       }
-      const after = text.slice(result.index + result[0].length);
-      content = /* @__PURE__ */ React2.createElement(React2.Fragment, null, before, /* @__PURE__ */ React2.createElement("span", {
-        className: "text-blue-500"
-      }, result[0]), after);
     }
+    return /* @__PURE__ */ React2.createElement("span", {
+      className: "text-xs mb-1 line-clamp-3 text-neutral-300"
+    }, content);
+  } finally {
+    _effect.f();
   }
-  return /* @__PURE__ */ React2.createElement("span", {
-    className: "text-xs mb-1 line-clamp-3 text-neutral-300"
-  }, content);
 };
 var SearchItem = /* @__PURE__ */ forwardRef((item, forwardRef3) => {
-  const { id, objectType, label, snippet, match, selected, onSelect } = item;
-  const Icon2 = void 0;
-  return /* @__PURE__ */ React2.createElement(Card.Root, {
-    ref: forwardRef3,
-    classNames: mx2("mx-2 mt-2 cursor-pointer", selected && "!bg-groupSurface", ghostHover),
-    onClick: () => onSelect?.(id)
-  }, objectType && /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement("div", {
-    className: "text-xs text-neutral-400 ml-4"
-  }, objectType)), /* @__PURE__ */ React2.createElement(Card.Header, null, /* @__PURE__ */ React2.createElement(Card.Title, {
-    title: label ?? "Untitled"
-  }), Icon2 && /* @__PURE__ */ React2.createElement(Card.Endcap, {
-    Icon: Icon2
-  })), snippet && /* @__PURE__ */ React2.createElement(Card.Body, {
-    gutter: true
-  }, /* @__PURE__ */ React2.createElement(Snippet, {
-    text: snippet,
-    match
-  })));
+  var _effect = _useSignals2();
+  try {
+    const { id, objectType, label, snippet, match, selected, onSelect } = item;
+    const Icon2 = void 0;
+    return /* @__PURE__ */ React2.createElement(Card.Root, {
+      ref: forwardRef3,
+      classNames: mx2("mx-2 mt-2 cursor-pointer", selected && "!bg-activeSurface", ghostHover),
+      onClick: () => onSelect?.(id)
+    }, objectType && /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement("div", {
+      className: "text-xs text-neutral-400 ml-4"
+    }, objectType)), /* @__PURE__ */ React2.createElement(Card.Header, null, /* @__PURE__ */ React2.createElement(Card.Title, {
+      title: label ?? "Untitled"
+    }), Icon2 && /* @__PURE__ */ React2.createElement(Card.Endcap, {
+      Icon: Icon2
+    })), snippet && /* @__PURE__ */ React2.createElement(Card.Body, {
+      gutter: true
+    }, /* @__PURE__ */ React2.createElement(Snippet, {
+      text: snippet,
+      match
+    })));
+  } finally {
+    _effect.f();
+  }
 });
 var SearchResults = ({ items, selected, onSelect }) => {
-  return /* @__PURE__ */ React2.createElement("div", {
-    className: "flex flex-col grow overflow-y-auto"
-  }, /* @__PURE__ */ React2.createElement("div", {
-    className: "flex flex-col"
-  }, items.map((item) => /* @__PURE__ */ React2.createElement(SearchItem, {
-    key: item.id,
-    type: SEARCH_RESULT,
-    ...item,
-    onSelect,
-    selected: selected === item.id
-  }))));
+  var _effect = _useSignals2();
+  try {
+    return /* @__PURE__ */ React2.createElement("div", {
+      className: "flex flex-col grow overflow-y-auto"
+    }, /* @__PURE__ */ React2.createElement("div", {
+      className: "flex flex-col"
+    }, items.map((item) => /* @__PURE__ */ React2.createElement(SearchItem, {
+      key: item.id,
+      type: SEARCH_RESULT,
+      ...item,
+      onSelect,
+      selected: selected === item.id
+    }))));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/plugins/plugin-search/src/hooks/useWebSearch.ts
 import { useState as useState2 } from "react";
-import { AIServiceEdgeClient } from "@dxos/assistant";
-import { AI_SERVICE_ENDPOINT } from "@dxos/assistant/testing";
+import { AIServiceEdgeClient } from "@dxos/ai";
+import { AI_SERVICE_ENDPOINT, EXA_API_KEY } from "@dxos/ai/testing";
 import { getSchema, getTypename } from "@dxos/echo-schema";
 import { log as log2 } from "@dxos/log";
 import { getIconAnnotation } from "@dxos/schema";
 import { Testing } from "@dxos/schema/testing";
 
 // packages/plugins/plugin-search/src/search/exa.ts
-import { Option, SchemaAST as AST } from "effect";
+import { Option, Schema, SchemaAST } from "effect";
 import Exa from "exa-js";
-import { defineTool, Message } from "@dxos/artifact";
-import { MixedStreamParser } from "@dxos/assistant";
+import { Message, MixedStreamParser, createTool } from "@dxos/ai";
 import { isEncodedReference } from "@dxos/echo-protocol";
-import { createStatic, getTypeAnnotation, ObjectId, ReferenceAnnotationId, S } from "@dxos/echo-schema";
+import { create, getTypeAnnotation, ObjectId, ReferenceAnnotationId } from "@dxos/echo-schema";
 import { mapAst } from "@dxos/effect";
 import { assertArgument, failedInvariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
@@ -163,7 +185,7 @@ var search = async (options) => {
       additionalSearchTerms: contextSearchTerms
     }, {
       F: __dxlog_file,
-      L: 47,
+      L: 53,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -182,7 +204,7 @@ var search = async (options) => {
     context
   }, {
     F: __dxlog_file,
-    L: 63,
+    L: 69,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -201,7 +223,7 @@ var search = async (options) => {
     model: "@anthropic/claude-3-5-haiku-20241022",
     systemPrompt,
     history: [
-      createStatic(Message, {
+      create(Message, {
         role: "user",
         content: context.results.map((r) => ({
           type: "text",
@@ -211,11 +233,11 @@ ${r.text}`
         }))
       })
     ],
-    schema: S.Struct({
+    schema: Schema.Struct({
       ...Object.fromEntries(mappedSchema.map((schema, index) => [
         `objects_${index}`,
-        S.Array(schema).annotations({
-          description: `The objects to answer the query of type ${getTypeAnnotation(schema)?.typename ?? AST.getIdentifierAnnotation(schema.ast).pipe(Option.getOrNull)}`
+        Schema.Array(schema).annotations({
+          description: `The objects to answer the query of type ${getTypeAnnotation(schema)?.typename ?? SchemaAST.getIdentifierAnnotation(schema.ast).pipe(Option.getOrNull)}`
         })
       ]))
     })
@@ -225,7 +247,7 @@ ${r.text}`
     result
   }, {
     F: __dxlog_file,
-    L: 107,
+    L: 113,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -260,11 +282,11 @@ var DATA_EXTRACTION_INSTRUCTIONS = `
     - Prefer using ids when available.
 `;
 var getStructuredOutput = async (aiService, request) => {
-  const result = await new MixedStreamParser().parse(await aiService.exec({
+  const result = await new MixedStreamParser().parse(await aiService.execStream({
     ...request,
     systemPrompt: request.systemPrompt + "\nDo not output anything other then the tool call. Call the submit_result tool with the result.",
     tools: [
-      defineTool("submit_result", {
+      createTool("submit_result", {
         name: "submit_result",
         description: "Submit the result",
         schema: request.schema,
@@ -284,7 +306,7 @@ var getSearchTerms = async (aiService, context) => {
       Prefer own names of people, companies, and projects, technologies, and other entities.
     `,
     history: [
-      createStatic(Message, {
+      create(Message, {
         role: "user",
         content: [
           {
@@ -296,8 +318,8 @@ ${context}`
         ]
       })
     ],
-    schema: S.Struct({
-      terms: S.Array(S.String).annotations({
+    schema: Schema.Struct({
+      terms: Schema.Array(Schema.String).annotations({
         description: "The search terms to use to find the objects. 0-10 terms."
       })
     })
@@ -326,27 +348,26 @@ var sanitizeObjects = (entries) => {
       }
       return recurse(value);
     });
-    return createStatic(entry.schema, data);
+    return create(entry.schema, data);
   });
 };
-var SoftRef = S.Struct({
-  "/": S.String
+var SoftRef = Schema.Struct({
+  "/": Schema.String
 }).annotations({
   description: "Reference to another object."
 });
 var mapSchemaRefs = (schema) => {
   const go = (ast) => {
-    if (AST.getAnnotation(ast, ReferenceAnnotationId).pipe(Option.isSome)) {
+    if (SchemaAST.getAnnotation(ast, ReferenceAnnotationId).pipe(Option.isSome)) {
       return SoftRef.ast;
     }
     return mapAst(ast, go);
   };
-  return S.make(mapAst(schema.ast, go));
+  return Schema.make(mapAst(schema.ast, go));
 };
 
 // packages/plugins/plugin-search/src/hooks/useWebSearch.ts
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-search/src/hooks/useWebSearch.ts";
-var EXA_API_KEY = "9c7e17ff-0c85-4cd5-827a-8b489f139e03";
 var useWebSearch = ({ query, context }) => {
   const aiService = new AIServiceEdgeClient({
     endpoint: AI_SERVICE_ENDPOINT.REMOTE
@@ -361,7 +382,7 @@ var useWebSearch = ({ query, context }) => {
         context
       }, {
         F: __dxlog_file2,
-        L: 33,
+        L: 30,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -370,7 +391,7 @@ var useWebSearch = ({ query, context }) => {
         context,
         schema: [
           Testing.Project,
-          Testing.Org,
+          Testing.Organization,
           Testing.Contact
         ],
         aiService,
@@ -411,54 +432,61 @@ var useWebSearch = ({ query, context }) => {
 // packages/plugins/plugin-search/src/components/SearchMain.tsx
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-search/src/components/SearchMain.tsx";
 var SearchMain = ({ classNames, space }) => {
-  const { t } = useTranslation(SEARCH_PLUGIN);
-  const client = useClient();
-  const { setMatch } = useGlobalSearch();
-  const [query, setQuery] = useState3();
-  const allSpaces = false;
-  const objects = useQuery(allSpaces ? client.spaces : space, Filter.all());
-  const results = useGlobalSearchResults(objects);
-  const { runSearch, results: webResults, isLoading } = useWebSearch({
-    query
-  });
-  const [selected, setSelected] = useState3();
-  const handleSelect = (id) => {
-    setSelected((selected2) => selected2 === id ? void 0 : id);
-  };
-  const allResults = [
-    ...results,
-    ...webResults
-  ];
-  log3.info("results", {
-    results,
-    webResults
-  }, {
-    F: __dxlog_file3,
-    L: 47,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
-  return /* @__PURE__ */ React3.createElement("div", {
-    className: mx3("flex flex-col grow h-full overflow-hidden", classNames)
-  }, /* @__PURE__ */ React3.createElement(Searchbar, {
-    placeholder: t("search placeholder"),
-    onChange: (text) => {
-      setQuery(text);
-      setMatch?.(text);
-    },
-    onSubmit: runSearch
-  }), isLoading && /* @__PURE__ */ React3.createElement("div", {
-    className: mx3("flex flex-col grow overflow-hidden", groupSurface)
-  }, "Loading..."), allResults.length > 0 && /* @__PURE__ */ React3.createElement("div", {
-    className: mx3("flex flex-col grow overflow-hidden", groupSurface)
-  }, /* @__PURE__ */ React3.createElement(SearchResults, {
-    items: allResults,
-    selected,
-    onSelect: handleSelect
-  })));
+  var _effect = _useSignals3();
+  try {
+    const { t } = useTranslation(SEARCH_PLUGIN);
+    const client = useClient();
+    const { setMatch } = useGlobalSearch();
+    const [query, setQuery] = useState3();
+    const allSpaces = false;
+    const objects = useQuery(allSpaces ? client.spaces : space, Filter.everything());
+    const results = useGlobalSearchResults(objects);
+    const { runSearch, results: webResults, isLoading } = useWebSearch({
+      query
+    });
+    const [selected, setSelected] = useState3();
+    const handleSelect = (id) => {
+      setSelected((selected2) => selected2 === id ? void 0 : id);
+    };
+    const allResults = [
+      ...results,
+      ...webResults
+    ];
+    log3.info("results", {
+      results,
+      webResults
+    }, {
+      F: __dxlog_file3,
+      L: 47,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    return /* @__PURE__ */ React3.createElement("div", {
+      className: mx3("flex flex-col grow h-full overflow-hidden", classNames)
+    }, /* @__PURE__ */ React3.createElement(Searchbar, {
+      placeholder: t("search placeholder"),
+      onChange: (text) => {
+        setQuery(text);
+        setMatch?.(text);
+      },
+      onSubmit: runSearch
+    }), isLoading && /* @__PURE__ */ React3.createElement("div", {
+      className: mx3("flex flex-col grow overflow-hidden", activeSurface)
+    }, "Loading..."), allResults.length > 0 && /* @__PURE__ */ React3.createElement("div", {
+      className: mx3("flex flex-col grow overflow-hidden", activeSurface)
+    }, /* @__PURE__ */ React3.createElement(SearchResults, {
+      items: allResults,
+      selected,
+      onSelect: handleSelect
+    })));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/plugins/plugin-search/src/components/SearchDialog.tsx
+import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
+import { Option as Option2 } from "effect";
 import React4, { forwardRef as forwardRef2, useCallback, useState as useState4 } from "react";
 import { LayoutAction, createIntent, useAppGraph, useIntentDispatcher, useLayout } from "@dxos/app-framework";
 import { useClient as useClient2 } from "@dxos/react-client";
@@ -468,100 +496,110 @@ import { SearchList } from "@dxos/react-ui-searchlist";
 import { descriptionText, mx as mx4 } from "@dxos/react-ui-theme";
 var SEARCH_DIALOG = `${SEARCH_PLUGIN}/SearchDialog`;
 var SearchListResult = /* @__PURE__ */ forwardRef2(({ node, onSelect }, forwardedRef) => {
-  const { t } = useTranslation2(SEARCH_PLUGIN);
-  const label = toLocalizedString(node?.properties.label ?? "never", t);
-  return /* @__PURE__ */ React4.createElement(SearchList.Item, {
-    value: label,
-    key: node.id,
-    classNames: "flex gap-2 items-center pli-2",
-    onSelect: () => onSelect?.(node.id),
-    ref: forwardedRef
-  }, /* @__PURE__ */ React4.createElement(Icon, {
-    size: 5,
-    icon: node?.properties.icon
-  }), /* @__PURE__ */ React4.createElement("span", {
-    className: "is-0 grow truncate"
-  }, label));
+  var _effect = _useSignals4();
+  try {
+    const { t } = useTranslation2(SEARCH_PLUGIN);
+    const label = toLocalizedString(node?.properties.label ?? "never", t);
+    return /* @__PURE__ */ React4.createElement(SearchList.Item, {
+      value: label,
+      key: node.id,
+      classNames: "flex gap-2 items-center pli-2",
+      onSelect: () => onSelect?.(node.id),
+      ref: forwardedRef
+    }, /* @__PURE__ */ React4.createElement(Icon, {
+      size: 5,
+      icon: node?.properties.icon
+    }), /* @__PURE__ */ React4.createElement("span", {
+      className: "is-0 grow truncate"
+    }, label));
+  } finally {
+    _effect.f();
+  }
 });
 var SearchDialog = ({ pivotId }) => {
-  const { t } = useTranslation2(SEARCH_PLUGIN);
-  const { graph } = useAppGraph();
-  const layout = useLayout();
-  const closed = (Array.isArray(layout.inactive) ? layout.inactive : [
-    layout.inactive
-  ]).map((id) => graph?.findNode(id)).filter(Boolean);
-  const [queryString, setQueryString] = useState4("");
-  const client = useClient2();
-  const dangerouslyLoadAllObjects = useQuery2(client.spaces, Filter2.all());
-  const [pending, results] = useSearchResults(queryString, dangerouslyLoadAllObjects);
-  const resultObjects = Array.from(results.keys());
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const handleSelect = useCallback(async (nodeId) => {
-    await dispatch(createIntent(LayoutAction.UpdateDialog, {
-      part: "dialog",
-      options: {
-        state: false
-      }
-    }));
-    const index = layout.active.findIndex((id) => id === nodeId);
-    if (index !== -1) {
-      await dispatch(createIntent(LayoutAction.ScrollIntoView, {
-        part: "current",
-        subject: nodeId
-      }));
-    } else {
-      await dispatch(createIntent(LayoutAction.Open, {
-        part: "main",
-        subject: [
-          nodeId
-        ],
+  var _effect = _useSignals4();
+  try {
+    const { t } = useTranslation2(SEARCH_PLUGIN);
+    const { graph } = useAppGraph();
+    const layout = useLayout();
+    const closed = (Array.isArray(layout.inactive) ? layout.inactive : [
+      layout.inactive
+    ]).map((id) => graph?.getNode(id)).filter(Boolean);
+    const [queryString, setQueryString] = useState4("");
+    const client = useClient2();
+    const dangerouslyLoadAllObjects = useQuery2(client.spaces, Filter2.everything());
+    const [pending, results] = useSearchResults(queryString, dangerouslyLoadAllObjects);
+    const resultObjects = Array.from(results.keys());
+    const { dispatchPromise: dispatch } = useIntentDispatcher();
+    const handleSelect = useCallback(async (nodeId) => {
+      await dispatch(createIntent(LayoutAction.UpdateDialog, {
+        part: "dialog",
         options: {
-          pivotId,
-          positioning: "end"
+          state: false
         }
       }));
-    }
-  }, [
-    pivotId,
-    dispatch,
-    layout
-  ]);
-  return /* @__PURE__ */ React4.createElement(Dialog.Content, {
-    classNames: [
-      "md:max-is-[24rem] overflow-hidden mbs-12"
-    ]
-  }, /* @__PURE__ */ React4.createElement(Dialog.Title, null, t("search dialog title")), /* @__PURE__ */ React4.createElement(SearchList.Root, {
-    label: t("search placeholder"),
-    classNames: "flex flex-col grow overflow-hidden my-2"
-  }, /* @__PURE__ */ React4.createElement(SearchList.Input, {
-    value: queryString,
-    onValueChange: (nextValue) => {
-      setQueryString(nextValue);
-    },
-    placeholder: t("search placeholder"),
-    classNames: "px-1 my-2"
-  }), /* @__PURE__ */ React4.createElement(SearchList.Content, {
-    classNames: "max-bs-[24rem] overflow-auto"
-  }, queryString.length > 0 ? resultObjects.length > 0 ? resultObjects.map((object) => graph?.findNode(fullyQualifiedId(object))).filter(Boolean).map((node) => /* @__PURE__ */ React4.createElement(SearchListResult, {
-    key: node.id,
-    node,
-    onSelect: handleSelect
-  })) : /* @__PURE__ */ React4.createElement("p", {
-    className: "pli-1"
-  }, t(pending ? "pending results message" : "empty results message")) : /* @__PURE__ */ React4.createElement(React4.Fragment, null, closed.length > 0 && /* @__PURE__ */ React4.createElement("h2", {
-    className: mx4("mlb-1", descriptionText)
-  }, t("recently closed heading")), closed.map((node) => /* @__PURE__ */ React4.createElement(SearchListResult, {
-    key: node.id,
-    node,
-    onSelect: handleSelect
-  }))))), /* @__PURE__ */ React4.createElement(Dialog.Close, {
-    asChild: true
-  }, /* @__PURE__ */ React4.createElement(Button, {
-    variant: "primary",
-    classNames: "mbs-2"
-  }, t("close label", {
-    ns: "os"
-  }))));
+      const index = layout.active.findIndex((id) => id === nodeId);
+      if (index !== -1) {
+        await dispatch(createIntent(LayoutAction.ScrollIntoView, {
+          part: "current",
+          subject: nodeId
+        }));
+      } else {
+        await dispatch(createIntent(LayoutAction.Open, {
+          part: "main",
+          subject: [
+            nodeId
+          ],
+          options: {
+            pivotId,
+            positioning: "end"
+          }
+        }));
+      }
+    }, [
+      pivotId,
+      dispatch,
+      layout
+    ]);
+    return /* @__PURE__ */ React4.createElement(Dialog.Content, {
+      classNames: [
+        "md:max-is-[24rem] overflow-hidden mbs-12"
+      ]
+    }, /* @__PURE__ */ React4.createElement(Dialog.Title, null, t("search dialog title")), /* @__PURE__ */ React4.createElement(SearchList.Root, {
+      label: t("search placeholder"),
+      classNames: "flex flex-col grow overflow-hidden my-2"
+    }, /* @__PURE__ */ React4.createElement(SearchList.Input, {
+      value: queryString,
+      onValueChange: (nextValue) => {
+        setQueryString(nextValue);
+      },
+      placeholder: t("search placeholder"),
+      classNames: "px-1 my-2"
+    }), /* @__PURE__ */ React4.createElement(SearchList.Content, {
+      classNames: "max-bs-[24rem] overflow-auto"
+    }, queryString.length > 0 ? resultObjects.length > 0 ? resultObjects.map((object) => graph.getNode(fullyQualifiedId(object))).filter(Option2.isSome).map((node) => /* @__PURE__ */ React4.createElement(SearchListResult, {
+      key: node.value.id,
+      node: node.value,
+      onSelect: handleSelect
+    })) : /* @__PURE__ */ React4.createElement("p", {
+      className: "pli-1"
+    }, t(pending ? "pending results message" : "empty results message")) : /* @__PURE__ */ React4.createElement(React4.Fragment, null, closed.length > 0 && /* @__PURE__ */ React4.createElement("h2", {
+      className: mx4("mlb-1", descriptionText)
+    }, t("recently closed heading")), closed.filter(Option2.isSome).map((node) => /* @__PURE__ */ React4.createElement(SearchListResult, {
+      key: node.value.id,
+      node: node.value,
+      onSelect: handleSelect
+    }))))), /* @__PURE__ */ React4.createElement(Dialog.Close, {
+      asChild: true
+    }, /* @__PURE__ */ React4.createElement(Button, {
+      variant: "primary",
+      classNames: "mbs-2"
+    }, t("close label", {
+      ns: "os"
+    }))));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/plugins/plugin-search/src/capabilities/react-surface.tsx
@@ -573,13 +611,10 @@ var react_surface_default = () => contributes(Capabilities.ReactSurface, [
     component: ({ data }) => /* @__PURE__ */ React5.createElement(SearchContextProvider, null, /* @__PURE__ */ React5.createElement(SearchDialog, data.props))
   }),
   createSurface({
-    // id: `${SEARCH_DIALOG}/search-input`,
-    id: "search-input",
+    id: `${SEARCH_DIALOG}/search-input`,
     role: "search-input",
     component: () => {
-      const layout = useLayout2();
-      const { graph } = useAppGraph2();
-      const space = graph ? getActiveSpace(graph, layout.active[0]) : void 0;
+      const space = useActiveSpace();
       if (!space) {
         return null;
       }
@@ -606,4 +641,4 @@ var react_surface_default = () => contributes(Capabilities.ReactSurface, [
 export {
   react_surface_default as default
 };
-//# sourceMappingURL=react-surface-QBBLEI2Q.mjs.map
+//# sourceMappingURL=react-surface-UJOSZGP5.mjs.map