@dxos/plugin-assistant 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/PLUGIN.mdl

@@ -4,7 +4,7 @@ name: AssistantPlugin
 version: 0.1.0
 ---
 
-An AI assistant plugin for DXOS Composer that provides conversational AI, blueprint-driven automation,
+An AI assistant plugin for DXOS Composer that provides conversational AI, skill-driven automation,
 multi-provider LLM support, and deep ECHO integration.
 
 ## Extensions
@@ -76,7 +76,7 @@ type NavigationTarget
 ```
 
 ```mdl
-type BlueprintForm
+type SkillForm
   fields:
     key: string
     name: string
@@ -174,18 +174,12 @@ op SetCurrentChat
 
 ```mdl
 op RunPromptInNewChat
-  desc: Creates a new chat, binds context objects and blueprints, then runs a prompt.
-  input:
-    db: Database
-    objects?: Obj[]
-    blueprints?: string[]
-    prompt: string | RoutineRef
-    background?: boolean
-  output: Chat
-  effects: [echo:write, ai:infer]
+  desc: Creates a new chat, binds context objects and skills, then runs a prompt.
   note: |
-    When background is true, the prompt runs via the compute runtime without
-    opening the chat UI. The returned Chat can be used to track progress.
+    Operation DEFINED in plugin-routine (RoutineOperation.RunPromptInNewChat)
+    so Routine UI and downstream plugins can dispatch it without depending on
+    plugin-assistant. The HANDLER (chat creation + AiContext binding) is contributed
+    here; see operations/run-prompt-in-new-chat.ts.
 ```
 
 ```mdl
@@ -256,14 +250,14 @@ feat F-2: Companion Chat
 ```
 
 ```mdl
-feat F-3: Blueprint System
+feat F-3: Skill System
 
-  req F-3.1: Blueprints define named AI configurations (instructions, tools, model).
-  req F-3.2: Built-in blueprints include: Assistant, Browser, Database, WebSearch, Discord, Linear, Agent, Planning, Memory, Automation, BlueprintManager, AgentWizard.
+  req F-3.1: Skills define named AI configurations (instructions, tools, model).
+  req F-3.2: Built-in skills include: Assistant, Browser, Database, WebSearch, Discord, Linear, Agent, Planning, Memory, Automation, SkillManager, AgentWizard.
   req F-3.3:
-    when: user selects a blueprint for a chat
-    then: chat uses that blueprint's instructions and tool set
-  req F-3.4: op:RunPromptInNewChat accepts blueprint keys to bind before sending the prompt.
+    when: user selects a skill for a chat
+    then: chat uses that skill's instructions and tool set
+  req F-3.4: op:RunPromptInNewChat accepts skill keys to bind before sending the prompt.
 ```
 
 ```mdl
@@ -279,7 +273,7 @@ feat F-4: Multi-Provider LLM
 ```mdl
 feat F-5: Tool Execution
 
-  req F-5.1: The assistant blueprint exposes LayoutOperation.Open and ResolveNavigationTargets as tools.
+  req F-5.1: The assistant skill exposes LayoutOperation.Open and ResolveNavigationTargets as tools.
   req F-5.2: Web search tool is registered via WebSearchToolkit.
   req F-5.3:
     when: AI invokes a tool during a conversation
@@ -289,7 +283,7 @@ feat F-5: Tool Execution
 ```mdl
 feat F-6: ECHO Integration
 
-  req F-6.1: Chat, CompanionTo, Blueprint, Feed, Message, Memory, Plan, Routine, Agent, McpServer, and Sequence schemas are registered with ECHO.
+  req F-6.1: Chat, CompanionTo, Skill, Feed, Message, Memory, Plan, Routine, Agent, McpServer, and Sequence schemas are registered with ECHO.
   req F-6.2:
     when: a new space is created
     then: op:OnCreateSpace provisions default assistant objects
@@ -325,11 +319,11 @@ test T-2: Companion chat provisioning
 ```
 
 ```mdl
-test T-3: Blueprint binding
+test T-3: Skill binding
   given: a chat exists
-  when: user binds the "WebSearch" blueprint key
+  when: user binds the "WebSearch" skill key
   then:
-    - blueprint instructions are applied to the next AI request
+    - skill instructions are applied to the next AI request
     - web search tool is available in the tool list
 ```
 

package/dist/lib/neutral/{AgentArticle-2BEPWUMN.mjs → AgentArticle-GV6EEW3I.mjs}

