@swarmclawai/swarmclaw 1.7.0 → 1.7.2

package/src/lib/setup-defaults.ts

@@ -3,33 +3,10 @@
  * Isomorphic — no 'use client', no server imports.
  */
 
-export type SetupProvider =
-  | 'claude-cli'
-  | 'codex-cli'
-  | 'opencode-cli'
-  | 'opencode-web'
-  | 'gemini-cli'
-  | 'copilot-cli'
-  | 'droid-cli'
-  | 'cursor-cli'
-  | 'qwen-code-cli'
-  | 'goose'
-  | 'anthropic'
-  | 'openai'
-  | 'openrouter'
-  | 'google'
-  | 'deepseek'
-  | 'groq'
-  | 'together'
-  | 'mistral'
-  | 'xai'
-  | 'fireworks'
-  | 'nebius'
-  | 'deepinfra'
-  | 'ollama'
-  | 'openclaw'
-  | 'hermes'
-  | 'custom'
+import { CLI_PROVIDER_METADATA, type CliProviderId, type CliProviderMetadata } from './providers/cli-provider-metadata.ts'
+import type { ProviderType } from '../types/provider.ts'
+
+export type SetupProvider = ProviderType | 'custom'
 
 export interface SetupProviderOption {
   id: SetupProvider
@@ -48,38 +25,27 @@ export interface SetupProviderOption {
   icon: string
   modelLibraryUrl?: string
   cloudEndpoint?: string
+  category?: 'cli' | 'api' | 'gateway' | 'local' | 'custom'
 }
 
+const CLI_SETUP_PROVIDERS: SetupProviderOption[] = (CLI_PROVIDER_METADATA as readonly CliProviderMetadata[]).map((provider) => ({
+  id: provider.id,
+  name: provider.displayName,
+  description: provider.description,
+  requiresKey: false,
+  supportsEndpoint: false,
+  optionalKey: provider.optionalApiKey,
+  keyUrl: provider.keyUrl,
+  keyLabel: provider.keyLabel,
+  keyPlaceholder: provider.keyPlaceholder,
+  badge: provider.setupBadge,
+  icon: provider.icon,
+  modelLibraryUrl: provider.modelLibraryUrl,
+  category: 'cli',
+}))
+
 export const SETUP_PROVIDERS: SetupProviderOption[] = [
-  {
-    id: 'claude-cli',
-    name: 'Claude Code CLI',
-    description: 'Anthropic’s coding agent with native tools, strong edits, and first-class CLI workflows.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'C',
-    modelLibraryUrl: 'https://docs.anthropic.com/en/docs/about-claude/models',
-  },
-  {
-    id: 'codex-cli',
-    name: 'OpenAI Codex CLI',
-    description: 'OpenAI’s terminal coding agent with resume support and structured headless output.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'O',
-    modelLibraryUrl: 'https://platform.openai.com/docs/models',
-  },
-  {
-    id: 'opencode-cli',
-    name: 'OpenCode CLI',
-    description: 'A flexible coding CLI that can route across multiple model backends.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'O',
-  },
+  ...CLI_SETUP_PROVIDERS,
   {
     id: 'opencode-web',
     name: 'OpenCode Web',
@@ -92,66 +58,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     keyPlaceholder: 'opencode:••••••• (or just the password)',
     badge: 'HTTP',
     icon: 'O',
-  },
-  {
-    id: 'gemini-cli',
-    name: 'Gemini CLI',
-    description: 'Google’s terminal coding agent with project-aware headless mode and resume support.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'G',
-    modelLibraryUrl: 'https://ai.google.dev/gemini-api/docs/models',
-  },
-  {
-    id: 'copilot-cli',
-    name: 'GitHub Copilot CLI',
-    description: 'GitHub’s multi-model terminal agent for coding and automation.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'P',
-  },
-  {
-    id: 'droid-cli',
-    name: 'Factory Droid CLI',
-    description: 'Factory.ai’s terminal coding agent with headless exec mode, session resume, and autonomy controls.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    optionalKey: true,
-    keyUrl: 'https://app.factory.ai/settings/api-keys',
-    keyLabel: 'app.factory.ai',
-    keyPlaceholder: 'FACTORY_API_KEY (optional if signed in via `droid`)',
-    badge: 'CLI',
-    icon: 'F',
-  },
-  {
-    id: 'cursor-cli',
-    name: 'Cursor Agent CLI',
-    description: 'Cursor’s terminal agent with resume support, JSON output, and Cursor-native coding workflows.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'U',
-  },
-  {
-    id: 'qwen-code-cli',
-    name: 'Qwen Code CLI',
-    description: 'Qwen’s terminal coding agent with structured headless mode and multi-provider model config.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'Q',
-  },
-  {
-    id: 'goose',
-    name: 'Goose',
-    description: 'A runtime-managed terminal agent with extensions, session history, and ACP support.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    optionalKey: true,
-    badge: 'Runtime',
-    icon: 'G',
+    category: 'cli',
   },
   {
     id: 'openai',
@@ -190,6 +97,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     optionalKey: true,
     badge: 'First-Tier',
     icon: 'C',
+    category: 'gateway',
   },
   {
     id: 'hermes',
@@ -202,6 +110,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     optionalKey: true,
     badge: 'API Server',
     icon: 'H',
+    category: 'gateway',
   },
   {
     id: 'anthropic',
@@ -327,6 +236,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     icon: 'L',
     modelLibraryUrl: 'https://ollama.com/library',
     cloudEndpoint: 'https://api.ollama.com',
+    category: 'local',
   },
   {
     id: 'custom',
@@ -337,6 +247,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     allowMultiple: true,
     optionalKey: true,
     icon: '+',
+    category: 'custom',
   },
 ]
 
@@ -815,28 +726,19 @@ export interface DefaultAgentConfig {
   tools: string[]
 }
 
-export const DEFAULT_AGENTS: Record<SetupProvider, DefaultAgentConfig> = {
-  'claude-cli': {
-    name: 'Claude CLI',
-    description: 'A helpful assistant powered by Claude Code CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'claude-sonnet-4-6',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'codex-cli': {
-    name: 'Codex CLI',
-    description: 'A helpful assistant powered by OpenAI Codex CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'gpt-5.3-codex',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'opencode-cli': {
-    name: 'OpenCode',
-    description: 'A helpful assistant powered by OpenCode CLI.',
+const CLI_DEFAULT_AGENTS = Object.fromEntries(CLI_PROVIDER_METADATA.map((provider) => [
+  provider.id,
+  {
+    name: provider.displayName.endsWith(' CLI') ? provider.displayName.slice(0, -4) : provider.displayName,
+    description: `A helpful assistant powered by ${provider.displayName}.`,
     systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'claude-sonnet-4-6',
+    model: provider.defaultModel,
     tools: STARTER_AGENT_TOOLS,
   },
+])) as Record<CliProviderId, DefaultAgentConfig>
+
+export const DEFAULT_AGENTS = {
+  ...CLI_DEFAULT_AGENTS,
   'opencode-web': {
     name: 'OpenCode Web',
     description: 'A helpful assistant powered by a remote OpenCode HTTP server.',
@@ -844,48 +746,6 @@ export const DEFAULT_AGENTS: Record<SetupProvider, DefaultAgentConfig> = {
     model: 'anthropic/claude-sonnet-4-6',
     tools: STARTER_AGENT_TOOLS,
   },
-  'gemini-cli': {
-    name: 'Gemini CLI',
-    description: 'A helpful assistant powered by Gemini CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'gemini-3.1-pro',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'copilot-cli': {
-    name: 'Copilot CLI',
-    description: 'A helpful assistant powered by GitHub Copilot CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'claude-sonnet-4-6',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'droid-cli': {
-    name: 'Factory Droid',
-    description: 'A helpful assistant powered by Factory Droid CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'default',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'cursor-cli': {
-    name: 'Cursor CLI',
-    description: 'A helpful assistant powered by Cursor Agent CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'auto',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'qwen-code-cli': {
-    name: 'Qwen Code',
-    description: 'A helpful assistant powered by Qwen Code CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'default',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  goose: {
-    name: 'Goose',
-    description: 'A helpful assistant powered by Goose.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'default',
-    tools: STARTER_AGENT_TOOLS,
-  },
   anthropic: {
     name: 'Claude',
     description: 'A helpful Claude-powered assistant.',
@@ -998,7 +858,7 @@ export const DEFAULT_AGENTS: Record<SetupProvider, DefaultAgentConfig> = {
     model: '',
     tools: STARTER_AGENT_TOOLS,
   },
-}
+} satisfies Record<SetupProvider, DefaultAgentConfig>
 
 export function getDefaultModelForProvider(provider: SetupProvider): string {
   return DEFAULT_AGENTS[provider].model

package/src/stores/slices/session-slice.test.ts

@@ -32,11 +32,49 @@ test('selectActiveSessionId prefers override when present', () => {
   assert.equal(selectActiveSessionId(state), 'task-1')
 })
 
-test('selectActiveSessionId falls back to agent thread session', () => {
+test('selectActiveSessionId chooses most recently active session for current agent', () => {
   const state = makeState({
     currentAgentId: 'agent-1',
     agents: { 'agent-1': makeAgent('agent-1', 'thread-1') },
-    sessions: { 'thread-1': makeSession('thread-1') },
+    sessions: {
+      'thread-1': { ...makeSession('thread-1'), agentId: 'agent-1', lastActiveAt: 100 } as unknown as Session,
+      'old-1': { ...makeSession('old-1'), agentId: 'agent-1', lastActiveAt: 90 } as unknown as Session,
+      'latest-1': { ...makeSession('latest-1'), agentId: 'agent-1', lastActiveAt: 200, messageCount: 1 } as unknown as Session,
+      'other-agent': { ...makeSession('other-agent'), agentId: 'agent-2', lastActiveAt: 999 } as unknown as Session,
+    },
+  })
+  assert.equal(selectActiveSessionId(state), 'latest-1')
+})
+
+test('selectActiveSessionId prefers most recent session with content over newer empty thread session', () => {
+  const state = makeState({
+    currentAgentId: 'agent-1',
+    agents: { 'agent-1': makeAgent('agent-1', 'thread-1') },
+    sessions: {
+      'thread-1': { ...makeSession('thread-1'), agentId: 'agent-1', lastActiveAt: 300 } as unknown as Session,
+      'work-1': { ...makeSession('work-1'), agentId: 'agent-1', lastActiveAt: 200, messageCount: 2 } as unknown as Session,
+    },
+  })
+  assert.equal(selectActiveSessionId(state), 'work-1')
+})
+
+test('selectActiveSessionId falls back to thread session when agent has no loaded sessions', () => {
+  const state = makeState({
+    currentAgentId: 'agent-1',
+    agents: { 'agent-1': makeAgent('agent-1', 'thread-1') },
+    sessions: { 'unrelated': { ...makeSession('unrelated'), agentId: 'agent-2' } as unknown as Session },
+  })
+  assert.equal(selectActiveSessionId(state), 'thread-1')
+})
+
+test('selectActiveSessionId falls back to thread session when all loaded sessions are empty', () => {
+  const state = makeState({
+    currentAgentId: 'agent-1',
+    agents: { 'agent-1': makeAgent('agent-1', 'thread-1') },
+    sessions: {
+      'thread-1': { ...makeSession('thread-1'), agentId: 'agent-1', lastActiveAt: 120 } as unknown as Session,
+      'empty-newer': { ...makeSession('empty-newer'), agentId: 'agent-1', lastActiveAt: 220 } as unknown as Session,
+    },
   })
   assert.equal(selectActiveSessionId(state), 'thread-1')
 })

package/src/stores/slices/session-slice.ts

@@ -8,6 +8,46 @@ import { createLoader, createInflightDeduplicator } from '../store-utils'
 
 const sessionRefreshDedup = createInflightDeduplicator('sessionSlice_inflightRefreshes')
 
+function getSessionSortScore(session: Session): number {
+  return session.lastAssistantAt
+    || session.lastActiveAt
+    || session.updatedAt
+    || session.createdAt
+    || 0
+}
+
+function hasSessionContent(session: Session): boolean {
+  if (typeof session.messageCount === 'number' && Number.isFinite(session.messageCount) && session.messageCount > 0) {
+    return true
+  }
+  if (session.lastMessageSummary) return true
+  return Array.isArray(session.messages) && session.messages.length > 0
+}
+
+function getLatestAgentSessionId(s: AppState, agentId: string, threadSessionId?: string | null): string | null {
+  let bestAnyId: string | null = null
+  let bestAnyScore = Number.NEGATIVE_INFINITY
+  let bestWithContentId: string | null = null
+  let bestWithContentScore = Number.NEGATIVE_INFINITY
+
+  for (const [sessionId, session] of Object.entries(s.sessions)) {
+    if (session.agentId !== agentId) continue
+    const score = getSessionSortScore(session)
+    if (score > bestAnyScore) {
+      bestAnyScore = score
+      bestAnyId = sessionId
+    }
+    if (hasSessionContent(session) && score > bestWithContentScore) {
+      bestWithContentScore = score
+      bestWithContentId = sessionId
+    }
+  }
+
+  if (bestWithContentId) return bestWithContentId
+  if (threadSessionId && s.sessions[threadSessionId]?.agentId === agentId) return threadSessionId
+  return bestAnyId
+}
+
 /** Derive the active session ID from the current agent — no stored `currentSessionId`. */
 export function selectActiveSessionId(s: AppState): string | null {
   if (s.activeSessionIdOverride && s.sessions[s.activeSessionIdOverride]) {
@@ -15,7 +55,7 @@ export function selectActiveSessionId(s: AppState): string | null {
   }
   if (!s.currentAgentId) return null
   const agent = s.agents[s.currentAgentId]
-  return agent?.threadSessionId ?? null
+  return getLatestAgentSessionId(s, s.currentAgentId, agent?.threadSessionId) || agent?.threadSessionId || null
 }
 
 export interface SessionSlice {

package/tsconfig.json

@@ -13,6 +13,7 @@
     "esModuleInterop": true,
     "module": "esnext",
     "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react-jsx",