From b26cbc1c2f2f4bb65a6b3cfdf1edf067839be79a Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 12 Dec 2024 13:07:14 -0500
Subject: [PATCH 1/7] fixes

---
 apps/shinkai-desktop/src/components/tools/python-tool.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/shinkai-desktop/src/components/tools/python-tool.tsx b/apps/shinkai-desktop/src/components/tools/python-tool.tsx
index 8da77e919..641c63007 100644
--- a/apps/shinkai-desktop/src/components/tools/python-tool.tsx
+++ b/apps/shinkai-desktop/src/components/tools/python-tool.tsx
@@ -173,7 +173,7 @@ export default function PythonTool({
             onCheckedChange={async () => {
               await updateTool({
                 toolKey: toolKey ?? '',
-                toolType: 'Deno',
+                toolType: 'Python',
                 toolPayload: {} as ShinkaiTool,
                 isToolEnabled: !isEnabled,
                 nodeAddress: auth?.node_address ?? '',

From 8e12eb7cbb69119a7c6c888f4dc7fa4fb84d8cd3 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 12 Dec 2024 17:45:57 -0500
Subject: [PATCH 2/7] fixes

---
 apps/shinkai-desktop/src/pages/tools.tsx    | 343 ++++++++++----------
 libs/shinkai-ui/src/components/textarea.tsx |  24 +-
 2 files changed, 186 insertions(+), 181 deletions(-)

diff --git a/apps/shinkai-desktop/src/pages/tools.tsx b/apps/shinkai-desktop/src/pages/tools.tsx
index 5f2f577de..d962af45e 100644
--- a/apps/shinkai-desktop/src/pages/tools.tsx
+++ b/apps/shinkai-desktop/src/pages/tools.tsx
@@ -17,7 +17,6 @@ import {
   Form,
   FormField,
   Input,
-  ScrollArea,
   Switch,
   TextField,
   Tooltip,
@@ -92,191 +91,187 @@ export const Tools = () => {
       }
       title={t('tools.label')}
     >
-      <ScrollArea className="pr-4 [&>div>div]:!block">
-        <div className="relative mb-4 flex h-10 w-full items-center">
-          <Input
-            className="placeholder-gray-80 !h-full border-none bg-gray-400 py-2 pl-10"
-            onChange={(e) => {
-              setSearchQuery(e.target.value);
+      <div className="relative mb-4 flex h-10 w-full items-center">
+        <Input
+          className="placeholder-gray-80 !h-full border-none bg-gray-400 py-2 pl-10"
+          onChange={(e) => {
+            setSearchQuery(e.target.value);
+          }}
+          placeholder="Search..."
+          spellCheck={false}
+          value={searchQuery}
+        />
+        <SearchIcon className="absolute left-4 top-1/2 -z-[1px] h-4 w-4 -translate-y-1/2" />
+        {searchQuery && (
+          <Button
+            className="absolute right-1 h-8 w-8 bg-gray-200 p-2"
+            onClick={() => {
+              setSearchQuery('');
             }}
-            placeholder="Search..."
-            spellCheck={false}
-            value={searchQuery}
-          />
-          <SearchIcon className="absolute left-4 top-1/2 -z-[1px] h-4 w-4 -translate-y-1/2" />
-          {searchQuery && (
-            <Button
-              className="absolute right-1 h-8 w-8 bg-gray-200 p-2"
-              onClick={() => {
-                setSearchQuery('');
-              }}
-              size="auto"
-              type="button"
-              variant="ghost"
+            size="auto"
+            type="button"
+            variant="ghost"
+          >
+            <XIcon />
+            <span className="sr-only">{t('common.clearSearch')}</span>
+          </Button>
+        )}
+      </div>
+      <div className="divide-y divide-gray-300">
+        {(isPending || !isSearchQuerySynced || isSearchToolListPending) &&
+          Array.from({ length: 8 }).map((_, idx) => (
+            <div
+              className={cn(
+                'grid animate-pulse grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+              )}
+              key={idx}
             >
-              <XIcon />
-              <span className="sr-only">{t('common.clearSearch')}</span>
-            </Button>
-          )}
-        </div>
-        <div className="divide-y divide-gray-300">
-          {(isPending || !isSearchQuerySynced || isSearchToolListPending) &&
-            Array.from({ length: 8 }).map((_, idx) => (
-              <div
-                className={cn(
-                  'grid animate-pulse grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
-                )}
-                key={idx}
-              >
-                <div className="flex w-full flex-1 flex-col gap-3">
-                  <span className="h-4 w-36 rounded-sm bg-gray-300" />
-                  <div className="flex flex-col gap-1">
-                    <span className="h-3 w-full rounded-sm bg-gray-300" />
-                    <span className="h-3 w-2/4 rounded-sm bg-gray-300" />
-                  </div>
+              <div className="flex w-full flex-1 flex-col gap-3">
+                <span className="h-4 w-36 rounded-sm bg-gray-300" />
+                <div className="flex flex-col gap-1">
+                  <span className="h-3 w-full rounded-sm bg-gray-300" />
+                  <span className="h-3 w-2/4 rounded-sm bg-gray-300" />
                 </div>
-                <span className="h-7 w-full rounded-md bg-gray-300" />
-                <span className="h-5 w-[36px] rounded-full bg-gray-300" />
               </div>
-            ))}
-          {!searchQuery &&
-            isSearchQuerySynced &&
-            toolsList?.map((tool) => (
-              <div
-                className={cn(
-                  'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
-                )}
-                key={tool.tool_router_key}
-              >
-                <div className="flex flex-col gap-2.5">
-                  <div className="flex items-center gap-2">
-                    <span className="text-sm font-medium capitalize text-white">
-                      {formatText(tool.name)}{' '}
-                    </span>
-                    {tool.author !== '@@official.shinkai' && (
-                      <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
-                        {tool.author}
-                      </Badge>
-                    )}
-                  </div>
-                  <p className="text-gray-80 line-clamp-2 text-xs">
-                    {tool.description}
-                  </p>
-                </div>
-                <Link
-                  className={cn(
-                    buttonVariants({
-                      variant: 'outline',
-                      size: 'sm',
-                    }),
-                    'min-h-auto h-auto rounded-md py-2',
+              <span className="h-7 w-full rounded-md bg-gray-300" />
+              <span className="h-5 w-[36px] rounded-full bg-gray-300" />
+            </div>
+          ))}
+        {!searchQuery &&
+          isSearchQuerySynced &&
+          toolsList?.map((tool) => (
+            <div
+              className={cn(
+                'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+              )}
+              key={tool.tool_router_key}
+            >
+              <div className="flex flex-col gap-2.5">
+                <div className="flex items-center gap-2">
+                  <span className="text-sm font-medium capitalize text-white">
+                    {formatText(tool.name)}{' '}
+                  </span>
+                  {tool.author !== '@@official.shinkai' && (
+                    <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
+                      {tool.author}
+                    </Badge>
                   )}
-                  to={`/tools/${tool.tool_router_key}`}
-                >
-                  <BoltIcon className="mr-1.5 h-4 w-4" />
-                  {t('common.configure')}
-                </Link>
-                <TooltipProvider delayDuration={0}>
-                  <Tooltip>
-                    <TooltipTrigger className="flex items-center gap-1">
-                      <Switch
-                        checked={tool.enabled}
-                        onCheckedChange={async () => {
-                          await updateTool({
-                            toolKey: tool.tool_router_key,
-                            toolType: tool.tool_type,
-                            toolPayload: {} as ShinkaiTool,
-                            isToolEnabled: !tool.enabled,
-                            nodeAddress: auth?.node_address ?? '',
-                            token: auth?.api_v2_key ?? '',
-                          });
-                        }}
-                      />
-                    </TooltipTrigger>
-                    <TooltipPortal>
-                      <TooltipContent align="center" side="top">
-                        {t('common.enabled')}
-                      </TooltipContent>
-                    </TooltipPortal>
-                  </Tooltip>
-                </TooltipProvider>
+                </div>
+                <p className="text-gray-80 line-clamp-2 text-xs">
+                  {tool.description}
+                </p>
               </div>
-            ))}
-          {searchQuery &&
-            isSearchQuerySynced &&
-            searchToolList?.map((tool) => (
-              <div
+              <Link
                 className={cn(
-                  'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+                  buttonVariants({
+                    variant: 'outline',
+                    size: 'sm',
+                  }),
+                  'min-h-auto h-auto rounded-md py-2',
                 )}
-                key={tool.tool_router_key}
+                to={`/tools/${tool.tool_router_key}`}
               >
-                <div className="flex flex-col gap-2.5">
-                  <div className="flex items-center gap-2">
-                    <span className="text-sm font-medium text-white">
-                      {formatText(tool.name)}{' '}
-                    </span>
-                    {tool.author !== '@@official.shinkai' && (
-                      <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
-                        {tool.author}
-                      </Badge>
-                    )}
-                  </div>
-                  <p className="text-gray-80 line-clamp-2 text-xs">
-                    {tool.description}
-                  </p>
-                </div>
-
-                <Link
-                  className={cn(
-                    buttonVariants({
-                      variant: 'outline',
-                      size: 'sm',
-                    }),
-                    'min-h-auto h-auto rounded-md py-2',
+                <BoltIcon className="mr-1.5 h-4 w-4" />
+                {t('common.configure')}
+              </Link>
+              <TooltipProvider delayDuration={0}>
+                <Tooltip>
+                  <TooltipTrigger className="flex items-center gap-1">
+                    <Switch
+                      checked={tool.enabled}
+                      onCheckedChange={async () => {
+                        await updateTool({
+                          toolKey: tool.tool_router_key,
+                          toolType: tool.tool_type,
+                          toolPayload: {} as ShinkaiTool,
+                          isToolEnabled: !tool.enabled,
+                          nodeAddress: auth?.node_address ?? '',
+                          token: auth?.api_v2_key ?? '',
+                        });
+                      }}
+                    />
+                  </TooltipTrigger>
+                  <TooltipPortal>
+                    <TooltipContent align="center" side="top">
+                      {t('common.enabled')}
+                    </TooltipContent>
+                  </TooltipPortal>
+                </Tooltip>
+              </TooltipProvider>
+            </div>
+          ))}
+        {searchQuery &&
+          isSearchQuerySynced &&
+          searchToolList?.map((tool) => (
+            <div
+              className={cn(
+                'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+              )}
+              key={tool.tool_router_key}
+            >
+              <div className="flex flex-col gap-2.5">
+                <div className="flex items-center gap-2">
+                  <span className="text-sm font-medium text-white">
+                    {formatText(tool.name)}{' '}
+                  </span>
+                  {tool.author !== '@@official.shinkai' && (
+                    <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
+                      {tool.author}
+                    </Badge>
                   )}
-                  to={`/tools/${tool.tool_router_key}`}
-                >
-                  <BoltIcon className="mr-1.5 h-4 w-4" />
-                  {t('common.configure')}
-                </Link>
-                <TooltipProvider delayDuration={0}>
-                  <Tooltip>
-                    <TooltipTrigger className="flex items-center gap-1">
-                      <Switch
-                        checked={tool.enabled}
-                        onCheckedChange={async () => {
-                          await updateTool({
-                            toolKey: tool.tool_router_key,
-                            toolType: tool.tool_type,
-                            toolPayload: {} as ShinkaiTool,
-                            isToolEnabled: !tool.enabled,
-                            nodeAddress: auth?.node_address ?? '',
-                            token: auth?.api_v2_key ?? '',
-                          });
-                        }}
-                      />
-                    </TooltipTrigger>
-                    <TooltipPortal>
-                      <TooltipContent align="center" side="top">
-                        {t('common.enabled')}
-                      </TooltipContent>
-                    </TooltipPortal>
-                  </Tooltip>
-                </TooltipProvider>
-              </div>
-            ))}
-          {searchQuery &&
-            isSearchQuerySynced &&
-            searchToolList?.length === 0 && (
-              <div className="flex h-20 items-center justify-center">
-                <p className="text-gray-80 text-sm">
-                  {t('tools.emptyState.search.text')}
+                </div>
+                <p className="text-gray-80 line-clamp-2 text-xs">
+                  {tool.description}
                 </p>
               </div>
-            )}
-        </div>
-      </ScrollArea>
+
+              <Link
+                className={cn(
+                  buttonVariants({
+                    variant: 'outline',
+                    size: 'sm',
+                  }),
+                  'min-h-auto h-auto rounded-md py-2',
+                )}
+                to={`/tools/${tool.tool_router_key}`}
+              >
+                <BoltIcon className="mr-1.5 h-4 w-4" />
+                {t('common.configure')}
+              </Link>
+              <TooltipProvider delayDuration={0}>
+                <Tooltip>
+                  <TooltipTrigger className="flex items-center gap-1">
+                    <Switch
+                      checked={tool.enabled}
+                      onCheckedChange={async () => {
+                        await updateTool({
+                          toolKey: tool.tool_router_key,
+                          toolType: tool.tool_type,
+                          toolPayload: {} as ShinkaiTool,
+                          isToolEnabled: !tool.enabled,
+                          nodeAddress: auth?.node_address ?? '',
+                          token: auth?.api_v2_key ?? '',
+                        });
+                      }}
+                    />
+                  </TooltipTrigger>
+                  <TooltipPortal>
+                    <TooltipContent align="center" side="top">
+                      {t('common.enabled')}
+                    </TooltipContent>
+                  </TooltipPortal>
+                </Tooltip>
+              </TooltipProvider>
+            </div>
+          ))}
+        {searchQuery && isSearchQuerySynced && searchToolList?.length === 0 && (
+          <div className="flex h-20 items-center justify-center">
+            <p className="text-gray-80 text-sm">
+              {t('tools.emptyState.search.text')}
+            </p>
+          </div>
+        )}
+      </div>
     </SimpleLayout>
   );
 };
diff --git a/libs/shinkai-ui/src/components/textarea.tsx b/libs/shinkai-ui/src/components/textarea.tsx
index 2ca03853c..7c5b664c7 100644
--- a/libs/shinkai-ui/src/components/textarea.tsx
+++ b/libs/shinkai-ui/src/components/textarea.tsx
@@ -5,14 +5,24 @@ import { cn } from '../utils';
 const DEFAULT_MIN_TEXTAREA_HEIGHT = 32;
 const DEFAULT_MAX_TEXTAREA_HEIGHT = 300;
 
-export type TextareaProps = React.TextareaHTMLAttributes<HTMLTextAreaElement> & {
-  minHeight?: number;
-  maxHeight?: number;
-  resize?: 'none' | 'both' | 'horizontal' | 'vertical';
-};
+export type TextareaProps =
+  React.TextareaHTMLAttributes<HTMLTextAreaElement> & {
+    minHeight?: number;
+    maxHeight?: number;
+    resize?: 'none' | 'both' | 'horizontal' | 'vertical';
+  };
 
 const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
-  ({ className, minHeight = DEFAULT_MIN_TEXTAREA_HEIGHT, maxHeight = DEFAULT_MAX_TEXTAREA_HEIGHT, resize = 'none', ...props }, ref) => {
+  (
+    {
+      className,
+      minHeight = DEFAULT_MIN_TEXTAREA_HEIGHT,
+      maxHeight = DEFAULT_MAX_TEXTAREA_HEIGHT,
+      resize = 'none',
+      ...props
+    },
+    ref,
+  ) => {
     const textareaRef = React.useRef<HTMLTextAreaElement>(null);
 
     React.useLayoutEffect(() => {
@@ -34,7 +44,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
     return (
       <textarea
         className={cn(
-          'flex w-full rounded-md border border-gray-200 bg-gray-400 px-4 py-2 pt-7 text-sm placeholder-transparent focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-gray-100 disabled:cursor-not-allowed disabled:opacity-50',
+          'flex w-full rounded-md border border-gray-200 bg-gray-400 px-4 py-2 pt-7 text-sm placeholder-gray-100 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-gray-100 disabled:cursor-not-allowed disabled:opacity-50',
           className,
         )}
         ref={ref || textareaRef}

From 3635a0b7fe3806485a56a3e658e765e2a0f2c6a0 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 12 Dec 2024 19:52:58 -0500
Subject: [PATCH 3/7] wip: implement cron endpoints

---
 .../shinkai-desktop/src/pages/create-task.tsx | 349 +++++++++++++++++
 .../src/pages/layout/main-layout.tsx          |   6 +
 apps/shinkai-desktop/src/pages/tasks.tsx      | 370 ++++++++++++++++++
 apps/shinkai-desktop/src/routes/index.tsx     |  15 +
 .../src/api/recurring-tasks/index.ts          |  91 +++++
 .../src/api/recurring-tasks/types.ts          |  63 +++
 libs/shinkai-node-state/src/v2/constants.ts   |   2 +
 .../v2/mutations/createRecurringTask/index.ts |  16 +
 .../v2/mutations/createRecurringTask/types.ts |  13 +
 .../useCreateRecurringTask.ts                 |  33 ++
 .../v2/mutations/removeRecurringTask/index.ts |  15 +
 .../v2/mutations/removeRecurringTask/types.ts |   9 +
 .../useRemoveRecurringTask.ts                 |  33 ++
 .../src/v2/queries/getRecurringTask/index.ts  |  14 +
 .../src/v2/queries/getRecurringTask/types.ts  |   9 +
 .../getRecurringTask/useGetRecurringTask.ts   |  13 +
 .../src/v2/queries/getRecurringTasks/index.ts |  11 +
 .../src/v2/queries/getRecurringTasks/types.ts |   8 +
 .../getRecurringTasks/useGetRecurringTasks.ts |  13 +
 libs/shinkai-ui/src/assets/icons/general.tsx  |  25 ++
 20 files changed, 1108 insertions(+)
 create mode 100644 apps/shinkai-desktop/src/pages/create-task.tsx
 create mode 100644 apps/shinkai-desktop/src/pages/tasks.tsx
 create mode 100644 libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
 create mode 100644 libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/createRecurringTask/useCreateRecurringTask.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/useRemoveRecurringTask.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTask/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTasks/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTasks/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTasks/useGetRecurringTasks.ts

diff --git a/apps/shinkai-desktop/src/pages/create-task.tsx b/apps/shinkai-desktop/src/pages/create-task.tsx
new file mode 100644
index 000000000..9a7623577
--- /dev/null
+++ b/apps/shinkai-desktop/src/pages/create-task.tsx
@@ -0,0 +1,349 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useTranslation } from '@shinkai_network/shinkai-i18n';
+import {
+  Button,
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  HoverCard,
+  HoverCardContent,
+  HoverCardTrigger,
+  Label,
+  Slider,
+  Switch,
+  Textarea,
+  TextField,
+} from '@shinkai_network/shinkai-ui';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { SubpageLayout } from './layout/simple-layout';
+
+const createTaskFormSchema = z.object({
+  name: z.string(),
+  cronExpression: z.string(),
+  jobConfig: z.object({
+    custom_system_prompt: z.string().optional(),
+    custom_prompt: z.string().optional(),
+    temperature: z.number().optional(),
+    max_tokens: z.number().optional(),
+    seed: z.number().optional(),
+    top_k: z.number().optional(),
+    top_p: z.number().optional(),
+    stream: z.boolean().optional(),
+    other_model_params: z.unknown().optional(),
+    use_tools: z.boolean().optional(),
+  }),
+  jobMessage: z.object({
+    content: z.string(),
+    toolKey: z.string().optional(),
+  }),
+});
+type CreateTaskForm = z.infer<typeof createTaskFormSchema>;
+
+function CreateTaskPage() {
+  const { t } = useTranslation();
+
+  const form = useForm<CreateTaskForm>({
+    resolver: zodResolver(createTaskFormSchema),
+    defaultValues: {
+      name: '',
+      cronExpression: '',
+      jobConfig: {
+        custom_system_prompt: '',
+        custom_prompt: '',
+        temperature: 0.5,
+        max_tokens: 100,
+        seed: 0,
+        top_k: 50,
+        top_p: 1,
+        stream: false,
+        other_model_params: {},
+        use_tools: false,
+      },
+      jobMessage: {
+        content: '',
+        toolKey: '',
+      },
+    },
+  });
+
+  const submit = async (values: CreateTaskForm) => {
+    console.log(values);
+  };
+  return (
+    <SubpageLayout className="max-w-lg" title="Create New Task">
+      <p className="text-gray-80 -mt-8 py-3 pb-6 text-center text-sm">
+        Schedule recurring tasks at a specified time
+      </p>
+      <Form {...form}>
+        <form
+          className="flex flex-col justify-between space-y-6"
+          onSubmit={form.handleSubmit(submit)}
+        >
+          <div className="space-y-4">
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <TextField autoFocus field={field} label="Task Name" />
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="jobMessage.content"
+              render={({ field }) => (
+                <TextField
+                  autoFocus
+                  field={field}
+                  helperMessage="e.g. Give me top hacker news stories "
+                  label="Task Description"
+                />
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="cronExpression"
+              render={({ field }) => (
+                <TextField
+                  autoFocus
+                  field={field}
+                  helperMessage="Enter a cron expression eg: */30 * * * * (every 30 min) "
+                  label="Cron Expression"
+                />
+              )}
+            />
+          </div>
+
+          <div className="space-y-4">
+            <div className="space-y-6 rounded-lg bg-gray-400 px-4 py-4 pb-7">
+              <span className="flex-1 items-center gap-1 truncate py-2 text-left text-xs font-semibold text-gray-50">
+                AI Model Configuration
+              </span>
+
+              <div className="space-y-4">
+                <FormField
+                  control={form.control}
+                  name="jobConfig.custom_system_prompt"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>System Prompt</FormLabel>
+                      <FormControl>
+                        <Textarea
+                          className="!min-h-[130px] resize-none text-sm"
+                          spellCheck={false}
+                          {...field}
+                        />
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+
+                <FormField
+                  control={form.control}
+                  name="jobConfig.stream"
+                  render={({ field }) => (
+                    <FormItem className="flex w-full flex-col gap-3">
+                      <div className="flex gap-3">
+                        <FormControl>
+                          <Switch
+                            checked={field.value}
+                            onCheckedChange={field.onChange}
+                          />
+                        </FormControl>
+                        <div className="space-y-1 leading-none">
+                          <FormLabel className="static space-y-1.5 text-sm text-white">
+                            Enable Stream
+                          </FormLabel>
+                        </div>
+                      </div>
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="jobConfig.use_tools"
+                  render={({ field }) => (
+                    <FormItem className="flex w-full flex-col gap-3">
+                      <div className="flex gap-3">
+                        <FormControl>
+                          <Switch
+                            checked={field.value}
+                            onCheckedChange={field.onChange}
+                          />
+                        </FormControl>
+                        <div className="space-y-1 leading-none">
+                          <FormLabel className="static space-y-1.5 text-sm text-white">
+                            Enable Tools
+                          </FormLabel>
+                        </div>
+                      </div>
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="jobConfig.temperature"
+                  render={({ field }) => (
+                    <FormItem className="flex gap-2.5">
+                      <FormControl>
+                        <HoverCard openDelay={200}>
+                          <HoverCardTrigger asChild>
+                            <div className="grid w-full gap-4">
+                              <div className="flex items-center justify-between">
+                                <Label htmlFor="temperature">Temperature</Label>
+                                <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
+                                  {field.value}
+                                </span>
+                              </div>
+                              <Slider
+                                aria-label="Temperature"
+                                className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
+                                id="temperature"
+                                max={1}
+                                onValueChange={(vals) => {
+                                  field.onChange(vals[0]);
+                                }}
+                                step={0.1}
+                                value={[field.value]}
+                              />
+                            </div>
+                          </HoverCardTrigger>
+                          <HoverCardContent
+                            align="start"
+                            className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
+                            side="left"
+                          >
+                            Temperature is a parameter that affects the
+                            randomness of AI outputs. Higher temp = more
+                            unexpected, lower temp = more predictable.
+                          </HoverCardContent>
+                        </HoverCard>
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="jobConfig.top_p"
+                  render={({ field }) => (
+                    <FormItem className="flex gap-2.5">
+                      <FormControl>
+                        <HoverCard openDelay={200}>
+                          <HoverCardTrigger asChild>
+                            <div className="grid w-full gap-4">
+                              <div className="flex items-center justify-between">
+                                <Label htmlFor="topP">Top P</Label>
+                                <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
+                                  {field.value}
+                                </span>
+                              </div>
+                              <Slider
+                                aria-label="Top P"
+                                className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
+                                id="topP"
+                                max={1}
+                                min={0}
+                                onValueChange={(vals) => {
+                                  field.onChange(vals[0]);
+                                }}
+                                step={0.1}
+                                value={[field.value]}
+                              />
+                            </div>
+                          </HoverCardTrigger>
+                          <HoverCardContent
+                            align="start"
+                            className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
+                            side="left"
+                          >
+                            Adjust the probability threshold to increase the
+                            relevance of results. For example, a threshold of
+                            0.9 could be optimal for targeted, specific
+                            applications, whereas a threshold of 0.95 or 0.97
+                            might be preferred for tasks that require broader,
+                            more creative responses.
+                          </HoverCardContent>
+                        </HoverCard>
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="jobConfig.top_k"
+                  render={({ field }) => (
+                    <FormItem className="flex gap-2.5">
+                      <FormControl>
+                        <HoverCard openDelay={200}>
+                          <HoverCardTrigger asChild>
+                            <div className="grid w-full gap-4">
+                              <div className="flex items-center justify-between">
+                                <Label htmlFor="topK">Top K</Label>
+                                <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
+                                  {field.value}
+                                </span>
+                              </div>
+                              <Slider
+                                aria-label="Top K"
+                                className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
+                                id="topK"
+                                max={100}
+                                onValueChange={(vals) => {
+                                  field.onChange(vals[0]);
+                                }}
+                                step={1}
+                                value={[field.value]}
+                              />
+                            </div>
+                          </HoverCardTrigger>
+                          <HoverCardContent
+                            align="start"
+                            className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
+                            side="left"
+                          >
+                            Adjust the count of key words for creating
+                            sequences. This parameter governs the extent of the
+                            generated passage, forestalling too much repetition.
+                            Selecting a higher figure yields longer narratives,
+                            whereas a smaller figure keeps the text brief.
+                          </HoverCardContent>
+                        </HoverCard>
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+              </div>
+            </div>
+          </div>
+          <div className="flex items-center justify-end gap-2">
+            <Button
+              className="min-w-[120px]"
+              // disabled={isPending}
+              // onClick={() => navigate('/ais?tab=agents')}
+              size="sm"
+              type="button"
+              variant="outline"
+            >
+              {t('common.cancel')}
+            </Button>
+            <Button
+              className="min-w-[120px]"
+              // disabled={isPending}
+              // isLoading={isPending}
+              size="sm"
+              type="submit"
+            >
+              {t('common.save')}
+            </Button>
+          </div>
+        </form>
+      </Form>
+    </SubpageLayout>
+  );
+}
+
+export default CreateTaskPage;
diff --git a/apps/shinkai-desktop/src/pages/layout/main-layout.tsx b/apps/shinkai-desktop/src/pages/layout/main-layout.tsx
index 60e08c815..5ab530eb9 100644
--- a/apps/shinkai-desktop/src/pages/layout/main-layout.tsx
+++ b/apps/shinkai-desktop/src/pages/layout/main-layout.tsx
@@ -28,6 +28,7 @@ import {
   CreateAIIcon,
   FilesIcon,
   InboxIcon,
+  ScheduledTasksIcon,
   // MySubscriptionsIcon,
   SheetIcon,
   ShinkaiCombinationMarkIcon,
@@ -361,6 +362,11 @@ export function MainNav() {
       href: '/tools',
       icon: <ToolsIcon className="h-5 w-5" />,
     },
+    optInExperimental && {
+      title: 'Scheduled Tasks',
+      href: '/tasks',
+      icon: <ScheduledTasksIcon className="h-5 w-5" />,
+    },
   ].filter(Boolean) as NavigationLink[];
 
   const footerNavigationLinks = [
diff --git a/apps/shinkai-desktop/src/pages/tasks.tsx b/apps/shinkai-desktop/src/pages/tasks.tsx
new file mode 100644
index 000000000..d2f1c6462
--- /dev/null
+++ b/apps/shinkai-desktop/src/pages/tasks.tsx
@@ -0,0 +1,370 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useTranslation } from '@shinkai_network/shinkai-i18n';
+import { ShinkaiTool } from '@shinkai_network/shinkai-message-ts/api/tools/types';
+import { useImportTool } from '@shinkai_network/shinkai-node-state/v2/mutations/importTool/useImportTool';
+import { useUpdateTool } from '@shinkai_network/shinkai-node-state/v2/mutations/updateTool/useUpdateTool';
+import { useGetTools } from '@shinkai_network/shinkai-node-state/v2/queries/getToolsList/useGetToolsList';
+import { useGetSearchTools } from '@shinkai_network/shinkai-node-state/v2/queries/getToolsSearch/useGetToolsSearch';
+import {
+  Badge,
+  Button,
+  buttonVariants,
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogTitle,
+  DialogTrigger,
+  Form,
+  FormField,
+  Input,
+  Switch,
+  TextField,
+  Tooltip,
+  TooltipContent,
+  TooltipPortal,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@shinkai_network/shinkai-ui';
+import { formatText } from '@shinkai_network/shinkai-ui/helpers';
+import { cn } from '@shinkai_network/shinkai-ui/utils';
+import {
+  BoltIcon,
+  CloudDownloadIcon,
+  PlusIcon,
+  SearchIcon,
+  XIcon,
+} from 'lucide-react';
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { Link, useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
+import { z } from 'zod';
+
+import { useDebounce } from '../hooks/use-debounce';
+import { useAuth } from '../store/auth';
+import { SimpleLayout } from './layout/simple-layout';
+
+export const Tasks = () => {
+  const auth = useAuth((state) => state.auth);
+  const { t } = useTranslation();
+  const [searchQuery, setSearchQuery] = useState('');
+  const debouncedSearchQuery = useDebounce(searchQuery, 600);
+  const isSearchQuerySynced = searchQuery === debouncedSearchQuery;
+
+  const { data: toolsList, isPending } = useGetTools({
+    nodeAddress: auth?.node_address ?? '',
+    token: auth?.api_v2_key ?? '',
+  });
+
+  const { data: searchToolList, isLoading: isSearchToolListPending } =
+    useGetSearchTools(
+      {
+        nodeAddress: auth?.node_address ?? '',
+        token: auth?.api_v2_key ?? '',
+        search: debouncedSearchQuery,
+      },
+      { enabled: isSearchQuerySynced && !!searchQuery },
+    );
+
+  const { mutateAsync: updateTool } = useUpdateTool();
+
+  return (
+    <SimpleLayout
+      classname="max-w-3xl"
+      headerRightElement={
+        <div className="flex items-center gap-2">
+          {/*<ImportToolModal />*/}
+          <Link
+            className={cn(
+              buttonVariants({
+                variant: 'default',
+                size: 'auto',
+              }),
+              'h-[30px] gap-2 rounded-lg px-3 text-xs',
+            )}
+            to="/tasks/create"
+          >
+            <PlusIcon className="size-4" />
+            Create New
+          </Link>
+        </div>
+      }
+      title="Scheduled Tasks"
+    >
+      <div className="relative mb-4 flex h-10 w-full items-center">
+        <Input
+          className="placeholder-gray-80 !h-full border-none bg-gray-400 py-2 pl-10"
+          onChange={(e) => {
+            setSearchQuery(e.target.value);
+          }}
+          placeholder="Search..."
+          spellCheck={false}
+          value={searchQuery}
+        />
+        <SearchIcon className="absolute left-4 top-1/2 -z-[1px] h-4 w-4 -translate-y-1/2" />
+        {searchQuery && (
+          <Button
+            className="absolute right-1 h-8 w-8 bg-gray-200 p-2"
+            onClick={() => {
+              setSearchQuery('');
+            }}
+            size="auto"
+            type="button"
+            variant="ghost"
+          >
+            <XIcon />
+            <span className="sr-only">{t('common.clearSearch')}</span>
+          </Button>
+        )}
+      </div>
+      <div className="divide-y divide-gray-300">
+        {(isPending || !isSearchQuerySynced || isSearchToolListPending) &&
+          Array.from({ length: 8 }).map((_, idx) => (
+            <div
+              className={cn(
+                'grid animate-pulse grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+              )}
+              key={idx}
+            >
+              <div className="flex w-full flex-1 flex-col gap-3">
+                <span className="h-4 w-36 rounded-sm bg-gray-300" />
+                <div className="flex flex-col gap-1">
+                  <span className="h-3 w-full rounded-sm bg-gray-300" />
+                  <span className="h-3 w-2/4 rounded-sm bg-gray-300" />
+                </div>
+              </div>
+              <span className="h-7 w-full rounded-md bg-gray-300" />
+              <span className="h-5 w-[36px] rounded-full bg-gray-300" />
+            </div>
+          ))}
+        {!searchQuery &&
+          isSearchQuerySynced &&
+          toolsList?.map((tool) => (
+            <div
+              className={cn(
+                'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+              )}
+              key={tool.tool_router_key}
+            >
+              <div className="flex flex-col gap-2.5">
+                <div className="flex items-center gap-2">
+                  <span className="text-sm font-medium capitalize text-white">
+                    {formatText(tool.name)}{' '}
+                  </span>
+                  {tool.author !== '@@official.shinkai' && (
+                    <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
+                      {tool.author}
+                    </Badge>
+                  )}
+                </div>
+                <p className="text-gray-80 line-clamp-2 text-xs">
+                  {tool.description}
+                </p>
+              </div>
+              <Link
+                className={cn(
+                  buttonVariants({
+                    variant: 'outline',
+                    size: 'sm',
+                  }),
+                  'min-h-auto h-auto rounded-md py-2',
+                )}
+                to={`/tools/${tool.tool_router_key}`}
+              >
+                <BoltIcon className="mr-1.5 h-4 w-4" />
+                {t('common.configure')}
+              </Link>
+              <TooltipProvider delayDuration={0}>
+                <Tooltip>
+                  <TooltipTrigger className="flex items-center gap-1">
+                    <Switch
+                      checked={tool.enabled}
+                      onCheckedChange={async () => {
+                        await updateTool({
+                          toolKey: tool.tool_router_key,
+                          toolType: tool.tool_type,
+                          toolPayload: {} as ShinkaiTool,
+                          isToolEnabled: !tool.enabled,
+                          nodeAddress: auth?.node_address ?? '',
+                          token: auth?.api_v2_key ?? '',
+                        });
+                      }}
+                    />
+                  </TooltipTrigger>
+                  <TooltipPortal>
+                    <TooltipContent align="center" side="top">
+                      {t('common.enabled')}
+                    </TooltipContent>
+                  </TooltipPortal>
+                </Tooltip>
+              </TooltipProvider>
+            </div>
+          ))}
+        {searchQuery &&
+          isSearchQuerySynced &&
+          searchToolList?.map((tool) => (
+            <div
+              className={cn(
+                'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+              )}
+              key={tool.tool_router_key}
+            >
+              <div className="flex flex-col gap-2.5">
+                <div className="flex items-center gap-2">
+                  <span className="text-sm font-medium text-white">
+                    {formatText(tool.name)}{' '}
+                  </span>
+                  {tool.author !== '@@official.shinkai' && (
+                    <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
+                      {tool.author}
+                    </Badge>
+                  )}
+                </div>
+                <p className="text-gray-80 line-clamp-2 text-xs">
+                  {tool.description}
+                </p>
+              </div>
+
+              <Link
+                className={cn(
+                  buttonVariants({
+                    variant: 'outline',
+                    size: 'sm',
+                  }),
+                  'min-h-auto h-auto rounded-md py-2',
+                )}
+                to={`/tools/${tool.tool_router_key}`}
+              >
+                <BoltIcon className="mr-1.5 h-4 w-4" />
+                {t('common.configure')}
+              </Link>
+              <TooltipProvider delayDuration={0}>
+                <Tooltip>
+                  <TooltipTrigger className="flex items-center gap-1">
+                    <Switch
+                      checked={tool.enabled}
+                      onCheckedChange={async () => {
+                        await updateTool({
+                          toolKey: tool.tool_router_key,
+                          toolType: tool.tool_type,
+                          toolPayload: {} as ShinkaiTool,
+                          isToolEnabled: !tool.enabled,
+                          nodeAddress: auth?.node_address ?? '',
+                          token: auth?.api_v2_key ?? '',
+                        });
+                      }}
+                    />
+                  </TooltipTrigger>
+                  <TooltipPortal>
+                    <TooltipContent align="center" side="top">
+                      {t('common.enabled')}
+                    </TooltipContent>
+                  </TooltipPortal>
+                </Tooltip>
+              </TooltipProvider>
+            </div>
+          ))}
+        {searchQuery && isSearchQuerySynced && searchToolList?.length === 0 && (
+          <div className="flex h-20 items-center justify-center">
+            <p className="text-gray-80 text-sm">
+              {t('tools.emptyState.search.text')}
+            </p>
+          </div>
+        )}
+      </div>
+    </SimpleLayout>
+  );
+};
+
+const importToolFormSchema = z.object({
+  url: z.string().url(),
+});
+type ImportToolFormSchema = z.infer<typeof importToolFormSchema>;
+
+function ImportToolModal() {
+  const auth = useAuth((state) => state.auth);
+
+  const navigate = useNavigate();
+  const importToolForm = useForm<ImportToolFormSchema>({
+    resolver: zodResolver(importToolFormSchema),
+  });
+  const [isImportModalOpen, setImportModalOpen] = useState(false);
+
+  const { mutateAsync: importTool, isPending: isPendingImportSheet } =
+    useImportTool({
+      onSuccess: (data) => {
+        setImportModalOpen(false);
+        toast.success('Tool imported successfully', {
+          action: {
+            label: 'View',
+            onClick: () => {
+              navigate(`/tools/${data.tool_key}`);
+            },
+          },
+        });
+      },
+      onError: (error) => {
+        toast.error('Failed to import tool', {
+          description: error.response?.data?.message ?? error.message,
+        });
+      },
+    });
+
+  const onSubmit = async (data: ImportToolFormSchema) => {
+    await importTool({
+      nodeAddress: auth?.node_address ?? '',
+      token: auth?.api_v2_key ?? '',
+      url: data.url,
+    });
+  };
+
+  return (
+    <Dialog onOpenChange={setImportModalOpen} open={isImportModalOpen}>
+      <DialogTrigger asChild>
+        <Button
+          className="h-[30px] gap-2 rounded-lg px-3 text-xs"
+          size="auto"
+          variant="outline"
+        >
+          <CloudDownloadIcon className="size-4" />
+          Import Tool
+        </Button>
+      </DialogTrigger>
+      <DialogContent className="max-w-[500px]">
+        <DialogTitle className="pb-0">Import Tool</DialogTitle>
+        <Form {...importToolForm}>
+          <form
+            className="mt-2 flex flex-col gap-6"
+            onSubmit={importToolForm.handleSubmit(onSubmit)}
+          >
+            <FormField
+              control={importToolForm.control}
+              name="url"
+              render={({ field }) => (
+                <TextField
+                  autoFocus
+                  field={{
+                    ...field,
+                    placeholder: 'https://example.com/file.zip',
+                  }}
+                  label={'URL'}
+                />
+              )}
+            />
+            <DialogFooter>
+              <Button
+                className="w-full"
+                disabled={isPendingImportSheet}
+                isLoading={isPendingImportSheet}
+                size="auto"
+                type="submit"
+              >
+                Import
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/shinkai-desktop/src/routes/index.tsx b/apps/shinkai-desktop/src/routes/index.tsx
index 1bb8afa67..3872f297a 100644
--- a/apps/shinkai-desktop/src/routes/index.tsx
+++ b/apps/shinkai-desktop/src/routes/index.tsx
@@ -37,6 +37,7 @@ import EmptyMessage from '../pages/chat/empty-message';
 import ChatLayout from '../pages/chat/layout';
 import { ConnectMethodQrCodePage } from '../pages/connect-method-qr-code';
 import CreateChatPage from '../pages/create-chat';
+import CreateTaskPage from '../pages/create-task';
 import CreateToolPage from '../pages/create-tool';
 import CryptoWalletPage from '../pages/crypto-wallet';
 import EditToolPage from '../pages/edit-tool';
@@ -57,6 +58,7 @@ import SettingsPage from '../pages/settings';
 import SheetDashboard from '../pages/sheet-dashboard';
 import SheetProject from '../pages/sheet-project';
 import ShinkaiPrivatePage from '../pages/shinkai-private';
+import { Tasks } from '../pages/tasks';
 import TermsAndConditionsPage from '../pages/terms-conditions';
 import { Tools } from '../pages/tools';
 import { useAuth } from '../store/auth';
@@ -314,6 +316,19 @@ const AppRoutes = () => {
           <Route element={<CreateToolPage />} path={'create'} />
           <Route element={<EditToolPage />} path={'edit/:toolRouterKey'} />
         </Route>
+        <Route
+          element={
+            <ProtectedRoute>
+              <Outlet />
+            </ProtectedRoute>
+          }
+          path={'tasks'}
+        >
+          <Route element={<Tasks />} index />
+          <Route element={<ToolDetails />} path={':toolKey'} />
+          <Route element={<CreateTaskPage />} path={'create'} />
+          <Route element={<EditToolPage />} path={'edit/:toolRouterKey'} />
+        </Route>
         <Route
           element={
             <ProtectedRoute>
diff --git a/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts b/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
new file mode 100644
index 000000000..159722900
--- /dev/null
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
@@ -0,0 +1,91 @@
+import { httpClient } from '../../http-client';
+import { urlJoin } from '../../utils/url-join';
+import {
+  CreateRecurringTaskRequest,
+  CreateRecurringTaskResponse,
+  GetRecurringTaskLogsRequest,
+  GetRecurringTaskRequest,
+  GetRecurringTaskResponse,
+  GetRecurringTasksResponse,
+  RemoveRecurringTaskRequest,
+  RemoveRecurringTaskResponse,
+} from './types';
+
+export const createRecurringTask = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: CreateRecurringTaskRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/add_cron_task'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as CreateRecurringTaskResponse;
+};
+
+export const getRecurringTasks = async (
+  nodeAddress: string,
+  bearerToken: string,
+) => {
+  const response = await httpClient.get(
+    urlJoin(nodeAddress, '/v2/list_all_cron_tasks'),
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as GetRecurringTasksResponse;
+};
+
+export const getRecurringTask = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: GetRecurringTaskRequest,
+) => {
+  const response = await httpClient.get(
+    urlJoin(nodeAddress, '/v2/get_cron_task'),
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      params: { cron_task_id: payload.cron_task_id },
+      responseType: 'json',
+    },
+  );
+  return response.data as GetRecurringTaskResponse;
+};
+
+export const removeRecurringTask = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: RemoveRecurringTaskRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/remove_cron_task'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      params: { cron_task_id: payload.cron_task_id },
+      responseType: 'json',
+    },
+  );
+  return response.data as RemoveRecurringTaskResponse;
+};
+
+export const getRecurringTaskLogs = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: GetRecurringTaskLogsRequest,
+) => {
+  const response = await httpClient.get(
+    urlJoin(nodeAddress, '/v2/get_cron_task_logs'),
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      params: { cron_task_id: payload.cron_task_id },
+      responseType: 'json',
+    },
+  );
+  return response.data;
+};
diff --git a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
new file mode 100644
index 000000000..85e616811
--- /dev/null
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
@@ -0,0 +1,63 @@
+import {
+  JobConfig,
+  JobMessage,
+  VRFolderScope,
+  VRItemScope,
+} from '../jobs/types';
+import { getRecurringTaskLogs } from './index';
+
+export type RecurringTaskAction =
+  | {
+      SendMessageToJob: {
+        job_id: string;
+        message: JobMessage;
+      };
+    }
+  | {
+      CreateJobWithConfigAndMessage: {
+        config: JobConfig;
+        message: JobMessage;
+        job_creation_info: {
+          scope: {
+            network_folders: [];
+            vector_fs_folders: VRFolderScope[];
+            vector_fs_items: VRItemScope[];
+            local_vrpack: [];
+            local_vrkai: [];
+          };
+          is_hidden?: boolean;
+          associated_ui?: null;
+        };
+      };
+    };
+
+export type CreateRecurringTaskRequest = {
+  cron: string;
+  action: RecurringTaskAction;
+};
+
+export type CreateRecurringTaskResponse = {};
+
+export type RecurringTask = {
+  task_id: number;
+  cron: string;
+  created_at: string;
+  last_modified: string;
+  action: RecurringTaskAction;
+};
+
+export type GetRecurringTasksResponse = RecurringTask[];
+
+export type GetRecurringTaskRequest = {
+  cron_task_id: number;
+};
+export type GetRecurringTaskResponse = RecurringTask;
+export type RemoveRecurringTaskRequest = {
+  cron_task_id: number;
+};
+export type RemoveRecurringTaskResponse = {
+  status: string;
+};
+export type GetRecurringTaskLogsRequest = {
+  cron_task_id: number;
+};
diff --git a/libs/shinkai-node-state/src/v2/constants.ts b/libs/shinkai-node-state/src/v2/constants.ts
index a989dc34a..efad75706 100644
--- a/libs/shinkai-node-state/src/v2/constants.ts
+++ b/libs/shinkai-node-state/src/v2/constants.ts
@@ -35,6 +35,8 @@ export enum FunctionKeyV2 {
   GET_LIST_PROMPTS = 'GET_LIST_PROMPTS',
   GET_SEARCH_PROMPT = 'GET_SEARCH_PROMPT',
   GET_WALLET_LIST = 'GET_WALLET_LIST',
+  GET_RECURRING_TASKS = 'GET_RECURRING_TASKS',
+  GET_RECURRING_TASK = 'GET_RECURRING_TASK',
 }
 
 export const DEFAULT_CHAT_CONFIG = {
diff --git a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
new file mode 100644
index 000000000..8ba7c0d99
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
@@ -0,0 +1,16 @@
+import { createRecurringTask as createRecurringTaskApi } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/index';
+
+import { CreateRecurringTaskInput } from './types';
+
+export const createRecurringTask = async ({
+  nodeAddress,
+  token,
+  cronExpression,
+  recurringTaskAction,
+}: CreateRecurringTaskInput) => {
+  const response = await createRecurringTaskApi(nodeAddress, token, {
+    cron: cronExpression,
+    action: recurringTaskAction,
+  });
+  return response;
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts
new file mode 100644
index 000000000..6b3e5abc6
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts
@@ -0,0 +1,13 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import {
+  CreateRecurringTaskResponse,
+  RecurringTaskAction,
+} from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/types';
+
+export type CreateRecurringTaskOutput = CreateRecurringTaskResponse;
+
+export type CreateRecurringTaskInput = Token & {
+  nodeAddress: string;
+  cronExpression: string;
+  recurringTaskAction: RecurringTaskAction;
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/useCreateRecurringTask.ts b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/useCreateRecurringTask.ts
new file mode 100644
index 000000000..27a6f2fcb
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/useCreateRecurringTask.ts
@@ -0,0 +1,33 @@
+import {
+  useMutation,
+  type UseMutationOptions,
+  useQueryClient,
+} from '@tanstack/react-query';
+
+import { FunctionKeyV2 } from '../../constants';
+import { APIError } from '../../types';
+import { createRecurringTask } from './index';
+import { CreateRecurringTaskInput, CreateRecurringTaskOutput } from './types';
+
+type Options = UseMutationOptions<
+  CreateRecurringTaskOutput,
+  APIError,
+  CreateRecurringTaskInput
+>;
+
+export const useCreateRecurringTask = (options?: Options) => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: createRecurringTask,
+    ...options,
+    onSuccess: (response, variables, context) => {
+      queryClient.invalidateQueries({
+        queryKey: [FunctionKeyV2.GET_RECURRING_TASKS],
+      });
+
+      if (options?.onSuccess) {
+        options.onSuccess(response, variables, context);
+      }
+    },
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts
new file mode 100644
index 000000000..4ef459e8b
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts
@@ -0,0 +1,15 @@
+import { removeRecurringTask as removeRecurringTaskApi } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/index';
+
+import { RemoveRecurringTaskInput } from './types';
+
+export const removeRecurringTask = async ({
+  nodeAddress,
+  token,
+
+  recurringTaskId,
+}: RemoveRecurringTaskInput) => {
+  const response = await removeRecurringTaskApi(nodeAddress, token, {
+    cron_task_id: recurringTaskId,
+  });
+  return response;
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts
new file mode 100644
index 000000000..4ecf10854
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts
@@ -0,0 +1,9 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { RemoveRecurringTaskResponse } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/types';
+
+export type RemoveRecurringTaskOutput = RemoveRecurringTaskResponse;
+
+export type RemoveRecurringTaskInput = Token & {
+  nodeAddress: string;
+  recurringTaskId: number;
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/useRemoveRecurringTask.ts b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/useRemoveRecurringTask.ts
new file mode 100644
index 000000000..5974197d9
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/useRemoveRecurringTask.ts
@@ -0,0 +1,33 @@
+import {
+  useMutation,
+  type UseMutationOptions,
+  useQueryClient,
+} from '@tanstack/react-query';
+
+import { FunctionKeyV2 } from '../../constants';
+import { APIError } from '../../types';
+import { removeRecurringTask } from './index';
+import { RemoveRecurringTaskInput, RemoveRecurringTaskOutput } from './types';
+
+type Options = UseMutationOptions<
+  RemoveRecurringTaskOutput,
+  APIError,
+  RemoveRecurringTaskInput
+>;
+
+export const useRemoveRecurringTask = (options?: Options) => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: removeRecurringTask,
+    ...options,
+    onSuccess: (response, variables, context) => {
+      queryClient.invalidateQueries({
+        queryKey: [FunctionKeyV2.GET_RECURRING_TASKS],
+      });
+
+      if (options?.onSuccess) {
+        options.onSuccess(response, variables, context);
+      }
+    },
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTask/index.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/index.ts
new file mode 100644
index 000000000..1462f6b47
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/index.ts
@@ -0,0 +1,14 @@
+import { getRecurringTask as getRecurringTaskApi } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/index';
+
+import type { GetRecurringTaskInput } from './types';
+
+export const getRecurringTask = async ({
+  nodeAddress,
+  token,
+  recurringTaskId,
+}: GetRecurringTaskInput) => {
+  const result = await getRecurringTaskApi(nodeAddress, token, {
+    cron_task_id: recurringTaskId,
+  });
+  return result;
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts
new file mode 100644
index 000000000..f13e5d2b0
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts
@@ -0,0 +1,9 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { GetRecurringTaskResponse } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/types';
+
+export type GetRecurringTaskInput = Token & {
+  nodeAddress: string;
+  recurringTaskId: number;
+};
+
+export type GetRecurringTaskOutput = GetRecurringTaskResponse;
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts
new file mode 100644
index 000000000..248dac63c
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts
@@ -0,0 +1,13 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { FunctionKeyV2 } from '../../constants';
+import { getRecurringTask } from './index';
+import { GetRecurringTaskInput } from './types';
+
+export const useGetRecurringTask = (input: GetRecurringTaskInput) => {
+  const response = useQuery({
+    queryKey: [FunctionKeyV2.GET_RECURRING_TASK, input],
+    queryFn: () => getRecurringTask(input),
+  });
+  return response;
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/index.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/index.ts
new file mode 100644
index 000000000..1d3eaff61
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/index.ts
@@ -0,0 +1,11 @@
+import { getRecurringTasks as getRecurringTasksApi } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/index';
+
+import type { GetRecurringTasksInput } from './types';
+
+export const getRecurringTasks = async ({
+  nodeAddress,
+  token,
+}: GetRecurringTasksInput) => {
+  const result = await getRecurringTasksApi(nodeAddress, token);
+  return result;
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/types.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/types.ts
new file mode 100644
index 000000000..eb2f64ea7
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/types.ts
@@ -0,0 +1,8 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { GetRecurringTasksResponse } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/types';
+
+export type GetRecurringTasksInput = Token & {
+  nodeAddress: string;
+};
+
+export type GetRecurringTasksOutput = GetRecurringTasksResponse;
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/useGetRecurringTasks.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/useGetRecurringTasks.ts
new file mode 100644
index 000000000..8f7a89bb1
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTasks/useGetRecurringTasks.ts
@@ -0,0 +1,13 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { FunctionKeyV2 } from '../../constants';
+import { getRecurringTasks } from './index';
+import { GetRecurringTasksInput } from './types';
+
+export const useGetRecurringTasks = (input: GetRecurringTasksInput) => {
+  const response = useQuery({
+    queryKey: [FunctionKeyV2.GET_RECURRING_TASKS, input],
+    queryFn: () => getRecurringTasks(input),
+  });
+  return response;
+};
diff --git a/libs/shinkai-ui/src/assets/icons/general.tsx b/libs/shinkai-ui/src/assets/icons/general.tsx
index 33468538a..7a7bb8ef3 100644
--- a/libs/shinkai-ui/src/assets/icons/general.tsx
+++ b/libs/shinkai-ui/src/assets/icons/general.tsx
@@ -1082,6 +1082,31 @@ export const ToolsIcon = ({ className }: { className?: string }) => (
     />
   </svg>
 );
+
+export const ScheduledTasksIcon = ({ className }: { className?: string }) => (
+  <svg
+    className={cn('shrink-0', className)}
+    fill={'none'}
+    height={24}
+    viewBox="0 0 24 24"
+    width={24}
+  >
+    <path
+      d="M18.952 8.60639L21.4621 8.45358C19.6628 3.70459 14.497 0.999731 9.46037 2.34456C4.09595 3.77692 0.909592 9.26089 2.34343 14.5933C3.77728 19.9258 9.28835 23.0874 14.6528 21.6551C18.6358 20.5916 21.418 17.2945 22 13.4842"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth="1.5"
+    />
+    <path
+      d="M12 7.99982V11.9998L14 13.9998"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth="1.5"
+    />
+  </svg>
+);
 export const AddCryptoWalletIcon = ({ className }: { className?: string }) => (
   <svg
     className={cn('shrink-0', className)}

From 1d139430e48779d7b7b7d48dc0a0c7413dccf8b9 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 13 Dec 2024 18:27:27 -0500
Subject: [PATCH 4/7] feat: add and list cron tasks

---
 .../shinkai-desktop/src/pages/create-task.tsx |  59 +-
 apps/shinkai-desktop/src/pages/tasks.tsx      | 516 ++++++++----------
 libs/shinkai-message-ts/src/api/jobs/types.ts |   1 +
 .../src/api/recurring-tasks/index.ts          |  19 +
 .../src/api/recurring-tasks/types.ts          |  10 +-
 .../v2/mutations/createRecurringTask/index.ts |  61 ++-
 .../v2/mutations/createRecurringTask/types.ts |   9 +-
 7 files changed, 377 insertions(+), 298 deletions(-)

diff --git a/apps/shinkai-desktop/src/pages/create-task.tsx b/apps/shinkai-desktop/src/pages/create-task.tsx
index 9a7623577..ed09f530a 100644
--- a/apps/shinkai-desktop/src/pages/create-task.tsx
+++ b/apps/shinkai-desktop/src/pages/create-task.tsx
@@ -1,5 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
+import { useCreateRecurringTask } from '@shinkai_network/shinkai-node-state/v2/mutations/createRecurringTask/useCreateRecurringTask';
 import {
   Button,
   Form,
@@ -17,23 +18,26 @@ import {
   TextField,
 } from '@shinkai_network/shinkai-ui';
 import { useForm } from 'react-hook-form';
+import { toast } from 'sonner';
 import { z } from 'zod';
 
+import { useAuth } from '../store/auth';
+import { useSettings } from '../store/settings';
 import { SubpageLayout } from './layout/simple-layout';
 
 const createTaskFormSchema = z.object({
   name: z.string(),
+  description: z.string(),
   cronExpression: z.string(),
   jobConfig: z.object({
     custom_system_prompt: z.string().optional(),
-    custom_prompt: z.string().optional(),
-    temperature: z.number().optional(),
+    custom_prompt: z.string(),
+    temperature: z.number(),
     max_tokens: z.number().optional(),
     seed: z.number().optional(),
-    top_k: z.number().optional(),
-    top_p: z.number().optional(),
+    top_k: z.number(),
+    top_p: z.number(),
     stream: z.boolean().optional(),
-    other_model_params: z.unknown().optional(),
     use_tools: z.boolean().optional(),
   }),
   jobMessage: z.object({
@@ -45,12 +49,15 @@ type CreateTaskForm = z.infer<typeof createTaskFormSchema>;
 
 function CreateTaskPage() {
   const { t } = useTranslation();
+  const defaultAgentId = useSettings((state) => state.defaultAgentId);
 
+  const auth = useAuth((state) => state.auth);
   const form = useForm<CreateTaskForm>({
     resolver: zodResolver(createTaskFormSchema),
     defaultValues: {
-      name: '',
-      cronExpression: '',
+      name: 'Hacker News',
+      description: 'Hacker News yada yada',
+      cronExpression: '*/30 * * * *',
       jobConfig: {
         custom_system_prompt: '',
         custom_prompt: '',
@@ -60,17 +67,39 @@ function CreateTaskPage() {
         top_k: 50,
         top_p: 1,
         stream: false,
-        other_model_params: {},
         use_tools: false,
       },
       jobMessage: {
-        content: '',
-        toolKey: '',
+        content: 'Search in duckduckgo about hacker news',
+        toolKey:
+          'local:::shinkai_tool_duckduckgo_search:::shinkai__duckduckgo_search',
       },
     },
   });
 
+  const { mutateAsync: createRecurringTask } = useCreateRecurringTask({
+    onSuccess: () => {
+      toast.success('Task created successfully');
+    },
+    onError: (error) => {
+      toast.error('Failed to create task', {
+        description: error.response?.data?.message ?? error.message,
+      });
+    },
+  });
+
   const submit = async (values: CreateTaskForm) => {
+    await createRecurringTask({
+      nodeAddress: auth?.node_address ?? '',
+      token: auth?.api_v2_key ?? '',
+      cronExpression: values.cronExpression,
+      chatConfig: values.jobConfig,
+      message: values.jobMessage.content,
+      toolRouterKey: values.jobMessage.toolKey,
+      llmProvider: defaultAgentId,
+      name: values.name,
+      description: values.description,
+    });
     console.log(values);
   };
   return (
@@ -92,6 +121,13 @@ function CreateTaskPage() {
               )}
             />
 
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <TextField autoFocus field={field} label="Task Description" />
+              )}
+            />
             <FormField
               control={form.control}
               name="jobMessage.content"
@@ -100,10 +136,11 @@ function CreateTaskPage() {
                   autoFocus
                   field={field}
                   helperMessage="e.g. Give me top hacker news stories "
-                  label="Task Description"
+                  label="Task Prompt"
                 />
               )}
             />
+
             <FormField
               control={form.control}
               name="cronExpression"
diff --git a/apps/shinkai-desktop/src/pages/tasks.tsx b/apps/shinkai-desktop/src/pages/tasks.tsx
index d2f1c6462..9aa8ae8d2 100644
--- a/apps/shinkai-desktop/src/pages/tasks.tsx
+++ b/apps/shinkai-desktop/src/pages/tasks.tsx
@@ -1,73 +1,44 @@
-import { zodResolver } from '@hookform/resolvers/zod';
+import { DialogClose } from '@radix-ui/react-dialog';
+import { DotsVerticalIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { ShinkaiTool } from '@shinkai_network/shinkai-message-ts/api/tools/types';
-import { useImportTool } from '@shinkai_network/shinkai-node-state/v2/mutations/importTool/useImportTool';
-import { useUpdateTool } from '@shinkai_network/shinkai-node-state/v2/mutations/updateTool/useUpdateTool';
-import { useGetTools } from '@shinkai_network/shinkai-node-state/v2/queries/getToolsList/useGetToolsList';
-import { useGetSearchTools } from '@shinkai_network/shinkai-node-state/v2/queries/getToolsSearch/useGetToolsSearch';
+import { useRemoveRecurringTask } from '@shinkai_network/shinkai-node-state/v2/mutations/removeRecurringTask/useRemoveRecurringTask';
+import { useGetRecurringTasks } from '@shinkai_network/shinkai-node-state/v2/queries/getRecurringTasks/useGetRecurringTasks';
 import {
-  Badge,
   Button,
   buttonVariants,
   Dialog,
   DialogContent,
+  DialogDescription,
   DialogFooter,
   DialogTitle,
-  DialogTrigger,
-  Form,
-  FormField,
-  Input,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
   Switch,
-  TextField,
-  Tooltip,
-  TooltipContent,
-  TooltipPortal,
-  TooltipProvider,
-  TooltipTrigger,
 } from '@shinkai_network/shinkai-ui';
-import { formatText } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
-import {
-  BoltIcon,
-  CloudDownloadIcon,
-  PlusIcon,
-  SearchIcon,
-  XIcon,
-} from 'lucide-react';
-import { useState } from 'react';
-import { useForm } from 'react-hook-form';
+import { Edit, HistoryIcon, PlusIcon, TrashIcon } from 'lucide-react';
+import React from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
-import { z } from 'zod';
 
-import { useDebounce } from '../hooks/use-debounce';
 import { useAuth } from '../store/auth';
 import { SimpleLayout } from './layout/simple-layout';
 
 export const Tasks = () => {
   const auth = useAuth((state) => state.auth);
-  const { t } = useTranslation();
-  const [searchQuery, setSearchQuery] = useState('');
-  const debouncedSearchQuery = useDebounce(searchQuery, 600);
-  const isSearchQuerySynced = searchQuery === debouncedSearchQuery;
 
-  const { data: toolsList, isPending } = useGetTools({
+  const {
+    data: tasks,
+    isPending,
+    isSuccess,
+  } = useGetRecurringTasks({
     nodeAddress: auth?.node_address ?? '',
     token: auth?.api_v2_key ?? '',
   });
 
-  const { data: searchToolList, isLoading: isSearchToolListPending } =
-    useGetSearchTools(
-      {
-        nodeAddress: auth?.node_address ?? '',
-        token: auth?.api_v2_key ?? '',
-        search: debouncedSearchQuery,
-      },
-      { enabled: isSearchQuerySynced && !!searchQuery },
-    );
-
-  const { mutateAsync: updateTool } = useUpdateTool();
-
   return (
     <SimpleLayout
       classname="max-w-3xl"
@@ -91,34 +62,8 @@ export const Tasks = () => {
       }
       title="Scheduled Tasks"
     >
-      <div className="relative mb-4 flex h-10 w-full items-center">
-        <Input
-          className="placeholder-gray-80 !h-full border-none bg-gray-400 py-2 pl-10"
-          onChange={(e) => {
-            setSearchQuery(e.target.value);
-          }}
-          placeholder="Search..."
-          spellCheck={false}
-          value={searchQuery}
-        />
-        <SearchIcon className="absolute left-4 top-1/2 -z-[1px] h-4 w-4 -translate-y-1/2" />
-        {searchQuery && (
-          <Button
-            className="absolute right-1 h-8 w-8 bg-gray-200 p-2"
-            onClick={() => {
-              setSearchQuery('');
-            }}
-            size="auto"
-            type="button"
-            variant="ghost"
-          >
-            <XIcon />
-            <span className="sr-only">{t('common.clearSearch')}</span>
-          </Button>
-        )}
-      </div>
       <div className="divide-y divide-gray-300">
-        {(isPending || !isSearchQuerySynced || isSearchToolListPending) &&
+        {isPending &&
           Array.from({ length: 8 }).map((_, idx) => (
             <div
               className={cn(
@@ -137,138 +82,25 @@ export const Tasks = () => {
               <span className="h-5 w-[36px] rounded-full bg-gray-300" />
             </div>
           ))}
-        {!searchQuery &&
-          isSearchQuerySynced &&
-          toolsList?.map((tool) => (
-            <div
-              className={cn(
-                'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
-              )}
-              key={tool.tool_router_key}
-            >
-              <div className="flex flex-col gap-2.5">
-                <div className="flex items-center gap-2">
-                  <span className="text-sm font-medium capitalize text-white">
-                    {formatText(tool.name)}{' '}
-                  </span>
-                  {tool.author !== '@@official.shinkai' && (
-                    <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
-                      {tool.author}
-                    </Badge>
-                  )}
-                </div>
-                <p className="text-gray-80 line-clamp-2 text-xs">
-                  {tool.description}
-                </p>
-              </div>
-              <Link
-                className={cn(
-                  buttonVariants({
-                    variant: 'outline',
-                    size: 'sm',
-                  }),
-                  'min-h-auto h-auto rounded-md py-2',
-                )}
-                to={`/tools/${tool.tool_router_key}`}
-              >
-                <BoltIcon className="mr-1.5 h-4 w-4" />
-                {t('common.configure')}
-              </Link>
-              <TooltipProvider delayDuration={0}>
-                <Tooltip>
-                  <TooltipTrigger className="flex items-center gap-1">
-                    <Switch
-                      checked={tool.enabled}
-                      onCheckedChange={async () => {
-                        await updateTool({
-                          toolKey: tool.tool_router_key,
-                          toolType: tool.tool_type,
-                          toolPayload: {} as ShinkaiTool,
-                          isToolEnabled: !tool.enabled,
-                          nodeAddress: auth?.node_address ?? '',
-                          token: auth?.api_v2_key ?? '',
-                        });
-                      }}
-                    />
-                  </TooltipTrigger>
-                  <TooltipPortal>
-                    <TooltipContent align="center" side="top">
-                      {t('common.enabled')}
-                    </TooltipContent>
-                  </TooltipPortal>
-                </Tooltip>
-              </TooltipProvider>
-            </div>
-          ))}
-        {searchQuery &&
-          isSearchQuerySynced &&
-          searchToolList?.map((tool) => (
-            <div
-              className={cn(
-                'grid grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
-              )}
-              key={tool.tool_router_key}
-            >
-              <div className="flex flex-col gap-2.5">
-                <div className="flex items-center gap-2">
-                  <span className="text-sm font-medium text-white">
-                    {formatText(tool.name)}{' '}
-                  </span>
-                  {tool.author !== '@@official.shinkai' && (
-                    <Badge className="text-gray-80 bg-gray-200 text-xs font-normal">
-                      {tool.author}
-                    </Badge>
-                  )}
-                </div>
-                <p className="text-gray-80 line-clamp-2 text-xs">
-                  {tool.description}
-                </p>
-              </div>
-
-              <Link
-                className={cn(
-                  buttonVariants({
-                    variant: 'outline',
-                    size: 'sm',
-                  }),
-                  'min-h-auto h-auto rounded-md py-2',
-                )}
-                to={`/tools/${tool.tool_router_key}`}
-              >
-                <BoltIcon className="mr-1.5 h-4 w-4" />
-                {t('common.configure')}
-              </Link>
-              <TooltipProvider delayDuration={0}>
-                <Tooltip>
-                  <TooltipTrigger className="flex items-center gap-1">
-                    <Switch
-                      checked={tool.enabled}
-                      onCheckedChange={async () => {
-                        await updateTool({
-                          toolKey: tool.tool_router_key,
-                          toolType: tool.tool_type,
-                          toolPayload: {} as ShinkaiTool,
-                          isToolEnabled: !tool.enabled,
-                          nodeAddress: auth?.node_address ?? '',
-                          token: auth?.api_v2_key ?? '',
-                        });
-                      }}
-                    />
-                  </TooltipTrigger>
-                  <TooltipPortal>
-                    <TooltipContent align="center" side="top">
-                      {t('common.enabled')}
-                    </TooltipContent>
-                  </TooltipPortal>
-                </Tooltip>
-              </TooltipProvider>
-            </div>
+        {isSuccess &&
+          tasks.length > 0 &&
+          tasks?.map((task) => (
+            <TaskCard
+              cronExpression={task.cron}
+              description={task.description}
+              key={task.task_id}
+              name={task.name}
+              prompt={
+                'CreateJobWithConfigAndMessage' in task.action
+                  ? task.action.CreateJobWithConfigAndMessage.message.content
+                  : ''
+              }
+              taskId={task.task_id}
+            />
           ))}
-        {searchQuery && isSearchQuerySynced && searchToolList?.length === 0 && (
+        {isSuccess && tasks?.length === 0 && (
           <div className="flex h-20 items-center justify-center">
-            <p className="text-gray-80 text-sm">
-              {t('tools.emptyState.search.text')}
-            </p>
+            <p className="text-gray-80 text-sm">No cron tasks found</p>
           </div>
         )}
       </div>
@@ -276,95 +108,213 @@ export const Tasks = () => {
   );
 };
 
-const importToolFormSchema = z.object({
-  url: z.string().url(),
-});
-type ImportToolFormSchema = z.infer<typeof importToolFormSchema>;
-
-function ImportToolModal() {
-  const auth = useAuth((state) => state.auth);
-
+const TaskCard = ({
+  taskId,
+  name,
+  description,
+  cronExpression,
+  prompt,
+}: {
+  taskId: number;
+  name: string;
+  description?: string;
+  cronExpression: string;
+  prompt: string;
+}) => {
   const navigate = useNavigate();
-  const importToolForm = useForm<ImportToolFormSchema>({
-    resolver: zodResolver(importToolFormSchema),
-  });
-  const [isImportModalOpen, setImportModalOpen] = useState(false);
+  const { t } = useTranslation();
+  const [isDeleteTaskDrawerOpen, setIsDeleteTaskDrawerOpen] =
+    React.useState(false);
 
-  const { mutateAsync: importTool, isPending: isPendingImportSheet } =
-    useImportTool({
-      onSuccess: (data) => {
-        setImportModalOpen(false);
-        toast.success('Tool imported successfully', {
-          action: {
-            label: 'View',
-            onClick: () => {
-              navigate(`/tools/${data.tool_key}`);
+  return (
+    <div
+      className={cn(
+        'grid grid-cols-[1fr_100px_100px_40px] items-start gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+      )}
+    >
+      <div className="flex flex-col gap-2.5">
+        <div className="flex items-center gap-2">
+          <span className="text-sm font-medium capitalize text-white">
+            {name}
+          </span>
+        </div>
+        <p className="text-gray-80 line-clamp-2 text-xs">
+          {description ?? '-'}
+        </p>
+        <p className="text-gray-80 line-clamp-2 text-xs">
+          <span className="mr-2">Prompt</span>
+          {prompt}
+        </p>
+        <p className="text-gray-80 line-clamp-2 text-xs">
+          <span className="mr-2">Schedule</span>
+          {cronExpression}
+        </p>
+      </div>
+      <div className="flex items-center gap-3 pt-1">
+        <Switch
+        // checked={true}
+        // onCheckedChange={async () => {
+        //   await updateTool({
+        //     toolKey: task.tool_router_key,
+        //     toolType: task.tool_type,
+        //     toolPayload: {} as ShinkaiTool,
+        //     isToolEnabled: !task.enabled,
+        //     nodeAddress: auth?.node_address ?? '',
+        //     token: auth?.api_v2_key ?? '',
+        //   });
+        // }}
+        />
+        <label className="text-xs text-gray-50" htmlFor="all">
+          Active
+        </label>
+      </div>
+      <Link
+        className={cn(
+          buttonVariants({
+            variant: 'outline',
+            size: 'auto',
+          }),
+          'h-[30px] gap-2 rounded-lg px-3 text-xs',
+        )}
+        to="/tasks"
+      >
+        <HistoryIcon className="size-4" />
+        History
+      </Link>
+      <DropdownMenu modal={false}>
+        <DropdownMenuTrigger asChild>
+          <div
+            className={cn(
+              buttonVariants({
+                variant: 'outline',
+                size: 'auto',
+              }),
+              'size-[34px] rounded-md border p-1',
+            )}
+            onClick={(event) => {
+              event.stopPropagation();
+            }}
+            role="button"
+            tabIndex={0}
+          >
+            <span className="sr-only">{t('common.moreOptions')}</span>
+            <DotsVerticalIcon className="text-gray-100" />
+          </div>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          align="end"
+          className="w-[160px] border bg-gray-500 px-2.5 py-2"
+        >
+          {[
+            {
+              name: t('common.edit'),
+              icon: <Edit className="mr-3 h-4 w-4" />,
+              onClick: () => {
+                navigate(`/tasks/edit/${taskId}`);
+              },
+            },
+            {
+              name: t('common.delete'),
+              icon: <TrashIcon className="mr-3 h-4 w-4" />,
+              onClick: () => {
+                // setIsDeleteTaskDrawerOpen(true);
+              },
             },
-          },
-        });
-      },
-      onError: (error) => {
-        toast.error('Failed to import tool', {
-          description: error.response?.data?.message ?? error.message,
-        });
-      },
-    });
+          ].map((option) => (
+            <React.Fragment key={option.name}>
+              {option.name === 'Delete' && (
+                <DropdownMenuSeparator className="bg-gray-300" />
+              )}
+              <DropdownMenuItem
+                key={option.name}
+                onClick={(event) => {
+                  event.stopPropagation();
+                  option.onClick();
+                }}
+              >
+                {option.icon}
+                {option.name}
+              </DropdownMenuItem>
+            </React.Fragment>
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <RemoveTaskDrawer
+        onOpenChange={setIsDeleteTaskDrawerOpen}
+        open={isDeleteTaskDrawerOpen}
+        taskId={taskId}
+        taskName={name}
+      />
+    </div>
+  );
+};
 
-  const onSubmit = async (data: ImportToolFormSchema) => {
-    await importTool({
-      nodeAddress: auth?.node_address ?? '',
-      token: auth?.api_v2_key ?? '',
-      url: data.url,
-    });
-  };
+const RemoveTaskDrawer = ({
+  open,
+  onOpenChange,
+  taskId,
+  taskName,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  taskId: number;
+  taskName: string;
+}) => {
+  const { t } = useTranslation();
+  const auth = useAuth((state) => state.auth);
+  const { mutateAsync: removeTask, isPending } = useRemoveRecurringTask({
+    onSuccess: () => {
+      onOpenChange(false);
+      toast.success('Delete task successfully');
+    },
+    onError: (error) => {
+      toast.error('Failed remove task', {
+        description: error.response?.data?.message ?? error.message,
+      });
+    },
+  });
 
   return (
-    <Dialog onOpenChange={setImportModalOpen} open={isImportModalOpen}>
-      <DialogTrigger asChild>
-        <Button
-          className="h-[30px] gap-2 rounded-lg px-3 text-xs"
-          size="auto"
-          variant="outline"
-        >
-          <CloudDownloadIcon className="size-4" />
-          Import Tool
-        </Button>
-      </DialogTrigger>
-      <DialogContent className="max-w-[500px]">
-        <DialogTitle className="pb-0">Import Tool</DialogTitle>
-        <Form {...importToolForm}>
-          <form
-            className="mt-2 flex flex-col gap-6"
-            onSubmit={importToolForm.handleSubmit(onSubmit)}
-          >
-            <FormField
-              control={importToolForm.control}
-              name="url"
-              render={({ field }) => (
-                <TextField
-                  autoFocus
-                  field={{
-                    ...field,
-                    placeholder: 'https://example.com/file.zip',
-                  }}
-                  label={'URL'}
-                />
-              )}
-            />
-            <DialogFooter>
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <DialogContent className="sm:max-w-[425px]">
+        <DialogTitle className="pb-0">
+          Delete Task <span className="font-mono text-base">{taskName}</span> ?
+        </DialogTitle>
+        <DialogDescription>
+          The task will be permanently deleted. This action cannot be undone.
+        </DialogDescription>
+
+        <DialogFooter>
+          <div className="flex gap-2 pt-4">
+            <DialogClose asChild className="flex-1">
               <Button
-                className="w-full"
-                disabled={isPendingImportSheet}
-                isLoading={isPendingImportSheet}
-                size="auto"
-                type="submit"
+                className="min-w-[100px] flex-1"
+                size="sm"
+                type="button"
+                variant="ghost"
               >
-                Import
+                {t('common.cancel')}
               </Button>
-            </DialogFooter>
-          </form>
-        </Form>
+            </DialogClose>
+            <Button
+              className="min-w-[100px] flex-1"
+              disabled={isPending}
+              isLoading={isPending}
+              onClick={async () => {
+                await removeTask({
+                  nodeAddress: auth?.node_address ?? '',
+                  token: auth?.api_v2_key ?? '',
+                  recurringTaskId: taskId,
+                });
+              }}
+              size="sm"
+              variant="destructive"
+            >
+              {t('common.delete')}
+            </Button>
+          </div>
+        </DialogFooter>
       </DialogContent>
     </Dialog>
   );
-}
+};
diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index 36983748c..8ba083970 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -131,6 +131,7 @@ export type JobMessage = {
   files_inbox: string;
   parent?: string;
   sheet_job_data?: null;
+  tool_router_key?: string;
   metadata?: {
     tps?: string;
     duration_ms: string;
diff --git a/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts b/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
index 159722900..36d924f3d 100644
--- a/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
@@ -9,6 +9,8 @@ import {
   GetRecurringTasksResponse,
   RemoveRecurringTaskRequest,
   RemoveRecurringTaskResponse,
+  SetRecurringTaskRequest,
+  SetRecurringTaskResponse,
 } from './types';
 
 export const createRecurringTask = async (
@@ -57,6 +59,23 @@ export const getRecurringTask = async (
   return response.data as GetRecurringTaskResponse;
 };
 
+export const setRecurringTask = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: SetRecurringTaskRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/update_cron_task'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      params: { cron_task_id: payload.cron_task_id },
+      responseType: 'json',
+    },
+  );
+  return response.data as SetRecurringTaskResponse;
+};
+
 export const removeRecurringTask = async (
   nodeAddress: string,
   bearerToken: string,
diff --git a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
index 85e616811..759507c8e 100644
--- a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
@@ -4,7 +4,6 @@ import {
   VRFolderScope,
   VRItemScope,
 } from '../jobs/types';
-import { getRecurringTaskLogs } from './index';
 
 export type RecurringTaskAction =
   | {
@@ -32,6 +31,8 @@ export type RecurringTaskAction =
     };
 
 export type CreateRecurringTaskRequest = {
+  name: string;
+  description?: string;
   cron: string;
   action: RecurringTaskAction;
 };
@@ -44,6 +45,8 @@ export type RecurringTask = {
   created_at: string;
   last_modified: string;
   action: RecurringTaskAction;
+  description?: string;
+  name: string;
 };
 
 export type GetRecurringTasksResponse = RecurringTask[];
@@ -52,6 +55,11 @@ export type GetRecurringTaskRequest = {
   cron_task_id: number;
 };
 export type GetRecurringTaskResponse = RecurringTask;
+export type SetRecurringTaskRequest = {
+  cron_task_id: number;
+} & Omit<RecurringTask, 'task_id'>;
+
+export type SetRecurringTaskResponse = RecurringTask;
 export type RemoveRecurringTaskRequest = {
   cron_task_id: number;
 };
diff --git a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
index 8ba7c0d99..ab2c1aa13 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
@@ -1,3 +1,7 @@
+import {
+  createJob as createJobApi,
+  updateChatConfig,
+} from '@shinkai_network/shinkai-message-ts/api/jobs/index';
 import { createRecurringTask as createRecurringTaskApi } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/index';
 
 import { CreateRecurringTaskInput } from './types';
@@ -5,12 +9,65 @@ import { CreateRecurringTaskInput } from './types';
 export const createRecurringTask = async ({
   nodeAddress,
   token,
+  name,
+  description,
+  llmProvider,
   cronExpression,
-  recurringTaskAction,
+  chatConfig,
+  message,
+  toolRouterKey,
 }: CreateRecurringTaskInput) => {
+  const { job_id: jobId } = await createJobApi(nodeAddress, token, {
+    llm_provider: llmProvider,
+    job_creation_info: {
+      scope: {
+        vector_fs_items: [],
+        vector_fs_folders: [],
+        local_vrpack: [],
+        local_vrkai: [],
+        network_folders: [],
+      },
+      associated_ui: null,
+      is_hidden: false,
+    },
+  });
+
   const response = await createRecurringTaskApi(nodeAddress, token, {
     cron: cronExpression,
-    action: recurringTaskAction,
+    action: {
+      CreateJobWithConfigAndMessage: {
+        config: chatConfig,
+        job_creation_info: {
+          associated_ui: null,
+          is_hidden: false,
+          scope: {
+            vector_fs_folders: [],
+            vector_fs_items: [],
+            local_vrpack: [],
+            local_vrkai: [],
+            network_folders: [],
+          },
+        },
+        message: {
+          job_id: jobId,
+          content: message,
+          tool_router_key: toolRouterKey,
+          files_inbox: '',
+        },
+      },
+      // we are repeting jobID here
+      // SendMessageToJob: {
+      //   job_id: jobId,
+      //   message: {
+      //     job_id: jobId,
+      //     files_inbox: '',
+      //     content: 'Recurring task message',
+      //     tool_router_key: '',
+      //   },
+      // },
+    },
+    description,
+    name,
   });
   return response;
 };
diff --git a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts
index 6b3e5abc6..9af960fbd 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/types.ts
@@ -1,4 +1,5 @@
 import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { JobConfig } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
 import {
   CreateRecurringTaskResponse,
   RecurringTaskAction,
@@ -8,6 +9,12 @@ export type CreateRecurringTaskOutput = CreateRecurringTaskResponse;
 
 export type CreateRecurringTaskInput = Token & {
   nodeAddress: string;
+  name: string;
+  description?: string;
   cronExpression: string;
-  recurringTaskAction: RecurringTaskAction;
+  message: string;
+  toolRouterKey?: string;
+  llmProvider: string;
+  // recurringTaskAction: RecurringTaskAction;
+  chatConfig: JobConfig;
 };

From aea208024899cea5271a8675b31f49180911297f Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 13 Dec 2024 21:15:47 -0500
Subject: [PATCH 5/7] wip

---
 .../components/tools-selection.tsx            |   2 +-
 .../shinkai-desktop/src/pages/create-task.tsx | 537 +++++++++++-------
 .../src/pages/layout/main-layout.tsx          |   2 +-
 apps/shinkai-desktop/src/pages/task-logs.tsx  | 318 +++++++++++
 apps/shinkai-desktop/src/pages/tasks.tsx      |  72 ++-
 apps/shinkai-desktop/src/routes/index.tsx     |   3 +-
 .../src/api/recurring-tasks/index.ts          |   2 +-
 .../src/api/recurring-tasks/types.ts          |   8 +-
 libs/shinkai-node-state/src/v2/constants.ts   |   1 +
 .../v2/mutations/removeRecurringTask/index.ts |   1 -
 .../v2/mutations/removeRecurringTask/types.ts |   2 +-
 .../src/v2/queries/getRecurringTask/types.ts  |   2 +-
 .../getRecurringTask/useGetRecurringTask.ts   |   1 +
 .../v2/queries/getRecurringTaskLogs/index.ts  |  14 +
 .../v2/queries/getRecurringTaskLogs/types.ts  |   9 +
 .../useGetRecurringTaskLogs.ts                |  14 +
 package-lock.json                             |   9 +
 package.json                                  |   1 +
 18 files changed, 763 insertions(+), 235 deletions(-)
 create mode 100644 apps/shinkai-desktop/src/pages/task-logs.tsx
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/useGetRecurringTaskLogs.ts

diff --git a/apps/shinkai-desktop/src/components/playground-tool/components/tools-selection.tsx b/apps/shinkai-desktop/src/components/playground-tool/components/tools-selection.tsx
index 694fac0ff..94a03e1a9 100644
--- a/apps/shinkai-desktop/src/components/playground-tool/components/tools-selection.tsx
+++ b/apps/shinkai-desktop/src/components/playground-tool/components/tools-selection.tsx
@@ -22,9 +22,9 @@ import { UseFormReturn } from 'react-hook-form';
 import { Link } from 'react-router-dom';
 import { toast } from 'sonner';
 
-import { CreateToolCodeFormSchema } from '../../../pages/create-tool';
 import { useAuth } from '../../../store/auth';
 import { actionButtonClassnames } from '../../chat/conversation-footer';
+import { CreateToolCodeFormSchema } from '../hooks/use-tool-code';
 
 export function ToolsSelection({
   form,
diff --git a/apps/shinkai-desktop/src/pages/create-task.tsx b/apps/shinkai-desktop/src/pages/create-task.tsx
index ed09f530a..33ef51760 100644
--- a/apps/shinkai-desktop/src/pages/create-task.tsx
+++ b/apps/shinkai-desktop/src/pages/create-task.tsx
@@ -1,8 +1,15 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
 import { useCreateRecurringTask } from '@shinkai_network/shinkai-node-state/v2/mutations/createRecurringTask/useCreateRecurringTask';
+import { useGetTools } from '@shinkai_network/shinkai-node-state/v2/queries/getToolsList/useGetToolsList';
 import {
   Button,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuLabel,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
   Form,
   FormControl,
   FormField,
@@ -17,10 +24,22 @@ import {
   Textarea,
   TextField,
 } from '@shinkai_network/shinkai-ui';
+import {
+  ScheduledTasksIcon,
+  ToolsIcon,
+} from '@shinkai_network/shinkai-ui/assets';
+import { formatText } from '@shinkai_network/shinkai-ui/helpers';
+import { cn } from '@shinkai_network/shinkai-ui/utils';
+import cronstrue from 'cronstrue';
+import { BotIcon, ChevronDownIcon } from 'lucide-react';
+import { useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 import { z } from 'zod';
 
+import { AIModelSelector } from '../components/chat/chat-action-bar/ai-update-selection-action-bar';
+import { actionButtonClassnames } from '../components/chat/conversation-footer';
 import { useAuth } from '../store/auth';
 import { useSettings } from '../store/settings';
 import { SubpageLayout } from './layout/simple-layout';
@@ -28,7 +47,23 @@ import { SubpageLayout } from './layout/simple-layout';
 const createTaskFormSchema = z.object({
   name: z.string(),
   description: z.string(),
-  cronExpression: z.string(),
+  llmOrAgentId: z.string(),
+  cronExpression: z.string().refine(
+    (value) => {
+      try {
+        cronstrue.toString(value, {
+          throwExceptionOnParseError: true,
+        });
+        return true;
+      } catch (error) {
+        return false;
+      }
+    },
+    {
+      message:
+        'Invalid cron expression. Please provide a valid cron expression.',
+    },
+  ),
   jobConfig: z.object({
     custom_system_prompt: z.string().optional(),
     custom_prompt: z.string(),
@@ -50,14 +85,14 @@ type CreateTaskForm = z.infer<typeof createTaskFormSchema>;
 function CreateTaskPage() {
   const { t } = useTranslation();
   const defaultAgentId = useSettings((state) => state.defaultAgentId);
-
+  const navigate = useNavigate();
   const auth = useAuth((state) => state.auth);
   const form = useForm<CreateTaskForm>({
     resolver: zodResolver(createTaskFormSchema),
     defaultValues: {
       name: 'Hacker News',
       description: 'Hacker News yada yada',
-      cronExpression: '*/30 * * * *',
+      cronExpression: '* * * * *',
       jobConfig: {
         custom_system_prompt: '',
         custom_prompt: '',
@@ -69,6 +104,7 @@ function CreateTaskPage() {
         stream: false,
         use_tools: false,
       },
+      llmOrAgentId: defaultAgentId,
       jobMessage: {
         content: 'Search in duckduckgo about hacker news',
         toolKey:
@@ -77,9 +113,15 @@ function CreateTaskPage() {
     },
   });
 
+  const { data: toolsList, isSuccess: isToolListSuccess } = useGetTools({
+    nodeAddress: auth?.node_address ?? '',
+    token: auth?.api_v2_key ?? '',
+  });
+
   const { mutateAsync: createRecurringTask } = useCreateRecurringTask({
     onSuccess: () => {
       toast.success('Task created successfully');
+      navigate('/tasks');
     },
     onError: (error) => {
       toast.error('Failed to create task', {
@@ -96,20 +138,37 @@ function CreateTaskPage() {
       chatConfig: values.jobConfig,
       message: values.jobMessage.content,
       toolRouterKey: values.jobMessage.toolKey,
-      llmProvider: defaultAgentId,
+      llmProvider: values.llmOrAgentId,
       name: values.name,
       description: values.description,
     });
-    console.log(values);
   };
+
+  useEffect(() => {
+    if (defaultAgentId) {
+      form.setValue('llmOrAgentId', defaultAgentId);
+    }
+  }, [defaultAgentId]);
+
+  const currentCronExpression = form.watch('cronExpression');
+
+  const readableCronExpression = useMemo(() => {
+    const readableCron = cronstrue.toString(currentCronExpression, {
+      throwExceptionOnParseError: false,
+    });
+    if (readableCron.toLowerCase().includes('error')) {
+      return null;
+    }
+    return readableCron;
+  }, [currentCronExpression, form]);
   return (
-    <SubpageLayout className="max-w-lg" title="Create New Task">
+    <SubpageLayout className="max-w-4xl" title="Create Cron Task">
       <p className="text-gray-80 -mt-8 py-3 pb-6 text-center text-sm">
         Schedule recurring tasks at a specified time
       </p>
       <Form {...form}>
         <form
-          className="flex flex-col justify-between space-y-6"
+          className="flex grid grid-cols-2 flex-col justify-between gap-8 pt-4"
           onSubmit={form.handleSubmit(submit)}
         >
           <div className="space-y-4">
@@ -153,210 +212,296 @@ function CreateTaskPage() {
                 />
               )}
             />
+            {readableCronExpression && (
+              <div className="flex items-center gap-2 text-xs">
+                <ScheduledTasksIcon className="size-4" />
+                <span>
+                  This cron will run {readableCronExpression.toLowerCase()}{' '}
+                  <span className="text-gray-80 font-mono">
+                    ({form.watch('cronExpression')})
+                  </span>
+                </span>
+              </div>
+            )}
           </div>
-
           <div className="space-y-4">
-            <div className="space-y-6 rounded-lg bg-gray-400 px-4 py-4 pb-7">
-              <span className="flex-1 items-center gap-1 truncate py-2 text-left text-xs font-semibold text-gray-50">
-                AI Model Configuration
-              </span>
+            <div className="space-y-4">
+              <div className="space-y-6 rounded-lg bg-gray-400 px-4 py-4 pb-7">
+                <span className="flex-1 items-center gap-1 truncate py-2 text-left text-xs font-semibold text-gray-50">
+                  AI Model Configuration
+                </span>
 
-              <div className="space-y-4">
-                <FormField
-                  control={form.control}
-                  name="jobConfig.custom_system_prompt"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>System Prompt</FormLabel>
-                      <FormControl>
-                        <Textarea
-                          className="!min-h-[130px] resize-none text-sm"
-                          spellCheck={false}
-                          {...field}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
+                <div className="space-y-4">
+                  <div className="grid grid-cols-[1fr_100px] items-center">
+                    <span className="text-gray-80 text-xs">
+                      Select Tool (optional)
+                    </span>
+                    <AIModelSelector
+                      onValueChange={(value) => {
+                        form.setValue('llmOrAgentId', value);
+                      }}
+                      value={form.watch('llmOrAgentId')}
+                    />
+                  </div>
+                  <div className="grid grid-cols-[1fr_250px] items-center">
+                    <span className="text-gray-80 text-xs">
+                      Select AI/Agent
+                    </span>
 
-                <FormField
-                  control={form.control}
-                  name="jobConfig.stream"
-                  render={({ field }) => (
-                    <FormItem className="flex w-full flex-col gap-3">
-                      <div className="flex gap-3">
+                    <DropdownMenu>
+                      <DropdownMenuTrigger
+                        className={cn(
+                          actionButtonClassnames,
+                          'w-auto truncate [&[data-state=open]>.icon]:rotate-180',
+                        )}
+                      >
+                        <ToolsIcon className="mr-1 h-4 w-4" />
+                        <span>
+                          {form.watch('jobMessage.toolKey')
+                            ? formatText(
+                                form
+                                  .watch('jobMessage.toolKey')
+                                  ?.split(':::')?.[2] ?? '',
+                              )
+                            : 'Select Tool (optional)'}
+                        </span>
+                        <ChevronDownIcon className="icon h-3 w-3" />
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent
+                        align="start"
+                        className="max-h-[400px] min-w-[330px] overflow-y-auto bg-gray-300 p-1 py-2"
+                        side="top"
+                      >
+                        <DropdownMenuRadioGroup
+                          onValueChange={(value) => {
+                            form.setValue('jobMessage.toolKey', value);
+                          }}
+                          value={form.watch('jobMessage.toolKey')}
+                        >
+                          <DropdownMenuLabel className="mt-2 px-2 py-1">
+                            Available Tools
+                          </DropdownMenuLabel>
+                          {isToolListSuccess &&
+                            toolsList.length > 0 &&
+                            toolsList?.map((tool) => (
+                              <DropdownMenuRadioItem
+                                className="flex cursor-pointer items-center gap-1.5 rounded-md px-2 py-2 text-white transition-colors hover:bg-gray-200 aria-checked:bg-gray-200"
+                                key={tool.tool_router_key}
+                                value={tool.tool_router_key}
+                              >
+                                <BotIcon className="h-3.5 w-3.5 shrink-0" />
+                                <div className="flex flex-col gap-1">
+                                  <span className="text-xs">
+                                    {formatText(tool.name)}
+                                  </span>
+                                </div>
+                              </DropdownMenuRadioItem>
+                            ))}
+                        </DropdownMenuRadioGroup>
+                      </DropdownMenuContent>
+                    </DropdownMenu>
+                  </div>
+                </div>
+                <div className="space-y-4">
+                  <FormField
+                    control={form.control}
+                    name="jobConfig.custom_system_prompt"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>System Prompt</FormLabel>
                         <FormControl>
-                          <Switch
-                            checked={field.value}
-                            onCheckedChange={field.onChange}
+                          <Textarea
+                            className="!min-h-[130px] resize-none text-sm"
+                            spellCheck={false}
+                            {...field}
                           />
                         </FormControl>
-                        <div className="space-y-1 leading-none">
-                          <FormLabel className="static space-y-1.5 text-sm text-white">
-                            Enable Stream
-                          </FormLabel>
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="jobConfig.stream"
+                    render={({ field }) => (
+                      <FormItem className="flex w-full flex-col gap-3">
+                        <div className="flex gap-3">
+                          <FormControl>
+                            <Switch
+                              checked={field.value}
+                              onCheckedChange={field.onChange}
+                            />
+                          </FormControl>
+                          <div className="space-y-1 leading-none">
+                            <FormLabel className="static space-y-1.5 text-sm text-white">
+                              Enable Stream
+                            </FormLabel>
+                          </div>
                         </div>
-                      </div>
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="jobConfig.use_tools"
-                  render={({ field }) => (
-                    <FormItem className="flex w-full flex-col gap-3">
-                      <div className="flex gap-3">
-                        <FormControl>
-                          <Switch
-                            checked={field.value}
-                            onCheckedChange={field.onChange}
-                          />
-                        </FormControl>
-                        <div className="space-y-1 leading-none">
-                          <FormLabel className="static space-y-1.5 text-sm text-white">
-                            Enable Tools
-                          </FormLabel>
+                      </FormItem>
+                    )}
+                  />
+                  <FormField
+                    control={form.control}
+                    name="jobConfig.use_tools"
+                    render={({ field }) => (
+                      <FormItem className="flex w-full flex-col gap-3">
+                        <div className="flex gap-3">
+                          <FormControl>
+                            <Switch
+                              checked={field.value}
+                              onCheckedChange={field.onChange}
+                            />
+                          </FormControl>
+                          <div className="space-y-1 leading-none">
+                            <FormLabel className="static space-y-1.5 text-sm text-white">
+                              Enable Tools
+                            </FormLabel>
+                          </div>
                         </div>
-                      </div>
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="jobConfig.temperature"
-                  render={({ field }) => (
-                    <FormItem className="flex gap-2.5">
-                      <FormControl>
-                        <HoverCard openDelay={200}>
-                          <HoverCardTrigger asChild>
-                            <div className="grid w-full gap-4">
-                              <div className="flex items-center justify-between">
-                                <Label htmlFor="temperature">Temperature</Label>
-                                <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
-                                  {field.value}
-                                </span>
+                      </FormItem>
+                    )}
+                  />
+                  <FormField
+                    control={form.control}
+                    name="jobConfig.temperature"
+                    render={({ field }) => (
+                      <FormItem className="flex gap-2.5">
+                        <FormControl>
+                          <HoverCard openDelay={200}>
+                            <HoverCardTrigger asChild>
+                              <div className="grid w-full gap-4">
+                                <div className="flex items-center justify-between">
+                                  <Label htmlFor="temperature">
+                                    Temperature
+                                  </Label>
+                                  <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
+                                    {field.value}
+                                  </span>
+                                </div>
+                                <Slider
+                                  aria-label="Temperature"
+                                  className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
+                                  id="temperature"
+                                  max={1}
+                                  onValueChange={(vals) => {
+                                    field.onChange(vals[0]);
+                                  }}
+                                  step={0.1}
+                                  value={[field.value]}
+                                />
                               </div>
-                              <Slider
-                                aria-label="Temperature"
-                                className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
-                                id="temperature"
-                                max={1}
-                                onValueChange={(vals) => {
-                                  field.onChange(vals[0]);
-                                }}
-                                step={0.1}
-                                value={[field.value]}
-                              />
-                            </div>
-                          </HoverCardTrigger>
-                          <HoverCardContent
-                            align="start"
-                            className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
-                            side="left"
-                          >
-                            Temperature is a parameter that affects the
-                            randomness of AI outputs. Higher temp = more
-                            unexpected, lower temp = more predictable.
-                          </HoverCardContent>
-                        </HoverCard>
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="jobConfig.top_p"
-                  render={({ field }) => (
-                    <FormItem className="flex gap-2.5">
-                      <FormControl>
-                        <HoverCard openDelay={200}>
-                          <HoverCardTrigger asChild>
-                            <div className="grid w-full gap-4">
-                              <div className="flex items-center justify-between">
-                                <Label htmlFor="topP">Top P</Label>
-                                <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
-                                  {field.value}
-                                </span>
+                            </HoverCardTrigger>
+                            <HoverCardContent
+                              align="start"
+                              className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
+                              side="left"
+                            >
+                              Temperature is a parameter that affects the
+                              randomness of AI outputs. Higher temp = more
+                              unexpected, lower temp = more predictable.
+                            </HoverCardContent>
+                          </HoverCard>
+                        </FormControl>
+                      </FormItem>
+                    )}
+                  />
+                  <FormField
+                    control={form.control}
+                    name="jobConfig.top_p"
+                    render={({ field }) => (
+                      <FormItem className="flex gap-2.5">
+                        <FormControl>
+                          <HoverCard openDelay={200}>
+                            <HoverCardTrigger asChild>
+                              <div className="grid w-full gap-4">
+                                <div className="flex items-center justify-between">
+                                  <Label htmlFor="topP">Top P</Label>
+                                  <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
+                                    {field.value}
+                                  </span>
+                                </div>
+                                <Slider
+                                  aria-label="Top P"
+                                  className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
+                                  id="topP"
+                                  max={1}
+                                  min={0}
+                                  onValueChange={(vals) => {
+                                    field.onChange(vals[0]);
+                                  }}
+                                  step={0.1}
+                                  value={[field.value]}
+                                />
                               </div>
-                              <Slider
-                                aria-label="Top P"
-                                className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
-                                id="topP"
-                                max={1}
-                                min={0}
-                                onValueChange={(vals) => {
-                                  field.onChange(vals[0]);
-                                }}
-                                step={0.1}
-                                value={[field.value]}
-                              />
-                            </div>
-                          </HoverCardTrigger>
-                          <HoverCardContent
-                            align="start"
-                            className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
-                            side="left"
-                          >
-                            Adjust the probability threshold to increase the
-                            relevance of results. For example, a threshold of
-                            0.9 could be optimal for targeted, specific
-                            applications, whereas a threshold of 0.95 or 0.97
-                            might be preferred for tasks that require broader,
-                            more creative responses.
-                          </HoverCardContent>
-                        </HoverCard>
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="jobConfig.top_k"
-                  render={({ field }) => (
-                    <FormItem className="flex gap-2.5">
-                      <FormControl>
-                        <HoverCard openDelay={200}>
-                          <HoverCardTrigger asChild>
-                            <div className="grid w-full gap-4">
-                              <div className="flex items-center justify-between">
-                                <Label htmlFor="topK">Top K</Label>
-                                <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
-                                  {field.value}
-                                </span>
+                            </HoverCardTrigger>
+                            <HoverCardContent
+                              align="start"
+                              className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
+                              side="left"
+                            >
+                              Adjust the probability threshold to increase the
+                              relevance of results. For example, a threshold of
+                              0.9 could be optimal for targeted, specific
+                              applications, whereas a threshold of 0.95 or 0.97
+                              might be preferred for tasks that require broader,
+                              more creative responses.
+                            </HoverCardContent>
+                          </HoverCard>
+                        </FormControl>
+                      </FormItem>
+                    )}
+                  />
+                  <FormField
+                    control={form.control}
+                    name="jobConfig.top_k"
+                    render={({ field }) => (
+                      <FormItem className="flex gap-2.5">
+                        <FormControl>
+                          <HoverCard openDelay={200}>
+                            <HoverCardTrigger asChild>
+                              <div className="grid w-full gap-4">
+                                <div className="flex items-center justify-between">
+                                  <Label htmlFor="topK">Top K</Label>
+                                  <span className="text-muted-foreground hover:border-border w-12 rounded-md border border-transparent px-2 py-0.5 text-right text-sm">
+                                    {field.value}
+                                  </span>
+                                </div>
+                                <Slider
+                                  aria-label="Top K"
+                                  className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
+                                  id="topK"
+                                  max={100}
+                                  onValueChange={(vals) => {
+                                    field.onChange(vals[0]);
+                                  }}
+                                  step={1}
+                                  value={[field.value]}
+                                />
                               </div>
-                              <Slider
-                                aria-label="Top K"
-                                className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
-                                id="topK"
-                                max={100}
-                                onValueChange={(vals) => {
-                                  field.onChange(vals[0]);
-                                }}
-                                step={1}
-                                value={[field.value]}
-                              />
-                            </div>
-                          </HoverCardTrigger>
-                          <HoverCardContent
-                            align="start"
-                            className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
-                            side="left"
-                          >
-                            Adjust the count of key words for creating
-                            sequences. This parameter governs the extent of the
-                            generated passage, forestalling too much repetition.
-                            Selecting a higher figure yields longer narratives,
-                            whereas a smaller figure keeps the text brief.
-                          </HoverCardContent>
-                        </HoverCard>
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
+                            </HoverCardTrigger>
+                            <HoverCardContent
+                              align="start"
+                              className="w-[260px] bg-gray-600 px-2 py-3 text-xs"
+                              side="left"
+                            >
+                              Adjust the count of key words for creating
+                              sequences. This parameter governs the extent of
+                              the generated passage, forestalling too much
+                              repetition. Selecting a higher figure yields
+                              longer narratives, whereas a smaller figure keeps
+                              the text brief.
+                            </HoverCardContent>
+                          </HoverCard>
+                        </FormControl>
+                      </FormItem>
+                    )}
+                  />
+                </div>
               </div>
             </div>
           </div>
-          <div className="flex items-center justify-end gap-2">
+          <div className="col-span-2 flex items-center justify-end gap-2">
             <Button
               className="min-w-[120px]"
               // disabled={isPending}
diff --git a/apps/shinkai-desktop/src/pages/layout/main-layout.tsx b/apps/shinkai-desktop/src/pages/layout/main-layout.tsx
index 5ab530eb9..14b51b274 100644
--- a/apps/shinkai-desktop/src/pages/layout/main-layout.tsx
+++ b/apps/shinkai-desktop/src/pages/layout/main-layout.tsx
@@ -363,7 +363,7 @@ export function MainNav() {
       icon: <ToolsIcon className="h-5 w-5" />,
     },
     optInExperimental && {
-      title: 'Scheduled Tasks',
+      title: 'Cron Tasks',
       href: '/tasks',
       icon: <ScheduledTasksIcon className="h-5 w-5" />,
     },
diff --git a/apps/shinkai-desktop/src/pages/task-logs.tsx b/apps/shinkai-desktop/src/pages/task-logs.tsx
new file mode 100644
index 000000000..f4c7103ab
--- /dev/null
+++ b/apps/shinkai-desktop/src/pages/task-logs.tsx
@@ -0,0 +1,318 @@
+import { DialogClose } from '@radix-ui/react-dialog';
+import { DotsVerticalIcon } from '@radix-ui/react-icons';
+import { useTranslation } from '@shinkai_network/shinkai-i18n';
+import { useRemoveRecurringTask } from '@shinkai_network/shinkai-node-state/v2/mutations/removeRecurringTask/useRemoveRecurringTask';
+import { useGetRecurringTask } from '@shinkai_network/shinkai-node-state/v2/queries/getRecurringTask/useGetRecurringTask';
+import { useGetRecurringTaskLogs } from '@shinkai_network/shinkai-node-state/v2/queries/getRecurringTaskLogs/useGetRecurringTaskLogs';
+import {
+  Button,
+  buttonVariants,
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogTitle,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@shinkai_network/shinkai-ui';
+import { cn } from '@shinkai_network/shinkai-ui/utils';
+import cronstrue from 'cronstrue';
+import { Edit, TrashIcon } from 'lucide-react';
+import React from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import { toast } from 'sonner';
+
+import { useAuth } from '../store/auth';
+import { SubpageLayout } from './layout/simple-layout';
+
+export const TaskLogs = () => {
+  const auth = useAuth((state) => state.auth);
+  const { taskId } = useParams();
+  const {
+    data: task,
+    isPending: isGetRecurringTaskPending,
+    isSuccess: isGetRecurringTaskSuccess,
+  } = useGetRecurringTask({
+    nodeAddress: auth?.node_address ?? '',
+    token: auth?.api_v2_key ?? '',
+    recurringTaskId: taskId ?? '',
+  });
+
+  const {
+    data: logs,
+    isPending,
+    isSuccess,
+  } = useGetRecurringTaskLogs({
+    nodeAddress: auth?.node_address ?? '',
+    token: auth?.api_v2_key ?? '',
+    recurringTaskId: taskId ?? '',
+  });
+
+  console.log(logs, 'logs');
+
+  return (
+    <SubpageLayout alignLeft className="px-4" title="Cron Logs">
+      {isGetRecurringTaskPending && (
+        <div className="p-4 text-center text-sm">
+          <p className="text-white">Loading cron task details</p>
+        </div>
+      )}
+      {isGetRecurringTaskSuccess && (
+        <TaskCard
+          cronExpression={task.cron}
+          description={task.description}
+          key={task.task_id}
+          name={task.name}
+          prompt={
+            'CreateJobWithConfigAndMessage' in task.action
+              ? task.action.CreateJobWithConfigAndMessage.message.content
+              : ''
+          }
+          taskId={task.task_id}
+        />
+      )}
+      <div className="mx-2 mt-6 border-b py-2">
+        <h1 className="text-sm font-bold">Logs</h1>
+      </div>
+      <div className="divide-y divide-gray-300">
+        {isPending &&
+          Array.from({ length: 8 }).map((_, idx) => (
+            <div
+              className={cn(
+                'grid animate-pulse grid-cols-[1fr_115px_36px] items-center gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+              )}
+              key={idx}
+            >
+              <div className="flex w-full flex-1 flex-col gap-3">
+                <span className="h-4 w-36 rounded-sm bg-gray-300" />
+                <div className="flex flex-col gap-1">
+                  <span className="h-3 w-full rounded-sm bg-gray-300" />
+                  <span className="h-3 w-2/4 rounded-sm bg-gray-300" />
+                </div>
+              </div>
+              <span className="h-7 w-full rounded-md bg-gray-300" />
+              <span className="h-5 w-[36px] rounded-full bg-gray-300" />
+            </div>
+          ))}
+        {isSuccess && logs.length === 0 && (
+          <div className="p-10 text-center text-sm">
+            <p className="text-white">No runs for this cron task yet</p>
+            <p className="text-gray-80">
+              check the schedule for your cron tasks to see when it runs
+            </p>
+          </div>
+        )}
+        {/*{isSuccess && (*/}
+        {/*  <TaskCard*/}
+        {/*    cronExpression={task.cron}*/}
+        {/*    description={task.description}*/}
+        {/*    key={task.task_id}*/}
+        {/*    name={task.name}*/}
+        {/*    prompt={*/}
+        {/*      'CreateJobWithConfigAndMessage' in task.action*/}
+        {/*        ? task.action.CreateJobWithConfigAndMessage.message.content*/}
+        {/*        : ''*/}
+        {/*    }*/}
+        {/*    taskId={task.task_id}*/}
+        {/*  />*/}
+        {/*)}*/}
+      </div>
+    </SubpageLayout>
+  );
+};
+
+const TaskCard = ({
+  taskId,
+  name,
+  description,
+  cronExpression,
+  prompt,
+}: {
+  taskId: number;
+  name: string;
+  description?: string;
+  cronExpression: string;
+  prompt: string;
+}) => {
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+  const [isDeleteTaskDrawerOpen, setIsDeleteTaskDrawerOpen] =
+    React.useState(false);
+
+  const readableCron = cronstrue.toString(cronExpression, {
+    throwExceptionOnParseError: false,
+  });
+
+  return (
+    <div
+      className={cn(
+        'grid grid-cols-[1fr_40px] items-start gap-5 rounded-sm bg-gray-500 px-2 text-left text-sm',
+      )}
+    >
+      <div className="flex flex-col gap-2.5">
+        <div className="flex items-center gap-2">
+          <span className="text-base font-medium capitalize text-white">
+            {name}
+          </span>
+        </div>
+        <p className="text-gray-80 line-clamp-2 text-sm">
+          {description ?? '-'}
+        </p>
+        <p className="line-clamp-2 text-sm text-gray-50">
+          <span className="text-gray-80 mr-2">Prompt</span>
+          {prompt}
+        </p>
+        <p className="line-clamp-2 text-sm text-gray-50">
+          <span className="text-gray-80 mr-2">Schedule</span>
+          {readableCron}
+        </p>
+      </div>
+      {/*<div className="flex items-center gap-3 pt-1">*/}
+      {/*  <Switch*/}
+      {/*    checked={true}*/}
+      {/*    // TODO: need backend changes*/}
+      {/*  />*/}
+      {/*  <label className="text-sm text-gray-50" htmlFor="all">*/}
+      {/*    Active*/}
+      {/*  </label>*/}
+      {/*</div>*/}
+      <DropdownMenu modal={false}>
+        <DropdownMenuTrigger asChild>
+          <div
+            className={cn(
+              buttonVariants({
+                variant: 'outline',
+                size: 'auto',
+              }),
+              'size-[34px] rounded-md border p-1',
+            )}
+            onClick={(event) => {
+              event.stopPropagation();
+            }}
+            role="button"
+            tabIndex={0}
+          >
+            <span className="sr-only">{t('common.moreOptions')}</span>
+            <DotsVerticalIcon className="text-gray-100" />
+          </div>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          align="end"
+          className="w-[160px] border bg-gray-500 px-2.5 py-2"
+        >
+          {[
+            {
+              name: t('common.edit'),
+              icon: <Edit className="mr-3 h-4 w-4" />,
+              onClick: () => {
+                navigate(`/tasks/edit/${taskId}`);
+              },
+            },
+            {
+              name: t('common.delete'),
+              icon: <TrashIcon className="mr-3 h-4 w-4" />,
+              onClick: () => {
+                setIsDeleteTaskDrawerOpen(true);
+              },
+            },
+          ].map((option) => (
+            <React.Fragment key={option.name}>
+              {option.name === 'Delete' && (
+                <DropdownMenuSeparator className="bg-gray-300" />
+              )}
+              <DropdownMenuItem
+                key={option.name}
+                onClick={(event) => {
+                  event.stopPropagation();
+                  option.onClick();
+                }}
+              >
+                {option.icon}
+                {option.name}
+              </DropdownMenuItem>
+            </React.Fragment>
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <RemoveTaskDrawer
+        onOpenChange={setIsDeleteTaskDrawerOpen}
+        open={isDeleteTaskDrawerOpen}
+        taskId={taskId}
+        taskName={name}
+      />
+    </div>
+  );
+};
+
+const RemoveTaskDrawer = ({
+  open,
+  onOpenChange,
+  taskId,
+  taskName,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  taskId: number;
+  taskName: string;
+}) => {
+  const { t } = useTranslation();
+  const auth = useAuth((state) => state.auth);
+  const { mutateAsync: removeTask, isPending } = useRemoveRecurringTask({
+    onSuccess: () => {
+      onOpenChange(false);
+      toast.success('Delete task successfully');
+    },
+    onError: (error) => {
+      toast.error('Failed remove task', {
+        description: error.response?.data?.message ?? error.message,
+      });
+    },
+  });
+
+  return (
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <DialogContent className="sm:max-w-[425px]">
+        <DialogTitle className="pb-0">
+          Delete Task <span className="font-mono text-base"> {taskName}</span> ?
+        </DialogTitle>
+        <DialogDescription>
+          The task will be permanently deleted. This action cannot be undone.
+        </DialogDescription>
+
+        <DialogFooter>
+          <div className="flex gap-2 pt-4">
+            <DialogClose asChild className="flex-1">
+              <Button
+                className="min-w-[100px] flex-1"
+                size="sm"
+                type="button"
+                variant="ghost"
+              >
+                {t('common.cancel')}
+              </Button>
+            </DialogClose>
+            <Button
+              className="min-w-[100px] flex-1"
+              disabled={isPending}
+              isLoading={isPending}
+              onClick={async () => {
+                await removeTask({
+                  nodeAddress: auth?.node_address ?? '',
+                  token: auth?.api_v2_key ?? '',
+                  recurringTaskId: taskId.toString(),
+                });
+              }}
+              size="sm"
+              variant="destructive"
+            >
+              {t('common.delete')}
+            </Button>
+          </div>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/shinkai-desktop/src/pages/tasks.tsx b/apps/shinkai-desktop/src/pages/tasks.tsx
index 9aa8ae8d2..d2b225c0e 100644
--- a/apps/shinkai-desktop/src/pages/tasks.tsx
+++ b/apps/shinkai-desktop/src/pages/tasks.tsx
@@ -19,7 +19,8 @@ import {
   Switch,
 } from '@shinkai_network/shinkai-ui';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
-import { Edit, HistoryIcon, PlusIcon, TrashIcon } from 'lucide-react';
+import cronstrue from 'cronstrue';
+import { Edit, PlusIcon, TrashIcon } from 'lucide-react';
 import React from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
@@ -41,10 +42,9 @@ export const Tasks = () => {
 
   return (
     <SimpleLayout
-      classname="max-w-3xl"
+      classname="max-w-4xl"
       headerRightElement={
         <div className="flex items-center gap-2">
-          {/*<ImportToolModal />*/}
           <Link
             className={cn(
               buttonVariants({
@@ -60,9 +60,9 @@ export const Tasks = () => {
           </Link>
         </div>
       }
-      title="Scheduled Tasks"
+      title="Cron Tasks"
     >
-      <div className="divide-y divide-gray-300">
+      <div className="divide-y divide-gray-300 pt-4">
         {isPending &&
           Array.from({ length: 8 }).map((_, idx) => (
             <div
@@ -126,10 +126,14 @@ const TaskCard = ({
   const [isDeleteTaskDrawerOpen, setIsDeleteTaskDrawerOpen] =
     React.useState(false);
 
+  const readableCron = cronstrue.toString(cronExpression, {
+    throwExceptionOnParseError: false,
+  });
+
   return (
     <div
       className={cn(
-        'grid grid-cols-[1fr_100px_100px_40px] items-start gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
+        'grid grid-cols-[1fr_100px_120px_40px] items-start gap-5 rounded-sm bg-gray-500 px-2 py-4 text-left text-sm',
       )}
     >
       <div className="flex flex-col gap-2.5">
@@ -141,28 +145,19 @@ const TaskCard = ({
         <p className="text-gray-80 line-clamp-2 text-xs">
           {description ?? '-'}
         </p>
-        <p className="text-gray-80 line-clamp-2 text-xs">
-          <span className="mr-2">Prompt</span>
+        <p className="line-clamp-2 text-xs text-gray-50">
+          <span className="text-gray-80 mr-2">Prompt</span>
           {prompt}
         </p>
-        <p className="text-gray-80 line-clamp-2 text-xs">
-          <span className="mr-2">Schedule</span>
-          {cronExpression}
+        <p className="line-clamp-2 text-xs text-gray-50">
+          <span className="text-gray-80 mr-2">Schedule</span>
+          {readableCron}
         </p>
       </div>
       <div className="flex items-center gap-3 pt-1">
         <Switch
-        // checked={true}
-        // onCheckedChange={async () => {
-        //   await updateTool({
-        //     toolKey: task.tool_router_key,
-        //     toolType: task.tool_type,
-        //     toolPayload: {} as ShinkaiTool,
-        //     isToolEnabled: !task.enabled,
-        //     nodeAddress: auth?.node_address ?? '',
-        //     token: auth?.api_v2_key ?? '',
-        //   });
-        // }}
+          checked={true}
+          // TODO: need backend changes
         />
         <label className="text-xs text-gray-50" htmlFor="all">
           Active
@@ -176,10 +171,31 @@ const TaskCard = ({
           }),
           'h-[30px] gap-2 rounded-lg px-3 text-xs',
         )}
-        to="/tasks"
+        to={`/tasks/${taskId}`}
       >
-        <HistoryIcon className="size-4" />
-        History
+        <svg
+          className="size-4"
+          fill="none"
+          height="24"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="2"
+          viewBox="0 0 24 24"
+          width="24"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path d="M13 12h8" />
+          <path d="M13 18h8" />
+          <path d="M13 6h8" />
+          <path d="M3 12h1" />
+          <path d="M3 18h1" />
+          <path d="M3 6h1" />
+          <path d="M8 12h1" />
+          <path d="M8 18h1" />
+          <path d="M8 6h1" />
+        </svg>
+        View Logs
       </Link>
       <DropdownMenu modal={false}>
         <DropdownMenuTrigger asChild>
@@ -217,7 +233,7 @@ const TaskCard = ({
               name: t('common.delete'),
               icon: <TrashIcon className="mr-3 h-4 w-4" />,
               onClick: () => {
-                // setIsDeleteTaskDrawerOpen(true);
+                setIsDeleteTaskDrawerOpen(true);
               },
             },
           ].map((option) => (
@@ -278,7 +294,7 @@ const RemoveTaskDrawer = ({
     <Dialog onOpenChange={onOpenChange} open={open}>
       <DialogContent className="sm:max-w-[425px]">
         <DialogTitle className="pb-0">
-          Delete Task <span className="font-mono text-base">{taskName}</span> ?
+          Delete Task <span className="font-mono text-base"> {taskName}</span> ?
         </DialogTitle>
         <DialogDescription>
           The task will be permanently deleted. This action cannot be undone.
@@ -304,7 +320,7 @@ const RemoveTaskDrawer = ({
                 await removeTask({
                   nodeAddress: auth?.node_address ?? '',
                   token: auth?.api_v2_key ?? '',
-                  recurringTaskId: taskId,
+                  recurringTaskId: taskId.toString(),
                 });
               }}
               size="sm"
diff --git a/apps/shinkai-desktop/src/routes/index.tsx b/apps/shinkai-desktop/src/routes/index.tsx
index 3872f297a..f7fed9d6a 100644
--- a/apps/shinkai-desktop/src/routes/index.tsx
+++ b/apps/shinkai-desktop/src/routes/index.tsx
@@ -58,6 +58,7 @@ import SettingsPage from '../pages/settings';
 import SheetDashboard from '../pages/sheet-dashboard';
 import SheetProject from '../pages/sheet-project';
 import ShinkaiPrivatePage from '../pages/shinkai-private';
+import { TaskLogs } from '../pages/task-logs';
 import { Tasks } from '../pages/tasks';
 import TermsAndConditionsPage from '../pages/terms-conditions';
 import { Tools } from '../pages/tools';
@@ -325,7 +326,7 @@ const AppRoutes = () => {
           path={'tasks'}
         >
           <Route element={<Tasks />} index />
-          <Route element={<ToolDetails />} path={':toolKey'} />
+          <Route element={<TaskLogs />} path={':taskId'} />
           <Route element={<CreateTaskPage />} path={'create'} />
           <Route element={<EditToolPage />} path={'edit/:toolRouterKey'} />
         </Route>
diff --git a/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts b/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
index 36d924f3d..38dcf8f2e 100644
--- a/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/index.ts
@@ -49,7 +49,7 @@ export const getRecurringTask = async (
   payload: GetRecurringTaskRequest,
 ) => {
   const response = await httpClient.get(
-    urlJoin(nodeAddress, '/v2/get_cron_task'),
+    urlJoin(nodeAddress, '/v2/get_specific_cron_task'),
     {
       headers: { Authorization: `Bearer ${bearerToken}` },
       params: { cron_task_id: payload.cron_task_id },
diff --git a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
index 759507c8e..e35021eb0 100644
--- a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
@@ -52,20 +52,20 @@ export type RecurringTask = {
 export type GetRecurringTasksResponse = RecurringTask[];
 
 export type GetRecurringTaskRequest = {
-  cron_task_id: number;
+  cron_task_id: string;
 };
 export type GetRecurringTaskResponse = RecurringTask;
 export type SetRecurringTaskRequest = {
-  cron_task_id: number;
+  cron_task_id: string;
 } & Omit<RecurringTask, 'task_id'>;
 
 export type SetRecurringTaskResponse = RecurringTask;
 export type RemoveRecurringTaskRequest = {
-  cron_task_id: number;
+  cron_task_id: string;
 };
 export type RemoveRecurringTaskResponse = {
   status: string;
 };
 export type GetRecurringTaskLogsRequest = {
-  cron_task_id: number;
+  cron_task_id: string;
 };
diff --git a/libs/shinkai-node-state/src/v2/constants.ts b/libs/shinkai-node-state/src/v2/constants.ts
index efad75706..9dda0e7a2 100644
--- a/libs/shinkai-node-state/src/v2/constants.ts
+++ b/libs/shinkai-node-state/src/v2/constants.ts
@@ -37,6 +37,7 @@ export enum FunctionKeyV2 {
   GET_WALLET_LIST = 'GET_WALLET_LIST',
   GET_RECURRING_TASKS = 'GET_RECURRING_TASKS',
   GET_RECURRING_TASK = 'GET_RECURRING_TASK',
+  GET_RECURRING_TASK_LOGS = 'GET_RECURRING_TASK_LOGS',
 }
 
 export const DEFAULT_CHAT_CONFIG = {
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts
index 4ef459e8b..fa46e6499 100644
--- a/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/index.ts
@@ -5,7 +5,6 @@ import { RemoveRecurringTaskInput } from './types';
 export const removeRecurringTask = async ({
   nodeAddress,
   token,
-
   recurringTaskId,
 }: RemoveRecurringTaskInput) => {
   const response = await removeRecurringTaskApi(nodeAddress, token, {
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts
index 4ecf10854..f70691123 100644
--- a/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/removeRecurringTask/types.ts
@@ -5,5 +5,5 @@ export type RemoveRecurringTaskOutput = RemoveRecurringTaskResponse;
 
 export type RemoveRecurringTaskInput = Token & {
   nodeAddress: string;
-  recurringTaskId: number;
+  recurringTaskId: string;
 };
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts
index f13e5d2b0..5f921620c 100644
--- a/libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/types.ts
@@ -3,7 +3,7 @@ import { GetRecurringTaskResponse } from '@shinkai_network/shinkai-message-ts/ap
 
 export type GetRecurringTaskInput = Token & {
   nodeAddress: string;
-  recurringTaskId: number;
+  recurringTaskId: string;
 };
 
 export type GetRecurringTaskOutput = GetRecurringTaskResponse;
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts
index 248dac63c..58c3b0f08 100644
--- a/libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTask/useGetRecurringTask.ts
@@ -8,6 +8,7 @@ export const useGetRecurringTask = (input: GetRecurringTaskInput) => {
   const response = useQuery({
     queryKey: [FunctionKeyV2.GET_RECURRING_TASK, input],
     queryFn: () => getRecurringTask(input),
+    enabled: !!input.recurringTaskId,
   });
   return response;
 };
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/index.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/index.ts
new file mode 100644
index 000000000..ce7aa3113
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/index.ts
@@ -0,0 +1,14 @@
+import { getRecurringTaskLogs as getRecurringTaskLogsApi } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/index';
+
+import type { GetRecurringTaskLogsInput } from './types';
+
+export const getRecurringTaskLogs = async ({
+  nodeAddress,
+  token,
+  recurringTaskId,
+}: GetRecurringTaskLogsInput) => {
+  const result = await getRecurringTaskLogsApi(nodeAddress, token, {
+    cron_task_id: recurringTaskId,
+  });
+  return result;
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/types.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/types.ts
new file mode 100644
index 000000000..8137d3262
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/types.ts
@@ -0,0 +1,9 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { GetRecurringTaskResponse } from '@shinkai_network/shinkai-message-ts/api/recurring-tasks/types';
+
+export type GetRecurringTaskLogsInput = Token & {
+  nodeAddress: string;
+  recurringTaskId: string;
+};
+
+export type GetRecurringTaskLogsOutput = GetRecurringTaskResponse;
diff --git a/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/useGetRecurringTaskLogs.ts b/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/useGetRecurringTaskLogs.ts
new file mode 100644
index 000000000..f3af4373a
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getRecurringTaskLogs/useGetRecurringTaskLogs.ts
@@ -0,0 +1,14 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { FunctionKeyV2 } from '../../constants';
+import { getRecurringTaskLogs } from './index';
+import { GetRecurringTaskLogsInput } from './types';
+
+export const useGetRecurringTaskLogs = (input: GetRecurringTaskLogsInput) => {
+  const response = useQuery({
+    queryKey: [FunctionKeyV2.GET_RECURRING_TASK_LOGS, input],
+    queryFn: () => getRecurringTaskLogs(input),
+    enabled: !!input.recurringTaskId,
+  });
+  return response;
+};
diff --git a/package-lock.json b/package-lock.json
index 71cc977f9..868f3b3a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,6 +68,7 @@
         "clsx": "^2.1.1",
         "cmdk": "^1.0.0",
         "consola": "^3.2.3",
+        "cronstrue": "^2.52.0",
         "crx": "^5.0.1",
         "crypto-js": "^4.2.0",
         "date-fns": "^3.6.0",
@@ -14196,6 +14197,14 @@
       "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
       "peer": true
     },
+    "node_modules/cronstrue": {
+      "version": "2.52.0",
+      "resolved": "https://registry.npmjs.org/cronstrue/-/cronstrue-2.52.0.tgz",
+      "integrity": "sha512-NKgHbWkSZXJUcaBHSsyzC8eegD6bBd4O0oCI6XMIJ+y4Bq3v4w7sY3wfWoKPuVlq9pQHRB6od0lmKpIqi8TlKA==",
+      "bin": {
+        "cronstrue": "bin/cli.js"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
diff --git a/package.json b/package.json
index 5fad2b21e..b34139ae3 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
     "consola": "^3.2.3",
+    "cronstrue": "^2.52.0",
     "crx": "^5.0.1",
     "crypto-js": "^4.2.0",
     "date-fns": "^3.6.0",

From 0f8c2f4e30d0f9cd3d1079c60e892f3f841944e2 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 13 Dec 2024 21:29:04 -0500
Subject: [PATCH 6/7] fixes

---
 apps/shinkai-desktop/src/pages/create-task.tsx | 8 ++++----
 apps/shinkai-desktop/src/pages/task-logs.tsx   | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/shinkai-desktop/src/pages/create-task.tsx b/apps/shinkai-desktop/src/pages/create-task.tsx
index 33ef51760..9b09d75d9 100644
--- a/apps/shinkai-desktop/src/pages/create-task.tsx
+++ b/apps/shinkai-desktop/src/pages/create-task.tsx
@@ -90,7 +90,7 @@ function CreateTaskPage() {
   const form = useForm<CreateTaskForm>({
     resolver: zodResolver(createTaskFormSchema),
     defaultValues: {
-      name: 'Hacker News',
+      name: 'Hacker News Task',
       description: 'Hacker News yada yada',
       cronExpression: '* * * * *',
       jobConfig: {
@@ -106,7 +106,7 @@ function CreateTaskPage() {
       },
       llmOrAgentId: defaultAgentId,
       jobMessage: {
-        content: 'Search in duckduckgo about hacker news',
+        content: 'Search in duckduckgo about top hacker news stories',
         toolKey:
           'local:::shinkai_tool_duckduckgo_search:::shinkai__duckduckgo_search',
       },
@@ -234,7 +234,7 @@ function CreateTaskPage() {
                 <div className="space-y-4">
                   <div className="grid grid-cols-[1fr_100px] items-center">
                     <span className="text-gray-80 text-xs">
-                      Select Tool (optional)
+                      Select AI/Agent
                     </span>
                     <AIModelSelector
                       onValueChange={(value) => {
@@ -245,7 +245,7 @@ function CreateTaskPage() {
                   </div>
                   <div className="grid grid-cols-[1fr_250px] items-center">
                     <span className="text-gray-80 text-xs">
-                      Select AI/Agent
+                      Select Tool (optional)
                     </span>
 
                     <DropdownMenu>
diff --git a/apps/shinkai-desktop/src/pages/task-logs.tsx b/apps/shinkai-desktop/src/pages/task-logs.tsx
index f4c7103ab..4e768a844 100644
--- a/apps/shinkai-desktop/src/pages/task-logs.tsx
+++ b/apps/shinkai-desktop/src/pages/task-logs.tsx
@@ -100,11 +100,17 @@ export const TaskLogs = () => {
         {isSuccess && logs.length === 0 && (
           <div className="p-10 text-center text-sm">
             <p className="text-white">No runs for this cron task yet</p>
-            <p className="text-gray-80">
+            <p className="text-gray-80 text-xs">
               check the schedule for your cron tasks to see when it runs
             </p>
           </div>
         )}
+        {isSuccess && logs.length > 0 && (
+          <div className="p-10 text-center text-sm">
+            <p className="text-white">Logs found</p>
+            <p className="text-gray-80 text-xs">TODO: Display logs</p>
+          </div>
+        )}
         {/*{isSuccess && (*/}
         {/*  <TaskCard*/}
         {/*    cronExpression={task.cron}*/}

From 3e7008766db23cfab798462d31d7039ee8b67477 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Fri, 13 Dec 2024 23:26:08 -0600
Subject: [PATCH 7/7] fix lint

---
 libs/shinkai-message-ts/src/api/recurring-tasks/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
index e35021eb0..69b02771e 100644
--- a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
@@ -37,7 +37,7 @@ export type CreateRecurringTaskRequest = {
   action: RecurringTaskAction;
 };
 
-export type CreateRecurringTaskResponse = {};
+export type CreateRecurringTaskResponse = Record<string, never>;
 
 export type RecurringTask = {
   task_id: number;