@ulam/halohalo 0.3.2 → 0.3.3

package/fetch.js

@@ -1,134 +1,134 @@
-import { AiApiError, httpStatusToErrorType, PROVIDER_CONFIGS } from './providers.js'
-
-// ─── Provider URL Whitelist ───────────────────────────────────────────────────
-// Prevents SSRF attacks from user-configured provider URLs.
-const ALLOWED_PROVIDER_HOSTS = new Set([
-  'api.anthropic.com',
-  'api.openai.com',
-  'generativelanguage.googleapis.com',
-])
-
-function validateProviderUrl(url) {
-  try {
-    const hostname = new URL(url).hostname
-    return ALLOWED_PROVIDER_HOSTS.has(hostname)
-  } catch {
-    return false
-  }
-}
-
-// ─── callProvider ─────────────────────────────────────────────────────────────
-// Single-turn completion against any configured provider.
-// Returns the response text string.
-
-export async function callProvider({ provider, model, key, prompt, maxTokens = 1024 }) {
-  const config = PROVIDER_CONFIGS[provider]
-  if (!config) throw new AiApiError('api_error', { provider })
-
-  let url
-  if (config.buildUrl) {
-    url = config.buildUrl(key, model)
-    if (!url) throw new AiApiError('api_error', { provider })
-  } else {
-    url = config.url.replace('{model}', model)
-  }
-
-  if (!validateProviderUrl(url)) {
-    throw new AiApiError('api_error', { provider })
-  }
-
-  let res
-  try {
-    res = await fetch(url, {
-      method: 'POST',
-      headers: config.buildHeaders(key),
-      body: config.buildBody(prompt, model, maxTokens),
-    })
-  } catch {
-    throw new AiApiError('network_error', { provider })
-  }
-
-  if (!res.ok) {
-    throw new AiApiError(httpStatusToErrorType(res.status), { status: res.status, provider })
-  }
-
-  return config.parseResponse(res)
-}
-
-// ─── callAnthropicWithTools ───────────────────────────────────────────────────
-// Agentic tool-use loop for Anthropic. Calls the messages API repeatedly until
-// stop_reason is 'end_turn' or maxTurns is exhausted.
-//
-// onToolCall(toolName, toolInput) => toolResultContent (string or object)
-// Returns the final text block content.
-
-export async function callAnthropicWithTools({
-  key,
-  model,
-  system,
-  tools,
-  messages,
-  maxTokens = 2048,
-  maxTurns = 5,
-  onToolCall,
-}) {
-  const config = PROVIDER_CONFIGS.anthropic
-  let turns = 0
-
-  while (turns <= maxTurns) {
-    let res
-    try {
-      res = await fetch(config.url, {
-        method: 'POST',
-        headers: config.buildHeaders(key),
-        body: JSON.stringify({ model, max_tokens: maxTokens, system, tools, messages }),
-      })
-    } catch {
-      throw new AiApiError('network_error', { provider: 'anthropic' })
-    }
-
-    if (!res.ok) {
-      throw new AiApiError(httpStatusToErrorType(res.status), { status: res.status, provider: 'anthropic' })
-    }
-
-    const data = await res.json()
-
-    if (import.meta.env.DEV) console.log(`[halohalo] turn ${turns + 1}, stop_reason: ${data.stop_reason}`)
-
-    messages.push({ role: 'assistant', content: data.content })
-
-    if (data.stop_reason === 'end_turn') {
-      return data.content.find(b => b.type === 'text')?.text || ''
-    }
-
-    if (data.stop_reason === 'tool_use') {
-      if (turns >= maxTurns) {
-        if (import.meta.env.DEV) console.warn('[halohalo] maxTurns reached')
-        throw new AiApiError('api_error', { provider: 'anthropic' })
-      }
-
-      const toolBlocks = data.content.filter(b => b.type === 'tool_use')
-      const toolResults = await Promise.all(
-        toolBlocks.map(async (block) => {
-          const result = await onToolCall?.(block.name, block.input) ?? ''
-          if (import.meta.env.DEV) {
-            console.log(`[halohalo] tool_use: ${block.name}`, block.input, '→', result)
-          }
-          return {
-            type: 'tool_result',
-            tool_use_id: block.id,
-            content: typeof result === 'string' ? result : JSON.stringify(result),
-          }
-        })
-      )
-
-      messages.push({ role: 'user', content: toolResults })
-      turns++
-      continue
-    }
-
-    break
-  }
-
-  throw new AiApiError('api_error', { provider: 'anthropic' })
-}
+import { AiApiError, httpStatusToErrorType, PROVIDER_CONFIGS } from './providers.js'
+
+// ─── Provider URL Whitelist ───────────────────────────────────────────────────
+// Prevents SSRF attacks from user-configured provider URLs.
+const ALLOWED_PROVIDER_HOSTS = new Set([
+  'api.anthropic.com',
+  'api.openai.com',
+  'generativelanguage.googleapis.com',
+])
+
+function validateProviderUrl(url) {
+  try {
+    const hostname = new URL(url).hostname
+    return ALLOWED_PROVIDER_HOSTS.has(hostname)
+  } catch {
+    return false
+  }
+}
+
+// ─── callProvider ─────────────────────────────────────────────────────────────
+// Single-turn completion against any configured provider.
+// Returns the response text string.
+
+export async function callProvider({ provider, model, key, prompt, maxTokens = 1024 }) {
+  const config = PROVIDER_CONFIGS[provider]
+  if (!config) throw new AiApiError('api_error', { provider })
+
+  let url
+  if (config.buildUrl) {
+    url = config.buildUrl(key, model)
+    if (!url) throw new AiApiError('api_error', { provider })
+  } else {
+    url = config.url.replace('{model}', model)
+  }
+
+  if (!validateProviderUrl(url)) {
+    throw new AiApiError('api_error', { provider })
+  }
+
+  let res
+  try {
+    res = await fetch(url, {
+      method: 'POST',
+      headers: config.buildHeaders(key),
+      body: config.buildBody(prompt, model, maxTokens),
+    })
+  } catch {
+    throw new AiApiError('network_error', { provider })
+  }
+
+  if (!res.ok) {
+    throw new AiApiError(httpStatusToErrorType(res.status), { status: res.status, provider })
+  }
+
+  return config.parseResponse(res)
+}
+
+// ─── callAnthropicWithTools ───────────────────────────────────────────────────
+// Agentic tool-use loop for Anthropic. Calls the messages API repeatedly until
+// stop_reason is 'end_turn' or maxTurns is exhausted.
+//
+// onToolCall(toolName, toolInput) => toolResultContent (string or object)
+// Returns the final text block content.
+
+export async function callAnthropicWithTools({
+  key,
+  model,
+  system,
+  tools,
+  messages,
+  maxTokens = 2048,
+  maxTurns = 5,
+  onToolCall,
+}) {
+  const config = PROVIDER_CONFIGS.anthropic
+  let turns = 0
+
+  while (turns <= maxTurns) {
+    let res
+    try {
+      res = await fetch(config.url, {
+        method: 'POST',
+        headers: config.buildHeaders(key),
+        body: JSON.stringify({ model, max_tokens: maxTokens, system, tools, messages }),
+      })
+    } catch {
+      throw new AiApiError('network_error', { provider: 'anthropic' })
+    }
+
+    if (!res.ok) {
+      throw new AiApiError(httpStatusToErrorType(res.status), { status: res.status, provider: 'anthropic' })
+    }
+
+    const data = await res.json()
+
+    if (import.meta.env.DEV) console.log(`[halohalo] turn ${turns + 1}, stop_reason: ${data.stop_reason}`)
+
+    messages.push({ role: 'assistant', content: data.content })
+
+    if (data.stop_reason === 'end_turn') {
+      return data.content.find(b => b.type === 'text')?.text || ''
+    }
+
+    if (data.stop_reason === 'tool_use') {
+      if (turns >= maxTurns) {
+        if (import.meta.env.DEV) console.warn('[halohalo] maxTurns reached')
+        throw new AiApiError('api_error', { provider: 'anthropic' })
+      }
+
+      const toolBlocks = data.content.filter(b => b.type === 'tool_use')
+      const toolResults = await Promise.all(
+        toolBlocks.map(async (block) => {
+          const result = await onToolCall?.(block.name, block.input) ?? ''
+          if (import.meta.env.DEV) {
+            console.log(`[halohalo] tool_use: ${block.name}`, block.input, '→', result)
+          }
+          return {
+            type: 'tool_result',
+            tool_use_id: block.id,
+            content: typeof result === 'string' ? result : JSON.stringify(result),
+          }
+        })
+      )
+
+      messages.push({ role: 'user', content: toolResults })
+      turns++
+      continue
+    }
+
+    break
+  }
+
+  throw new AiApiError('api_error', { provider: 'anthropic' })
+}

