@lapis-notes/ai 0.1.2 → 0.1.5

package/dist/chat/ai-chat-panel.svelte

@@ -1,11 +1,10 @@
 <script lang="ts">
-  import { onMount, untrack } from "svelte";
+  import { onDestroy, onMount, untrack } from "svelte";
   import type { App, WorkspaceLeaf } from "@lapis-notes/api";
   import { MarkdownEmbed } from "@lapis-notes/markdown/embed";
   import * as Chat from "@lapismd/design-core/ai/chat";
   import { Reasoning } from "@lapismd/design-core/ai/experimental";
   import { Button } from "@lapismd/design-core/shadcn/button";
-  import { CodeBlock } from "@lapismd/design-core/shadcn/code-block";
   import * as CommandView from "@lapismd/design-core/shadcn/command-view";
   import * as DropdownMenu from "@lapismd/design-core/shadcn/dropdown-menu";
   import * as Empty from "@lapismd/design-core/shadcn/empty";
@@ -92,6 +91,11 @@
   import type { AutomaticMemoryRecall } from "../memory/types";
   import type { HandoffSummaryCoordinator } from "../conversations/handoff-summary";
 
+  import {
+    ComposerModelCatalog,
+    type ComposerModelCatalogState,
+  } from "./composer-model-catalog";
+
   let {
     app,
     runtime,
@@ -122,6 +126,7 @@
     fileSearch,
     models = [],
     modelCatalogError = null,
+    loadModels,
     settings,
     onSettingsChange,
   }: {
@@ -158,6 +163,10 @@
     fileSearch?: ComposerSearchSource;
     models?: ModelRef[];
     modelCatalogError?: string | null;
+    loadModels?: (
+      agent: AcpAgentId,
+      runtime: AiPluginSettings["defaultRuntime"],
+    ) => Promise<ModelRef[]>;
     settings?: Partial<AiPluginSettings>;
     onSettingsChange?: (
       patch: Partial<AiPluginSettings>,
@@ -196,7 +205,9 @@
         skillSnapshots,
         slashRouter,
         appToolHost,
-        memoryRecall: settings?.memoryAutomaticRecall ? memoryRecall : undefined,
+        memoryRecall: settings?.memoryAutomaticRecall
+          ? memoryRecall
+          : undefined,
         handoffSummaries,
         skillContext,
         readVaultText: app
@@ -207,18 +218,52 @@
           : undefined,
         onComposerDefaults: ({ agent, runtimePreference }) => {
           if (runtimePreference === "fake") {
+            catalog.cancel();
+            catalogState = {
+              agent,
+              runtime: "fake",
+              models: [],
+              model: localModel ?? "",
+              loading: false,
+              error: null,
+            };
             localAgent = agent;
             localRuntime = "fake";
-            persistComposerDefaults(agent, "fake", localModel, selectedThinking);
+            persistComposerDefaults(
+              agent,
+              "fake",
+              localModel,
+              selectedThinking,
+            );
             return;
           }
           changeAgent(agent, runtimePreference);
         },
       }),
   );
+  let catalogState = $state<ComposerModelCatalogState | null>(null);
+  const catalog = new ComposerModelCatalog(
+    (agent, runtime) => loadModels?.(agent, runtime) ?? Promise.resolve([]),
+    (state) => {
+      catalogState = state;
+      if (!state.loading && !state.error) {
+        localModel = state.model;
+        persistComposerDefaults(
+          state.agent,
+          state.runtime === "auto" ? "acp" : state.runtime,
+          state.model,
+          selectedThinking,
+        );
+      }
+    },
+  );
+  onDestroy(() => catalog.cancel());
+  const catalogModels = $derived(catalogState?.models ?? models);
   let draft = $state("");
   let localAgent = $state<AcpAgentId | null>(null);
-  let localRuntime = $state<"acp" | "codex-native" | "fake" | null>(null);
+  let localRuntime = $state<
+    "acp" | "codex-native" | "opencode-native" | "fake" | null
+  >(null);
   let localModel = $state<string | null>(null);
   let localThinking = $state<AiThinkingLevel | null>(null);
   let attachments = $state<{ path: string; name: string }[]>([]);