@@ -23,7 +23,6 @@ var AgentArticle = ({ role, subject: agent }) => {
   const [viewport, setViewport] = useState(null);
   const spaceId = Obj.getDatabase(agent)?.spaceId;
   const resetHistory = useSpaceCallback(spaceId, [
-    Feed.FeedService,
     Database.Service
   ], Effect.fnUntraced(function* () {
     yield* Agent.resetChatHistory(agent);
@@ -159,4 +158,4 @@ StackTile.displayName = "StackTile";
 export {
   AgentArticle as default
 };
-//# sourceMappingURL=AgentArticle-2BEPWUMN.mjs.map
+//# sourceMappingURL=AgentArticle-GV6EEW3I.mjs.map

package/dist/lib/neutral/AgentArticle-GV6EEW3I.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/containers/AgentArticle/AgentArticle.tsx"],
+  "sourcesContent": ["//\n// Copyright 2026 DXOS.org\n//\n\nimport { Atom, useAtomValue } from '@effect-atom/atom-react';\nimport * as Effect from 'effect/Effect';\nimport * as Option from 'effect/Option';\nimport React, { forwardRef, useCallback, useMemo, useState } from 'react';\n\nimport { Surface, useSpaceCallback } from '@dxos/app-framework/ui';\nimport { AppSurface, useObjectMenuItems } from '@dxos/app-toolkit/ui';\nimport { Agent } from '@dxos/assistant-toolkit';\nimport { Database, Feed, Filter, Obj, Query, Ref } from '@dxos/echo';\nimport { useQuery } from '@dxos/react-client/echo';\nimport { Card, Icon, IconButton, Message, Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';\nimport { composable } from '@dxos/react-ui';\nimport { Masonry } from '@dxos/react-ui-masonry';\nimport { Menu } from '@dxos/react-ui-menu';\nimport { Focus, Mosaic, type MosaicTileProps } from '@dxos/react-ui-mosaic';\nimport { isNonNullable } from '@dxos/util';\n\nimport { meta } from '#meta';\n\ntype Tab = 'artifacts' | 'inputs';\n\nexport type AgentArticleProps = AppSurface.ObjectArticleProps<Agent.Agent>;\n\nexport const AgentArticle = ({ role, subject: agent }: AgentArticleProps) => {\n  const { t } = useTranslation(meta.profile.key);\n  const [tab, setTab] = useState<Tab>('artifacts');\n  const [viewport, setViewport] = useState<HTMLElement | null>(null);\n\n  const spaceId = Obj.getDatabase(agent)?.spaceId;\n  // TODO(burdon): Clear input feed also.\n  const resetHistory = useSpaceCallback(\n    spaceId,\n    [Database.Service] as const,\n    Effect.fnUntraced(function* () {\n      yield* Agent.resetChatHistory(agent);\n      if (!agent.feed) {\n        const feed = yield* Database.add(Feed.make());\n        Obj.update(agent, (agent) => {\n          agent.feed = Ref.make(feed);\n        });\n      }\n    }),\n    [agent],\n  );\n  const handleResetHistory = useCallback(async () => {\n    await resetHistory();\n  }, [resetHistory]);\n\n  const artifacts = useAtomValue(\n    useMemo(\n      () =>\n        Obj.atom(agent).pipe((agent) =>\n          Atom.make((get) => {\n            return get(agent)\n              .artifacts.map((artifact) => get(artifact.data.atom))\n              .filter(isNonNullable);\n          }),\n        ),\n      [agent],\n    ),\n  );\n\n  const inputFeed = useAtomValue(\n    Obj.atom(agent).pipe((_) =>\n      Atom.make((get) =>\n        Option.fromNullable(get(_).feed).pipe(\n          Option.map((ref) => ref.atom),\n          Option.map(get),\n          Option.getOrUndefined,\n        ),\n      ),\n    ),\n  );\n\n  const db = Obj.getDatabase(agent);\n  const inputObjects = useQuery(\n    db,\n    inputFeed ? Query.select(Filter.everything()).from(inputFeed) : Query.select(Filter.nothing()),\n  );\n\n  return (\n    <Panel.Root role={role}>\n      <Panel.Toolbar asChild>\n        <Toolbar.Root>\n          <Toolbar.ToggleGroup type='single' value={tab} onValueChange={(value) => value && setTab(value as Tab)}>\n            <Toolbar.ToggleGroupIconItem value='artifacts' label={t('artifacts.label')} icon='ph--cube--regular' />\n            <Toolbar.ToggleGroupIconItem value='inputs' label={t('inputs.label')} icon='ph--queue--regular' />\n          </Toolbar.ToggleGroup>\n          <Toolbar.Separator />\n          <Toolbar.IconButton\n            icon='ph--trash--regular'\n            label={t('reset-history.button')}\n            onCanPlay={handleResetHistory}\n          />\n        </Toolbar.Root>\n      </Panel.Toolbar>\n      <Panel.Content className='dx-container flex flex-col'>\n        {tab === 'artifacts' && (\n          <>\n            {artifacts.length === 0 && (\n              <Message.Root classNames='m-2' valence='info'>\n                <Message.Title>{t('project-empty-spec.message')}</Message.Title>\n                <Message.Content>{t('project-empty-spec.description')}</Message.Content>\n              </Message.Root>\n            )}\n\n            <Masonry.Root Tile={MasonryArtifactTile}>\n              <Masonry.Content padding thin centered>\n                <Masonry.Viewport items={artifacts} getId={(item: Obj.Unknown) => item.id} />\n              </Masonry.Content>\n            </Masonry.Root>\n          </>\n        )}\n\n        {tab === 'inputs' && (\n          <Mosaic.Container asChild withFocus autoScroll={viewport} classNames='dx-document'>\n            <ScrollArea.Root orientation='vertical' padding thin centered>\n              <ScrollArea.Viewport ref={setViewport}>\n                <Mosaic.VirtualStack\n                  Tile={StackTile}\n                  classNames='gap-2'\n                  draggable={false}\n                  estimateSize={() => 160}\n                  gap={8}\n                  getId={(item: Obj.Unknown) => item.id}\n                  getScrollElement={() => viewport}\n                  items={inputObjects}\n                />\n              </ScrollArea.Viewport>\n            </ScrollArea.Root>\n          </Mosaic.Container>\n        )}\n      </Panel.Content>\n    </Panel.Root>\n  );\n};\n\nconst ArtifactTileCard = composable<HTMLDivElement, { data: Obj.Unknown }>(({ data, ...props }, forwardedRef) => {\n  const objectMenuItems = useObjectMenuItems(data);\n  const icon = Obj.getIcon(data)?.icon ?? 'ph--circle-dashed--regular';\n\n  return (\n    <Card.Root {...props} ref={forwardedRef} data-testid='board-item' fullWidth>\n      <Card.Header>\n        <Card.Block>\n          <Icon icon={icon} />\n        </Card.Block>\n        <Card.Title>{Obj.getLabel(data, { fallback: 'typename' })}</Card.Title>\n        {/* TODO(wittjosiah): Reconcile with Card.Menu. */}\n        <Card.Block end>\n          <Menu.Trigger asChild disabled={!objectMenuItems?.length}>\n            <IconButton iconOnly variant='ghost' icon='ph--dots-three-vertical--regular' label='Actions' />\n          </Menu.Trigger>\n          <Menu.Content items={objectMenuItems} />\n        </Card.Block>\n      </Card.Header>\n      <Card.Body>\n        <Surface.Surface\n          type={AppSurface.CardContent}\n          limit={1}\n          data={{ subject: data } satisfies AppSurface.ObjectCardData}\n        />\n      </Card.Body>\n    </Card.Root>\n  );\n});\n\nArtifactTileCard.displayName = 'ArtifactTileCard';\n\nconst MasonryArtifactTile = ({ data }: { data: Obj.Unknown; index: number }) => (\n  <Menu.Root>\n    <ArtifactTileCard data={data} />\n  </Menu.Root>\n);\n\nconst StackTile = forwardRef<HTMLDivElement, MosaicTileProps<Obj.Unknown>>(\n  ({ data, location, debug, current }, forwardedRef) => (\n    <Menu.Root>\n      <Mosaic.Tile asChild id={data.id} data={data} location={location} debug={debug}>\n        <Focus.Item asChild current={current}>\n          <ArtifactTileCard ref={forwardedRef} data={data} />\n        </Focus.Item>\n      </Mosaic.Tile>\n    </Menu.Root>\n  ),\n);\n\nStackTile.displayName = 'StackTile';\n"],
+  "mappings": ";;;AAIA,SAASA,MAAMC,oBAAoB;AACnC,YAAYC,YAAY;AACxB,YAAYC,YAAY;AACxB,OAAOC,SAASC,YAAYC,aAAaC,SAASC,gBAAgB;AAElE,SAASC,SAASC,wBAAwB;AAC1C,SAASC,YAAYC,0BAA0B;AAC/C,SAASC,aAAa;AACtB,SAASC,UAAUC,MAAMC,QAAQC,KAAKC,OAAOC,WAAW;AACxD,SAASC,gBAAgB;AACzB,SAASC,MAAMC,MAAMC,YAAYC,SAASC,OAAOC,YAAYC,SAASC,sBAAsB;AAC5F,SAASC,kBAAkB;AAC3B,SAASC,eAAe;AACxB,SAASC,YAAY;AACrB,SAASC,OAAOC,cAAoC;AACpD,SAASC,qBAAqB;AAE9B,SAASC,YAAY;AAMd,IAAMC,eAAe,CAAC,EAAEC,MAAMC,SAASC,MAAK,MAAqB;AACtE,QAAM,EAAEC,EAAC,IAAKZ,eAAeO,KAAKM,QAAQC,GAAG;AAC7C,QAAM,CAACC,KAAKC,MAAAA,IAAUpC,SAAc,WAAA;AACpC,QAAM,CAACqC,UAAUC,WAAAA,IAAetC,SAA6B,IAAA;AAE7D,QAAMuC,UAAU9B,IAAI+B,YAAYT,KAAAA,GAAQQ;AAExC,QAAME,eAAevC,iBACnBqC,SACA;IAACjC,SAASoC;KACHC,kBAAW,aAAA;AAChB,WAAOtC,MAAMuC,iBAAiBb,KAAAA;AAC9B,QAAI,CAACA,MAAMc,MAAM;AACf,YAAMA,OAAO,OAAOvC,SAASwC,IAAIvC,KAAKwC,KAAI,CAAA;AAC1CtC,UAAIuC,OAAOjB,OAAO,CAACA,WAAAA;AACjBA,QAAAA,OAAMc,OAAOlC,IAAIoC,KAAKF,IAAAA;MACxB,CAAA;IACF;EACF,CAAA,GACA;IAACd;GAAM;AAET,QAAMkB,qBAAqBnD,YAAY,YAAA;AACrC,UAAM2C,aAAAA;EACR,GAAG;IAACA;GAAa;AAEjB,QAAMS,YAAYzD,aAChBM,QACE,MACEU,IAAI0C,KAAKpB,KAAAA,EAAOqB,KAAK,CAACrB,WACpBvC,KAAKuD,KAAK,CAACM,QAAAA;AACT,WAAOA,IAAItB,MAAAA,EACRmB,UAAUI,IAAI,CAACC,aAAaF,IAAIE,SAASC,KAAKL,IAAI,CAAA,EAClDM,OAAO/B,aAAAA;EACZ,CAAA,CAAA,GAEJ;IAACK;GAAM,CAAA;AAIX,QAAM2B,YAAYjE,aAChBgB,IAAI0C,KAAKpB,KAAAA,EAAOqB,KAAK,CAACO,MACpBnE,KAAKuD,KAAK,CAACM,QACFO,oBAAaP,IAAIM,CAAAA,EAAGd,IAAI,EAAEO,KACxBE,WAAI,CAACO,QAAQA,IAAIV,IAAI,GACrBG,WAAID,GAAAA,GACJS,qBAAc,CAAA,CAAA,CAAA;AAM7B,QAAMC,KAAKtD,IAAI+B,YAAYT,KAAAA;AAC3B,QAAMiC,eAAepD,SACnBmD,IACAL,YAAYhD,MAAMuD,OAAOzD,OAAO0D,WAAU,CAAA,EAAIC,KAAKT,SAAAA,IAAahD,MAAMuD,OAAOzD,OAAO4D,QAAO,CAAA,CAAA;AAG7F,SACE,sBAAA,cAACnD,MAAMoD,MAAI;IAACxC;KACV,sBAAA,cAACZ,MAAME,SAAO;IAACmD,SAAAA;KACb,sBAAA,cAACnD,QAAQkD,MAAI,MACX,sBAAA,cAAClD,QAAQoD,aAAW;IAACC,MAAK;IAASC,OAAOtC;IAAKuC,eAAe,CAACD,UAAUA,SAASrC,OAAOqC,KAAAA;KACvF,sBAAA,cAACtD,QAAQwD,qBAAmB;IAACF,OAAM;IAAYG,OAAO5C,EAAE,iBAAA;IAAoB6C,MAAK;MACjF,sBAAA,cAAC1D,QAAQwD,qBAAmB;IAACF,OAAM;IAASG,OAAO5C,EAAE,cAAA;IAAiB6C,MAAK;OAE7E,sBAAA,cAAC1D,QAAQ2D,WAAS,IAAA,GAClB,sBAAA,cAAC3D,QAAQJ,YAAU;IACjB8D,MAAK;IACLD,OAAO5C,EAAE,sBAAA;IACT+C,WAAW9B;QAIjB,sBAAA,cAAChC,MAAM+D,SAAO;IAACC,WAAU;KACtB9C,QAAQ,eACP,sBAAA,cAAA,MAAA,UAAA,MACGe,UAAUgC,WAAW,KACpB,sBAAA,cAAClE,QAAQqD,MAAI;IAACc,YAAW;IAAMC,SAAQ;KACrC,sBAAA,cAACpE,QAAQqE,OAAK,MAAErD,EAAE,4BAAA,CAAA,GAClB,sBAAA,cAAChB,QAAQgE,SAAO,MAAEhD,EAAE,gCAAA,CAAA,CAAA,GAIxB,sBAAA,cAACV,QAAQ+C,MAAI;IAACiB,MAAMC;KAClB,sBAAA,cAACjE,QAAQ0D,SAAO;IAACQ,SAAAA;IAAQC,MAAAA;IAAKC,UAAAA;KAC5B,sBAAA,cAACpE,QAAQqE,UAAQ;IAACC,OAAO1C;IAAW2C,OAAO,CAACC,SAAsBA,KAAKC;SAM9E5D,QAAQ,YACP,sBAAA,cAACV,OAAOuE,WAAS;IAAC1B,SAAAA;IAAQ2B,WAAAA;IAAUC,YAAY7D;IAAU8C,YAAW;KACnE,sBAAA,cAACjE,WAAWmD,MAAI;IAAC8B,aAAY;IAAWX,SAAAA;IAAQC,MAAAA;IAAKC,UAAAA;KACnD,sBAAA,cAACxE,WAAWyE,UAAQ;IAAC9B,KAAKvB;KACxB,sBAAA,cAACb,OAAO2E,cAAY;IAClBd,MAAMe;IACNlB,YAAW;IACXmB,WAAW;IACXC,cAAc,MAAM;IACpBC,KAAK;IACLX,OAAO,CAACC,SAAsBA,KAAKC;IACnCU,kBAAkB,MAAMpE;IACxBuD,OAAO5B;;AASzB;AAEA,IAAM0C,mBAAmBrF,WAAkD,CAAC,EAAEmC,MAAM,GAAGmD,MAAAA,GAASC,iBAAAA;AAC9F,QAAMC,kBAAkBzG,mBAAmBoD,IAAAA;AAC3C,QAAMqB,OAAOpE,IAAIqG,QAAQtD,IAAAA,GAAOqB,QAAQ;AAExC,SACE,sBAAA,cAAChE,KAAKwD,MAAI;IAAE,GAAGsC;IAAO9C,KAAK+C;IAAcG,eAAY;IAAaC,WAAAA;KAChE,sBAAA,cAACnG,KAAKoG,QAAM,MACV,sBAAA,cAACpG,KAAKqG,OAAK,MACT,sBAAA,cAACpG,MAAAA;IAAK+D;OAER,sBAAA,cAAChE,KAAKwE,OAAK,MAAE5E,IAAI0G,SAAS3D,MAAM;IAAE4D,UAAU;EAAW,CAAA,CAAA,GAEvD,sBAAA,cAACvG,KAAKqG,OAAK;IAACG,KAAAA;KACV,sBAAA,cAAC9F,KAAK+F,SAAO;IAAChD,SAAAA;IAAQiD,UAAU,CAACV,iBAAiB3B;KAChD,sBAAA,cAACnE,YAAAA;IAAWyG,UAAAA;IAASC,SAAQ;IAAQ5C,MAAK;IAAmCD,OAAM;OAErF,sBAAA,cAACrD,KAAKyD,SAAO;IAACY,OAAOiB;QAGzB,sBAAA,cAAChG,KAAK6G,MAAI,MACR,sBAAA,cAACzH,QAAQA,SAAO;IACduE,MAAMrE,WAAWwH;IACjBC,OAAO;IACPpE,MAAM;MAAE1B,SAAS0B;IAAK;;AAKhC,CAAA;AAEAkD,iBAAiBmB,cAAc;AAE/B,IAAMtC,sBAAsB,CAAC,EAAE/B,KAAI,MACjC,sBAAA,cAACjC,KAAK8C,MAAI,MACR,sBAAA,cAACqC,kBAAAA;EAAiBlD;;AAItB,IAAM6C,YAAYxG,2BAChB,CAAC,EAAE2D,MAAMsE,UAAUC,OAAOC,QAAO,GAAIpB,iBACnC,sBAAA,cAACrF,KAAK8C,MAAI,MACR,sBAAA,cAAC5C,OAAO6D,MAAI;EAAChB,SAAAA;EAAQyB,IAAIvC,KAAKuC;EAAIvC;EAAYsE;EAAoBC;GAChE,sBAAA,cAACvG,MAAMyG,MAAI;EAAC3D,SAAAA;EAAQ0D;GAClB,sBAAA,cAACtB,kBAAAA;EAAiB7C,KAAK+C;EAAcpD;;AAO/C6C,UAAUwB,cAAc;",
+  "names": ["Atom", "useAtomValue", "Effect", "Option", "React", "forwardRef", "useCallback", "useMemo", "useState", "Surface", "useSpaceCallback", "AppSurface", "useObjectMenuItems", "Agent", "Database", "Feed", "Filter", "Obj", "Query", "Ref", "useQuery", "Card", "Icon", "IconButton", "Message", "Panel", "ScrollArea", "Toolbar", "useTranslation", "composable", "Masonry", "Menu", "Focus", "Mosaic", "isNonNullable", "meta", "AgentArticle", "role", "subject", "agent", "t", "profile", "key", "tab", "setTab", "viewport", "setViewport", "spaceId", "getDatabase", "resetHistory", "Service", "fnUntraced", "resetChatHistory", "feed", "add", "make", "update", "handleResetHistory", "artifacts", "atom", "pipe", "get", "map", "artifact", "data", "filter", "inputFeed", "_", "fromNullable", "ref", "getOrUndefined", "db", "inputObjects", "select", "everything", "from", "nothing", "Root", "asChild", "ToggleGroup", "type", "value", "onValueChange", "ToggleGroupIconItem", "label", "icon", "Separator", "onCanPlay", "Content", "className", "length", "classNames", "valence", "Title", "Tile", "MasonryArtifactTile", "padding", "thin", "centered", "Viewport", "items", "getId", "item", "id", "Container", "withFocus", "autoScroll", "orientation", "VirtualStack", "StackTile", "draggable", "estimateSize", "gap", "getScrollElement", "ArtifactTileCard", "props", "forwardedRef", "objectMenuItems", "getIcon", "data-testid", "fullWidth", "Header", "Block", "getLabel", "fallback", "end", "Trigger", "disabled", "iconOnly", "variant", "Body", "CardContent", "limit", "displayName", "location", "debug", "current", "Item"]
+}

package/dist/lib/neutral/AssistantPlugin.mjs

@@ -1,7 +1,7 @@
 import {
   AssistantPlugin,
   AssistantPlugin_default
-} from "./chunk-IQZJ5TTM.mjs";
+} from "./chunk-XVGEJWJX.mjs";
 import "./chunk-J5LGTIGS.mjs";
 export {
   AssistantPlugin,

package/dist/lib/neutral/AssistantPlugin.node.mjs

@@ -5,18 +5,18 @@ import { ActivationEvents, Capability, Plugin } from "@dxos/app-framework";
 import { AppPlugin } from "@dxos/app-toolkit";
 import { AiContext } from "@dxos/assistant";
 import { Agent, Chat, McpServer, Memory, Plan } from "@dxos/assistant-toolkit";
-import { Blueprint, Routine } from "@dxos/compute";
+import { Instructions, Skill } from "@dxos/compute";
 import { Sequence } from "@dxos/conductor";
 import { Feed } from "@dxos/echo";
 import { Text } from "@dxos/schema";
 import { HasSubject, Message } from "@dxos/types";
-import { AgentHydrator, AgentRuntime, AiContext as AiContextCapability, AiService, AppGraphBuilder, BlueprintDefinition, CreateObject, EdgeModelResolver, LocalModelResolver, OperationHandler, Toolkit } from "#capabilities";
+import { AgentHydrator, AgentRuntime, AiContext as AiContextCapability, AiService, AppGraphBuilder, CreateObject, EdgeModelResolver, LocalModelResolver, OperationHandler, SkillDefinition, Toolkit } from "#capabilities";
 import { meta } from "#meta";
 import { AssistantEvents } from "#types";
 var AssistantPlugin = Plugin.define(meta).pipe(AppPlugin.addAppGraphModule({
   activate: AppGraphBuilder
-}), AppPlugin.addBlueprintDefinitionModule({
-  activate: BlueprintDefinition
+}), AppPlugin.addSkillDefinitionModule({
+  activate: SkillDefinition
 }), AppPlugin.addCreateObjectModule({
   activate: CreateObject
 }), AppPlugin.addOperationHandlerModule({
@@ -25,12 +25,12 @@ var AssistantPlugin = Plugin.define(meta).pipe(AppPlugin.addAppGraphModule({
   schema: [
     Chat.Chat,
     Chat.CompanionTo,
-    Blueprint.Blueprint,
+    Skill.Skill,
     AiContext.Binding,
     Feed.Feed,
     HasSubject.HasSubject,
     Message.Message,
-    Routine.Routine,
+    Instructions.Instructions,
     Agent.Agent,
     McpServer.McpServer,
     Plan.Plan,

package/dist/lib/neutral/AssistantPlugin.node.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/AssistantPlugin.node.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';\nimport { AppPlugin } from '@dxos/app-toolkit';\nimport { AiContext } from '@dxos/assistant';\nimport { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';\nimport { Blueprint, Routine } from '@dxos/compute';\nimport { Sequence } from '@dxos/conductor';\nimport { Feed } from '@dxos/echo';\nimport { Text } from '@dxos/schema';\nimport { HasSubject, Message } from '@dxos/types';\n\nimport {\n  AgentHydrator,\n  AgentRuntime,\n  AiContext as AiContextCapability,\n  AiService,\n  AppGraphBuilder,\n  BlueprintDefinition,\n  CreateObject,\n  EdgeModelResolver,\n  LocalModelResolver,\n  OperationHandler,\n  Toolkit,\n} from '#capabilities';\nimport { meta } from '#meta';\nimport { AssistantEvents, type AssistantPluginOptions } from '#types';\n\nexport const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta)\n  .pipe(\n    AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),\n    AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),\n    AppPlugin.addCreateObjectModule({ activate: CreateObject }),\n    AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),\n    AppPlugin.addSchemaModule({\n      schema: [\n        Chat.Chat,\n        Chat.CompanionTo,\n        Blueprint.Blueprint,\n        AiContext.Binding,\n        Feed.Feed,\n        HasSubject.HasSubject,\n        Message.Message,\n        Routine.Routine,\n        Agent.Agent,\n        McpServer.McpServer,\n        Plan.Plan,\n        Sequence.Sequence,\n        Memory.Memory,\n        Text.Text,\n      ],\n    }),\n    Plugin.addModule({\n      activatesOn: AssistantEvents.SetupAiServiceProviders,\n      activate: EdgeModelResolver,\n    }),\n    Plugin.addModule({\n      activatesOn: AssistantEvents.SetupAiServiceProviders,\n      activate: LocalModelResolver,\n    }),\n    Plugin.addModule((options) => ({\n      id: Capability.getModuleTag(AiService),\n      firesBeforeActivation: [AssistantEvents.SetupAiServiceProviders],\n      activatesOn: ActivationEvents.SetupProcessManager,\n      activate: () => AiService(options),\n    })),\n    Plugin.addModule({\n      activatesOn: ActivationEvents.SetupProcessManager,\n      activate: AiContextCapability,\n    }),\n    Plugin.addModule({\n      activatesOn: ActivationEvents.Startup,\n      activate: Toolkit,\n    }),\n    Plugin.addModule({\n      activatesOn: ActivationEvents.SetupProcessManager,\n      activate: AgentRuntime,\n    }),\n  )\n  .pipe(\n    Plugin.addModule({\n      activatesOn: ActivationEvents.ProcessManagerReady,\n      activate: AgentHydrator,\n    }),\n    Plugin.make,\n  );\n\nexport default AssistantPlugin;\n"],
-  "mappings": ";;;AAIA,SAASA,kBAAkBC,YAAYC,cAAc;AACrD,SAASC,iBAAiB;AAC1B,SAASC,iBAAiB;AAC1B,SAASC,OAAOC,MAAMC,WAAWC,QAAQC,YAAY;AACrD,SAASC,WAAWC,eAAe;AACnC,SAASC,gBAAgB;AACzB,SAASC,YAAY;AACrB,SAASC,YAAY;AACrB,SAASC,YAAYC,eAAe;AAEpC,SACEC,eACAC,cACAd,aAAae,qBACbC,WACAC,iBACAC,qBACAC,cACAC,mBACAC,oBACAC,kBACAC,eACK;AACP,SAASC,YAAY;AACrB,SAASC,uBAAoD;AAEtD,IAAMC,kBAAkB5B,OAAO6B,OAAsCH,IAAAA,EACzEI,KACC7B,UAAU8B,kBAAkB;EAAEC,UAAUb;AAAgB,CAAA,GACxDlB,UAAUgC,6BAA6B;EAAED,UAAUZ;AAAoB,CAAA,GACvEnB,UAAUiC,sBAAsB;EAAEF,UAAUX;AAAa,CAAA,GACzDpB,UAAUkC,0BAA0B;EAAEH,UAAUR;AAAiB,CAAA,GACjEvB,UAAUmC,gBAAgB;EACxBC,QAAQ;IACNjC,KAAKA;IACLA,KAAKkC;IACL9B,UAAUA;IACVN,UAAUqC;IACV5B,KAAKA;IACLE,WAAWA;IACXC,QAAQA;IACRL,QAAQA;IACRN,MAAMA;IACNE,UAAUA;IACVE,KAAKA;IACLG,SAASA;IACTJ,OAAOA;IACPM,KAAKA;;AAET,CAAA,GACAZ,OAAOwC,UAAU;EACfC,aAAad,gBAAgBe;EAC7BV,UAAUV;AACZ,CAAA,GACAtB,OAAOwC,UAAU;EACfC,aAAad,gBAAgBe;EAC7BV,UAAUT;AACZ,CAAA,GACAvB,OAAOwC,UAAU,CAACG,aAAa;EAC7BC,IAAI7C,WAAW8C,aAAa3B,SAAAA;EAC5B4B,uBAAuB;IAACnB,gBAAgBe;;EACxCD,aAAa3C,iBAAiBiD;EAC9Bf,UAAU,MAAMd,UAAUyB,OAAAA;AAC5B,EAAA,GACA3C,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBiD;EAC9Bf,UAAUf;AACZ,CAAA,GACAjB,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBkD;EAC9BhB,UAAUP;AACZ,CAAA,GACAzB,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBiD;EAC9Bf,UAAUhB;AACZ,CAAA,CAAA,EAEDc,KACC9B,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBmD;EAC9BjB,UAAUjB;AACZ,CAAA,GACAf,OAAOkD,IAAI;AAGf,IAAA,+BAAetB;",
-  "names": ["ActivationEvents", "Capability", "Plugin", "AppPlugin", "AiContext", "Agent", "Chat", "McpServer", "Memory", "Plan", "Blueprint", "Routine", "Sequence", "Feed", "Text", "HasSubject", "Message", "AgentHydrator", "AgentRuntime", "AiContextCapability", "AiService", "AppGraphBuilder", "BlueprintDefinition", "CreateObject", "EdgeModelResolver", "LocalModelResolver", "OperationHandler", "Toolkit", "meta", "AssistantEvents", "AssistantPlugin", "define", "pipe", "addAppGraphModule", "activate", "addBlueprintDefinitionModule", "addCreateObjectModule", "addOperationHandlerModule", "addSchemaModule", "schema", "CompanionTo", "Binding", "addModule", "activatesOn", "SetupAiServiceProviders", "options", "id", "getModuleTag", "firesBeforeActivation", "SetupProcessManager", "Startup", "ProcessManagerReady", "make"]
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';\nimport { AppPlugin } from '@dxos/app-toolkit';\nimport { AiContext } from '@dxos/assistant';\nimport { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';\nimport { Instructions, Skill } from '@dxos/compute';\nimport { Sequence } from '@dxos/conductor';\nimport { Feed } from '@dxos/echo';\nimport { Text } from '@dxos/schema';\nimport { HasSubject, Message } from '@dxos/types';\n\nimport {\n  AgentHydrator,\n  AgentRuntime,\n  AiContext as AiContextCapability,\n  AiService,\n  AppGraphBuilder,\n  CreateObject,\n  EdgeModelResolver,\n  LocalModelResolver,\n  OperationHandler,\n  SkillDefinition,\n  Toolkit,\n} from '#capabilities';\nimport { meta } from '#meta';\nimport { AssistantEvents, type AssistantPluginOptions } from '#types';\n\nexport const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta)\n  .pipe(\n    AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),\n    AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),\n    AppPlugin.addCreateObjectModule({ activate: CreateObject }),\n    AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),\n    AppPlugin.addSchemaModule({\n      schema: [\n        Chat.Chat,\n        Chat.CompanionTo,\n        Skill.Skill,\n        AiContext.Binding,\n        Feed.Feed,\n        HasSubject.HasSubject,\n        Message.Message,\n        Instructions.Instructions,\n        Agent.Agent,\n        McpServer.McpServer,\n        Plan.Plan,\n        Sequence.Sequence,\n        Memory.Memory,\n        Text.Text,\n      ],\n    }),\n    Plugin.addModule({\n      activatesOn: AssistantEvents.SetupAiServiceProviders,\n      activate: EdgeModelResolver,\n    }),\n    Plugin.addModule({\n      activatesOn: AssistantEvents.SetupAiServiceProviders,\n      activate: LocalModelResolver,\n    }),\n    Plugin.addModule((options) => ({\n      id: Capability.getModuleTag(AiService),\n      firesBeforeActivation: [AssistantEvents.SetupAiServiceProviders],\n      activatesOn: ActivationEvents.SetupProcessManager,\n      activate: () => AiService(options),\n    })),\n    Plugin.addModule({\n      activatesOn: ActivationEvents.SetupProcessManager,\n      activate: AiContextCapability,\n    }),\n    Plugin.addModule({\n      activatesOn: ActivationEvents.Startup,\n      activate: Toolkit,\n    }),\n    Plugin.addModule({\n      activatesOn: ActivationEvents.SetupProcessManager,\n      activate: AgentRuntime,\n    }),\n  )\n  .pipe(\n    Plugin.addModule({\n      activatesOn: ActivationEvents.ProcessManagerReady,\n      activate: AgentHydrator,\n    }),\n    Plugin.make,\n  );\n\nexport default AssistantPlugin;\n"],
+  "mappings": ";;;AAIA,SAASA,kBAAkBC,YAAYC,cAAc;AACrD,SAASC,iBAAiB;AAC1B,SAASC,iBAAiB;AAC1B,SAASC,OAAOC,MAAMC,WAAWC,QAAQC,YAAY;AACrD,SAASC,cAAcC,aAAa;AACpC,SAASC,gBAAgB;AACzB,SAASC,YAAY;AACrB,SAASC,YAAY;AACrB,SAASC,YAAYC,eAAe;AAEpC,SACEC,eACAC,cACAd,aAAae,qBACbC,WACAC,iBACAC,cACAC,mBACAC,oBACAC,kBACAC,iBACAC,eACK;AACP,SAASC,YAAY;AACrB,SAASC,uBAAoD;AAEtD,IAAMC,kBAAkB5B,OAAO6B,OAAsCH,IAAAA,EACzEI,KACC7B,UAAU8B,kBAAkB;EAAEC,UAAUb;AAAgB,CAAA,GACxDlB,UAAUgC,yBAAyB;EAAED,UAAUR;AAAgB,CAAA,GAC/DvB,UAAUiC,sBAAsB;EAAEF,UAAUZ;AAAa,CAAA,GACzDnB,UAAUkC,0BAA0B;EAAEH,UAAUT;AAAiB,CAAA,GACjEtB,UAAUmC,gBAAgB;EACxBC,QAAQ;IACNjC,KAAKA;IACLA,KAAKkC;IACL7B,MAAMA;IACNP,UAAUqC;IACV5B,KAAKA;IACLE,WAAWA;IACXC,QAAQA;IACRN,aAAaA;IACbL,MAAMA;IACNE,UAAUA;IACVE,KAAKA;IACLG,SAASA;IACTJ,OAAOA;IACPM,KAAKA;;AAET,CAAA,GACAZ,OAAOwC,UAAU;EACfC,aAAad,gBAAgBe;EAC7BV,UAAUX;AACZ,CAAA,GACArB,OAAOwC,UAAU;EACfC,aAAad,gBAAgBe;EAC7BV,UAAUV;AACZ,CAAA,GACAtB,OAAOwC,UAAU,CAACG,aAAa;EAC7BC,IAAI7C,WAAW8C,aAAa3B,SAAAA;EAC5B4B,uBAAuB;IAACnB,gBAAgBe;;EACxCD,aAAa3C,iBAAiBiD;EAC9Bf,UAAU,MAAMd,UAAUyB,OAAAA;AAC5B,EAAA,GACA3C,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBiD;EAC9Bf,UAAUf;AACZ,CAAA,GACAjB,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBkD;EAC9BhB,UAAUP;AACZ,CAAA,GACAzB,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBiD;EAC9Bf,UAAUhB;AACZ,CAAA,CAAA,EAEDc,KACC9B,OAAOwC,UAAU;EACfC,aAAa3C,iBAAiBmD;EAC9BjB,UAAUjB;AACZ,CAAA,GACAf,OAAOkD,IAAI;AAGf,IAAA,+BAAetB;",
+  "names": ["ActivationEvents", "Capability", "Plugin", "AppPlugin", "AiContext", "Agent", "Chat", "McpServer", "Memory", "Plan", "Instructions", "Skill", "Sequence", "Feed", "Text", "HasSubject", "Message", "AgentHydrator", "AgentRuntime", "AiContextCapability", "AiService", "AppGraphBuilder", "CreateObject", "EdgeModelResolver", "LocalModelResolver", "OperationHandler", "SkillDefinition", "Toolkit", "meta", "AssistantEvents", "AssistantPlugin", "define", "pipe", "addAppGraphModule", "activate", "addSkillDefinitionModule", "addCreateObjectModule", "addOperationHandlerModule", "addSchemaModule", "schema", "CompanionTo", "Binding", "addModule", "activatesOn", "SetupAiServiceProviders", "options", "id", "getModuleTag", "firesBeforeActivation", "SetupProcessManager", "Startup", "ProcessManagerReady", "make"]
 }

package/dist/lib/neutral/AssistantPlugin.workerd.mjs

@@ -1,38 +1,11 @@
+import {
+  AssistantPlugin,
+  AssistantPlugin_workerd_default
+} from "./chunk-U4LTLBAX.mjs";
+import "./chunk-V2Y4XE3O.mjs";
+import "./chunk-LS72HWMM.mjs";
+import "./chunk-QOKLFHUS.mjs";
 import "./chunk-J5LGTIGS.mjs";
-
-// src/AssistantPlugin.workerd.ts
-import { Plugin } from "@dxos/app-framework";
-import { AppPlugin } from "@dxos/app-toolkit";
-import { AiContext } from "@dxos/assistant";
-import { Agent, Chat, McpServer, Memory, Plan } from "@dxos/assistant-toolkit";
-import { Blueprint, Routine } from "@dxos/compute";
-import { Sequence } from "@dxos/conductor";
-import { Feed } from "@dxos/echo";
-import { Text } from "@dxos/schema";
-import { HasSubject, Message } from "@dxos/types";
-import { OperationHandler } from "#capabilities";
-import { meta } from "#meta";
-var AssistantPlugin = Plugin.define(meta).pipe(AppPlugin.addOperationHandlerModule({
-  activate: OperationHandler
-}), AppPlugin.addSchemaModule({
-  schema: [
-    Chat.Chat,
-    Chat.CompanionTo,
-    Blueprint.Blueprint,
-    AiContext.Binding,
-    Feed.Feed,
-    HasSubject.HasSubject,
-    Message.Message,
-    Routine.Routine,
-    Agent.Agent,
-    McpServer.McpServer,
-    Plan.Plan,
-    Sequence.Sequence,
-    Memory.Memory,
-    Text.Text
-  ]
-}), Plugin.make);
-var AssistantPlugin_workerd_default = AssistantPlugin;
 export {
   AssistantPlugin,
   AssistantPlugin_workerd_default as default

package/dist/lib/neutral/AssistantPlugin.workerd.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/AssistantPlugin.workerd.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { Plugin } from '@dxos/app-framework';\nimport { AppPlugin } from '@dxos/app-toolkit';\nimport { AiContext } from '@dxos/assistant';\nimport { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';\nimport { Blueprint, Routine } from '@dxos/compute';\nimport { Sequence } from '@dxos/conductor';\nimport { Feed } from '@dxos/echo';\nimport { Text } from '@dxos/schema';\nimport { HasSubject, Message } from '@dxos/types';\n\nimport { OperationHandler } from '#capabilities';\nimport { meta } from '#meta';\n\nexport const AssistantPlugin = Plugin.define(meta).pipe(\n  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),\n  AppPlugin.addSchemaModule({\n    schema: [\n      Chat.Chat,\n      Chat.CompanionTo,\n      Blueprint.Blueprint,\n      AiContext.Binding,\n      Feed.Feed,\n      HasSubject.HasSubject,\n      Message.Message,\n      Routine.Routine,\n      Agent.Agent,\n      McpServer.McpServer,\n      Plan.Plan,\n      Sequence.Sequence,\n      Memory.Memory,\n      Text.Text,\n    ],\n  }),\n  Plugin.make,\n);\n\nexport default AssistantPlugin;\n"],
-  "mappings": ";;;AAIA,SAASA,cAAc;AACvB,SAASC,iBAAiB;AAC1B,SAASC,iBAAiB;AAC1B,SAASC,OAAOC,MAAMC,WAAWC,QAAQC,YAAY;AACrD,SAASC,WAAWC,eAAe;AACnC,SAASC,gBAAgB;AACzB,SAASC,YAAY;AACrB,SAASC,YAAY;AACrB,SAASC,YAAYC,eAAe;AAEpC,SAASC,wBAAwB;AACjC,SAASC,YAAY;AAEd,IAAMC,kBAAkBjB,OAAOkB,OAAOF,IAAAA,EAAMG,KACjDlB,UAAUmB,0BAA0B;EAAEC,UAAUN;AAAiB,CAAA,GACjEd,UAAUqB,gBAAgB;EACxBC,QAAQ;IACNnB,KAAKA;IACLA,KAAKoB;IACLhB,UAAUA;IACVN,UAAUuB;IACVd,KAAKA;IACLE,WAAWA;IACXC,QAAQA;IACRL,QAAQA;IACRN,MAAMA;IACNE,UAAUA;IACVE,KAAKA;IACLG,SAASA;IACTJ,OAAOA;IACPM,KAAKA;;AAET,CAAA,GACAZ,OAAO0B,IAAI;AAGb,IAAA,kCAAeT;",
-  "names": ["Plugin", "AppPlugin", "AiContext", "Agent", "Chat", "McpServer", "Memory", "Plan", "Blueprint", "Routine", "Sequence", "Feed", "Text", "HasSubject", "Message", "OperationHandler", "meta", "AssistantPlugin", "define", "pipe", "addOperationHandlerModule", "activate", "addSchemaModule", "schema", "CompanionTo", "Binding", "make"]
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
 }

package/dist/lib/neutral/AssistantSettings-3N5M5VCN.mjs

@@ -0,0 +1,302 @@
+import {
+  presetsForProvider,
+  resolveProvider
+} from "./chunk-BXI2R4OO.mjs";
+import "./chunk-J5LGTIGS.mjs";
+
+// src/containers/AssistantSettings/AssistantSettings.tsx
+import { useAtomValue as useAtomValue2 } from "@effect-atom/atom-react";
+import React2, { useMemo } from "react";
+import { Provider as Provider2 } from "@dxos/ai";
+import { useOptionalCapability as useOptionalCapability2 } from "@dxos/app-framework/ui";
+import { useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { Form as Form2, createSelectField } from "@dxos/react-ui-form";
+import { meta as meta2 } from "#meta";
+import { Assistant, AssistantCapabilities as AssistantCapabilities2, Ollama } from "#types";
+
+// src/containers/AssistantSettings/OllamaModels.tsx
+import { useAtomValue } from "@effect-atom/atom-react";
+import React, { useCallback, useEffect, useState } from "react";
+import { Model, Provider } from "@dxos/ai";
+import { useOptionalCapability } from "@dxos/app-framework/ui";
+import { EffectEx } from "@dxos/effect";
+import { List, ListItem } from "@dxos/react-list";
+import { IconButton, useTranslation } from "@dxos/react-ui";
+import { Form } from "@dxos/react-ui-form";
+import { Combobox } from "@dxos/react-ui-list";
+import { meta } from "#meta";
+import { AssistantCapabilities } from "#types";
+var QUICK_PICKS = Model.forProvider(Provider.ollama.id).map((model) => model.backend);
+var LOADED_POLL_INTERVAL = 3e3;
+var OllamaModels = () => {
+  const manager = useOptionalCapability(AssistantCapabilities.OllamaManager);
+  if (!manager) {
+    return null;
+  }
+  return /* @__PURE__ */ React.createElement(OllamaModelsSection, {
+    manager
+  });
+};
+var OllamaModelsSection = ({ manager }) => {
+  const { t } = useTranslation(meta.profile.key);
+  const state = useAtomValue(manager.state);
+  const [query, setQuery] = useState("");
+  const [open, setOpen] = useState(false);
+  const [pending, setPending] = useState({});
+  useEffect(() => {
+    void EffectEx.runPromise(manager.refresh);
+  }, [
+    manager
+  ]);
+  useEffect(() => {
+    const interval = setInterval(() => void EffectEx.runPromise(manager.refreshLoaded), LOADED_POLL_INTERVAL);
+    return () => clearInterval(interval);
+  }, [
+    manager
+  ]);
+  const installed = new Set(state.models.map((model) => model.name));
+  const loaded = new Map(state.loaded.map((model) => [
+    model.name,
+    model
+  ]));
+  const pulling = Object.keys(state.pulls).filter((name) => !installed.has(name));
+  const withPending = useCallback((key, action) => async () => {
+    setPending((prev) => ({
+      ...prev,
+      [key]: true
+    }));
+    try {
+      await action();
+    } finally {
+      setPending((prev) => ({
+        ...prev,
+        [key]: false
+      }));
+    }
+  }, []);
+  const handlePull = useCallback((target) => {
+    const trimmed = target.trim();
+    if (trimmed.length === 0) {
+      return;
+    }
+    setQuery("");
+    setOpen(false);
+    void withPending(trimmed, () => EffectEx.runPromise(manager.pull(trimmed)))();
+  }, [
+    manager,
+    withPending
+  ]);
+  const filter = query.trim();
+  const suggestions = QUICK_PICKS.filter((pick) => !installed.has(pick) && (filter === "" || pick.includes(filter)));
+  const offerCustom = filter.length > 0 && !installed.has(filter) && !suggestions.includes(filter);
+  const empty = state.models.length === 0 && pulling.length === 0;
+  return /* @__PURE__ */ React.createElement(Form.Section, {
+    title: t("settings.ollama.title")
+  }, /* @__PURE__ */ React.createElement(Form.Row, {
+    label: t("settings.ollama.installed.label")
+  }, state.kind === "failed" && state.error ? (
+    // Connection-level failure has no associated model, so it shows inline as the row content.
+    /* @__PURE__ */ React.createElement("p", {
+      className: "text-sm text-error-text"
+    }, t("settings.ollama.failed.message", {
+      error: state.error
+    }))
+  ) : empty ? /* @__PURE__ */ React.createElement("p", {
+    className: "text-sm text-description"
+  }, t("settings.ollama.empty.message")) : (
+    // Plain `List`/`ListItem` (non-select), with the trigger editor's "fatter" two-line row
+    // treatment: a name line plus a secondary meta line, on a surface-styled row. Rows are
+    // actioned via their trailing buttons (no selection semantics).
+    /* @__PURE__ */ React.createElement(List, {
+      variant: "unordered",
+      className: "flex flex-col gap-1 grow is-full text-left"
+    }, state.models.map((model) => {
+      const running = loaded.get(model.name);
+      const error = state.errors[model.name];
+      const size = model.size != null ? formatBytes(model.size) : void 0;
+      const loadedLabel = running ? running.sizeVram ? t("settings.ollama.loaded.vram", {
+        size: formatBytes(running.sizeVram)
+      }) : t("settings.ollama.loaded.label") : void 0;
+      return /* @__PURE__ */ React.createElement(ListItem, {
+        key: model.name,
+        className: "flex flex-col gap-0.5 rounded-sm bg-input-surface px-2 py-1.5 is-full"
+      }, /* @__PURE__ */ React.createElement("div", {
+        className: "flex items-center gap-2"
+      }, /* @__PURE__ */ React.createElement("span", {
+        className: "grow truncate font-medium"
+      }, model.name), /* @__PURE__ */ React.createElement(IconButton, {
+        icon: running ? "ph--eject--regular" : "ph--play--regular",
+        iconOnly: true,
+        label: running ? t("settings.ollama.unload.label") : t("settings.ollama.load.label"),
+        disabled: pending[model.name],
+        onClick: () => void withPending(model.name, () => EffectEx.runPromise(running ? manager.unload(model.name) : manager.load(model.name)))()
+      }), /* @__PURE__ */ React.createElement(IconButton, {
+        icon: "ph--trash--regular",
+        iconOnly: true,
+        label: t("settings.ollama.remove.label"),
+        disabled: pending[model.name],
+        onClick: () => void withPending(model.name, () => EffectEx.runPromise(manager.remove(model.name)))()
+      })), (size || loadedLabel || error) && /* @__PURE__ */ React.createElement("div", {
+        className: "flex items-center gap-2 text-sm"
+      }, size && /* @__PURE__ */ React.createElement("span", {
+        className: "text-description"
+      }, size), loadedLabel && /* @__PURE__ */ React.createElement("span", {
+        className: "text-success-text"
+      }, loadedLabel), error && /* @__PURE__ */ React.createElement("span", {
+        className: "truncate text-error-text"
+      }, shortError(error))));
+    }), pulling.map((name) => {
+      const progress = state.pulls[name];
+      const status = progress?.total ? t("settings.ollama.pulling.message", {
+        percent: percentOf(progress)
+      }) : progress?.status ?? t("settings.ollama.pulling.label");
+      return /* @__PURE__ */ React.createElement(ListItem, {
+        key: name,
+        className: "flex flex-col gap-0.5 rounded-sm bg-input-surface px-2 py-1.5 is-full"
+      }, /* @__PURE__ */ React.createElement("div", {
+        className: "flex items-center gap-2"
+      }, /* @__PURE__ */ React.createElement("span", {
+        className: "grow truncate font-medium text-description"
+      }, name), /* @__PURE__ */ React.createElement(IconButton, {
+        icon: "ph--x--regular",
+        iconOnly: true,
+        label: t("settings.ollama.cancel.label"),
+        onClick: () => void EffectEx.runPromise(manager.cancel(name))
+      })), /* @__PURE__ */ React.createElement("span", {
+        className: "text-sm text-description"
+      }, status));
+    }))
+  )), /* @__PURE__ */ React.createElement(Form.Row, {
+    label: t("settings.ollama.pull.label")
+  }, Object.entries(state.errors).filter(([name]) => !installed.has(name)).map(([name, error]) => /* @__PURE__ */ React.createElement("p", {
+    key: name,
+    className: "text-xs text-error-text"
+  }, name, ": ", shortError(error))), /* @__PURE__ */ React.createElement(Combobox.Root, {
+    open,
+    onOpenChange: setOpen,
+    value: "",
+    onValueChange: () => {
+    },
+    placeholder: t("settings.ollama.pull.placeholder")
+  }, /* @__PURE__ */ React.createElement(Combobox.Trigger, {
+    classNames: "is-full"
+  }), /* @__PURE__ */ React.createElement(Combobox.Portal, null, /* @__PURE__ */ React.createElement(Combobox.Content, null, /* @__PURE__ */ React.createElement(Combobox.Input, {
+    value: query,
+    onValueChange: setQuery,
+    placeholder: t("settings.ollama.pull.placeholder"),
+    onKeyDown: (event) => {
+      if (event.key === "Enter" && filter.length > 0) {
+        handlePull(filter);
+      }
+    }
+  }), /* @__PURE__ */ React.createElement(Combobox.List, null, offerCustom && /* @__PURE__ */ React.createElement(Combobox.Item, {
+    value: filter,
+    label: t("settings.ollama.pull-custom.label", {
+      name: filter
+    }),
+    icon: "ph--download-simple--regular",
+    onSelect: () => handlePull(filter)
+  }), suggestions.map((pick) => /* @__PURE__ */ React.createElement(Combobox.Item, {
+    key: pick,
+    value: pick,
+    label: pick,
+    onSelect: () => handlePull(pick)
+  }))), /* @__PURE__ */ React.createElement(Combobox.Arrow, null))))));
+};
+var shortError = (error) => {
+  const head = error.split(/\s*\(checked:/)[0].trim();
+  return head.length > 160 ? `${head.slice(0, 160)}\u2026` : head;
+};
+var percentOf = (progress) => progress && progress.total && progress.total > 0 ? Math.round((progress.completed ?? 0) / progress.total * 100) : 0;
+var UNITS = [
+  "B",
+  "KB",
+  "MB",
+  "GB",
+  "TB"
+];
+var formatBytes = (bytes) => {
+  let value = bytes;
+  let unit = 0;
+  while (value >= 1024 && unit < UNITS.length - 1) {
+    value /= 1024;
+    unit += 1;
+  }
+  return `${value.toFixed(unit === 0 ? 0 : 1)} ${UNITS[unit]}`;
+};
+
+// src/containers/AssistantSettings/AssistantSettings.tsx
+var presetOptions = (provider, installed) => presetsForProvider(provider).filter((preset) => !installed || installed.has(preset.backend)).map((preset) => ({
+  value: preset.model,
+  label: preset.label
+}));
+var AssistantSettings = ({ settings, onSettingsChange }) => {
+  const { t } = useTranslation2(meta2.profile.key);
+  const ollamaManager = useOptionalCapability2(AssistantCapabilities2.OllamaManager);
+  const localProvider = ollamaManager ? Provider2.builtIn : Provider2.ollama;
+  const localProviderKey = ollamaManager ? "built-in" : "ollama";
+  const localModels = useAtomValue2(ollamaManager?.state ?? Ollama.emptyState);
+  const installed = useMemo(() => new Set(localModels.models.map((model) => model.name)), [
+    localModels
+  ]);
+  const values = useMemo(() => ({
+    ...settings,
+    modelProvider: resolveProvider(settings.modelProvider, !!ollamaManager)
+  }), [
+    settings,
+    ollamaManager
+  ]);
+  const fieldMap = useMemo(() => ({
+    // `defaultLabel: null` drops the sentinel "Default" option — a provider is always concrete.
+    "modelProvider": createSelectField({
+      defaultLabel: null,
+      options: [
+        {
+          value: Provider2.edge.id,
+          label: t("settings.provider.edge.label")
+        },
+        {
+          value: localProvider.id,
+          label: t(`settings.provider.${localProviderKey}.label`)
+        },
+        {
+          value: Provider2.lmStudio.id,
+          label: t("settings.provider.lmstudio.label")
+        }
+      ]
+    }),
+    "modelDefaults.edge": createSelectField({
+      options: presetOptions(Provider2.edge.id)
+    }),
+    // `built-in` and `ollama` share the `ollama` default key; the managed sidecar restricts to installed.
+    "modelDefaults.ollama": createSelectField({
+      options: presetOptions(localProvider.id, ollamaManager ? installed : void 0)
+    }),
+    "modelDefaults.lmstudio": createSelectField({
+      options: presetOptions(Provider2.lmStudio.id)
+    })
+  }), [
+    t,
+    localProvider,
+    localProviderKey,
+    ollamaManager,
+    installed
+  ]);
+  return /* @__PURE__ */ React2.createElement(Form2.Root, {
+    variant: "settings",
+    schema: Assistant.Settings,
+    readonly: !onSettingsChange,
+    values,
+    onValuesChanged: (values2) => onSettingsChange?.(() => values2)
+  }, /* @__PURE__ */ React2.createElement(Form2.Viewport, {
+    scroll: true
+  }, /* @__PURE__ */ React2.createElement(Form2.Content, null, /* @__PURE__ */ React2.createElement(Form2.Section, {
+    title: meta2.profile.name ?? meta2.profile.key
+  }, /* @__PURE__ */ React2.createElement(Form2.FieldSet, {
+    fieldMap
+  })), /* @__PURE__ */ React2.createElement(OllamaModels, null))));
+};
+export {
+  AssistantSettings as default
+};
+//# sourceMappingURL=AssistantSettings-3N5M5VCN.mjs.map