package/index.js

@@ -1,20 +1,20 @@
-// vanilla core
-export { initHalohalo } from './init.js'
-export { AiApiError, httpStatusToErrorType, PROVIDER_CONFIGS } from './providers.js'
-export { callProvider, callAnthropicWithTools } from './fetch.js'
-export { searchItems, makeSearchTool } from './search.js'
-export { createProviderConfig } from './createProviderConfig.js'
-export { createCompletion } from './createCompletion.js'
-export { getAiRefinement, parseAiResponse } from './aiService.js'
-export { getAgenticRefinement } from './agenticAiService.js'
-export { PROVIDERS, PROVIDER_MODELS, initModels, initApiKeys } from './models.js'
-export { getAiProvider, isAgenticModeEnabled, getAiModel, getProviderLabel } from './prefs.js'
-export { checkConnectivity } from './connectivity.js'
-export {
-  LS_AI_PROVIDER, LS_AGENTIC_MODE, LS_APIKEY_PREFIX, LS_AI_MODEL_PREFIX,
-  AI_MAX_TOKENS, AI_AGENTIC_MAX_TOKENS, AGENTIC_MAX_TOOL_TURNS,
-  AI_DESC_REGEX, AI_FIX_REGEX,
-  DEBUG_AI_DELAY_MS, DEFAULT_AI_MODELS, PROVIDER_LABELS,
-  DEBUG_COMMANDS, DEBUG_COMMAND_VALUES,
-  ANTHROPIC_API_VERSION, ANTHROPIC_API_URL,
-} from './constants.js'
+// vanilla core
+export { initHalohalo } from './init.js'
+export { AiApiError, httpStatusToErrorType, PROVIDER_CONFIGS } from './providers.js'
+export { callProvider, callAnthropicWithTools } from './fetch.js'
+export { searchItems, makeSearchTool } from './search.js'
+export { createProviderConfig } from './createProviderConfig.js'
+export { createCompletion } from './createCompletion.js'
+export { getAiRefinement, parseAiResponse } from './aiService.js'
+export { getAgenticRefinement } from './agenticAiService.js'
+export { PROVIDERS, PROVIDER_MODELS, initModels, initApiKeys } from './models.js'
+export { getAiProvider, isAgenticModeEnabled, getAiModel, getProviderLabel } from './prefs.js'
+export { checkConnectivity } from './connectivity.js'
+export {
+  LS_AI_PROVIDER, LS_AGENTIC_MODE, LS_APIKEY_PREFIX, LS_AI_MODEL_PREFIX,
+  AI_MAX_TOKENS, AI_AGENTIC_MAX_TOKENS, AGENTIC_MAX_TOOL_TURNS,
+  AI_DESC_REGEX, AI_FIX_REGEX,
+  DEBUG_AI_DELAY_MS, DEFAULT_AI_MODELS, PROVIDER_LABELS,
+  DEBUG_COMMANDS, DEBUG_COMMAND_VALUES,
+  ANTHROPIC_API_VERSION, ANTHROPIC_API_URL,
+} from './constants.js'