@@ -243,9 +288,11 @@
     localRuntime ??
       (settings?.defaultRuntime === "codex-native"
         ? "codex-native"
-        : settings?.defaultRuntime === "fake"
-          ? "fake"
-          : "acp"),
+        : settings?.defaultRuntime === "opencode-native"
+          ? "opencode-native"
+          : settings?.defaultRuntime === "fake"
+            ? "fake"
+            : "acp"),
   );
   const selectedModel = $derived(
     localModel ?? settings?.defaultModel ?? DEFAULT_AI_SETTINGS.defaultModel,
@@ -253,8 +300,63 @@
   const selectedThinking = $derived(
     localThinking ?? settings?.thinking ?? DEFAULT_AI_SETTINGS.thinking,
   );
+  // Settings notifications also reach a mounted composer. Own menu updates
+  // already match the local harness and must not trigger a second discovery.
+  let observedDefaults: {
+    agent: AcpAgentId;
+    runtime: typeof selectedRuntime;
+    model: string;
+    thinking: AiThinkingLevel;
+  } | null = null;
+  $effect(() => {
+    if (initializing) return;
+    const next = {
+      agent: normalizeAcpAgent(settings?.acpAgent),
+      runtime:
+        settings?.defaultRuntime === "codex-native"
+          ? ("codex-native" as const)
+          : settings?.defaultRuntime === "opencode-native"
+            ? ("opencode-native" as const)
+            : settings?.defaultRuntime === "fake"
+              ? ("fake" as const)
+              : ("acp" as const),
+      model: settings?.defaultModel ?? DEFAULT_AI_SETTINGS.defaultModel,
+      thinking: settings?.thinking ?? DEFAULT_AI_SETTINGS.thinking,
+    };
+    untrack(() => {
+      const previous = observedDefaults;
+      observedDefaults = next;
+      if (!previous) return;
+      const harnessChanged =
+        previous.agent !== next.agent || previous.runtime !== next.runtime;
+      if (
+        harnessChanged &&
+        ((localAgent ?? previous.agent) !== next.agent ||
+          (localRuntime ?? previous.runtime) !== next.runtime)
+      ) {
+        localAgent = next.agent;
+        localRuntime = next.runtime;
+        localModel = next.model;
+        catalog.cancel();
+        if (next.runtime === "fake") {
+          catalogState = {
+            ...next,
+            runtime: "fake",
+            models: [],
+            loading: false,
+            error: null,
+          };
+        } else if (loadModels) {
+          void catalog.refresh(next.agent, next.runtime, next.model);
+        }
+      } else if (previous.model !== next.model) {
+        localModel = next.model;
+      }
+      if (previous.thinking !== next.thinking) localThinking = next.thinking;
+    });
+  });
   const modelOptions = $derived.by<ModelRef[]>(() => {
-    const available = catalogModelsForAgent(selectedAgent, models);
+    const available = catalogModelsForAgent(selectedAgent, catalogModels);
     if (
       selectedModel &&
       !available.some((model) => model.model === selectedModel)
@@ -299,21 +401,26 @@
     }
     return triggers;
   });
-  const agentLabels = $derived.by(() =>
-    new Map(
-      controller.bindings.map((binding) => {
-        const label =
-          binding.runtime === "codex-native"
-            ? "Codex Native"
-            : binding.agent === "cursor"
-              ? "Cursor ACP"
-              : "Codex ACP";
-        return [
-          binding.id,
-          binding.model?.model ? `${label} · ${binding.model.model}` : label,
-        ] as const;
-      }),
-    ),
+  const agentLabels = $derived.by(
+    () =>
+      new Map(
+        controller.bindings.map((binding) => {
+          const label =
+            binding.runtime === "codex-native"
+              ? "Codex Native"
+              : binding.runtime === "opencode-native"
+                ? "OpenCode Native"
+                : binding.agent === "cursor"
+                  ? "Cursor ACP"
+                  : binding.agent === "opencode"
+                    ? "OpenCode ACP"
+                    : "Codex ACP";
+          return [
+            binding.id,
+            binding.model?.model ? `${label} · ${binding.model.model}` : label,
+          ] as const;
+        }),
+      ),
   );
   const timeline = $derived(
     groupChatItemsByDate(controller.items, new Date(), agentLabels),
@@ -340,8 +447,9 @@
   );
   const composerError = $derived(
     controller.error ??
-      modelCatalogError ??
-      unavailableReason ??
+      (catalogState
+        ? catalogState.error
+        : (modelCatalogError ?? unavailableReason)) ??
       controller.appToolsUnavailableReason,
   );
   const composerStatus = $derived<ComposerStatus | undefined>(
@@ -379,8 +487,8 @@
   });
 
   async function submit(prompt: string): Promise<void> {
-    if (initializing) return;
-    const selected = catalogModelsForAgent(selectedAgent, models).find(
+    if (initializing || catalogState?.loading) return;
+    const selected = catalogModelsForAgent(selectedAgent, catalogModels).find(
       (model) => model.model === selectedModel,
     );
     const extra = attachments.map((file) => file.path);
@@ -406,7 +514,7 @@
 
   function persistComposerDefaults(
     agent: AcpAgentId,
-    runtimePreference: "acp" | "codex-native" | "fake",
+    runtimePreference: "acp" | "codex-native" | "opencode-native" | "fake",
     model: string | null,
     thinking: AiThinkingLevel,
   ): void {
@@ -420,7 +528,7 @@
 
   function changeAgent(
     agent: AcpAgentId,
-    runtimePreference: "acp" | "codex-native",
+    runtimePreference: "acp" | "codex-native" | "opencode-native",
   ): void {
     localAgent = agent;
     localRuntime = runtimePreference;
@@ -430,13 +538,19 @@
       catalogModelsForAgent(agent, models).find((model) => model.isDefault)
         ?.model ||
       catalogModelsForAgent(agent, models)[0]?.model ||
-      null;
+      "";
     persistComposerDefaults(
       agent,
       runtimePreference,
       localModel,
       selectedThinking,
     );
+    if (loadModels)
+      void catalog.refresh(
+        agent,
+        runtimePreference,
+        configured ?? localModel ?? "",
+      );
   }
 
   function changeModel(value: string): void {
@@ -549,7 +663,9 @@
   function toolCallProps(item: AiChatToolItem) {
     const hint = { toolName: item.name, input: item.input };
     const presentedError =
-      item.state === "error" ? presentToolPayload(item.output, hint) : undefined;
+      item.state === "error"
+        ? presentToolPayload(item.output, hint)
+        : undefined;
     return {
       id: item.toolId,
       name: item.name,
@@ -689,18 +805,8 @@
   {@const detail = call.data as
     | { input?: string; output?: string; error?: string; name?: string }
     | undefined}
-  {@const hint = {
-    toolName: detail?.name ?? call.name,
-    input: detail?.input,
-  }}
   {@const ResultView = resolveToolResultView(app, detail?.name ?? call.name)}
   {@const parsedOutput = parseToolResultPayload(detail?.output)}
-  {@const inputPayload = presentToolPayload(detail?.input)}
-  {@const outputPayload = presentToolPayload(detail?.output, hint)}
-  {@const errorPayload = presentToolPayload(detail?.error, hint)}
-  {@const showErrorBlock = Boolean(
-    errorPayload && !isOneLineAlert(errorPayload),
-  )}
   {#if ResultView && app && parsedOutput != null && !detail?.error}
     <ResultView
       {app}
@@ -711,41 +817,12 @@
       state="completed"
     />
   {:else}
-  <div class="ai-chat-panel__tool-detail">
-    {#if inputPayload}
-      <CodeBlock
-        code={inputPayload.code}
-        language={inputPayload.language}
-        title="Input"
-        size="sm"
-        width="full"
-        isWrapped
-        maxHeight="16rem"
-      />
-    {/if}
-    {#if outputPayload}
-      <CodeBlock
-        code={outputPayload.code}
-        language={outputPayload.language}
-        title="Output"
-        size="sm"
-        width="full"
-        isWrapped
-        maxHeight="16rem"
-      />
-    {/if}
-    {#if showErrorBlock && errorPayload}
-      <CodeBlock
-        code={errorPayload.code}
-        language={errorPayload.language}
-        title="Error"
-        size="sm"
-        width="full"
-        isWrapped
-        maxHeight="16rem"
-      />
-    {/if}
-  </div>
+    <Chat.ToolCallDetail
+      input={detail?.input}
+      output={detail?.output}
+      error={detail?.error}
+      toolName={detail?.name ?? call.name}
+    />
   {/if}
 {/snippet}
 
@@ -754,6 +831,7 @@
   data-ui-component="ai-chat-panel"
   data-testid="ai-chat-panel"
   data-initializing={initializing}
+  data-model-catalog-loading={catalogState?.loading ?? false}
 >
   <Chat.Layout density="compact" {isEmpty} aria-label="AI chat">
     {#snippet emptyState()}
@@ -786,7 +864,9 @@
       <Chat.Composer
         bind:value={draft}
         placeholder="Ask anything…"
-        disabled={initializing || controller.busy}
+        disabled={initializing ||
+          Boolean(catalogState?.loading) ||
+          controller.busy}
         interactiveDrawerWhenDisabled={Boolean(pendingInteraction)}
         isStopShown={controller.busy}
         status={composerStatus}
@@ -890,7 +970,9 @@
                         value={`${item.label} ${item.id}`}
                         onSelect={() => addAttachment(item)}
                       >
-                        <CommandView.ItemLabel>{item.label}</CommandView.ItemLabel>
+                        <CommandView.ItemLabel
+                          >{item.label}</CommandView.ItemLabel
+                        >
                       </CommandView.Item>
                     {/each}
                   </CommandView.List>
@@ -1029,15 +1111,29 @@
                       <DropdownMenu.RadioItem
                         value="acp:codex"
                         onclick={() => changeAgent("codex", "acp")}
-                      >Codex ACP</DropdownMenu.RadioItem>
+                        >Codex ACP</DropdownMenu.RadioItem
+                      >
                       <DropdownMenu.RadioItem
                         value="acp:cursor"
                         onclick={() => changeAgent("cursor", "acp")}
-                      >Cursor ACP</DropdownMenu.RadioItem>
+                        >Cursor ACP</DropdownMenu.RadioItem
+                      >
                       <DropdownMenu.RadioItem
                         value="codex-native:codex"
                         onclick={() => changeAgent("codex", "codex-native")}
-                      >Codex Native</DropdownMenu.RadioItem>
+                        >Codex Native</DropdownMenu.RadioItem
+                      >
+                      <DropdownMenu.RadioItem
+                        value="acp:opencode"
+                        onclick={() => changeAgent("opencode", "acp")}
+                        >OpenCode ACP</DropdownMenu.RadioItem
+                      >
+                      <DropdownMenu.RadioItem
+                        value="opencode-native:opencode"
+                        onclick={() =>
+                          changeAgent("opencode", "opencode-native")}
+                        >OpenCode Native</DropdownMenu.RadioItem
+                      >
                     </DropdownMenu.RadioGroup>
                   </DropdownMenu.SubContent>
                 </DropdownMenu.Sub>
@@ -1047,7 +1143,13 @@
                   Model
                 </DropdownMenu.SubTrigger>
                 <DropdownMenu.SubContent>
-                  {#if modelOptions.length > 0}
+                  {#if catalogState?.loading}
+                    <DropdownMenu.Group
+                      ><DropdownMenu.Item disabled
+                        >Loading models…</DropdownMenu.Item
+                      ></DropdownMenu.Group
+                    >
+                  {:else if modelOptions.length > 0}
                     <DropdownMenu.RadioGroup value={selectedModel}>
                       {#each modelOptions as option (option.model)}
                         <DropdownMenu.RadioItem
@@ -1154,8 +1256,7 @@
           <Chat.ToolCalls
             calls={entry.items.map((item) => ({
               ...toolCallProps(item),
-              detail:
-                item.input || item.output ? toolDetail : undefined,
+              detail: item.input || item.output ? toolDetail : undefined,
             }))}
             defaultExpanded={false}
           />
@@ -1255,8 +1356,7 @@
               </Chat.MessageMetadata>
             {/snippet}
           </Chat.Message>
-        {:else if entry.item.type === "status" &&
-          entry.item.layout === "inventory"}
+        {:else if entry.item.type === "status" && entry.item.layout === "inventory"}
           <div
             class="ai-chat-panel__command-notice"
             data-testid="ai-chat-command-notice"

package/dist/chat/ai-chat-panel.svelte.d.ts

@@ -4,6 +4,7 @@ import type { AgentRequest, AgentRuntime, ModelRef, McpServerContribution } from
 import type { AgentSessionStore } from "../sessions/session-store";
 import type { ConversationRepository, CreateConversationInput } from "../conversations/conversation-repository";
 import type { ConversationLocation } from "../conversations/types";
+import { type AcpAgentId } from "../settings/acp-agents";
 import { type AiPluginSettings } from "../settings/ai-settings";
 import type { AppToolBridgeCoordinator } from "../tools/desktop-app-tool-bridge";
 import type { SkillRegistry, SkillSnapshotStore } from "../skills/registry";
@@ -42,6 +43,7 @@ type $$ComponentProps = {
     fileSearch?: ComposerSearchSource;
     models?: ModelRef[];
     modelCatalogError?: string | null;
+    loadModels?: (agent: AcpAgentId, runtime: AiPluginSettings["defaultRuntime"]) => Promise<ModelRef[]>;
     settings?: Partial<AiPluginSettings>;
     onSettingsChange?: (patch: Partial<AiPluginSettings>) => void | Promise<void>;
 };

package/dist/chat/ai-view-bootstrap.d.ts

@@ -11,3 +11,4 @@ export type AiViewBootstrap = {
 };
 export declare function initialAiViewBootstrap(host: AiViewHost): AiViewBootstrap;
 export declare function prepareAiViewBootstrap(host: AiViewHost, initialLocation: ConversationLocation | null, mcpServers: McpServerContribution[]): Promise<AiViewBootstrap>;
+export declare function applyAiViewSettingsPatch(settings: AiPluginSettings, patch: Partial<AiPluginSettings>, current: AiPluginSettings): AiPluginSettings;

package/dist/chat/ai-view-bootstrap.js

@@ -1,4 +1,3 @@
-import { ACP_AGENT_IDS } from "../settings/acp-agents";
 export function initialAiViewBootstrap(host) {
     return {
         runtime: host.fallbackRuntime(),
@@ -13,32 +12,36 @@ export async function prepareAiViewBootstrap(host, initialLocation, mcpServers)
     const conversation = initialLocation
         ? host.conversations.read(initialLocation)
         : Promise.resolve(null);
-    const catalogs = ACP_AGENT_IDS.map((agent) => host.models.listModels(agent));
-    const [snapshot, settledCatalogs] = await Promise.all([
-        conversation.catch(() => null),
-        Promise.allSettled(catalogs),
-    ]);
+    const snapshot = await conversation.catch(() => null);
     if (snapshot) {
         const binding = snapshot.agents.find((record) => record.type === "binding.created" &&
             record.id === snapshot.metadata.activeAgentBindingId);
         if (binding?.type === "binding.created") {
-            const agent = binding.agent === "cursor" ? "cursor" : "codex";
+            const agent = binding.agent === "cursor"
+                ? "cursor"
+                : binding.agent === "opencode"
+                    ? "opencode"
+                    : "codex";
             settings = {
                 ...settings,
                 acpAgent: agent,
                 defaultRuntime: binding.runtime === "codex-native"
                     ? "codex-native"
-                    : binding.runtime === "fake"
-                        ? "fake"
-                        : "acp",
+                    : binding.runtime === "opencode-native"
+                        ? "opencode-native"
+                        : binding.runtime === "fake"
+                            ? "fake"
+                            : "acp",
                 defaultModel: binding.model?.model ?? settings.defaultModels[agent],
                 thinking: binding.thinking ?? settings.thinking,
             };
         }
     }
-    const models = settledCatalogs.flatMap((catalog) => catalog.status === "fulfilled" ? catalog.value : []);
+    const [selectedCatalog] = await Promise.allSettled([
+        host.models.listModels(settings.acpAgent, settings.defaultRuntime),
+    ]);
+    const models = selectedCatalog?.status === "fulfilled" ? selectedCatalog.value : [];
     let modelCatalogError = null;
-    const selectedCatalog = settledCatalogs[ACP_AGENT_IDS.indexOf(settings.acpAgent)];
     const agentModels = models.filter((model) => model.provider === settings.acpAgent);
     if (selectedCatalog?.status === "rejected") {
         modelCatalogError = errorMessage(selectedCatalog.reason);
@@ -56,6 +59,7 @@ export async function prepareAiViewBootstrap(host, initialLocation, mcpServers)
     try {
         runtime = await host.selectRuntime({
             prompt: "",
+            workspace: host.workspace,
             mcpServers,
             agent: settings.acpAgent,
             model: { provider: settings.acpAgent, model: settings.defaultModel },
@@ -84,3 +88,19 @@ export async function prepareAiViewBootstrap(host, initialLocation, mcpServers)
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
+export function applyAiViewSettingsPatch(settings, patch, current) {
+    const acpAgent = patch.acpAgent ?? settings.acpAgent;
+    const defaultModels = { ...settings.defaultModels, ...patch.defaultModels };
+    if (patch.defaultModel !== undefined)
+        defaultModels[acpAgent] = patch.defaultModel;
+    return {
+        ...settings,
+        ...patch,
+        acpAgent,
+        defaultModels,
+        defaultModel: patch.defaultModel ??
+            (patch.acpAgent !== undefined
+                ? current.defaultModels[acpAgent]
+                : (patch.defaultModels?.[acpAgent] ?? settings.defaultModel)),
+    };
+}

package/dist/chat/ai-view-panel.svelte

@@ -6,6 +6,7 @@
   import type { AiViewHost } from "./ai-view";
   import {
     initialAiViewBootstrap,
+    applyAiViewSettingsPatch,
     prepareAiViewBootstrap,
     type AiViewBootstrap,
   } from "./ai-view-bootstrap";
@@ -34,6 +35,17 @@
 
   onMount(() => {
     let disposed = false;
+    const unsubscribe = host.subscribeSettings?.((patch) => {
+      if (disposed || !preparedBootstrap) return;
+      preparedBootstrap = {
+        ...preparedBootstrap,
+        settings: applyAiViewSettingsPatch(
+          preparedBootstrap.settings,
+          patch,
+          host.getSettings(),
+        ),
+      };
+    });
     void prepareAiViewBootstrap(host, initialLocation, mcpServers)
       .then((prepared) => {
         if (disposed) return;
@@ -51,6 +63,7 @@
       });
     return () => {
       disposed = true;
+      unsubscribe?.();
     };
   });
 </script>
@@ -83,6 +96,7 @@
   {workspaceLeaf}
   fileSearch={host.searchVaultFiles}
   models={bootstrap.models}
+  loadModels={(agent, runtime) => host.models.listModels(agent, runtime)}
   modelCatalogError={bootstrap.modelCatalogError}
   settings={bootstrap.settings}
   onSettingsChange={(patch) => host.updateSettings(patch)}

package/dist/chat/ai-view.d.ts

@@ -31,7 +31,7 @@ export type AiViewHost = {
     updateSettings(patch: Partial<AiPluginSettings>): Promise<void>;
     subscribeSettings?(listener: (patch: Partial<AiPluginSettings>) => void): () => void;
     models: {
-        listModels(provider: string): Promise<ModelRef[]>;
+        listModels(provider: string, runtime?: string): Promise<ModelRef[]>;
     };
     workspace?: string;
 };

package/dist/chat/chat-controller.svelte.d.ts

@@ -57,7 +57,7 @@ export declare class AiChatController {
         handoffSummaries?: Pick<HandoffSummaryCoordinator, "afterTerminal">;
         onComposerDefaults?: (next: {
             agent: AcpAgentId;
-            runtimePreference: "acp" | "codex-native" | "fake";
+            runtimePreference: "acp" | "codex-native" | "opencode-native" | "fake";
         }) => void;
     });
     restore(): Promise<void>;