gloomberb 0.9.9 → 0.10.0

package/src/plugins/builtin/ai/screener/editor-runtime.ts

@@ -1,7 +1,8 @@
 import { useCallback, useRef, useState } from "react";
-import type { TextareaRenderable } from "../../../../ui";
+import type { InputRenderable, TextareaRenderable } from "../../../../ui";
 import type { AiProvider } from "../providers";
 import { resolveDefaultAiProviderId } from "../providers";
+import { modelIdAfterAiProviderChange, normalizeAiModelId } from "../runner-selection";
 import {
   createScreenerTab,
   generateScreenerEditorKey,
@@ -10,6 +11,8 @@ import {
 } from "./model";
 
 export function useAiScreenerEditorRuntime({
+  defaultModelId,
+  defaultProviderId,
   providers,
   queueInitialRun,
   selectableProviders,
@@ -18,6 +21,8 @@ export function useAiScreenerEditorRuntime({
   updateTabs,
   upsertTab,
 }: {
+  defaultModelId: string | null;
+  defaultProviderId: string;
   providers: AiProvider[];
   queueInitialRun: (tabId: string) => void;
   selectableProviders: AiProvider[];
@@ -27,25 +32,43 @@ export function useAiScreenerEditorRuntime({
   upsertTab: (tabId: string, updater: (tab: AiScreenerTab) => AiScreenerTab) => void;
 }) {
   const [editorState, setEditorState] = useState<ScreenerEditorState | null>(null);
+  const [editorFocusTarget, setEditorFocusTarget] = useState<"prompt" | "model">("prompt");
+  const editorModelInputRef = useRef<InputRenderable | null>(null);
   const editorTextareaRef = useRef<TextareaRenderable | null>(null);
 
+  const focusEditorPrompt = useCallback(() => {
+    setEditorFocusTarget("prompt");
+    queueMicrotask(() => editorTextareaRef.current?.focus?.());
+  }, []);
+
+  const focusEditorModel = useCallback(() => {
+    setEditorFocusTarget("model");
+    queueMicrotask(() => editorModelInputRef.current?.focus?.());
+  }, []);
+
   const openCreateEditor = useCallback(() => {
+    setEditorFocusTarget("prompt");
     setEditorState({
       mode: "create",
       tabId: null,
-      providerId: resolveDefaultAiProviderId(providers),
+      providerId: selectableProviders.some((provider) => provider.id === defaultProviderId)
+        ? defaultProviderId
+        : resolveDefaultAiProviderId(providers),
+      modelId: defaultModelId ?? "",
       prompt: "",
       key: generateScreenerEditorKey(),
       error: null,
     });
-  }, [providers]);
+  }, [defaultModelId, defaultProviderId, providers, selectableProviders]);
 
   const openEditEditor = useCallback((tab: AiScreenerTab | null) => {
     if (!tab) return;
+    setEditorFocusTarget("prompt");
     setEditorState({
       mode: "edit",
       tabId: tab.id,
       providerId: tab.providerId,
+      modelId: tab.modelId ?? "",
       prompt: tab.prompt,
       key: generateScreenerEditorKey(),
       error: null,
@@ -53,10 +76,24 @@ export function useAiScreenerEditorRuntime({
   }, []);
 
   const closeEditor = useCallback(() => {
+    editorModelInputRef.current = null;
     editorTextareaRef.current = null;
+    setEditorFocusTarget("prompt");
     setEditorState(null);
   }, []);
 
+  const selectEditorProvider = useCallback((providerId: string) => {
+    setEditorState((current) => {
+      if (!current || current.providerId === providerId) return current;
+      return {
+        ...current,
+        providerId,
+        modelId: modelIdAfterAiProviderChange(providerId, defaultProviderId, defaultModelId),
+        error: null,
+      };
+    });
+  }, [defaultModelId, defaultProviderId]);
+
   const cycleEditorProvider = useCallback((direction: -1 | 1) => {
     setEditorState((current) => {
       if (!current || selectableProviders.length === 0) return current;
@@ -65,10 +102,15 @@ export function useAiScreenerEditorRuntime({
       return {
         ...current,
         providerId: selectableProviders[nextIndex]!.id,
+        modelId: modelIdAfterAiProviderChange(
+          selectableProviders[nextIndex]!.id,
+          defaultProviderId,
+          defaultModelId,
+        ),
         error: null,
       };
     });
-  }, [selectableProviders]);
+  }, [defaultModelId, defaultProviderId, selectableProviders]);
 
   const saveEditor = useCallback(() => {
     if (!editorState) return;
@@ -79,7 +121,7 @@ export function useAiScreenerEditorRuntime({
     }
 
     if (editorState.mode === "create") {
-      const tab = createScreenerTab(prompt, editorState.providerId);
+      const tab = createScreenerTab(prompt, editorState.providerId, normalizeAiModelId(editorState.modelId));
       queueInitialRun(tab.id);
       updateTabs((current) => [...current, tab]);
       setActiveTabId(tab.id);
@@ -89,22 +131,30 @@ export function useAiScreenerEditorRuntime({
         ...current,
         prompt,
         providerId: editorState.providerId,
+        modelId: normalizeAiModelId(editorState.modelId),
         lastError: null,
       }));
     }
 
     editorTextareaRef.current = null;
+    editorModelInputRef.current = null;
+    setEditorFocusTarget("prompt");
     setEditorState(null);
   }, [editorState, queueInitialRun, setActiveTabId, setCursorSymbol, updateTabs, upsertTab]);
 
   return {
     closeEditor,
     cycleEditorProvider,
+    editorFocusTarget,
+    editorModelInputRef,
     editorState,
     editorTextareaRef,
+    focusEditorModel,
+    focusEditorPrompt,
     openCreateEditor,
     openEditEditor,
     saveEditor,
+    selectEditorProvider,
     setEditorState,
   };
 }

package/src/plugins/builtin/ai/screener/editor.tsx

@@ -1,21 +1,28 @@
 import type { RefObject } from "react";
 import { useEffect } from "react";
-import { Box, Text, Textarea, type TextareaRenderable } from "../../../../ui";
-import { Button, SegmentedControl } from "../../../../components";
+import { Box, Text, Textarea, type InputRenderable, type TextareaRenderable } from "../../../../ui";
 import { colors } from "../../../../theme/colors";
-import type { AiProvider } from "../providers";
+import { t } from "../../../../i18n";
+import {
+  getAiProviderUnavailableReason,
+  type AiProvider,
+} from "../providers";
 import type { ScreenerEditorState } from "./model";
+import { AiRunnerSelector } from "../runner-selector";
+import { isAiProviderReady } from "../runner-selection";
 
 function ScreenerPromptEditor({
   editorKey,
   initialValue,
   focused,
   textareaRef,
+  onFocusRequest,
 }: {
   editorKey: string;
   initialValue: string;
   focused: boolean;
   textareaRef: RefObject<TextareaRenderable | null>;
+  onFocusRequest: () => void;
 }) {
   useEffect(() => {
     if (focused) {
@@ -26,16 +33,17 @@ function ScreenerPromptEditor({
   return (
     <Box
       flexGrow={1}
-      minHeight={10}
+      minHeight={3}
       border
       borderColor={colors.border}
       backgroundColor={colors.panel}
+      onMouseDown={onFocusRequest}
     >
       <Textarea
         key={editorKey}
         ref={textareaRef}
         initialValue={initialValue}
-        placeholder="Examples: humanoid robot suppliers, defense software compounders, EM payment rails, obesity-drug picks-and-shovels..."
+        placeholder={t("Examples: humanoid robot suppliers, defense software compounders, EM payment rails, obesity-drug picks-and-shovels...")}
         focused={focused}
         textColor={colors.text}
         placeholderColor={colors.textDim}
@@ -48,48 +56,49 @@ function ScreenerPromptEditor({
 }
 
 export function AiScreenerEditorView({
-  contentHeight,
   editorProvider,
+  editorFocusTarget,
   editorState,
   focused,
+  modelInputRef,
   selectableProviders,
   textareaRef,
-  width,
-  onCancel,
+  onModelFocusRequest,
   onProviderChange,
-  onSave,
+  onModelChange,
+  onPromptFocusRequest,
 }: {
-  contentHeight: number;
   editorProvider: AiProvider | null;
+  editorFocusTarget: "prompt" | "model";
   editorState: ScreenerEditorState;
   focused: boolean;
+  modelInputRef: RefObject<InputRenderable | null>;
   selectableProviders: AiProvider[];
   textareaRef: RefObject<TextareaRenderable | null>;
-  width: number;
-  onCancel: () => void;
+  onModelFocusRequest: () => void;
   onProviderChange: (providerId: string) => void;
-  onSave: () => void;
+  onModelChange: (modelId: string) => void;
+  onPromptFocusRequest: () => void;
 }) {
   return (
     <>
-      <Box flexDirection="row" height={1} gap={1}>
-        <Button label="Save" variant="primary" onPress={onSave} />
-        <Button label="Cancel" variant="ghost" onPress={onCancel} />
-      </Box>
-
       <Box flexDirection="column" paddingX={1} paddingTop={1} gap={1}>
         <Text fg={colors.textDim}>
           {editorState.mode === "create"
-            ? "Describe the companies or setups you want this screener to discover."
-            : "Update the screener prompt or provider. Saving does not rerun it automatically."}
+            ? t("Describe the companies or setups you want this screener to discover.")
+            : t("Update the screener prompt or provider. Saving does not rerun it automatically.")}
         </Text>
-        <SegmentedControl
-          value={editorState.providerId}
-          options={selectableProviders.map((provider) => ({
-            value: provider.id,
-            label: provider.available ? provider.name : `${provider.name} (missing)`,
-          }))}
-          onChange={onProviderChange}
+        <AiRunnerSelector
+          providers={selectableProviders}
+          providerId={editorState.providerId}
+          modelId={editorState.modelId}
+          modelInputRef={modelInputRef}
+          modelFocused={focused && editorFocusTarget === "model"}
+          onProviderChange={onProviderChange}
+          onModelChange={onModelChange}
+          onModelFocusRequest={onModelFocusRequest}
+          onModelBlur={onPromptFocusRequest}
+          modelHint="Ctrl+O opens the Pi model catalog."
         />
         {editorState.error ? (
           <Text fg={colors.negative}>{editorState.error}</Text>
@@ -100,24 +109,21 @@ export function AiScreenerEditorView({
         )}
       </Box>
 
-      <Box flexGrow={1} minHeight={contentHeight} padding={1}>
+      <Box flexGrow={1} minHeight={4} padding={1}>
         <ScreenerPromptEditor
           editorKey={editorState.key}
           initialValue={editorState.prompt}
-          focused={focused}
+          focused={focused && editorFocusTarget === "prompt"}
           textareaRef={textareaRef}
+          onFocusRequest={onPromptFocusRequest}
         />
       </Box>
 
-      <Box height={1} paddingX={1}>
-        <Text fg={colors.textDim}>{"\u2500".repeat(Math.max(width - 2, 0))}</Text>
-      </Box>
-
       <Box flexDirection="column" paddingX={1}>
         <Text fg={colors.textDim}>
-          {editorProvider?.available === false
-            ? `${editorProvider.name} is not currently installed. Save and switch later.`
-            : "Click a provider chip to switch. Save to keep the draft."}
+          {editorProvider && !isAiProviderReady(editorProvider)
+            ? `${getAiProviderUnavailableReason(editorProvider)} Save and switch later.`
+            : "Click a provider to switch. Save to keep the draft."}
         </Text>
       </Box>
     </>

package/src/plugins/builtin/ai/screener/footer.ts

@@ -1,93 +1,108 @@
 import { usePaneFooter } from "../../../../components";
-import { formatTimeAgo } from "../../../../utils/format";
-import { getAiProvider, type AiProvider } from "../providers";
+import { t } from "../../../../i18n";
 import type { AiScreenerTab, RunState, ScreenerEditorState } from "./model";
 
 interface UseAiScreenerFooterOptions {
   activeTab: AiScreenerTab | null;
-  addTab: () => void;
-  cycleEditorProvider: (direction: -1 | 1) => void;
-  editActiveTab: () => void;
-  editorProvider: AiProvider | null;
   editorState: ScreenerEditorState | null;
-  forceRefreshActiveTab: () => void;
-  forceRunArmed: boolean;
   isRunningActiveTab: boolean;
-  providers: AiProvider[];
-  refreshActiveTab: () => void;
-  removeTab: (tabId: string) => void;
   runState: RunState | null;
-  saveEditor: () => void;
-  selectableProviders: AiProvider[];
+  onAddTab: () => void;
+  onCancelRun: () => void;
+  onCloseEditor: () => void;
+  onEdit: () => void;
+  onRefresh: () => void;
+  onSaveEditor: () => void;
 }
 
 export function useAiScreenerFooter({
   activeTab,
-  addTab,
-  cycleEditorProvider,
-  editActiveTab,
-  editorProvider,
   editorState,
-  forceRefreshActiveTab,
-  forceRunArmed,
   isRunningActiveTab,
-  providers,
-  refreshActiveTab,
-  removeTab,
   runState,
-  saveEditor,
-  selectableProviders,
+  onAddTab,
+  onCancelRun,
+  onCloseEditor,
+  onEdit,
+  onRefresh,
+  onSaveEditor,
 }: UseAiScreenerFooterOptions) {
-  const activeProvider = activeTab ? getAiProvider(activeTab.providerId, providers) : null;
-  const statusText = activeTab
-    ? isRunningActiveTab && runState
-      ? `${runState.mode === "force" ? "Force refreshing" : "Refreshing"} with ${activeProvider?.name ?? "AI"}...`
-      : activeTab.lastSuccessAt
-        ? `Last ran ${formatTimeAgo(new Date(activeTab.lastSuccessAt))}`
-        : "Never run"
-    : "No screener selected";
-
   usePaneFooter("ai-screener", () => ({
-    info: [
-      ...(editorState ? [{
-        id: "provider",
-        parts: [{ text: editorProvider?.name ?? editorState.providerId, tone: editorProvider?.available === false ? "warning" as const : "value" as const, bold: true }],
-      }] : activeTab ? [{
-        id: "provider",
-        parts: [{ text: activeProvider?.name ?? activeTab.providerId, tone: activeProvider?.available === false ? "warning" as const : "value" as const, bold: true }],
-      }] : []),
-      { id: "status", parts: [{ text: statusText, tone: isRunningActiveTab ? "muted" : "value" }] },
-      ...(forceRunArmed ? [{ id: "force", parts: [{ text: "force refresh armed", tone: "warning" as const }] }] : []),
-    ],
+    info: isRunningActiveTab && runState
+      ? [{
+          id: "running",
+          parts: [{
+            text: t("Refreshing…"),
+            tone: "muted" as const,
+          }],
+        }]
+      : activeTab?.lastError
+        ? [{
+            id: "error",
+            parts: [{ text: activeTab.lastError, tone: "warning" as const }],
+          }]
+        : activeTab?.lastWarning
+          ? [{
+              id: "warning",
+              parts: [{ text: activeTab.lastWarning, tone: "warning" as const }],
+            }]
+          : [],
     hints: editorState
       ? [
-          { id: "save", key: "Ctrl+S", label: "save", onPress: saveEditor },
-          { id: "provider", key: "Ctrl+P", label: "provider", onPress: () => cycleEditorProvider(1), disabled: selectableProviders.length <= 1 },
+          {
+            id: "save",
+            key: "Ctrl+S",
+            label: t("save"),
+            onPress: onSaveEditor,
+          },
+          {
+            id: "cancel-edit",
+            key: "Esc",
+            label: t("cancel"),
+            onPress: onCloseEditor,
+          },
         ]
-      : [
-          { id: "new", key: "t", label: "new", onPress: addTab },
-          { id: "close", key: "w", label: "close tab", onPress: activeTab ? () => removeTab(activeTab.id) : undefined, disabled: !activeTab },
-          { id: "refresh", key: "r", label: "efresh", onPress: refreshActiveTab, disabled: !activeTab || isRunningActiveTab },
-          { id: "force-refresh", key: "Shift+R", label: "force refresh", onPress: forceRefreshActiveTab, disabled: !activeTab || isRunningActiveTab },
-          { id: "edit", key: "e", label: "dit", onPress: editActiveTab, disabled: !activeTab },
-        ],
+      : isRunningActiveTab
+        ? [
+            {
+              id: "stop",
+              key: "Esc",
+              label: t("stop"),
+              onPress: onCancelRun,
+            },
+          ]
+        : [
+            {
+              id: "new",
+              key: "t",
+              label: t("ab"),
+              onPress: onAddTab,
+            },
+            {
+              id: "refresh",
+              key: "r",
+              label: t("efresh"),
+              onPress: onRefresh,
+              disabled: !activeTab,
+            },
+            {
+              id: "edit",
+              key: "e",
+              label: t("dit"),
+              onPress: onEdit,
+              disabled: !activeTab,
+            },
+          ],
   }), [
-    activeProvider?.available,
-    activeProvider?.name,
     activeTab,
-    addTab,
-    cycleEditorProvider,
-    editActiveTab,
-    editorProvider?.available,
-    editorProvider?.name,
     editorState,
-    forceRefreshActiveTab,
-    forceRunArmed,
     isRunningActiveTab,
-    refreshActiveTab,
-    removeTab,
-    saveEditor,
-    selectableProviders.length,
-    statusText,
+    onAddTab,
+    onCancelRun,
+    onCloseEditor,
+    onEdit,
+    onRefresh,
+    onSaveEditor,
+    runState,
   ]);
 }

package/src/plugins/builtin/ai/screener/keyboard.ts

@@ -1,5 +1,5 @@
 import { useShortcut } from "../../../../react/input";
-import type { AiScreenerTab, RunState, ScreenerEditorState } from "./model";
+import type { AiScreenerTab, ScreenerEditorState } from "./model";
 
 export function useAiScreenerKeyboard({
   activeTab,
@@ -9,11 +9,14 @@ export function useAiScreenerKeyboard({
   cycleEditorProvider,
   cycleTabs,
   editActiveTab,
+  editorFocusTarget,
   editorState,
   focused,
+  focusEditorModel,
+  focusEditorPrompt,
   isRunningActiveTab,
+  refreshActiveTab,
   removeTab,
-  runTab,
   saveEditor,
 }: {
   activeTab: AiScreenerTab | null;
@@ -23,27 +26,44 @@ export function useAiScreenerKeyboard({
   cycleEditorProvider: (direction: -1 | 1) => void;
   cycleTabs: (direction: -1 | 1) => void;
   editActiveTab: () => void;
+  editorFocusTarget: "prompt" | "model";
   editorState: ScreenerEditorState | null;
   focused: boolean;
+  focusEditorModel: () => void;
+  focusEditorPrompt: () => void;
   isRunningActiveTab: boolean;
+  refreshActiveTab: () => void;
   removeTab: (tabId: string) => void;
-  runTab: (tabId: string, mode: RunState["mode"]) => void;
   saveEditor: () => void;
 }) {
   useShortcut((event) => {
     if (!focused) return;
 
     if (editorState) {
+      if (event.ctrl && event.name === "s") {
+        event.stopPropagation?.();
+        event.preventDefault?.();
+        saveEditor();
+        return;
+      }
+      if (editorFocusTarget === "model") {
+        if (event.name === "escape" || event.name === "tab") {
+          event.stopPropagation?.();
+          event.preventDefault?.();
+          focusEditorPrompt();
+        }
+        return;
+      }
       if (event.name === "escape") {
         event.stopPropagation?.();
         event.preventDefault?.();
         closeEditor();
         return;
       }
-      if (event.ctrl && event.name === "s") {
+      if (event.ctrl && event.name === "o") {
         event.stopPropagation?.();
         event.preventDefault?.();
-        saveEditor();
+        focusEditorModel();
         return;
       }
       if (event.ctrl && event.name === "p") {
@@ -75,12 +95,8 @@ export function useAiScreenerKeyboard({
       cancelRun();
       return;
     }
-    if (event.shift && event.name === "r" && activeTab && !isRunningActiveTab) {
-      void runTab(activeTab.id, "force");
-      return;
-    }
-    if (event.name === "r" && activeTab && !isRunningActiveTab) {
-      void runTab(activeTab.id, "refresh");
+    if (!event.shift && event.name === "r" && activeTab && !isRunningActiveTab) {
+      refreshActiveTab();
       return;
     }
     if (event.name === "e") {

package/src/plugins/builtin/ai/screener/model.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, test } from "bun:test";
+import { normalizeTabs } from "./model";
+
+describe("AI screener model", () => {
+  test("migrates persisted provider aliases and defaults missing providers", () => {
+    const tabs = normalizeTabs({
+      tabs: [
+        { id: "claude", providerId: "claude" },
+        { id: "codex", providerId: "codex" },
+        { id: "gemini", providerId: "gemini" },
+        { id: "unsupported", providerId: "opencode" },
+        { id: "missing" },
+      ],
+    });
+
+    expect(tabs.map((tab) => tab.providerId)).toEqual([
+      "anthropic",
+      "openai-codex",
+      "google",
+      "opencode",
+      "anthropic",
+    ]);
+  });
+});

package/src/plugins/builtin/ai/screener/model.ts

@@ -1,3 +1,4 @@
+import { migrateLegacyAiProviderId } from "../providers";
 import { deriveScreenerTitle, type ValidatedScreenerResult } from "./contract";
 
 export interface AiScreenerTab {
@@ -5,6 +6,7 @@ export interface AiScreenerTab {
   title: string;
   prompt: string;
   providerId: string;
+  modelId: string | null;
   createdAt: number;
   lastRunAt: number | null;
   lastSuccessAt: number | null;
@@ -27,7 +29,6 @@ export interface ScreenerSortPreference {
 
 export interface RunState {
   tabId: string;
-  mode: "refresh" | "force";
   output: string;
 }
 
@@ -35,6 +36,7 @@ export interface ScreenerEditorState {
   mode: "create" | "edit";
   tabId: string | null;
   providerId: string;
+  modelId: string;
   prompt: string;
   key: string;
   error: string | null;
@@ -54,12 +56,13 @@ export function generateScreenerEditorKey(): string {
   return `editor-${Date.now()}-${nextScreenerEditorId++}`;
 }
 
-export function createScreenerTab(prompt: string, providerId: string): AiScreenerTab {
+export function createScreenerTab(prompt: string, providerId: string, modelId: string | null = null): AiScreenerTab {
   return {
     id: generateScreenerTabId(),
     title: deriveScreenerTitle(prompt),
     prompt,
     providerId,
+    modelId: modelId?.trim() || null,
     createdAt: Date.now(),
     lastRunAt: null,
     lastSuccessAt: null,
@@ -80,7 +83,10 @@ export function normalizeTabs(value: unknown): AiScreenerTab[] {
       ...entry,
       title: typeof entry.title === "string" ? entry.title : "New Screener",
       prompt: typeof entry.prompt === "string" ? entry.prompt : "",
-      providerId: typeof entry.providerId === "string" ? entry.providerId : "claude",
+      providerId: typeof entry.providerId === "string" && entry.providerId.trim()
+        ? migrateLegacyAiProviderId(entry.providerId.trim())
+        : "anthropic",
+      modelId: typeof entry.modelId === "string" && entry.modelId.trim() ? entry.modelId.trim() : null,
       createdAt: typeof entry.createdAt === "number" ? entry.createdAt : Date.now(),
       lastRunAt: typeof entry.lastRunAt === "number" ? entry.lastRunAt : null,
       lastSuccessAt: typeof entry.lastSuccessAt === "number" ? entry.lastSuccessAt : null,