package/init.js

@@ -1,33 +1,33 @@
-// ─── halohalo module singleton ────────────────────────────────────────────────
-// Holds app-injected config. Call initHalohalo() before using aiService or
-// agenticAiService.
-
-let _buildPrompt = null
-let _systemPrompt = null
-
-/**
- * Register app-specific AI config. Call once at app init.
- *
- * @param {{
- *   buildPrompt: (params: object) => string,
- *   systemPrompt?: string,
- * }} config
- *
- * buildPrompt receives { finding, descText, fixText, note } and must return
- * the user-turn prompt string for single-turn refinement.
- *
- * systemPrompt is used for agentic (tool-use) mode. If omitted, agentic mode
- * falls back to a generic instruction.
- */
-export function initHalohalo({ buildPrompt, systemPrompt = null }) {
-  _buildPrompt = buildPrompt
-  _systemPrompt = systemPrompt
-}
-
-export function getBuildPrompt() {
-  return _buildPrompt
-}
-
-export function getSystemPrompt() {
-  return _systemPrompt
-}
+// ─── halohalo module singleton ────────────────────────────────────────────────
+// Holds app-injected config. Call initHalohalo() before using aiService or
+// agenticAiService.
+
+let _buildPrompt = null
+let _systemPrompt = null
+
+/**
+ * Register app-specific AI config. Call once at app init.
+ *
+ * @param {{
+ *   buildPrompt: (params: object) => string,
+ *   systemPrompt?: string,
+ * }} config
+ *
+ * buildPrompt receives { finding, descText, fixText, note } and must return
+ * the user-turn prompt string for single-turn refinement.
+ *
+ * systemPrompt is used for agentic (tool-use) mode. If omitted, agentic mode
+ * falls back to a generic instruction.
+ */
+export function initHalohalo({ buildPrompt, systemPrompt = null }) {
+  _buildPrompt = buildPrompt
+  _systemPrompt = systemPrompt
+}
+
+export function getBuildPrompt() {
+  return _buildPrompt
+}
+
+export function getSystemPrompt() {
+  return _systemPrompt
+}

