- {agentMessage.messages.map((message, index) => {
+ {agentMessage.messages.map((message) => {
return (
diff --git a/src/hooks/useTaskManager.ts b/src/hooks/useTaskManager.ts
index 3d75c0b..5bb6cec 100644
--- a/src/hooks/useTaskManager.ts
+++ b/src/hooks/useTaskManager.ts
@@ -15,6 +15,7 @@ interface UseTaskManagerReturn {
createTask: (taskId: string, initialData: Partial
) => void;
updateMessages: (taskId: string, messages: DisplayMessage[]) => void;
addToolHistory: (taskId: string, toolData: any) => void;
+ replaceTaskId: (oldTaskId: string, newTaskId: string) => void;
// History mode
enterHistoryMode: (task: Task) => void;
@@ -120,6 +121,43 @@ export const useTaskManager = (): UseTaskManagerReturn => {
});
}, [saveTask]);
+ // Replace task ID (for temporary task -> real task transition)
+ const replaceTaskId = useCallback((oldTaskId: string, newTaskId: string) => {
+ if (isHistoryMode) return;
+
+ setTasks(prevTasks => {
+ const existingTaskIndex = prevTasks.findIndex(task => task.id === oldTaskId);
+ if (existingTaskIndex >= 0) {
+ const updatedTasks = [...prevTasks];
+ // Create new task object with new ID, keep all other data
+ const newTask = {
+ ...updatedTasks[existingTaskIndex],
+ id: newTaskId,
+ updatedAt: new Date()
+ };
+
+ // Replace old task with new task
+ updatedTasks[existingTaskIndex] = newTask;
+
+ // Save new task to IndexedDB
+ saveTask(newTask);
+
+ // Delete old temporary task from IndexedDB
+ taskStorage.deleteTask(oldTaskId).catch(error => {
+ console.error('Failed to delete temporary task:', error);
+ });
+
+ return updatedTasks;
+ }
+ return prevTasks;
+ });
+
+ // Update currentTaskId if it matches the old ID
+ if (currentTaskId === oldTaskId) {
+ setCurrentTaskId(newTaskId);
+ }
+ }, [isHistoryMode, saveTask, currentTaskId]);
+
// Enter history mode
const enterHistoryMode = useCallback((task: Task) => {
setIsHistoryMode(true);
@@ -153,6 +191,7 @@ export const useTaskManager = (): UseTaskManagerReturn => {
createTask,
updateMessages,
addToolHistory,
+ replaceTaskId,
enterHistoryMode,
exitHistoryMode,
diff --git a/src/pages/home.tsx b/src/pages/home.tsx
index 9299b59..281088e 100644
--- a/src/pages/home.tsx
+++ b/src/pages/home.tsx
@@ -5,6 +5,7 @@ import { Input, Button } from 'antd'
import {ImageType, ReportType, SlideType, WebType, SpreadsheetType, VisualizeType, MoreType} from '@/icons/source-type-icons'
import { ScheduledTaskModal, ScheduledTaskListPanel } from '@/components/scheduled-task'
import { useScheduledTaskStore } from '@/stores/scheduled-task-store'
+import { ModelConfigBar } from '@/components/ModelConfigBar'
export default function Home() {
const [query, setQuery] = useState('')
@@ -79,16 +80,28 @@ export default function Home() {
I am Jarvis, a robot powered by llm. What can I do for you?
- {/* Query input box */}
-
-
setQuery(e.target.value)}
- onKeyDown={handleKeyDown}
- className='!h-full !bg-tool-call !text-text-01-dark !placeholder-text-12-dark !py-3 !px-4'
- placeholder='Please enter your task'
- autoSize={false}
- />
+ {/* Unified Input Area: Model Config + Query Input */}
+
+
+ {/* Model Configuration Bar */}
+
+
+ {/* Query input box */}
+
+ setQuery(e.target.value)}
+ onKeyDown={handleKeyDown}
+ className='!h-full !bg-transparent !text-text-01-dark !placeholder-text-12-dark !py-3 !px-4 !border !border-solid'
+ placeholder='Please enter your task'
+ autoSize={false}
+ style={{
+ borderColor: 'rgba(255, 255, 255, 0.2)',
+ borderWidth: '1px',
+ }}
+ />
+
+
diff --git a/src/pages/main.tsx b/src/pages/main.tsx
index 4e0f54d..fc5704c 100644
--- a/src/pages/main.tsx
+++ b/src/pages/main.tsx
@@ -34,6 +34,7 @@ export default function main() {
createTask,
updateMessages,
addToolHistory,
+ replaceTaskId,
enterHistoryMode,
} = useTaskManager();
@@ -349,47 +350,60 @@ export default function main() {
const updatedMessages = messageProcessorRef.current.processStreamMessage(message);
console.log('Updated message list:', updatedMessages);
- // Set task ID (if not already set)
- if (message.taskId && !currentTaskId) {
+ // Handle task ID replacement: temporary task -> real task
+ const isCurrentTaskTemporary = taskIdRef.current?.startsWith('temp-');
+ const hasRealTaskId = message.taskId && !message.taskId.startsWith('temp-');
+
+ if (isCurrentTaskTemporary && hasRealTaskId) {
+ const tempTaskId = taskIdRef.current;
+ const realTaskId = message.taskId;
+
+ console.log(`Replacing temporary task ${tempTaskId} with real task ${realTaskId}`);
+
+ // Replace task ID
+ replaceTaskId(tempTaskId, realTaskId);
+
+ // Update taskIdRef
+ taskIdRef.current = realTaskId;
+
+ // Update task with new workflow info if available
+ if (message.type === 'workflow' && message.workflow?.name) {
+ updateTask(realTaskId, {
+ name: message.workflow.name,
+ workflow: message.workflow,
+ messages: updatedMessages
+ });
+ } else {
+ updateTask(realTaskId, { messages: updatedMessages });
+ }
+
+ return; // Exit early, task ID has been replaced
+ }
+
+ // Set task ID (if not already set and not temporary)
+ if (message.taskId && !currentTaskId && !message.taskId.startsWith('temp-')) {
setCurrentTaskId(message.taskId);
}
// Update or create task
const taskIdToUpdate = message.taskId || taskIdRef.current;
if (taskIdToUpdate) {
- const existingTask = tasks.find(task => task.id === taskIdToUpdate);
-
- if (existingTask) {
- // Update existing task
- const updates: Partial
= {
- messages: updatedMessages
- };
+ const updates: Partial = {
+ messages: updatedMessages
+ };
- if (message.type === 'workflow' && message.workflow?.name) {
- updates.name = message.workflow.name;
- updates.workflow = message.workflow;
- }
+ if (message.type === 'workflow' && message.workflow?.name) {
+ updates.name = message.workflow.name;
+ updates.workflow = message.workflow;
+ }
- updateTask(taskIdToUpdate, updates);
- } else {
- // Create new task
- const initialData: Partial = {
- name: (message.type === 'workflow' && message.workflow?.name)
- ? message.workflow.name
- : `Task ${taskIdToUpdate.slice(0, 8)}`,
- workflow: (message.type === 'workflow' && message.workflow)
- ? message.workflow
- : undefined,
- messages: updatedMessages,
- status: 'running', // Set to running state on initialization
- // Set taskType based on whether it's scheduled task mode
- taskType: isTaskDetailMode ? 'scheduled' : 'normal',
- scheduledTaskId: isTaskDetailMode ? scheduledTaskIdFromUrl : undefined,
- startTime: new Date(), // Record start time
- };
-
- createTask(taskIdToUpdate, initialData);
+ // For error messages, also update task status
+ if (message.type === 'error') {
+ updates.status = 'error';
}
+
+ // Always update task (will only work if task exists)
+ updateTask(taskIdToUpdate, updates);
}
// Detect tool call messages, automatically show detail panel
@@ -604,8 +618,23 @@ export default function main() {
// Add user message to message processor
const updatedMessages = messageProcessorRef.current.addUserMessage(message.trim());
- // Immediately update current task's messages (if task exists)
- if (taskIdRef.current) {
+ // If no current task, create temporary task immediately to display user message
+ if (!taskIdRef.current) {
+ const tempTaskId = `temp-${newExecutionId}`;
+ taskIdRef.current = tempTaskId;
+ setCurrentTaskId(tempTaskId);
+
+ // Create temporary task with user message
+ createTask(tempTaskId, {
+ name: 'Processing...',
+ messages: updatedMessages,
+ status: 'running',
+ taskType: isTaskDetailMode ? 'scheduled' : 'normal',
+ scheduledTaskId: isTaskDetailMode ? scheduledTaskIdFromUrl : undefined,
+ startTime: new Date(),
+ });
+ } else {
+ // Update existing task's messages
updateMessages(taskIdRef.current, updatedMessages);
// Set existing task to running state
updateTask(taskIdRef.current, { status: 'running' });
@@ -623,19 +652,24 @@ export default function main() {
}
try {
- if (!taskIdRef.current) {
- // Use IPC to call main thread's EkoService
+ // Check if current task is temporary
+ const isTemporaryTask = taskIdRef.current.startsWith('temp-');
+
+ if (isTemporaryTask) {
+ // Use IPC to call main thread's EkoService to run new task
const req = window.api.ekoRun(message.trim());
setEkoRequest(req);
result = await req;
- result && setCurrentTaskId(result.taskId);
+ // Note: real taskId will be set via stream callback's replaceTaskId
} else {
+ // Modify existing task
const req = window.api.ekoModify(taskIdRef.current, message.trim());
setEkoRequest(req);
result = await req;
}
+
// Update task status based on result (directly using eko-core status)
- if (result) {
+ if (result && taskIdRef.current) {
updateTask(taskIdRef.current, {
status: result.stopReason
});
diff --git a/src/type.d.ts b/src/type.d.ts
index b6f6e7c..a6f25f8 100644
--- a/src/type.d.ts
+++ b/src/type.d.ts
@@ -1,3 +1,32 @@
+// Supported providers
+export type ProviderType = 'deepseek' | 'qwen' | 'google' | 'anthropic' | 'openrouter';
+
+// Model configuration types
+export interface UserModelConfigs {
+ deepseek?: {
+ apiKey?: string
+ baseURL?: string
+ model?: string
+ }
+ qwen?: {
+ apiKey?: string
+ model?: string
+ }
+ google?: {
+ apiKey?: string
+ model?: string
+ }
+ anthropic?: {
+ apiKey?: string
+ model?: string
+ }
+ openrouter?: {
+ apiKey?: string
+ model?: string
+ }
+ selectedProvider?: ProviderType
+}
+
declare global {
interface Window {
api: {
@@ -24,6 +53,14 @@ declare global {
onEkoStreamMessage: (callback: (message: any) => void) => void
ekoGetTaskStatus: (taskId: string) => Promise
ekoCancelTask: (taskId: string) => Promise
+
+ // Model configuration APIs
+ getUserModelConfigs: () => Promise
+ saveUserModelConfigs: (configs: UserModelConfigs) => Promise<{ success: boolean }>
+ getModelConfig: (provider: ProviderType) => Promise
+ getApiKeySource: (provider: ProviderType) => Promise<'user' | 'env' | 'none'>
+ getSelectedProvider: () => Promise
+ setSelectedProvider: (provider: ProviderType) => Promise<{ success: boolean }>
}
// PDF.js type declarations
pdfjsLib?: {
diff --git a/src/utils/messageTransform.ts b/src/utils/messageTransform.ts
index bf09d41..b5a1676 100644
--- a/src/utils/messageTransform.ts
+++ b/src/utils/messageTransform.ts
@@ -17,7 +17,7 @@ export class MessageProcessor {
// Process streaming messages and convert to structured display messages
public processStreamMessage(message: StreamCallbackMessage): DisplayMessage[] {
console.log('MessageProcessor processing message:', message.type, message);
-
+
switch (message.type) {
case 'workflow':
this.handleWorkflowMessage(message);
@@ -41,6 +41,9 @@ export class MessageProcessor {
case 'agent_result':
this.handleAgentResultMessage(message);
break;
+ case 'error':
+ this.handleErrorMessage(message);
+ break;
}
console.log('MessageProcessor current message count:', this.messages.length);
@@ -249,6 +252,30 @@ export class MessageProcessor {
return [...this.messages];
}
+ // Handle error message
+ private handleErrorMessage(message: any) {
+ console.error('Error message received:', message);
+
+ // Create error message as AgentGroupMessage with error status
+ const errorMsg: AgentGroupMessage = {
+ id: uuidv4(),
+ type: 'agent_group',
+ taskId: message.taskId || 'unknown',
+ agentName: 'System',
+ messages: [
+ {
+ type: 'text',
+ id: uuidv4(),
+ content: `❌ Error: ${message.error || 'Unknown error occurred'}\n\n${message.detail || ''}`
+ }
+ ],
+ status: 'error',
+ timestamp: new Date()
+ };
+
+ this.messages.push(errorMsg);
+ }
+
// Get current message list
public getMessages(): DisplayMessage[] {
return [...this.messages];