package/models.js

@@ -1,48 +1,40 @@
-import { LS_AI_MODEL_PREFIX, LS_APIKEY_PREFIX, DEFAULT_AI_MODELS } from './constants.js'
-
-let _adapter = null
-async function getAdapterInstance() {
-  if (!_adapter) {
-    const mod = await import('@ulam/sawsawan')
-    _adapter = mod.getAdapter()
-  }
-  return _adapter
-}
-
-export const PROVIDERS = [
-  { id: 'anthropic', label: 'Anthropic (Claude)', placeholderKey: 'settings.api_placeholder_anthropic' },
-  { id: 'openai',    label: 'OpenAI (GPT)',        placeholderKey: 'settings.api_placeholder_openai'    },
-  { id: 'google',    label: 'Google (Gemini)',      placeholderKey: 'settings.api_placeholder_google'    },
-  { id: 'microsoft', label: 'Microsoft (Copilot)', placeholderKey: 'settings.api_placeholder_default'   },
-]
-
-export const PROVIDER_MODELS = {
-  anthropic: [
-    { id: 'claude-haiku-4-5-20251001', label: 'Claude Haiku 4.5, fast, low cost' },
-    { id: 'claude-sonnet-4-6',         label: 'Claude Sonnet 4.6, balanced (default)' },
-    { id: 'claude-opus-4-7',           label: 'Claude Opus 4.7, most capable' },
-  ],
-  openai: [
-    { id: 'gpt-4o-mini', label: 'GPT-4o Mini, fast, low cost' },
-    { id: 'gpt-4o',      label: 'GPT-4o, balanced (default)' },
-  ],
-  google: [
-    { id: 'gemini-1.5-flash', label: 'Gemini 1.5 Flash, fast (default)' },
-    { id: 'gemini-1.5-pro',   label: 'Gemini 1.5 Pro, most capable' },
-  ],
-  microsoft: [],
-}
-
-export function initModels() {
-  const adapter = getAdapterInstance()
-  return Object.fromEntries(
-    PROVIDERS.map(p => [p.id, adapter.readPref(`${LS_AI_MODEL_PREFIX}${p.id}`) || DEFAULT_AI_MODELS[p.id] || ''])
-  )
-}
-
-export function initApiKeys() {
-  const adapter = getAdapterInstance()
-  return Object.fromEntries(
-    PROVIDERS.map(p => [p.id, window.electronAPI ? '' : adapter.readPref(`${LS_APIKEY_PREFIX}${p.id}`) || ''])
-  )
-}
+import { LS_AI_MODEL_PREFIX, LS_APIKEY_PREFIX, DEFAULT_AI_MODELS } from './constants.js'
+import { getAdapter } from '@ulam/sawsawan'
+
+const _adapter = getAdapter()
+
+export const PROVIDERS = [
+  { id: 'anthropic', label: 'Anthropic (Claude)', placeholderKey: 'settings.api_placeholder_anthropic' },
+  { id: 'openai',    label: 'OpenAI (GPT)',        placeholderKey: 'settings.api_placeholder_openai'    },
+  { id: 'google',    label: 'Google (Gemini)',      placeholderKey: 'settings.api_placeholder_google'    },
+  { id: 'microsoft', label: 'Microsoft (Copilot)', placeholderKey: 'settings.api_placeholder_default'   },
+]
+
+export const PROVIDER_MODELS = {
+  anthropic: [
+    { id: 'claude-haiku-4-5-20251001', label: 'Claude Haiku 4.5, fast, low cost' },
+    { id: 'claude-sonnet-4-6',         label: 'Claude Sonnet 4.6, balanced (default)' },
+    { id: 'claude-opus-4-7',           label: 'Claude Opus 4.7, most capable' },
+  ],
+  openai: [
+    { id: 'gpt-4o-mini', label: 'GPT-4o Mini, fast, low cost' },
+    { id: 'gpt-4o',      label: 'GPT-4o, balanced (default)' },
+  ],
+  google: [
+    { id: 'gemini-1.5-flash', label: 'Gemini 1.5 Flash, fast (default)' },
+    { id: 'gemini-1.5-pro',   label: 'Gemini 1.5 Pro, most capable' },
+  ],
+  microsoft: [],
+}
+
+export function initModels() {
+  return Object.fromEntries(
+    PROVIDERS.map(p => [p.id, _adapter.readPref(`${LS_AI_MODEL_PREFIX}${p.id}`) || DEFAULT_AI_MODELS[p.id] || ''])
+  )
+}
+
+export function initApiKeys() {
+  return Object.fromEntries(
+    PROVIDERS.map(p => [p.id, window.electronAPI ? '' : _adapter.readPref(`${LS_APIKEY_PREFIX}${p.id}`) || ''])
+  )
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ulam/halohalo",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "AI service adapters, model configuration, and provider abstraction.",
   "type": "module",
   "license": "MIT",

package/react.js

@@ -1,2 +1,2 @@
-export { useProviderConfig } from './useProviderConfig.js'
-export { useCompletion } from './useCompletion.js'
+export { useProviderConfig } from './useProviderConfig.js'
+export { useCompletion } from './useCompletion.js'

package/useCompletion.js

@@ -1,17 +1,17 @@
-import { useState, useEffect } from 'react'
-import { createCompletion } from './createCompletion.js'
-
-export function useCompletion(options = {}) {
-  const [instance] = useState(createCompletion)
-  const [state, setState] = useState({ loading: false, animating: false })
-
-  useEffect(() => instance.subscribe(setState), [instance])
-  useEffect(() => () => instance.cancel(), [instance])
-
-  return {
-    loading: state.loading,
-    animating: state.animating,
-    complete: (callOptions) => instance.complete({ ...options, ...callOptions }),
-    cancel: () => instance.cancel(),
-  }
-}
+import { useState, useEffect } from 'react'
+import { createCompletion } from './createCompletion.js'
+
+export function useCompletion(options = {}) {
+  const [instance] = useState(createCompletion)
+  const [state, setState] = useState({ loading: false, animating: false })
+
+  useEffect(() => instance.subscribe(setState), [instance])
+  useEffect(() => () => instance.cancel(), [instance])
+
+  return {
+    loading: state.loading,
+    animating: state.animating,
+    complete: (callOptions) => instance.complete({ ...options, ...callOptions }),
+    cancel: () => instance.cancel(),
+  }
+}

package/useProviderConfig.js

@@ -1,27 +1,27 @@
-import { useState, useCallback, useSyncExternalStore } from 'react'
-import { createProviderConfig } from './createProviderConfig.js'
-
-export function useProviderConfig(storageKeys, providers) {
-  const [config] = useState(() => createProviderConfig(storageKeys, providers))
-
-  const snapshot = useSyncExternalStore(
-    (listen) => config.subscribe(listen),
-    () => ({
-      provider: config.provider,
-      models: config.models,
-      mode: config.mode,
-      providers: config.providers,
-    })
-  )
-
-  return {
-    ...snapshot,
-    setProvider: useCallback((id) => config.setProvider(id), [config]),
-    setModel: useCallback((pid, mid) => config.setModel(pid, mid), [config]),
-    setMode: useCallback((v) => config.setMode(v), [config]),
-    setKey: useCallback((pid, v) => config.setKey(pid, v), [config]),
-    getKey: useCallback((pid) => config.getKey(pid), [config]),
-    getModel: useCallback((pid) => config.getModel(pid), [config]),
-    getLabel: useCallback((pid) => config.getLabel(pid), [config]),
-  }
-}
+import { useState, useCallback, useSyncExternalStore } from 'react'
+import { createProviderConfig } from './createProviderConfig.js'
+
+export function useProviderConfig(storageKeys, providers) {
+  const [config] = useState(() => createProviderConfig(storageKeys, providers))
+
+  const snapshot = useSyncExternalStore(
+    (listen) => config.subscribe(listen),
+    () => ({
+      provider: config.provider,
+      models: config.models,
+      mode: config.mode,
+      providers: config.providers,
+    })
+  )
+
+  return {
+    ...snapshot,
+    setProvider: useCallback((id) => config.setProvider(id), [config]),
+    setModel: useCallback((pid, mid) => config.setModel(pid, mid), [config]),
+    setMode: useCallback((v) => config.setMode(v), [config]),
+    setKey: useCallback((pid, v) => config.setKey(pid, v), [config]),
+    getKey: useCallback((pid) => config.getKey(pid), [config]),
+    getModel: useCallback((pid) => config.getModel(pid), [config]),
+    getLabel: useCallback((pid) => config.getLabel(pid), [config]),
+  }
+}