From fc093175168a74b1bf5d18b5d6b0434c5e91d563 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Mon, 30 Dec 2024 11:35:22 +0530
Subject: [PATCH 01/39] first commit

---
 .../vector-fs/components/vector-fs-item.tsx   | 28 +++----
 libs/shinkai-message-ts/src/api/methods.ts    |  4 +
 libs/shinkai-node-state/jest.config.ts        | 11 +++
 .../lib/queries/getVRPathSimplified/types.ts  | 48 ++---------
 .../src/lib/utils/files.test.ts               | 82 +++++++++++++++++++
 .../shinkai-node-state/src/lib/utils/files.ts | 73 +++++++++--------
 libs/shinkai-node-state/tsconfig.spec.json    | 27 ++++++
 7 files changed, 185 insertions(+), 88 deletions(-)
 create mode 100644 libs/shinkai-node-state/jest.config.ts
 create mode 100644 libs/shinkai-node-state/src/lib/utils/files.test.ts
 create mode 100644 libs/shinkai-node-state/tsconfig.spec.json

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index 818221123..3c7cefedc 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -29,20 +29,20 @@ import { VectorFsItemAction } from './vector-fs-drawer';
 export const VectorFsItemInfo = ({
   file,
   createdDatetime,
-  fileSize,
+  // fileSize,
 }: {
   file: VRItem;
   createdDatetime: string;
-  fileSize: string;
+  // fileSize: string;
 }) => {
   const layout = useVectorFsStore((state) => state.layout);
 
   return (
     <div className="flex-1 truncate text-left">
-      <div className="text-sm font-medium">{file.name}</div>
+      <div className="text-sm font-medium">{file.path}</div>
       {layout === VectorFSLayout.List && (
         <p className="text-xs font-medium text-gray-100">
-          <span>{createdDatetime}</span> - <span>{fileSize}</span>
+          <span>{createdDatetime}</span> - <span>0</span>
         </p>
       )}
     </div>
@@ -77,33 +77,33 @@ const VectorFsItem = ({
     layout === VectorFSLayout.Grid && 'bg-gray-400/30 p-2',
   );
 
-  const createdDatetime = formatDateToUSLocaleString(file.created_datetime);
-  const fileSize = size(file.vr_size);
+  const createdDatetime = formatDateToUSLocaleString(new Date(file.created_time));
+  // const fileSize = size(file.size);
 
   if (isVRSelectionActive) {
     return (
       <div className={wrapperClassname}>
         <Checkbox
           checked={isSelectedFile}
-          id={`item-${file.name}`}
+          id={`item-${file.path}`}
           onCheckedChange={() => {
             handleSelectFiles(file);
           }}
         />
         <label
           className="flex flex-1 items-center gap-3"
-          htmlFor={`item-${file.name}`}
+          htmlFor={`item-${file.path}`}
         >
-          <FileTypeIcon
+          {/* <FileTypeIcon
             type={
               file?.vr_header?.resource_source?.Standard?.FileRef?.file_type
                 ?.Document
             }
-          />
+          /> */}
           <VectorFsItemInfo
             createdDatetime={createdDatetime}
             file={file}
-            fileSize={fileSize}
+            // fileSize={fileSize}
           />
         </label>
       </div>
@@ -112,16 +112,16 @@ const VectorFsItem = ({
 
   return (
     <button className={wrapperClassname} onClick={onClick}>
-      <FileTypeIcon
+      {/* <FileTypeIcon
         type={
           file?.vr_header?.resource_source?.Standard?.FileRef?.file_type
             ?.Document
         }
-      />
+      /> */}
       <VectorFsItemInfo
         createdDatetime={createdDatetime}
         file={file}
-        fileSize={fileSize}
+        // fileSize={fileSize}
       />
 
       <TooltipProvider delayDuration={0}>
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index f4898fa52..6ee25a169 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -914,6 +914,8 @@ export const getAvailableSharedFolders = async (
   const data = response.data;
   return data;
 };
+
+// TODO: remove this
 export const getMySharedFolders = async (
   nodeAddress: string,
   sender: string,
@@ -992,6 +994,8 @@ export const createShareableFolder = async (
   const data = response.data;
   return data;
 };
+
+// TODO: remove this
 export const unshareFolder = async (
   nodeAddress: string,
   sender: string,
diff --git a/libs/shinkai-node-state/jest.config.ts b/libs/shinkai-node-state/jest.config.ts
new file mode 100644
index 000000000..628c78569
--- /dev/null
+++ b/libs/shinkai-node-state/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'shinkai-node-state',
+  preset: '../../jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/libs/shinkai-node-state',
+};
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
index e0ab18ed8..e56d4d67c 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
@@ -21,50 +21,16 @@ type ResourceKeywords = {
   keywords_embedding: null;
 };
 
-type VRHeader = {
-  resource_name: string;
-  resource_id: string;
-  resource_base_type: 'Document';
-  resource_source: ResourceSource;
-  resource_embedding: null;
-  resource_created_datetime: Date;
-  resource_last_written_datetime: Date;
-  resource_embedding_model_used: {
-    TextEmbeddingsInference: string;
-  };
-  resource_merkle_root: string;
-  resource_keywords: ResourceKeywords;
-  data_tag_names: string[];
-  metadata_index_keys: string[];
-};
-
-export type VRItem = {
-  name: string;
+export type FileInfo = {
+  created_time: string;
+  has_embeddings: boolean;
+  is_directory: boolean;
+  modified_time: string;
   path: string;
-  vr_header: VRHeader;
-  created_datetime: Date;
-  last_written_datetime: Date;
-  last_read_datetime: Date;
-  vr_last_saved_datetime: Date;
-  source_file_map_last_saved_datetime: Date;
-  distribution_origin: null;
-  vr_size: number;
-  source_file_map_size: number;
-  merkle_hash: string;
 };
 
-export type VRFolder = {
-  path: string;
-  child_folders: VRFolder[];
-  child_items: Array<VRItem>;
-  created_datetime: Date;
-  last_written_datetime: Date;
-  merkle_root: string;
-  last_modified_datetime: Date;
-  last_read_datetime: Date;
-  merkle_hash: string;
-  name: string;
-};
+export type VRItem = FileInfo;
+export type VRFolder = FileInfo;
 
 export type GetVRPathSimplifiedInput = JobCredentialsPayload & {
   nodeAddress: string;
diff --git a/libs/shinkai-node-state/src/lib/utils/files.test.ts b/libs/shinkai-node-state/src/lib/utils/files.test.ts
new file mode 100644
index 000000000..3dd442d7b
--- /dev/null
+++ b/libs/shinkai-node-state/src/lib/utils/files.test.ts
@@ -0,0 +1,82 @@
+import { FileInfo } from '../queries/getVRPathSimplified/types';
+import { transformDataToTreeNodes } from './files';
+
+describe('transformDataToTreeNodes', () => {
+  it('should handle paths without a leading slash', () => {
+    const data: FileInfo[] = [{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: true,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "nico"
+    }];
+
+    const result = transformDataToTreeNodes(data);
+    expect(result).toEqual([
+      {
+        key: "nico",
+        label: "nico",
+        data: data[0],
+        icon: "icon-folder",
+        children: []
+      }
+    ]);
+  });
+
+  it('should handle paths with a leading slash', () => {
+    const data: FileInfo[] = [{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: true,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "/nico"
+    }];
+
+    const result = transformDataToTreeNodes(data);
+    expect(result).toEqual([
+      {
+        key: "/nico",
+        label: "nico",
+        data: data[0],
+        icon: "icon-folder",
+        children: []
+      }
+    ]);
+  });
+
+  it('should handle multiple items', () => {
+    const data: FileInfo[] = [
+      {
+        created_time: "2024-12-30T05:27:59.764041184+00:00",
+        has_embeddings: false,
+        is_directory: true,
+        modified_time: "2024-12-30T05:27:59.764041184+00:00",
+        path: "nico"
+      },
+      {
+        created_time: "2024-12-30T05:27:59.764041184+00:00",
+        has_embeddings: false,
+        is_directory: false,
+        modified_time: "2024-12-30T05:27:59.764041184+00:00",
+        path: "nico/file.txt"
+      }
+    ];
+
+    const result = transformDataToTreeNodes(data);
+    expect(result).toEqual([
+      {
+        key: "nico",
+        label: "nico",
+        data: data[0],
+        icon: "icon-folder",
+        children: []
+      },
+      {
+        key: "nico/file.txt",
+        label: "file.txt",
+        data: data[1],
+        icon: "icon-file"
+      }
+    ]);
+  });
+}); 
\ No newline at end of file
diff --git a/libs/shinkai-node-state/src/lib/utils/files.ts b/libs/shinkai-node-state/src/lib/utils/files.ts
index 69640d88d..bb98b841f 100644
--- a/libs/shinkai-node-state/src/lib/utils/files.ts
+++ b/libs/shinkai-node-state/src/lib/utils/files.ts
@@ -1,47 +1,54 @@
 import { TreeNode } from 'primereact/treenode';
 
-import { VRFolder, VRItem } from '../queries/getVRPathSimplified/types';
+import { FileInfo } from '../queries/getVRPathSimplified/types';
 
 export function transformDataToTreeNodes(
-  data: VRFolder,
+  data: FileInfo[],
   parentPath = '/',
 ): TreeNode[] {
   const result: TreeNode[] = [];
-
-  for (const folder of data?.child_folders ?? []) {
-    const folderNode: TreeNode = {
-      key: folder.path,
-      label: folder.name,
-      data: folder,
-      icon: 'icon-folder',
-      children: transformDataToTreeNodes(folder, folder.path),
-    };
-    result.push(folderNode);
-  }
-
-  for (const item of data.child_items ?? []) {
-    const itemNode: TreeNode = {
-      key: item.path,
-      label: item.name,
-      data: item,
-      icon: 'icon-file',
-    };
-    result.push(itemNode);
-  }
+  console.log('data: ', data);
+
+  // Directly iterate over data assuming it's an array
+  data.forEach((fileInfo) => {
+    const pathWithSlash = fileInfo.path.startsWith('/') ? fileInfo.path : `/${fileInfo.path}`;
+    const label = pathWithSlash.split('/').pop() || '';
+
+    if (fileInfo.is_directory) {
+      const folderNode: TreeNode = {
+        key: fileInfo.path,
+        label: label,
+        data: fileInfo,
+        icon: 'icon-folder',
+        children: [], // Assuming you will populate this with child nodes
+      };
+      result.push(folderNode);
+    } else {
+      const itemNode: TreeNode = {
+        key: fileInfo.path,
+        label: label,
+        data: fileInfo,
+        icon: 'icon-file',
+      };
+      result.push(itemNode);
+    }
+  });
 
   return result;
 }
 
-export function getFlatChildItems(data: VRFolder): VRItem[] {
-  let result: VRItem[] = [];
-
-  for (const folder of data?.child_folders ?? []) {
-    result = result.concat(getFlatChildItems(folder));
-  }
-
-  for (const item of data.child_items ?? []) {
-    result.push(item);
-  }
+export function getFlatChildItems(data: FileInfo[]): FileInfo[] {
+  const result: FileInfo[] = [];
+
+  // for (const item of data) {
+  //   if (item.is_directory) {
+  //     // Assuming you have a way to retrieve child items for a directory
+  //     const childItems = getChildItemsForDirectory(item.path);
+  //     result = result.concat(getFlatChildItems(childItems));
+  //   } else {
+  //     result.push(item);
+  //   }
+  // }
 
   return result;
 }
diff --git a/libs/shinkai-node-state/tsconfig.spec.json b/libs/shinkai-node-state/tsconfig.spec.json
new file mode 100644
index 000000000..5d6aa0138
--- /dev/null
+++ b/libs/shinkai-node-state/tsconfig.spec.json
@@ -0,0 +1,27 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ]
+  },
+  "include": [
+    "vite.config.ts",
+    "vitest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}

From 5ef4c08013600e050ad31b9b2aaec326496c43eb Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Mon, 30 Dec 2024 12:24:48 +0530
Subject: [PATCH 02/39] better testing and updating types

---
 .../chat/set-conversation-context.tsx         |  6 +-
 .../src/components/sheet/data-table-cell.tsx  |  6 +-
 .../vector-fs/components/all-files-tab.tsx    | 14 +--
 .../lib/queries/getVRPathSimplified/index.ts  |  9 +-
 .../transformations.test.ts                   | 91 +++++++++++++++++++
 .../getVRPathSimplified/transformations.ts    | 18 ++++
 .../lib/queries/getVRPathSimplified/types.ts  |  7 +-
 .../src/lib/utils/files.test.ts               | 22 ++++-
 .../shinkai-node-state/src/lib/utils/files.ts |  1 -
 9 files changed, 147 insertions(+), 27 deletions(-)
 create mode 100644 libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
 create mode 100644 libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts

diff --git a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
index 943bb35b6..22f2adaf6 100644
--- a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
+++ b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
@@ -60,7 +60,7 @@ export const SetJobScopeDrawer = () => {
   const auth = useAuth((state) => state.auth);
   const [nodes, setNodes] = useState<TreeNode[]>([]);
 
-  const { data: VRFiles, isSuccess: isVRFilesSuccess } = useGetVRPathSimplified(
+  const { data: fileInfoArray, isSuccess: isVRFilesSuccess } = useGetVRPathSimplified(
     {
       nodeAddress: auth?.node_address ?? '',
       profile: auth?.profile ?? '',
@@ -88,9 +88,9 @@ export const SetJobScopeDrawer = () => {
 
   useEffect(() => {
     if (isVRFilesSuccess) {
-      setNodes(transformDataToTreeNodes(VRFiles));
+      setNodes(transformDataToTreeNodes(fileInfoArray));
     }
-  }, [VRFiles, isVRFilesSuccess]);
+  }, [fileInfoArray, isVRFilesSuccess]);
 
   useEffect(() => {
     if (!isSetJobScopeOpen) {
diff --git a/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx b/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
index 4337d6d04..681a303c8 100644
--- a/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
+++ b/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
@@ -386,7 +386,7 @@ export const VectorFsScopeDrawer = ({
   const [nodes, setNodes] = useState<TreeNode[]>([]);
   const auth = useAuth((state) => state.auth);
 
-  const { data: VRFiles, isSuccess: isVRFilesSuccess } = useGetVRPathSimplified(
+  const { data: fileInfoArray, isSuccess: isVRFilesSuccess } = useGetVRPathSimplified(
     {
       nodeAddress: auth?.node_address ?? '',
       profile: auth?.profile ?? '',
@@ -402,9 +402,9 @@ export const VectorFsScopeDrawer = ({
 
   useEffect(() => {
     if (isVRFilesSuccess) {
-      setNodes(transformDataToTreeNodes(VRFiles));
+      setNodes(transformDataToTreeNodes(fileInfoArray));
     }
-  }, [VRFiles, isVRFilesSuccess]);
+  }, [fileInfoArray, isVRFilesSuccess]);
 
   const { t } = useTranslation();
 
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
index 12fe6ebe6..71a723af4 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
@@ -86,7 +86,7 @@ const AllFiles = () => {
   const debouncedSearchQuery = useDebounce(searchQuery, 600);
   const {
     isPending: isVRFilesPending,
-    data: VRFiles,
+    data: fileInfoArray,
     isSuccess: isVRFilesSuccess,
   } = useGetVRPathSimplified(
     {
@@ -102,15 +102,9 @@ const AllFiles = () => {
     },
     {
       select: (data) => {
-        return {
-          ...data,
-          child_folders: data?.child_folders?.sort((a, b) =>
-            a.name.localeCompare(b.name),
-          ),
-          child_items: data?.child_items?.sort((a, b) =>
-            a.name.localeCompare(b.name),
-          ),
-        };
+        return data?.sort((a, b) =>
+          a.path.split('/').pop().localeCompare(b.path.split('/').pop())
+        );
       },
       refetchInterval: 6000,
     },
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts
index ab8b48e27..5f41a7b0a 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts
@@ -1,6 +1,7 @@
 import { retrieveVRPathSimplified as retrieveVRPathSimplifiedApi } from '@shinkai_network/shinkai-message-ts/api';
 
-import { GetVRPathSimplifiedInput, VRFolder } from './types';
+import { transformFileInfo } from './transformations';
+import { FileInfo, GetVRPathSimplifiedInput } from './types';
 
 export const getVRPathSimplified = async ({
   nodeAddress,
@@ -12,7 +13,7 @@ export const getVRPathSimplified = async ({
   node_encryption_pk,
   profile_encryption_sk,
   profile_identity_sk,
-}: GetVRPathSimplifiedInput): Promise<VRFolder> => {
+}: GetVRPathSimplifiedInput): Promise<FileInfo[]> => {
   const response = await retrieveVRPathSimplifiedApi(
     nodeAddress,
     shinkaiIdentity,
@@ -29,5 +30,7 @@ export const getVRPathSimplified = async ({
     },
   );
 
-  return response.data;
+  const transformedData = transformFileInfo(response.data);
+
+  return transformedData;
 };
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
new file mode 100644
index 000000000..280995e19
--- /dev/null
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
@@ -0,0 +1,91 @@
+import { transformFileInfo } from './transformations';
+
+describe('transformFileInfo', () => {
+  it('should add name, extension, and file_size to a file', () => {
+    const data = [{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: false,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "nico/file.txt"
+    }];
+
+    const result = transformFileInfo(data);
+    expect(result).toEqual([{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: false,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "nico/file.txt",
+      name: "file.txt",
+      extension: "txt",
+      file_size: "0"
+    }]);
+  });
+
+  it('should add name and set extension and file_size to null for a directory', () => {
+    const data = [{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: true,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "nico"
+    }];
+
+    const result = transformFileInfo(data);
+    expect(result).toEqual([{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: true,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "nico",
+      name: "nico",
+      extension: null,
+      file_size: null
+    }]);
+  });
+
+  it('should handle paths with a leading slash', () => {
+    const data = [{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: false,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "/nico/file.txt"
+    }];
+
+    const result = transformFileInfo(data);
+    expect(result).toEqual([{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: false,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "/nico/file.txt",
+      name: "file.txt",
+      extension: "txt",
+      file_size: "0"
+    }]);
+  });
+
+  it('should handle files without an extension', () => {
+    const data = [{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: false,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "nico/file"
+    }];
+
+    const result = transformFileInfo(data);
+    expect(result).toEqual([{
+      created_time: "2024-12-30T05:27:59.764041184+00:00",
+      has_embeddings: false,
+      is_directory: false,
+      modified_time: "2024-12-30T05:27:59.764041184+00:00",
+      path: "nico/file",
+      name: "file",
+      extension: null,
+      file_size: "0"
+    }]);
+  });
+}); 
\ No newline at end of file
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
new file mode 100644
index 000000000..7d4848b8d
--- /dev/null
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
@@ -0,0 +1,18 @@
+import { FileInfo } from "./types";
+
+export function transformFileInfo(data: any[]): FileInfo[] {
+  return data.map(fileInfo => {
+    const pathWithSlash = fileInfo.path.startsWith('/') ? fileInfo.path : `/${fileInfo.path}`;
+    const name = pathWithSlash.split('/').pop() || '';
+    const hasDot = name.includes('.');
+    const extension = fileInfo.is_directory || !hasDot ? null : name.split('.').pop();
+    const file_size = fileInfo.is_directory ? null : '0';
+
+    return {
+      ...fileInfo,
+      name,
+      extension,
+      file_size,
+    };
+  });
+}
\ No newline at end of file
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
index e56d4d67c..8455e6971 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
@@ -27,10 +27,13 @@ export type FileInfo = {
   is_directory: boolean;
   modified_time: string;
   path: string;
+  name: string;
+  extension: string | null;
+  file_size: string | null;
 };
 
 export type VRItem = FileInfo;
-export type VRFolder = FileInfo;
+export type VRFolder = FileInfo[];
 
 export type GetVRPathSimplifiedInput = JobCredentialsPayload & {
   nodeAddress: string;
@@ -43,7 +46,7 @@ export type UseGetMySharedFolders = [
   GetVRPathSimplifiedInput,
 ];
 
-export type GetVRPathSimplifiedOutput = VRFolder;
+export type GetVRPathSimplifiedOutput = FileInfo[];
 
 export type Options = QueryObserverOptions<
   GetVRPathSimplifiedOutput,
diff --git a/libs/shinkai-node-state/src/lib/utils/files.test.ts b/libs/shinkai-node-state/src/lib/utils/files.test.ts
index 3dd442d7b..46f45f364 100644
--- a/libs/shinkai-node-state/src/lib/utils/files.test.ts
+++ b/libs/shinkai-node-state/src/lib/utils/files.test.ts
@@ -8,7 +8,10 @@ describe('transformDataToTreeNodes', () => {
       has_embeddings: false,
       is_directory: true,
       modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "nico"
+      path: "nico",
+      name: "nico",
+      extension: null,
+      file_size: null
     }];
 
     const result = transformDataToTreeNodes(data);
@@ -29,7 +32,10 @@ describe('transformDataToTreeNodes', () => {
       has_embeddings: false,
       is_directory: true,
       modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "/nico"
+      path: "/nico",
+      name: "nico",
+      extension: null,
+      file_size: null
     }];
 
     const result = transformDataToTreeNodes(data);
@@ -51,14 +57,20 @@ describe('transformDataToTreeNodes', () => {
         has_embeddings: false,
         is_directory: true,
         modified_time: "2024-12-30T05:27:59.764041184+00:00",
-        path: "nico"
+        path: "nico",
+        name: "nico",
+        extension: null,
+        file_size: null
       },
       {
         created_time: "2024-12-30T05:27:59.764041184+00:00",
         has_embeddings: false,
         is_directory: false,
         modified_time: "2024-12-30T05:27:59.764041184+00:00",
-        path: "nico/file.txt"
+        path: "nico/file.txt",
+        name: "file.txt",
+        extension: "txt",
+        file_size: "0"
       }
     ];
 
@@ -79,4 +91,4 @@ describe('transformDataToTreeNodes', () => {
       }
     ]);
   });
-}); 
\ No newline at end of file
+});
diff --git a/libs/shinkai-node-state/src/lib/utils/files.ts b/libs/shinkai-node-state/src/lib/utils/files.ts
index bb98b841f..de20e05b8 100644
--- a/libs/shinkai-node-state/src/lib/utils/files.ts
+++ b/libs/shinkai-node-state/src/lib/utils/files.ts
@@ -7,7 +7,6 @@ export function transformDataToTreeNodes(
   parentPath = '/',
 ): TreeNode[] {
   const result: TreeNode[] = [];
-  console.log('data: ', data);
 
   // Directly iterate over data assuming it's an array
   data.forEach((fileInfo) => {

From ceb72d2a48b5974366d326fed9402366a60a25c9 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Mon, 30 Dec 2024 13:27:40 +0530
Subject: [PATCH 03/39] fix uploading

---
 .../vector-fs/components/all-files-tab.tsx    | 29 ++++++-------
 .../components/vector-fs-general-options.tsx  | 20 ++-------
 .../node-files/vector-fs-general-options.tsx  |  2 +-
 libs/shinkai-message-ts/src/api/methods.ts    | 41 ++++++++++---------
 .../src/lib/mutations/uploadVRFiles/index.ts  | 33 ---------------
 .../src/lib/mutations/uploadVRFiles/types.ts  | 14 -------
 .../lib/queries/getVRPathSimplified/types.ts  |  2 +-
 .../src/v2/mutations/uploadVRFiles/index.ts   | 19 +++++++++
 .../src/v2/mutations/uploadVRFiles/types.ts   | 11 +++++
 .../uploadVRFiles/useUploadVRFiles.ts         |  2 +-
 10 files changed, 70 insertions(+), 103 deletions(-)
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/types.ts
 rename libs/shinkai-node-state/src/{lib => v2}/mutations/uploadVRFiles/useUploadVRFiles.ts (93%)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
index 71a723af4..a8ca2902b 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
@@ -2,6 +2,7 @@ import { HomeIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
 import { useGetSearchVRItems } from '@shinkai_network/shinkai-node-state/lib/queries/getSearchVRItems/useGetSearchVRItems';
 import {
+  FileInfo,
   VRFolder,
   VRItem,
 } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
@@ -101,10 +102,8 @@ const AllFiles = () => {
       profile_identity_sk: auth?.profile_identity_sk ?? '',
     },
     {
-      select: (data) => {
-        return data?.sort((a, b) =>
-          a.path.split('/').pop().localeCompare(b.path.split('/').pop())
-        );
+      select: (data: FileInfo[]) => {
+        return data?.sort((a, b) => a.name.localeCompare(b.name));
       },
       refetchInterval: 6000,
     },
@@ -202,19 +201,17 @@ const AllFiles = () => {
     },
   ];
 
-  const splitCurrentPath = VRFiles?.path?.split('/').filter(Boolean) ?? [];
+  const splitCurrentPath = currentGlobalPath.split('/').filter(Boolean);
 
   const folderList = React.useMemo(() => {
-    return !isSortByName
-      ? [...(VRFiles?.child_folders ?? [])].reverse()
-      : VRFiles?.child_folders;
-  }, [VRFiles?.child_folders, isSortByName]);
+    const folders = fileInfoArray?.filter((file) => file.is_directory) ?? [];
+    return isSortByName ? folders : [...folders].reverse();
+  }, [fileInfoArray, isSortByName]);
 
   const itemList = React.useMemo(() => {
-    return !isSortByName
-      ? [...(VRFiles?.child_items ?? [])].reverse()
-      : VRFiles?.child_items;
-  }, [VRFiles?.child_items, isSortByName]);
+    const items = fileInfoArray?.filter((file) => !file.is_directory) ?? [];
+    return isSortByName ? items : [...items].reverse();
+  }, [fileInfoArray, isSortByName]);
 
   return (
     <div className="flex h-full flex-col">
@@ -396,7 +393,7 @@ const AllFiles = () => {
             })}
           {!searchQuery &&
             isVRFilesSuccess &&
-            VRFiles?.child_folders?.length === 0 &&
+            folderList.length === 0 &&
             currentGlobalPath === '/' && (
               <div className="text-gray-80 mt-4 flex flex-col items-center justify-center gap-4 text-center text-base">
                 <FileEmptyStateIcon className="h-20 w-20" />
@@ -412,8 +409,8 @@ const AllFiles = () => {
             )}
           {!searchQuery &&
             isVRFilesSuccess &&
-            VRFiles?.child_items?.length === 0 &&
-            VRFiles.child_folders?.length === 0 && (
+            itemList.length === 0 &&
+            folderList.length === 0 && (
               <div className="flex h-20 items-center justify-center text-gray-100">
                 {t('vectorFs.emptyState.noFiles')}
               </div>
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
index f5a02c966..34e728b2b 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
@@ -9,7 +9,7 @@ import {
   uploadVRFilesFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
 import { useCreateVRFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createVRFolder/useCreateVRFolder';
-import { useUploadVRFiles } from '@shinkai_network/shinkai-node-state/lib/mutations/uploadVRFiles/useUploadVRFiles';
+import { useUploadVRFiles } from '@shinkai_network/shinkai-node-state/v2/mutations/uploadVRFiles/useUploadVRFiles';
 import {
   Button,
   FileItem,
@@ -183,16 +183,9 @@ export const UploadVRFilesAction = () => {
     closeDrawerMenu();
     await uploadVRFiles({
       nodeAddress: auth?.node_address ?? '',
-      sender: auth?.shinkai_identity ?? '',
-      senderSubidentity: auth?.profile ?? '',
-      receiver: auth?.shinkai_identity ?? '',
       destinationPath: currentGlobalPath,
       files: values.files,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
+      token: auth?.api_v2_key ?? '',
     });
   };
 
@@ -302,16 +295,9 @@ export const SaveWebpageToVectorFsAction = () => {
     closeDrawerMenu();
     await uploadVRFiles({
       nodeAddress: auth?.node_address ?? '',
-      sender: auth?.shinkai_identity ?? '',
-      senderSubidentity: auth?.profile ?? '',
-      receiver: auth?.shinkai_identity ?? '',
       destinationPath: values.destinationFolderPath,
       files: values.files,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
+      token: auth?.api_v2_key ?? '',
     });
   };
 
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
index cec23476b..d5f529e46 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
@@ -9,7 +9,7 @@ import {
   uploadVRFilesFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
 import { useCreateVRFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createVRFolder/useCreateVRFolder';
-import { useUploadVRFiles } from '@shinkai_network/shinkai-node-state/lib/mutations/uploadVRFiles/useUploadVRFiles';
+import { useUploadVRFiles } from '@shinkai_network/shinkai-node-state/v2/mutations/uploadVRFiles/useUploadVRFiles';
 import {
   Button,
   DrawerDescription,
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 6ee25a169..1b90f720c 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -569,33 +569,34 @@ export const retrieveVectorSearchSimplified = async (
 
 export const uploadFilesToVR = async (
   nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
+  bearerToken: string,
   destinationPath: string,
   files: File[],
-  setupDetailsState: CredentialsPayload,
 ): Promise<{ status: string }> => {
   try {
-    const fileUploader = new FileUploader(
-      nodeAddress,
-      setupDetailsState.profile_encryption_sk,
-      setupDetailsState.profile_identity_sk,
-      setupDetailsState.node_encryption_pk,
-      '',
-      sender,
-      sender_subidentity,
-      receiver,
-    );
-
-    await fileUploader.createFolder();
     for (const fileToUpload of files) {
-      await fileUploader.uploadEncryptedFile(fileToUpload);
+      const formData = new FormData();
+      formData.append('file_data', fileToUpload);
+      formData.append('filename', fileToUpload.name);
+      formData.append('path', destinationPath);
+
+      const response = await httpClient.post(
+        urlJoin(nodeAddress, '/v2/upload_file_to_folder'),
+        formData,
+        {
+          headers: {
+            'Content-Type': 'multipart/form-data',
+            'Authorization': `Bearer ${bearerToken}`,
+          },
+        }
+      );
+
+      if (response.status !== 200) {
+        throw new Error(`Failed to upload file: ${fileToUpload.name}`);
+      }
     }
-    const response =
-      await fileUploader.finalizeAndAddItemsToDb(destinationPath);
 
-    return response;
+    return { status: 'success' };
   } catch (error) {
     console.error('Error uploadFilesToVR:', error);
     throw error;
diff --git a/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/index.ts b/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/index.ts
deleted file mode 100644
index ae256e857..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { uploadFilesToVR } from '@shinkai_network/shinkai-message-ts/api';
-
-import { UploadVRFilesInput } from './types';
-
-export const uploadVRFiles = async ({
-  nodeAddress,
-  sender,
-  senderSubidentity,
-  receiver,
-  destinationPath,
-  files,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: UploadVRFilesInput) => {
-  return await uploadFilesToVR(
-    nodeAddress,
-    sender,
-    senderSubidentity,
-    receiver,
-    destinationPath,
-    files,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/types.ts b/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/types.ts
deleted file mode 100644
index 7545fcb4c..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type UploadVRFilesOutput = {
-  status: string;
-};
-
-export type UploadVRFilesInput = CredentialsPayload & {
-  nodeAddress: string;
-  sender: string;
-  receiver: string;
-  senderSubidentity: string;
-  destinationPath: string;
-  files: File[];
-};
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
index 8455e6971..b8c4dac10 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
@@ -33,7 +33,7 @@ export type FileInfo = {
 };
 
 export type VRItem = FileInfo;
-export type VRFolder = FileInfo[];
+export type VRFolder = FileInfo;
 
 export type GetVRPathSimplifiedInput = JobCredentialsPayload & {
   nodeAddress: string;
diff --git a/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/index.ts b/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/index.ts
new file mode 100644
index 000000000..bc2510a25
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/index.ts
@@ -0,0 +1,19 @@
+import { uploadFilesToVR } from '@shinkai_network/shinkai-message-ts/api';
+
+import { UploadVRFilesInput } from './types';
+
+export const uploadVRFiles = async ({
+  nodeAddress,
+  token,
+  destinationPath,
+  files,
+}: UploadVRFilesInput) => {
+  const response = await uploadFilesToVR(
+    nodeAddress,
+    token,
+    destinationPath,
+    files
+  );
+
+  return response;
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/types.ts b/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/types.ts
new file mode 100644
index 000000000..8c4579ca8
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/types.ts
@@ -0,0 +1,11 @@
+export type UploadVRFilesOutput = {
+  status: string;
+};
+
+export type UploadVRFilesInput = {
+  nodeAddress: string;
+  token: string;
+  destinationPath: string;
+  files: File[];
+};
+
diff --git a/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/useUploadVRFiles.ts b/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/useUploadVRFiles.ts
similarity index 93%
rename from libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/useUploadVRFiles.ts
rename to libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/useUploadVRFiles.ts
index 6a6520527..c640cdb82 100644
--- a/libs/shinkai-node-state/src/lib/mutations/uploadVRFiles/useUploadVRFiles.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/uploadVRFiles/useUploadVRFiles.ts
@@ -4,7 +4,7 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
+import { FunctionKey } from '../../../lib/constants';
 import { uploadVRFiles } from '.';
 import { UploadVRFilesInput, UploadVRFilesOutput } from './types';
 

From 955a5e2801216e5fe3eb8950268da41bdda9d1d0 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Mon, 30 Dec 2024 13:58:27 +0530
Subject: [PATCH 04/39] update to include files in jobscope

---
 .../chat/context/set-job-scope-context.tsx    |  17 +--
 .../components/chat/conversation-footer.tsx   |  25 ++--
 .../chat/set-conversation-context.tsx         |  27 +---
 .../src/components/create-job/create-job.tsx  |  19 +--
 .../node-files/vector-fs-general-options.tsx  |  18 +--
 .../src/models/SchemaTypes.ts                 | 128 +-----------------
 .../src/v2/mutations/createJob/types.ts       |   9 +-
 7 files changed, 38 insertions(+), 205 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx b/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx
index bf02e1c74..88f47c2b8 100644
--- a/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx
+++ b/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx
@@ -1,7 +1,4 @@
-import {
-  VectorFSFolderScopeEntry,
-  VectorFSItemScopeEntry,
-} from '@shinkai_network/shinkai-message-ts/models/SchemaTypes';
+import { ShinkaiPath } from '@shinkai_network/shinkai-message-ts/models';
 import { TreeCheckboxSelectionKeys } from 'primereact/tree';
 import React, { createContext, useContext, useState } from 'react';
 import { createStore, useStore } from 'zustand';
@@ -16,8 +13,8 @@ type SetJobScopeStore = {
   setSetJobScopeOpen: (isSetJobScopeOpen: boolean) => void;
   selectedKeys: TreeCheckboxSelectionKeys | null;
   onSelectedKeysChange: (value: TreeCheckboxSelectionKeys | null) => void;
-  selectedFileKeysRef: Map<string, VectorFSItemScopeEntry>;
-  selectedFolderKeysRef: Map<string, VectorFSFolderScopeEntry>;
+  selectedFileKeysRef: Map<string, ShinkaiPath>;
+  selectedFolderKeysRef: Map<string, ShinkaiPath>;
 
   isKnowledgeSearchOpen: boolean;
   setKnowledgeSearchOpen: (isKnowledgeSearchOpen: boolean) => void;
@@ -35,8 +32,8 @@ const createVectorFsStore = () =>
     onSelectedKeysChange: (selectedKeys) => {
       set({ selectedKeys });
     },
-    selectedFileKeysRef: new Map(),
-    selectedFolderKeysRef: new Map(),
+    selectedFileKeysRef: new Map<string, ShinkaiPath>(),
+    selectedFolderKeysRef: new Map<string, ShinkaiPath>(),
 
     isKnowledgeSearchOpen: false,
     setKnowledgeSearchOpen: (isKnowledgeSearchOpen) => {
@@ -46,8 +43,8 @@ const createVectorFsStore = () =>
       set({
         isSetJobScopeOpen: false,
         selectedKeys: null,
-        selectedFileKeysRef: new Map(),
-        selectedFolderKeysRef: new Map(),
+        selectedFileKeysRef: new Map<string, ShinkaiPath>(),
+        selectedFolderKeysRef: new Map<string, ShinkaiPath>(),
         isKnowledgeSearchOpen: false,
       });
     },
diff --git a/apps/shinkai-desktop/src/components/chat/conversation-footer.tsx b/apps/shinkai-desktop/src/components/chat/conversation-footer.tsx
index b1ca9b9ff..e4ec60b22 100644
--- a/apps/shinkai-desktop/src/components/chat/conversation-footer.tsx
+++ b/apps/shinkai-desktop/src/components/chat/conversation-footer.tsx
@@ -16,10 +16,6 @@ import {
   createJobFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/chat/create-job';
 import { useSendMessageToInbox } from '@shinkai_network/shinkai-node-state/lib/mutations/sendMesssageToInbox/useSendMessageToInbox';
-import {
-  VRFolder,
-  VRItem,
-} from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
 import { Models } from '@shinkai_network/shinkai-node-state/lib/utils/models';
 import { DEFAULT_CHAT_CONFIG } from '@shinkai_network/shinkai-node-state/v2/constants';
 import { useCreateJob } from '@shinkai_network/shinkai-node-state/v2/mutations/createJob/useCreateJob';
@@ -86,8 +82,8 @@ export const actionButtonClassnames =
 export type ChatConversationLocationState = {
   files: File[];
   agentName: string;
-  selectedVRFiles: VRItem[];
-  selectedVRFolders: VRFolder[];
+  selectedVRFiles: string[];
+  selectedVRFolders: string[];
   llmProviderId: string;
 };
 
@@ -180,13 +176,9 @@ function ConversationEmptyFooter() {
         locationState?.selectedVRFolders?.length > 0)
     ) {
       const selectedVRFilesPathMap = locationState?.selectedVRFiles?.reduce(
-        (acc, file) => {
-          selectedFileKeysRef.set(file.path, {
-            name: file.name,
-            path: file.path,
-            source: file.vr_header.resource_source,
-          });
-          acc[file.path] = {
+        (acc, path) => {
+          selectedFileKeysRef.set(path, path);
+          acc[path] = {
             checked: true,
           };
           return acc;
@@ -195,9 +187,9 @@ function ConversationEmptyFooter() {
       );
 
       const selectedVRFoldersPathMap = locationState?.selectedVRFolders?.reduce(
-        (acc, folder) => {
-          selectedFolderKeysRef.set(folder.path, folder);
-          acc[folder.path] = {
+        (acc, path) => {
+          selectedFolderKeysRef.set(path, path);
+          acc[path] = {
             checked: true,
           };
           return acc;
@@ -216,6 +208,7 @@ function ConversationEmptyFooter() {
     locationState?.selectedVRFolders,
     selectedFileKeysRef,
     selectedFolderKeysRef,
+    onSelectedKeysChange,
   ]);
 
   const currentMessage = useWatch({
diff --git a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
index 22f2adaf6..554a0d97c 100644
--- a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
+++ b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
@@ -121,14 +121,10 @@ export const SetJobScopeDrawer = () => {
           <Tree
             onSelect={(e) => {
               if (e.node.icon === 'icon-folder') {
-                selectedFolderKeysRef.set(String(e.node.key), e.node.data);
+                selectedFolderKeysRef.set(String(e.node.key), e.node.data.path);
                 return;
               }
-              selectedFileKeysRef.set(String(e.node.key), {
-                path: e.node.data.path,
-                name: e.node.data.name,
-                source: e.node.data.vr_header.resource_source,
-              });
+              selectedFileKeysRef.set(String(e.node.key), e.node.data.path);
             }}
             onSelectionChange={(e) => {
               onSelectedKeysChange(e.value as TreeCheckboxSelectionKeys);
@@ -173,22 +169,9 @@ export const SetJobScopeDrawer = () => {
                   nodeAddress: auth?.node_address ?? '',
                   token: auth?.api_v2_key ?? '',
                   jobScope: {
-                    vector_fs_items: Array.from(
-                      selectedFileKeysRef.values(),
-                    )?.map((vfFile) => ({
-                      path: vfFile.path,
-                      name: vfFile.name,
-                      source: vfFile.source,
-                    })),
-                    vector_fs_folders: Array.from(
-                      selectedFolderKeysRef.values(),
-                    )?.map((vfFolder) => ({
-                      path: vfFolder.path,
-                      name: vfFolder.name,
-                    })),
-                    local_vrpack: [],
-                    local_vrkai: [],
-                    network_folders: [],
+                    vector_fs_items: Array.from(selectedFileKeysRef.values()),
+                    vector_fs_folders: Array.from(selectedFolderKeysRef.values()),
+                    vector_search_mode: [],
                   },
                 });
               }
diff --git a/apps/shinkai-visor/src/components/create-job/create-job.tsx b/apps/shinkai-visor/src/components/create-job/create-job.tsx
index 8e86ebd50..048dad2e4 100644
--- a/apps/shinkai-visor/src/components/create-job/create-job.tsx
+++ b/apps/shinkai-visor/src/components/create-job/create-job.tsx
@@ -1,8 +1,7 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
 import {
-  VectorFSFolderScopeEntry,
-  VectorFSItemScopeEntry,
+  ShinkaiPath,
 } from '@shinkai_network/shinkai-message-ts/models/SchemaTypes';
 import { buildInboxIdFromJobId } from '@shinkai_network/shinkai-message-ts/utils';
 import {
@@ -71,12 +70,8 @@ export const CreateJob = () => {
   const query = useQuery();
   const auth = useAuth((state) => state.auth);
 
-  const selectedFileKeysRef = useRef<Map<string, VectorFSItemScopeEntry>>(
-    new Map(),
-  );
-  const selectedFolderKeysRef = useRef<Map<string, VectorFSFolderScopeEntry>>(
-    new Map(),
-  );
+  const selectedFileKeysRef = useRef<Map<string, ShinkaiPath>>(new Map());
+  const selectedFolderKeysRef = useRef<Map<string, ShinkaiPath>>(new Map());
   // const settings = useSettings((state) => state.settings);
   const currentDefaultAgentId = useSettings((state) => state.defaultAgentId);
   const {
@@ -199,11 +194,7 @@ export const CreateJob = () => {
     ) {
       const selectedVRFilesPathMap = location?.state?.selectedVRFiles?.reduce(
         (acc, file) => {
-          selectedFileKeysRef.current.set(file.path, {
-            path: file.path,
-            name: file.name,
-            source: file.vr_header.resource_source,
-          });
+          selectedFileKeysRef.current.set(file.path, file.path);
           acc[file.path] = {
             checked: true,
           };
@@ -215,7 +206,7 @@ export const CreateJob = () => {
       const selectedVRFoldersPathMap =
         location?.state?.selectedVRFolders?.reduce(
           (acc, folder) => {
-            selectedFolderKeysRef.current.set(folder.path, folder);
+            selectedFolderKeysRef.current.set(folder.path, folder.path);
             acc[folder.path] = {
               checked: true,
             };
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
index d5f529e46..1febba691 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
@@ -177,16 +177,9 @@ export const UploadVRFilesAction = () => {
     closeDrawerMenu();
     await uploadVRFiles({
       nodeAddress: auth?.node_address ?? '',
-      sender: auth?.shinkai_identity ?? '',
-      senderSubidentity: auth?.profile ?? '',
-      receiver: auth?.shinkai_identity ?? '',
       destinationPath: currentGlobalPath,
       files: values.files,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
+      token: auth?.api_v2_key ?? '',
     });
   };
 
@@ -298,16 +291,9 @@ export const SaveWebpageToVectorFsAction = () => {
     closeDrawerMenu();
     await uploadVRFiles({
       nodeAddress: auth?.node_address ?? '',
-      sender: auth?.shinkai_identity ?? '',
-      senderSubidentity: auth?.profile ?? '',
-      receiver: auth?.shinkai_identity ?? '',
       destinationPath: values.destinationFolderPath,
       files: values.files,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
+      token: auth?.api_v2_key ?? '',
     });
   };
 
diff --git a/libs/shinkai-message-ts/src/models/SchemaTypes.ts b/libs/shinkai-message-ts/src/models/SchemaTypes.ts
index 59cb04905..c28107509 100644
--- a/libs/shinkai-message-ts/src/models/SchemaTypes.ts
+++ b/libs/shinkai-message-ts/src/models/SchemaTypes.ts
@@ -67,131 +67,17 @@ export enum MessageSchemaType {
   SearchShinkaiTool = 'SearchShinkaiTool',
 }
 
-export interface LocalScopeVRKaiEntry {
-  vrkai: {
-    resource: {
-      Map: {
-        created_datetime: string;
-        data_tag_index: Record<string, string>;
-        description?: null;
-        distribution_info: {
-          origin: null;
-          release_datetime: null;
-        };
-        embedding_model_used_string: string;
-        embeddings: Record<string, string>;
-        keywords: {
-          keyword_list?: string[];
-          keywords_embedding?: null;
-        };
-        last_written_datetime: string;
-        merkle_root: string;
-        metadata_index: {
-          index: Record<string, string>;
-        };
-        name: string;
-        node_count: number;
-        nodes: Record<string, string>;
-        resource_base_type: string;
-        resource_embedding: {
-          id: string;
-          vector?: number[];
-        };
-        resource_id: string;
-        source: string;
-      };
-    };
-    metadata: Record<string, string>;
-    resource_id: string;
-    source: {
-      Standard: {
-        FileRef: {
-          file_name: string;
-          file_type: {
-            Document: string;
-          };
-          original_creation_datetime?: string;
-          text_chunking_strategy: string;
-        };
-      };
-    };
-  };
-}
-
-export interface LocalScopeVRPackEntry {
-  vrpack: {
-    embedding_models_used: Record<string, string>;
-    folder_count: number;
-    metadata: Record<string, string>;
-    name: string;
-    resource: {
-      Map: {
-        created_datetime: string;
-        data_tag_index: Record<string, string>;
-        description?: null;
-        distribution_info: {
-          origin: null;
-          release_datetime: null;
-        };
-        embedding_model_used_string: string;
-        embeddings: Record<string, string>;
-        keywords: {
-          keyword_list?: string[];
-          keywords_embedding?: null;
-        };
-        last_written_datetime: string;
-        merkle_root: string;
-        metadata_index: {
-          index: Record<string, string>;
-        };
-        name: string;
-        node_count: number;
-        nodes: Record<string, string>;
-        resource_base_type: string;
-        resource_embedding: {
-          id: string;
-          vector?: number[];
-        };
-        resource_id: string;
-        source: string;
-      };
-    };
-    version: string;
-    vrkai_count: number;
-  };
-}
-
-export interface VectorFSItemScopeEntry {
-  name: string;
-  path: string;
-  source: {
-    Standard: {
-      FileRef: {
-        file_name: string;
-        file_type: {
-          Document: string;
-        };
-        original_creation_datetime: null;
-        text_chunking_strategy: string;
-      };
-    };
-  };
-}
-
-export interface VectorFSFolderScopeEntry {
-  name: string;
-  path: string;
+export enum VectorSearchMode {
+  FillUpTo25k = 'FillUpTo25k',
+  MergeSiblings = 'MergeSiblings'
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface NetworkFolderScopeEntry {}
+export type ShinkaiPath = string;
 
 export interface JobScope {
-  local_vrkai: LocalScopeVRKaiEntry[];
-  local_vrpack: LocalScopeVRPackEntry[];
-  vector_fs_items: VectorFSItemScopeEntry[];
-  vector_fs_folders: VectorFSFolderScopeEntry[];
-  network_folders: [];
+  vector_fs_items: ShinkaiPath[];
+  vector_fs_folders: ShinkaiPath[];
+  vector_search_mode: VectorSearchMode[];
 }
 
 export interface JobCreation {
diff --git a/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts b/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts
index 6c5cd3de2..4c2665355 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts
@@ -1,9 +1,6 @@
 import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
 import { JobConfig } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
-import {
-  VectorFSFolderScopeEntry,
-  VectorFSItemScopeEntry,
-} from '@shinkai_network/shinkai-message-ts/models/SchemaTypes';
+import { ShinkaiPath } from '@shinkai_network/shinkai-message-ts/models';
 
 export type CreateJobInput = Token & {
   nodeAddress: string;
@@ -13,8 +10,8 @@ export type CreateJobInput = Token & {
   isHidden: boolean;
   toolKey?: string;
   files?: File[];
-  selectedVRFiles?: VectorFSItemScopeEntry[];
-  selectedVRFolders?: VectorFSFolderScopeEntry[];
+  selectedVRFiles?: ShinkaiPath[];
+  selectedVRFolders?: ShinkaiPath[];
   chatConfig?: JobConfig;
 };
 

From f94d920c86602f4859ffdc6e301f696e9acdecbb Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Mon, 30 Dec 2024 23:03:41 +0530
Subject: [PATCH 05/39] adding upload to job

---
 libs/shinkai-message-ts/src/api/methods.ts    | 97 ++++++++++++++-----
 .../sendMesssageWithFilesToInbox/index.ts     | 35 -------
 .../sendMesssageWithFilesToInbox/index.ts     | 17 ++++
 .../sendMesssageWithFilesToInbox/types.ts     | 12 +--
 .../useSendMessageWithFilesToInbox.ts         |  6 +-
 5 files changed, 96 insertions(+), 71 deletions(-)
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts
 rename libs/shinkai-node-state/src/{lib => v2}/mutations/sendMesssageWithFilesToInbox/types.ts (53%)
 rename libs/shinkai-node-state/src/{lib => v2}/mutations/sendMesssageWithFilesToInbox/useSendMessageWithFilesToInbox.ts (83%)

diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 1b90f720c..93485dd46 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -136,41 +136,50 @@ export const sendTextMessageWithInbox = async (
   }
 };
 
-export const sendTextMessageWithFilesForInbox = async (
+export const sendTextMessageWithFilesToJob = async (
   nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
   text_message: string,
-  job_inbox: string,
+  job_id: string,
   files: File[],
-  setupDetailsState: CredentialsPayload,
+  bearerToken: string,
 ): Promise<{ inboxId: string; message: ShinkaiMessage }> => {
-  const fileUploader = new FileUploader(
+  // Upload files using the uploadFilesToVR function
+  const uploadResponse = await uploadFilesToJob(
     nodeAddress,
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    job_inbox,
-    sender,
-    sender_subidentity,
-    receiver,
+    bearerToken,
+    job_id,
+    files
   );
 
-  await fileUploader.createFolder();
-  for (const fileToUpload of files) {
-    await fileUploader.uploadEncryptedFile(fileToUpload);
+  if (uploadResponse.status !== 'success') {
+    throw new Error('Failed to upload files');
   }
-  const message = await fileUploader.finalizeAndSend(text_message, null);
 
-  if (message.body && 'unencrypted' in message.body) {
-    const inboxId = message.body.unencrypted.internal_metadata.inbox;
-    return { inboxId, message };
-  } else {
-    console.warn('message body is null or encrypted');
-    // TODO: workaround to skip error reading encrypted message
-    return { inboxId: job_inbox, message };
-  }
+  // Prepare the message payload
+  const messagePayload = {
+    job_message: {
+      job_id,
+      content: text_message,
+      files: [], // update with an array of string with the file paths
+    },
+  };
+
+  // Send the message to the job
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/job_message'),
+    messagePayload,
+    {
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${bearerToken}`,
+      },
+    }
+  );
+
+  const data = response.data;
+
+  // Assuming the response contains the message and inboxId
+  return { inbox_id: job_id, message: data };
 };
 
 export const updateInboxName = async (
@@ -1659,3 +1668,39 @@ export const removeRowsSheet = async (
   const data = response.data;
   return data;
 };
+
+export const uploadFilesToJob = async (
+  nodeAddress: string,
+  bearerToken: string,
+  jobId: string,
+  files: File[],
+): Promise<{ status: string }> => {
+  try {
+    for (const fileToUpload of files) {
+      const formData = new FormData();
+      formData.append('file_data', fileToUpload);
+      formData.append('filename', fileToUpload.name);
+      formData.append('job_id', jobId);
+
+      const response = await httpClient.post(
+        urlJoin(nodeAddress, '/v2/upload_file_to_job'),
+        formData,
+        {
+          headers: {
+            'Content-Type': 'multipart/form-data',
+            'Authorization': `Bearer ${bearerToken}`,
+          },
+        }
+      );
+
+      if (response.status !== 200) {
+        throw new Error(`Failed to upload file: ${fileToUpload.name}`);
+      }
+    }
+
+    return { status: 'success' };
+  } catch (error) {
+    console.error('Error uploadFilesToJob:', error);
+    throw error;
+  }
+};
diff --git a/libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/index.ts b/libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/index.ts
deleted file mode 100644
index 4a7ed03b9..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { sendTextMessageWithFilesForInbox } from '@shinkai_network/shinkai-message-ts/api';
-
-import { SendMessageWithFilesToInboxInput } from './types';
-
-export const sendMessageWithFilesToInbox = async ({
-  nodeAddress,
-  sender,
-  senderSubidentity,
-  receiver,
-  message,
-  inboxId,
-  files,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: SendMessageWithFilesToInboxInput) => {
-  return await sendTextMessageWithFilesForInbox(
-    nodeAddress,
-    sender,
-    senderSubidentity,
-    receiver,
-    message,
-    inboxId,
-    files,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts
new file mode 100644
index 000000000..744f65f64
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts
@@ -0,0 +1,17 @@
+import { sendTextMessageWithFilesToJob } from '@shinkai_network/shinkai-message-ts/api';
+
+import { SendMessageWithFilesToInboxInput } from './types';
+
+export const sendMessageWithFilesToJob = async ({
+  nodeAddress,
+  message,
+  jobId,
+  files,
+}: SendMessageWithFilesToInboxInput) => {
+  return await sendTextMessageWithFilesToJob(
+    nodeAddress,
+    message,
+    jobId,
+    files,
+  );
+};
diff --git a/libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/types.ts b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/types.ts
similarity index 53%
rename from libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/types.ts
rename to libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/types.ts
index 180050d7d..bbcdbb6da 100644
--- a/libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/types.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/types.ts
@@ -1,18 +1,16 @@
 import type {
-  CredentialsPayload,
   ShinkaiMessage,
 } from '@shinkai_network/shinkai-message-ts/models';
 
-export type SendMessageWithFilesToInboxInput = CredentialsPayload & {
+export type SendMessageWithFilesToInboxInput = {
   nodeAddress: string;
-  sender: string;
-  receiver: string;
-  senderSubidentity: string;
+  token: string;
   message: string;
-  inboxId: string;
+  jobId: string;
   files: File[];
 };
+
 export type SendMessageWithFilesToInboxOutput = {
-  inboxId: string;
+  jobId: string;
   message: ShinkaiMessage;
 };
diff --git a/libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/useSendMessageWithFilesToInbox.ts b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/useSendMessageWithFilesToInbox.ts
similarity index 83%
rename from libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/useSendMessageWithFilesToInbox.ts
rename to libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/useSendMessageWithFilesToInbox.ts
index 5633821a4..30c2bc331 100644
--- a/libs/shinkai-node-state/src/lib/mutations/sendMesssageWithFilesToInbox/useSendMessageWithFilesToInbox.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/useSendMessageWithFilesToInbox.ts
@@ -4,8 +4,8 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { sendMessageWithFilesToInbox } from '.';
+import { FunctionKey } from '../../../lib/constants';
+import { sendMessageWithFilesToJob } from '.';
 import {
   SendMessageWithFilesToInboxInput,
   SendMessageWithFilesToInboxOutput,
@@ -20,7 +20,7 @@ type Options = UseMutationOptions<
 export const useSendMessageWithFilesToInbox = (options?: Options) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: sendMessageWithFilesToInbox,
+    mutationFn: sendMessageWithFilesToJob,
     ...options,
     onSuccess: (response, variables, context) => {
       queryClient.invalidateQueries({

From 8dc51943f49fc789e04010bc23cf051eb925b4b1 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Mon, 30 Dec 2024 23:09:31 +0530
Subject: [PATCH 06/39] fix

---
 libs/shinkai-message-ts/src/api/methods.ts                    | 4 ++--
 .../src/v2/mutations/sendMesssageWithFilesToInbox/index.ts    | 2 ++
 .../src/v2/mutations/sendMesssageWithFilesToInbox/types.ts    | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 93485dd46..e6743fe81 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -142,7 +142,7 @@ export const sendTextMessageWithFilesToJob = async (
   job_id: string,
   files: File[],
   bearerToken: string,
-): Promise<{ inboxId: string; message: ShinkaiMessage }> => {
+): Promise<{ message: ShinkaiMessage }> => {
   // Upload files using the uploadFilesToVR function
   const uploadResponse = await uploadFilesToJob(
     nodeAddress,
@@ -179,7 +179,7 @@ export const sendTextMessageWithFilesToJob = async (
   const data = response.data;
 
   // Assuming the response contains the message and inboxId
-  return { inbox_id: job_id, message: data };
+  return { message: data };
 };
 
 export const updateInboxName = async (
diff --git a/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts
index 744f65f64..bae35d49e 100644
--- a/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/index.ts
@@ -4,6 +4,7 @@ import { SendMessageWithFilesToInboxInput } from './types';
 
 export const sendMessageWithFilesToJob = async ({
   nodeAddress,
+  token,
   message,
   jobId,
   files,
@@ -13,5 +14,6 @@ export const sendMessageWithFilesToJob = async ({
     message,
     jobId,
     files,
+    token,
   );
 };
diff --git a/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/types.ts b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/types.ts
index bbcdbb6da..fa5d42f9f 100644
--- a/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/types.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMesssageWithFilesToInbox/types.ts
@@ -11,6 +11,5 @@ export type SendMessageWithFilesToInboxInput = {
 };
 
 export type SendMessageWithFilesToInboxOutput = {
-  jobId: string;
   message: ShinkaiMessage;
 };

From e3d8c3fc408577f0006dd59a35734fa2e7c7b8a5 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Mon, 30 Dec 2024 23:03:39 -0500
Subject: [PATCH 07/39] vector fs changes, fixes

---
 .../chat/context/set-job-scope-context.tsx    |  2 +-
 .../src/components/sheet/data-table-cell.tsx  |  8 ++---
 .../vector-fs/components/all-files-tab.tsx    |  6 ++--
 .../vector-fs/components/vector-fs-folder.tsx |  5 +--
 .../vector-fs/components/vector-fs-item.tsx   | 20 ++++-------
 .../src/components/create-job/create-job.tsx  |  4 +--
 libs/shinkai-message-ts/src/api/jobs/index.ts | 35 ++++++++++++++++---
 libs/shinkai-message-ts/src/api/jobs/types.ts | 30 +++++++++++-----
 libs/shinkai-message-ts/src/api/methods.ts    | 25 ++++++++-----
 .../src/api/recurring-tasks/types.ts          | 14 ++------
 .../src/models/SchemaTypes.ts                 | 22 ------------
 .../src/models/ShinkaiMessage.ts              | 12 +------
 .../src/v2/mutations/createJob/index.ts       |  9 ++---
 .../src/v2/mutations/createJob/types.ts       |  6 ++--
 .../v2/mutations/createRecurringTask/index.ts |  6 ----
 .../v2/mutations/sendMessageToJob/index.ts    |  7 ++--
 .../src/v2/mutations/updateJobScope/types.ts  |  6 ++--
 .../v2/queries/getChatConversation/index.ts   |  2 ++
 .../src/v2/queries/getJobScope/types.ts       |  2 +-
 19 files changed, 107 insertions(+), 114 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx b/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx
index 88f47c2b8..5787bfa78 100644
--- a/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx
+++ b/apps/shinkai-desktop/src/components/chat/context/set-job-scope-context.tsx
@@ -1,4 +1,4 @@
-import { ShinkaiPath } from '@shinkai_network/shinkai-message-ts/models';
+import { ShinkaiPath } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
 import { TreeCheckboxSelectionKeys } from 'primereact/tree';
 import React, { createContext, useContext, useState } from 'react';
 import { createStore, useStore } from 'zustand';
diff --git a/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx b/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
index 681a303c8..e13cddf6a 100644
--- a/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
+++ b/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
@@ -386,8 +386,8 @@ export const VectorFsScopeDrawer = ({
   const [nodes, setNodes] = useState<TreeNode[]>([]);
   const auth = useAuth((state) => state.auth);
 
-  const { data: fileInfoArray, isSuccess: isVRFilesSuccess } = useGetVRPathSimplified(
-    {
+  const { data: fileInfoArray, isSuccess: isVRFilesSuccess } =
+    useGetVRPathSimplified({
       nodeAddress: auth?.node_address ?? '',
       profile: auth?.profile ?? '',
       shinkaiIdentity: auth?.shinkai_identity ?? '',
@@ -397,8 +397,7 @@ export const VectorFsScopeDrawer = ({
       node_encryption_pk: auth?.node_encryption_pk ?? '',
       profile_encryption_sk: auth?.profile_encryption_sk ?? '',
       profile_identity_sk: auth?.profile_identity_sk ?? '',
-    },
-  );
+    });
 
   useEffect(() => {
     if (isVRFilesSuccess) {
@@ -482,6 +481,7 @@ const FileUploadButton = ({
       onDrop: async (acceptedFiles) => {
         if (!auth || !fileInboxId) return;
         try {
+          // TODO: we need a jobId to upload files in shinkai sheet
           await addFileToInbox(auth.node_address, auth.api_v2_key, {
             file: acceptedFiles[0],
             filename: encodeURIComponent(acceptedFiles[0].name),
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
index a8ca2902b..1dc62a3ad 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
@@ -492,8 +492,10 @@ const AllFiles = () => {
                 } else {
                   navigate('/inboxes', {
                     state: {
-                      selectedVRFiles: selectedFiles,
-                      selectedVRFolders: selectedFolders,
+                      selectedVRFiles: selectedFiles.map((file) => file.path),
+                      selectedVRFolders: selectedFolders.map(
+                        (folder) => folder.path,
+                      ),
                     },
                   });
                 }
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
index 4407b54b0..64c994fe3 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
@@ -92,7 +92,8 @@ const VectorFsFolder = ({
     layout === VectorFSLayout.Grid && 'bg-gray-400/30 p-2',
   );
   const totalItem =
-    (folder.child_folders?.length ?? 0) + (folder.child_items?.length ?? 0);
+    // (folder.child_folders?.length ?? 0) + (folder.child_items?.length ?? 0);
+    0;
 
   const FolderIcon = isSharedFolder ? SharedFolderIcon : DirectoryTypeIcon;
 
@@ -144,7 +145,7 @@ const VectorFsFolder = ({
                 event.stopPropagation();
                 navigate('/inboxes', {
                   state: {
-                    selectedVRFolders: [folder],
+                    selectedVRFolders: [folder.path],
                   },
                 });
               }}
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index 3c7cefedc..e9b26749d 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -77,7 +77,9 @@ const VectorFsItem = ({
     layout === VectorFSLayout.Grid && 'bg-gray-400/30 p-2',
   );
 
-  const createdDatetime = formatDateToUSLocaleString(new Date(file.created_time));
+  const createdDatetime = formatDateToUSLocaleString(
+    new Date(file.created_time),
+  );
   // const fileSize = size(file.size);
 
   if (isVRSelectionActive) {
@@ -94,12 +96,7 @@ const VectorFsItem = ({
           className="flex flex-1 items-center gap-3"
           htmlFor={`item-${file.path}`}
         >
-          {/* <FileTypeIcon
-            type={
-              file?.vr_header?.resource_source?.Standard?.FileRef?.file_type
-                ?.Document
-            }
-          /> */}
+          <FileTypeIcon type={file?.extension ?? ''} />
           <VectorFsItemInfo
             createdDatetime={createdDatetime}
             file={file}
@@ -112,12 +109,7 @@ const VectorFsItem = ({
 
   return (
     <button className={wrapperClassname} onClick={onClick}>
-      {/* <FileTypeIcon
-        type={
-          file?.vr_header?.resource_source?.Standard?.FileRef?.file_type
-            ?.Document
-        }
-      /> */}
+      <FileTypeIcon type={file?.extension ?? ''} />
       <VectorFsItemInfo
         createdDatetime={createdDatetime}
         file={file}
@@ -139,7 +131,7 @@ const VectorFsItem = ({
                 event.stopPropagation();
                 navigate('/inboxes', {
                   state: {
-                    selectedVRFiles: [file],
+                    selectedVRFiles: [file.path],
                   },
                 });
               }}
diff --git a/apps/shinkai-visor/src/components/create-job/create-job.tsx b/apps/shinkai-visor/src/components/create-job/create-job.tsx
index 048dad2e4..d9d0550c4 100644
--- a/apps/shinkai-visor/src/components/create-job/create-job.tsx
+++ b/apps/shinkai-visor/src/components/create-job/create-job.tsx
@@ -1,8 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import {
-  ShinkaiPath,
-} from '@shinkai_network/shinkai-message-ts/models/SchemaTypes';
+import { ShinkaiPath } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
 import { buildInboxIdFromJobId } from '@shinkai_network/shinkai-message-ts/utils';
 import {
   CreateJobFormSchema,
diff --git a/libs/shinkai-message-ts/src/api/jobs/index.ts b/libs/shinkai-message-ts/src/api/jobs/index.ts
index dbc39a112..364660473 100644
--- a/libs/shinkai-message-ts/src/api/jobs/index.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/index.ts
@@ -3,6 +3,7 @@ import { urlJoin } from '../../utils/url-join';
 import {
   AddFileToInboxRequest,
   AddFileToInboxResponse,
+  AddFileToJobRequest,
   AddLLMProviderRequest,
   AddLLMProviderResponse,
   CreateFilesInboxResponse,
@@ -152,20 +153,44 @@ export const addFileToInbox = async (
   return response.data as AddFileToInboxResponse;
 };
 
-export const uploadFilesToInbox = async (
+export const addFileToJob = async (
   nodeAddress: string,
   bearerToken: string,
+
+  payload: AddFileToJobRequest,
+) => {
+  const fileData = await payload.file.arrayBuffer();
+
+  const formData = new FormData();
+  formData.append('job_id', payload.job_id);
+  formData.append('filename', payload.filename);
+  formData.append('file_data', new Blob([fileData]));
+
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/upload_file_to_job'),
+    formData,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+
+  return response.data as AddFileToInboxResponse;
+};
+
+export const uploadFilesToJob = async (
+  nodeAddress: string,
+  bearerToken: string,
+  jobId: string,
   files: File[],
 ) => {
-  const folderId = await createFilesInbox(nodeAddress, bearerToken);
   for (const file of files) {
-    await addFileToInbox(nodeAddress, bearerToken, {
+    await addFileToJob(nodeAddress, bearerToken, {
       filename: encodeURIComponent(file.name),
-      file_inbox_name: folderId,
+      job_id: jobId,
       file,
     });
   }
-  return folderId;
 };
 
 export const downloadFileFromInbox = async (
diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index 20a04e121..272b88fca 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -1,4 +1,3 @@
-import { JobScope } from '../../models/SchemaTypes';
 import { AgentInbox } from '../../models/ShinkaiMessage';
 
 type ResourceSource = {
@@ -69,16 +68,23 @@ export type VRItemScope = Pick<VRItem, 'name' | 'path'> & {
   source: ResourceSource;
 };
 
+export enum VectorSearchMode {
+  FillUpTo25k = 'FillUpTo25k',
+  MergeSiblings = 'MergeSiblings',
+}
+
+export type ShinkaiPath = string;
+
+export type JobScope = {
+  vector_fs_items: ShinkaiPath[];
+  vector_fs_folders: ShinkaiPath[];
+  vector_search_mode?: VectorSearchMode[];
+};
+
 export type CreateJobRequest = {
   llm_provider: string;
   job_creation_info: {
-    scope: {
-      network_folders: [];
-      vector_fs_folders: VRFolderScope[];
-      vector_fs_items: VRItemScope[];
-      local_vrpack: [];
-      local_vrkai: [];
-    };
+    scope: JobScope;
     associated_ui:
       | 'Playground'
       | {
@@ -96,9 +102,9 @@ export type JobMessageRequest = {
   job_message: {
     job_id: string;
     content: string;
-    files_inbox: string;
     parent: string | null;
     tool_key?: string;
+    files?: string[];
   };
 };
 export type JobMessageResponse = {
@@ -308,3 +314,9 @@ export type RetryMessageRequest = {
 export type RemoveJobRequest = {
   job_id: string;
 };
+export type AddFileToJobRequest = {
+  job_id: string;
+  filename: string;
+  file: File;
+};
+export type AddFileToJobResponse = string;
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index e6743fe81..312f31a31 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -148,7 +148,7 @@ export const sendTextMessageWithFilesToJob = async (
     nodeAddress,
     bearerToken,
     job_id,
-    files
+    files,
   );
 
   if (uploadResponse.status !== 'success') {
@@ -171,9 +171,9 @@ export const sendTextMessageWithFilesToJob = async (
     {
       headers: {
         'Content-Type': 'application/json',
-        'Authorization': `Bearer ${bearerToken}`,
+        Authorization: `Bearer ${bearerToken}`,
       },
-    }
+    },
   );
 
   const data = response.data;
@@ -505,7 +505,16 @@ export const retrieveVRPathSimplified = async (
   receiver_subidentity: string,
   path = '/',
   setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
+): Promise<{
+  data: {
+    created_time: string;
+    has_embeddings: boolean;
+    is_directory: boolean;
+    modified_time: string;
+    path: string;
+  }[];
+  status: string;
+}> => {
   const messageStr = ShinkaiMessageBuilderWrapper.retrievePathSimplified(
     setupDetailsState.profile_encryption_sk,
     setupDetailsState.profile_identity_sk,
@@ -595,9 +604,9 @@ export const uploadFilesToVR = async (
         {
           headers: {
             'Content-Type': 'multipart/form-data',
-            'Authorization': `Bearer ${bearerToken}`,
+            Authorization: `Bearer ${bearerToken}`,
           },
-        }
+        },
       );
 
       if (response.status !== 200) {
@@ -1688,9 +1697,9 @@ export const uploadFilesToJob = async (
         {
           headers: {
             'Content-Type': 'multipart/form-data',
-            'Authorization': `Bearer ${bearerToken}`,
+            Authorization: `Bearer ${bearerToken}`,
           },
-        }
+        },
       );
 
       if (response.status !== 200) {
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 3d8053d0b..0d27e8acc 100644
--- a/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
+++ b/libs/shinkai-message-ts/src/api/recurring-tasks/types.ts
@@ -1,9 +1,4 @@
-import {
-  JobConfig,
-  JobMessage,
-  VRFolderScope,
-  VRItemScope,
-} from '../jobs/types';
+import { JobConfig, JobMessage } from '../jobs/types';
 
 export type RecurringTaskAction =
   | {
@@ -19,11 +14,8 @@ export type RecurringTaskAction =
         llm_provider: string;
         job_creation_info: {
           scope: {
-            network_folders: [];
-            vector_fs_folders: VRFolderScope[];
-            vector_fs_items: VRItemScope[];
-            local_vrpack: [];
-            local_vrkai: [];
+            vector_fs_folders: string[];
+            vector_fs_items: string[];
           };
           is_hidden?: boolean;
           associated_ui?: null;
diff --git a/libs/shinkai-message-ts/src/models/SchemaTypes.ts b/libs/shinkai-message-ts/src/models/SchemaTypes.ts
index c28107509..5bb30f10a 100644
--- a/libs/shinkai-message-ts/src/models/SchemaTypes.ts
+++ b/libs/shinkai-message-ts/src/models/SchemaTypes.ts
@@ -67,28 +67,6 @@ export enum MessageSchemaType {
   SearchShinkaiTool = 'SearchShinkaiTool',
 }
 
-export enum VectorSearchMode {
-  FillUpTo25k = 'FillUpTo25k',
-  MergeSiblings = 'MergeSiblings'
-}
-
-export type ShinkaiPath = string;
-
-export interface JobScope {
-  vector_fs_items: ShinkaiPath[];
-  vector_fs_folders: ShinkaiPath[];
-  vector_search_mode: VectorSearchMode[];
-}
-
-export interface JobCreation {
-  scope: JobScope;
-}
-
-export interface JobMessage {
-  job_id: string;
-  content: string;
-}
-
 export interface JobToolCall {
   tool_id: string;
   inputs: Record<string, string>;
diff --git a/libs/shinkai-message-ts/src/models/ShinkaiMessage.ts b/libs/shinkai-message-ts/src/models/ShinkaiMessage.ts
index 6835768e3..7321f2352 100644
--- a/libs/shinkai-message-ts/src/models/ShinkaiMessage.ts
+++ b/libs/shinkai-message-ts/src/models/ShinkaiMessage.ts
@@ -1,4 +1,4 @@
-import { JobScope, MessageSchemaType, TSEncryptionMethod } from './SchemaTypes';
+import { MessageSchemaType, TSEncryptionMethod } from './SchemaTypes';
 
 export interface InternalMetadata {
   sender_subidentity: string;
@@ -69,16 +69,6 @@ export type AgentInbox = {
   type: 'Agent' | 'LLMProvider';
 };
 
-export type SmartInbox = {
-  custom_name: string;
-  inbox_id: string;
-  last_message?: ShinkaiMessage;
-  is_finished: boolean;
-  job_scope?: JobScope;
-  agent?: AgentInbox;
-  datetime_created: string;
-};
-
 export type CreateChatInboxResponse = {
   status: string;
   message: string;
diff --git a/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts b/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
index 853774576..29b976019 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
@@ -2,7 +2,7 @@ import {
   createJob as createJobApi,
   sendMessageToJob,
   updateChatConfig,
-  uploadFilesToInbox,
+  uploadFilesToJob,
 } from '@shinkai_network/shinkai-message-ts/api/jobs/index';
 
 import { CreateJobInput } from './types';
@@ -26,9 +26,6 @@ export const createJob = async ({
       scope: {
         vector_fs_items: selectedVRFiles ?? [],
         vector_fs_folders: selectedVRFolders ?? [],
-        local_vrpack: [],
-        local_vrkai: [],
-        network_folders: [],
       },
       associated_ui: sheetId ? { Sheet: sheetId } : null,
       is_hidden: isHidden,
@@ -42,16 +39,14 @@ export const createJob = async ({
     });
   }
 
-  let folderId = '';
   if (files && files.length > 0) {
-    folderId = await uploadFilesToInbox(nodeAddress, token, files);
+    await uploadFilesToJob(nodeAddress, token, jobId, files);
   }
 
   await sendMessageToJob(nodeAddress, token, {
     job_message: {
       content,
       job_id: jobId,
-      files_inbox: folderId,
       parent: '',
       tool_key: toolKey,
     },
diff --git a/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts b/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts
index 4c2665355..e8999b97b 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createJob/types.ts
@@ -1,6 +1,8 @@
 import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
-import { JobConfig } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
-import { ShinkaiPath } from '@shinkai_network/shinkai-message-ts/models';
+import {
+  JobConfig,
+  ShinkaiPath,
+} from '@shinkai_network/shinkai-message-ts/api/jobs/types';
 
 export type CreateJobInput = Token & {
   nodeAddress: string;
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 f603525aa..b9c986379 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
@@ -23,9 +23,6 @@ export const createRecurringTask = async ({
       scope: {
         vector_fs_items: [],
         vector_fs_folders: [],
-        local_vrpack: [],
-        local_vrkai: [],
-        network_folders: [],
       },
       associated_ui: null,
       is_hidden: true,
@@ -43,9 +40,6 @@ export const createRecurringTask = async ({
           scope: {
             vector_fs_folders: [],
             vector_fs_items: [],
-            local_vrpack: [],
-            local_vrkai: [],
-            network_folders: [],
           },
         },
         llm_provider: llmProvider,
diff --git a/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts b/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
index 0d68f9ad0..a259c7ee4 100644
--- a/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
@@ -1,6 +1,6 @@
 import {
   sendMessageToJob as sendMessageToJobApi,
-  uploadFilesToInbox,
+  uploadFilesToJob,
 } from '@shinkai_network/shinkai-message-ts/api/jobs/index';
 
 import { SendMessageToJobInput } from './types';
@@ -14,18 +14,17 @@ export const sendMessageToJob = async ({
   files,
   toolKey,
 }: SendMessageToJobInput) => {
-  let folderId = '';
   if (files && files.length > 0) {
-    folderId = await uploadFilesToInbox(nodeAddress, token, files);
+    await uploadFilesToJob(nodeAddress, token, jobId, files);
   }
 
   return await sendMessageToJobApi(nodeAddress, token, {
     job_message: {
       content: message,
       job_id: jobId,
-      files_inbox: folderId,
       parent: parent,
       tool_key: toolKey,
+      files: [],
     },
   });
 };
diff --git a/libs/shinkai-node-state/src/v2/mutations/updateJobScope/types.ts b/libs/shinkai-node-state/src/v2/mutations/updateJobScope/types.ts
index c9333b723..d32be02ab 100644
--- a/libs/shinkai-node-state/src/v2/mutations/updateJobScope/types.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/updateJobScope/types.ts
@@ -1,6 +1,8 @@
 import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
-import { UpdateChatConfigResponse } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
-import { JobScope } from '@shinkai_network/shinkai-message-ts/models/SchemaTypes';
+import {
+  JobScope,
+  UpdateChatConfigResponse,
+} from '@shinkai_network/shinkai-message-ts/api/jobs/types';
 
 export type UpdateChatConfigOutput = UpdateChatConfigResponse;
 
diff --git a/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts b/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
index 957695737..e8fc70139 100644
--- a/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
@@ -28,6 +28,7 @@ const createUserMessage = async (
   const attachments: UserMessage['attachments'] = [];
 
   if (inbox) {
+    // TODO: list files from jobId, inboxes no longer exist
     const fileNames = await getFileNames(nodeAddress, token, {
       inboxName: inbox,
     });
@@ -42,6 +43,7 @@ const createUserMessage = async (
 
         if (name.match(/\.(jpg|jpeg|png|gif)$/i)) {
           try {
+            // TODO: download file from jobId, inboxes no longer exist
             const response = await downloadFileFromInbox(
               nodeAddress,
               token,
diff --git a/libs/shinkai-node-state/src/v2/queries/getJobScope/types.ts b/libs/shinkai-node-state/src/v2/queries/getJobScope/types.ts
index 31ee8b3b1..26262ecaf 100644
--- a/libs/shinkai-node-state/src/v2/queries/getJobScope/types.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getJobScope/types.ts
@@ -1,5 +1,5 @@
 import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
-import { JobScope } from '@shinkai_network/shinkai-message-ts/models/SchemaTypes';
+import { JobScope } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
 
 export type GetJobScopeInput = Token & {
   nodeAddress: string;

From a0dc4fcc659277617ea1de19834b6e0a8706d7fa Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Tue, 31 Dec 2024 10:53:14 +0530
Subject: [PATCH 08/39] fixes to include files in job message

---
 libs/shinkai-message-ts/src/api/jobs/index.ts | 11 ++--
 libs/shinkai-message-ts/src/api/jobs/types.ts |  5 +-
 libs/shinkai-message-ts/src/api/methods.ts    | 54 +++----------------
 .../src/v2/mutations/createJob/index.ts       |  5 +-
 .../v2/mutations/sendMessageToJob/index.ts    |  6 ++-
 5 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/libs/shinkai-message-ts/src/api/jobs/index.ts b/libs/shinkai-message-ts/src/api/jobs/index.ts
index 364660473..5c85acb6c 100644
--- a/libs/shinkai-message-ts/src/api/jobs/index.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/index.ts
@@ -129,6 +129,7 @@ export const createFilesInbox = async (
   return response.data as CreateFilesInboxResponse;
 };
 
+// TODO: remove this
 export const addFileToInbox = async (
   nodeAddress: string,
   bearerToken: string,
@@ -156,9 +157,8 @@ export const addFileToInbox = async (
 export const addFileToJob = async (
   nodeAddress: string,
   bearerToken: string,
-
   payload: AddFileToJobRequest,
-) => {
+): Promise<AddFileToInboxResponse> => {
   const fileData = await payload.file.arrayBuffer();
 
   const formData = new FormData();
@@ -183,14 +183,17 @@ export const uploadFilesToJob = async (
   bearerToken: string,
   jobId: string,
   files: File[],
-) => {
+): Promise<AddFileToInboxResponse[]> => {
+  const responses: AddFileToInboxResponse[] = [];
   for (const file of files) {
-    await addFileToJob(nodeAddress, bearerToken, {
+    const response = await addFileToJob(nodeAddress, bearerToken, {
       filename: encodeURIComponent(file.name),
       job_id: jobId,
       file,
     });
+    responses.push(response);
   }
+  return responses;
 };
 
 export const downloadFileFromInbox = async (
diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index 272b88fca..8e7e3dc88 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -168,7 +168,10 @@ export type AddFileToInboxRequest = {
   filename: string;
   file: File;
 };
-export type AddFileToInboxResponse = string;
+export type AddFileToInboxResponse = {
+  message: string;
+  path: string;
+};
 
 export type LLMProvider = {
   id: string;
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 312f31a31..8086a1b63 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -5,8 +5,6 @@ import {
   CreateChatInboxResponse,
   CredentialsPayload,
   JobCredentialsPayload,
-  LastMessagesFromInboxCredentialsPayload,
-  LLMProvider,
   SetupPayload,
   ShinkaiMessage,
 } from '../models';
@@ -14,12 +12,11 @@ import {
   APIUseRegistrationCodeSuccessResponse,
   SubmitInitialRegistrationNoCodePayload,
 } from '../models/Payloads';
-import { SerializedLLMProvider } from '../models/SchemaTypes';
 import { InboxNameWrapper } from '../pkg/shinkai_message_wasm';
 import { urlJoin } from '../utils/url-join';
-import { FileUploader } from '../wasm/FileUploaderUsingSymmetricKeyManager';
 import { ShinkaiMessageBuilderWrapper } from '../wasm/ShinkaiMessageBuilderWrapper';
 import { ShinkaiNameWrapper } from '../wasm/ShinkaiNameWrapper';
+import { uploadFilesToJob } from './jobs';
 
 export const fetchPublicKey =
   (nodeAddress: string) => async (): Promise<any> => {
@@ -143,24 +140,25 @@ export const sendTextMessageWithFilesToJob = async (
   files: File[],
   bearerToken: string,
 ): Promise<{ message: ShinkaiMessage }> => {
-  // Upload files using the uploadFilesToVR function
-  const uploadResponse = await uploadFilesToJob(
+  // Upload files using the uploadFilesToJob function
+  const uploadResponses = await uploadFilesToJob(
     nodeAddress,
     bearerToken,
     job_id,
     files,
   );
 
-  if (uploadResponse.status !== 'success') {
-    throw new Error('Failed to upload files');
-  }
+  // Extract file paths from the upload responses
+  const filePaths = uploadResponses.map(response => response.path);
+
+  console.log('filePaths: ', filePaths);
 
   // Prepare the message payload
   const messagePayload = {
     job_message: {
       job_id,
       content: text_message,
-      files: [], // update with an array of string with the file paths
+      files: filePaths,
     },
   };
 
@@ -1677,39 +1675,3 @@ export const removeRowsSheet = async (
   const data = response.data;
   return data;
 };
-
-export const uploadFilesToJob = async (
-  nodeAddress: string,
-  bearerToken: string,
-  jobId: string,
-  files: File[],
-): Promise<{ status: string }> => {
-  try {
-    for (const fileToUpload of files) {
-      const formData = new FormData();
-      formData.append('file_data', fileToUpload);
-      formData.append('filename', fileToUpload.name);
-      formData.append('job_id', jobId);
-
-      const response = await httpClient.post(
-        urlJoin(nodeAddress, '/v2/upload_file_to_job'),
-        formData,
-        {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-            Authorization: `Bearer ${bearerToken}`,
-          },
-        },
-      );
-
-      if (response.status !== 200) {
-        throw new Error(`Failed to upload file: ${fileToUpload.name}`);
-      }
-    }
-
-    return { status: 'success' };
-  } catch (error) {
-    console.error('Error uploadFilesToJob:', error);
-    throw error;
-  }
-};
diff --git a/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts b/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
index 29b976019..cfdf64df4 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
@@ -39,8 +39,10 @@ export const createJob = async ({
     });
   }
 
+  let filePaths: string[] = [];
   if (files && files.length > 0) {
-    await uploadFilesToJob(nodeAddress, token, jobId, files);
+    const uploadResponses = await uploadFilesToJob(nodeAddress, token, jobId, files);
+    filePaths = uploadResponses.map(response => response.path);
   }
 
   await sendMessageToJob(nodeAddress, token, {
@@ -49,6 +51,7 @@ export const createJob = async ({
       job_id: jobId,
       parent: '',
       tool_key: toolKey,
+      files: filePaths,
     },
   });
 
diff --git a/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts b/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
index a259c7ee4..d08516c19 100644
--- a/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
@@ -14,8 +14,10 @@ export const sendMessageToJob = async ({
   files,
   toolKey,
 }: SendMessageToJobInput) => {
+  let filePaths: string[] = [];
   if (files && files.length > 0) {
-    await uploadFilesToJob(nodeAddress, token, jobId, files);
+    const uploadResponses = await uploadFilesToJob(nodeAddress, token, jobId, files);
+    filePaths = uploadResponses.map(response => response.path);
   }
 
   return await sendMessageToJobApi(nodeAddress, token, {
@@ -24,7 +26,7 @@ export const sendMessageToJob = async ({
       job_id: jobId,
       parent: parent,
       tool_key: toolKey,
-      files: [],
+      files: filePaths,
     },
   });
 };

From 454876729a50d38d3b89f376008eebf499b22522 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Tue, 31 Dec 2024 18:17:07 +0530
Subject: [PATCH 09/39] fixes

---
 libs/shinkai-message-ts/src/api/jobs/types.ts              | 5 +++--
 libs/shinkai-message-ts/src/api/methods.ts                 | 7 +++----
 .../shinkai-node-state/src/v2/mutations/createJob/index.ts | 7 ++++---
 .../src/v2/mutations/sendMessageToJob/index.ts             | 7 ++++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index 8e7e3dc88..2595063e2 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -104,7 +104,8 @@ export type JobMessageRequest = {
     content: string;
     parent: string | null;
     tool_key?: string;
-    files?: string[];
+    fs_files_paths?: string[];
+    job_filenames?: string[];
   };
 };
 export type JobMessageResponse = {
@@ -170,7 +171,7 @@ export type AddFileToInboxRequest = {
 };
 export type AddFileToInboxResponse = {
   message: string;
-  path: string;
+  filename: string;
 };
 
 export type LLMProvider = {
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 8086a1b63..c95549130 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -149,16 +149,15 @@ export const sendTextMessageWithFilesToJob = async (
   );
 
   // Extract file paths from the upload responses
-  const filePaths = uploadResponses.map(response => response.path);
-
-  console.log('filePaths: ', filePaths);
+  const filenames = uploadResponses.map(response => response.filename);
 
   // Prepare the message payload
   const messagePayload = {
     job_message: {
       job_id,
       content: text_message,
-      files: filePaths,
+      fs_files_paths: [],
+      job_filenames: filenames,
     },
   };
 
diff --git a/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts b/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
index cfdf64df4..9ce1500f9 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createJob/index.ts
@@ -39,10 +39,10 @@ export const createJob = async ({
     });
   }
 
-  let filePaths: string[] = [];
+  let filenames: string[] = [];
   if (files && files.length > 0) {
     const uploadResponses = await uploadFilesToJob(nodeAddress, token, jobId, files);
-    filePaths = uploadResponses.map(response => response.path);
+    filenames = uploadResponses.map(response => response.filename);
   }
 
   await sendMessageToJob(nodeAddress, token, {
@@ -51,7 +51,8 @@ export const createJob = async ({
       job_id: jobId,
       parent: '',
       tool_key: toolKey,
-      files: filePaths,
+      fs_files_paths: [],
+      job_filenames: filenames,
     },
   });
 
diff --git a/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts b/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
index d08516c19..e6d27edc7 100644
--- a/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/sendMessageToJob/index.ts
@@ -14,10 +14,10 @@ export const sendMessageToJob = async ({
   files,
   toolKey,
 }: SendMessageToJobInput) => {
-  let filePaths: string[] = [];
+  let filenames: string[] = [];
   if (files && files.length > 0) {
     const uploadResponses = await uploadFilesToJob(nodeAddress, token, jobId, files);
-    filePaths = uploadResponses.map(response => response.path);
+    filenames = uploadResponses.map(response => response.filename);
   }
 
   return await sendMessageToJobApi(nodeAddress, token, {
@@ -26,7 +26,8 @@ export const sendMessageToJob = async ({
       job_id: jobId,
       parent: parent,
       tool_key: toolKey,
-      files: filePaths,
+      fs_files_paths: [],
+      job_filenames: filenames,
     },
   });
 };

From 0251a178bead4d1e261209306cf04cff95016608 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Tue, 31 Dec 2024 14:49:33 -0500
Subject: [PATCH 10/39] fix: attachments in chat

---
 libs/shinkai-message-ts/src/api/jobs/index.ts | 32 ++++++++----
 libs/shinkai-message-ts/src/api/jobs/types.ts |  9 +++-
 .../v2/queries/getChatConversation/index.ts   | 49 +++++++++++++------
 3 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/libs/shinkai-message-ts/src/api/jobs/index.ts b/libs/shinkai-message-ts/src/api/jobs/index.ts
index 5c85acb6c..b61b3375b 100644
--- a/libs/shinkai-message-ts/src/api/jobs/index.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/index.ts
@@ -14,6 +14,8 @@ import {
   GetChatConfigResponse,
   GetFileNamesRequest,
   GetFileNamesResponse,
+  GetJobFolderNameRequest,
+  GetJobFolderNameResponse,
   GetJobScopeRequest,
   GetJobScopeResponse,
   GetLastMessagesRequest,
@@ -196,23 +198,35 @@ export const uploadFilesToJob = async (
   return responses;
 };
 
-export const downloadFileFromInbox = async (
+export const getJobFolderName = async (
   nodeAddress: string,
   bearerToken: string,
-  inboxName: string,
-  filename: string,
+  payload: GetJobFolderNameRequest,
 ) => {
   const response = await httpClient.get(
-    urlJoin(
-      nodeAddress,
-      `/v2/download_file_from_inbox/${inboxName}/${decodeURIComponent(filename)}`,
-    ),
+    urlJoin(nodeAddress, '/v2/get_folder_name_for_job'),
     {
       headers: { Authorization: `Bearer ${bearerToken}` },
-      responseType: 'blob',
+      responseType: 'json',
+      params: { job_id: payload.job_id },
+    },
+  );
+  return response.data as GetJobFolderNameResponse;
+};
+
+export const downloadFileFromJob = async (
+  nodeAddress: string,
+  bearerToken: string,
+  filePath: string,
+) => {
+  const response = await httpClient.get(
+    urlJoin(nodeAddress, `/v2/download_file`),
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      params: { path: filePath },
     },
   );
-  return response.data as Blob;
+  return response.data as string;
 };
 
 export const getLLMProviders = async (
diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index 2595063e2..ebb519b77 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -135,7 +135,6 @@ export type JobMessage = {
   job_id: string;
   callback?: null;
   content: string;
-  files_inbox: string;
   parent?: string;
   sheet_job_data?: null;
   tool_key?: string;
@@ -151,6 +150,8 @@ export type JobMessage = {
       response?: string;
     }[];
   };
+  fs_files_paths: ShinkaiPath[];
+  job_filenames: string[];
 };
 export type ChatMessage = {
   job_message: JobMessage;
@@ -324,3 +325,9 @@ export type AddFileToJobRequest = {
   file: File;
 };
 export type AddFileToJobResponse = string;
+export type GetJobFolderNameRequest = {
+  job_id: string;
+};
+export type GetJobFolderNameResponse = {
+  folder_name: string;
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts b/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
index e8fc70139..c93216bbb 100644
--- a/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
@@ -1,10 +1,11 @@
 import { ToolStatusType } from '@shinkai_network/shinkai-message-ts/api/general/types';
 import {
-  downloadFileFromInbox,
-  getFileNames,
+  downloadFileFromJob,
+  getJobFolderName,
   getLastMessagesWithBranches,
 } from '@shinkai_network/shinkai-message-ts/api/jobs/index';
 import { ChatMessage } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
+import { extractJobIdFromInbox } from '@shinkai_network/shinkai-message-ts/utils/inbox_name_handler';
 
 import {
   Artifact,
@@ -21,17 +22,15 @@ const createUserMessage = async (
   message: ChatMessage,
   nodeAddress: string,
   token: string,
+  folderName: string,
 ): Promise<UserMessage> => {
   const text = message.job_message.content;
 
-  const inbox = message.job_message?.files_inbox;
+  const hasFiles = message.job_message?.job_filenames?.length > 0;
   const attachments: UserMessage['attachments'] = [];
 
-  if (inbox) {
-    // TODO: list files from jobId, inboxes no longer exist
-    const fileNames = await getFileNames(nodeAddress, token, {
-      inboxName: inbox,
-    });
+  if (hasFiles) {
+    const fileNames = message.job_message.job_filenames;
 
     await Promise.all(
       fileNames?.map(async (name) => {
@@ -43,15 +42,22 @@ const createUserMessage = async (
 
         if (name.match(/\.(jpg|jpeg|png|gif)$/i)) {
           try {
-            // TODO: download file from jobId, inboxes no longer exist
-            const response = await downloadFileFromInbox(
+            const fileNameBase = name.split('/')?.at(-1) ?? 'untitled_tool';
+            const fileExtension = fileNameBase.split('.')?.at(-1) ?? '';
+            const base64String = await downloadFileFromJob(
               nodeAddress,
               token,
-              inbox,
-              name,
+              `${folderName}/${name}`,
             );
-            if (response) {
-              const blob = new Blob([response]);
+            if (base64String) {
+              const byteCharacters = atob(base64String);
+              const byteNumbers = new Array(byteCharacters.length)
+                .fill(0)
+                .map((_, i) => byteCharacters.charCodeAt(i));
+              const byteArray = new Uint8Array(byteNumbers);
+              const blob = new Blob([byteArray], {
+                type: `image/${fileExtension}`,
+              });
               file.type = 'image';
               file.preview = URL.createObjectURL(blob);
             }
@@ -152,6 +158,14 @@ export const getChatConversation = async ({
     offset_key: lastKey,
   });
 
+  const { folder_name: folderName } = await getJobFolderName(
+    nodeAddress,
+    token,
+    {
+      job_id: extractJobIdFromInbox(inboxId),
+    },
+  );
+
   const flattenMessages = data.flat(1);
 
   const uniqueParentHashes = new Set<string>();
@@ -173,7 +187,12 @@ export const getChatConversation = async ({
         : 'assistant';
 
     if (role === 'user') {
-      const userMessage = await createUserMessage(message, nodeAddress, token);
+      const userMessage = await createUserMessage(
+        message,
+        nodeAddress,
+        token,
+        folderName,
+      );
       messagesV2.push(userMessage);
     } else {
       const assistantMessage = createAssistantMessage(message);

From ea4e3ed210cac302b2a3399209156db960a108e4 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Tue, 31 Dec 2024 18:29:14 -0500
Subject: [PATCH 11/39] update v2

---
 .../components/vector-fs-folder-options.tsx   |  36 ++----
 .../vector-fs/components/vector-fs-folder.tsx |   4 +-
 .../components/vector-fs-item-options.tsx     |  61 ++++------
 .../node-files/vector-fs-folder-options.tsx   |  36 ++----
 .../node-files/vector-fs-item-options.tsx     |  40 ++-----
 .../src/api/vector-fs/index.ts                | 112 +++++++++++++++++-
 .../src/api/vector-fs/types.ts                |  33 ++++++
 .../src/lib/mutations/copyVRFolder/index.ts   |  33 ------
 .../src/lib/mutations/copyVRFolder/types.ts   |  13 --
 .../src/lib/mutations/copyVRItem/index.ts     |  33 ------
 .../src/lib/mutations/copyVRItem/types.ts     |  13 --
 .../src/lib/mutations/deleteVRFolder/index.ts |  31 -----
 .../src/lib/mutations/deleteVRFolder/types.ts |  12 --
 .../src/lib/mutations/deleteVRItem/index.ts   |  31 -----
 .../src/lib/mutations/deleteVRItem/types.ts   |  12 --
 .../mutations/deleteVRItem/useDeleteVRItem.ts |  28 -----
 .../src/lib/mutations/moveVRFolder/index.ts   |  33 ------
 .../src/lib/mutations/moveVRFolder/types.ts   |  13 --
 .../src/lib/mutations/moveVRItem/index.ts     |  33 ------
 .../src/lib/mutations/moveVRItem/types.ts     |  13 --
 .../src/v2/mutations/copyFolder/index.ts      |  15 +++
 .../src/v2/mutations/copyFolder/types.ts      |  10 ++
 .../mutations/copyFolder/useCopyFolder.ts}    |  14 +--
 .../src/v2/mutations/copyFsItem/index.ts      |  15 +++
 .../src/v2/mutations/copyFsItem/types.ts      |  10 ++
 .../mutations/copyFsItem/useCopyFsItem.ts}    |  10 +-
 .../src/v2/mutations/moveFolder/index.ts      |  16 +++
 .../src/v2/mutations/moveFolder/types.ts      |  10 ++
 .../mutations/moveFolder/useMoveFolder.ts}    |  19 +--
 .../src/v2/mutations/moveFsItem/index.ts      |  15 +++
 .../src/v2/mutations/moveFsItem/types.ts      |  10 ++
 .../mutations/moveFsItem/useMoveFsItem.ts}    |  14 +--
 .../src/v2/mutations/removeFolder/index.ts    |  13 ++
 .../src/v2/mutations/removeFolder/types.ts    |   9 ++
 .../mutations/removeFolder/useRemoveFolder.ts |  33 ++++++
 .../src/v2/mutations/removeFsItem/index.ts    |  13 ++
 .../src/v2/mutations/removeFsItem/types.ts    |   8 ++
 .../removeFsItem/useRemoveFsItem.ts}          |  14 +--
 38 files changed, 409 insertions(+), 459 deletions(-)
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/copyVRFolder/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/copyVRFolder/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/copyVRItem/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/copyVRItem/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/deleteVRItem/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/deleteVRItem/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/deleteVRItem/useDeleteVRItem.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/moveVRFolder/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/moveVRFolder/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/moveVRItem/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/moveVRItem/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/copyFolder/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/copyFolder/types.ts
 rename libs/shinkai-node-state/src/{lib/mutations/moveVRItem/useMoveVRItem.ts => v2/mutations/copyFolder/useCopyFolder.ts} (52%)
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/copyFsItem/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/copyFsItem/types.ts
 rename libs/shinkai-node-state/src/{lib/mutations/copyVRItem/useCopyVrItem.ts => v2/mutations/copyFsItem/useCopyFsItem.ts} (71%)
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/moveFolder/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/moveFolder/types.ts
 rename libs/shinkai-node-state/src/{lib/mutations/deleteVRFolder/useDeleteVRFolder.ts => v2/mutations/moveFolder/useMoveFolder.ts} (53%)
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/moveFsItem/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/moveFsItem/types.ts
 rename libs/shinkai-node-state/src/{lib/mutations/copyVRFolder/useCopyVrFolder.ts => v2/mutations/moveFsItem/useMoveFsItem.ts} (52%)
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeFolder/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeFolder/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeFolder/useRemoveFolder.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeFsItem/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/removeFsItem/types.ts
 rename libs/shinkai-node-state/src/{lib/mutations/moveVRFolder/useMoveVRFolder.ts => v2/mutations/removeFsItem/useRemoveFsItem.ts} (51%)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
index 1f70f35e0..2b42cb8dd 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
@@ -5,11 +5,11 @@ import {
   ShareFolderFormSchema,
   shareFolderFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
-import { useCopyVrFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/copyVRFolder/useCopyVrFolder';
 import { useCreateShareableFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createShareableFolder/useCreateShareableFolder';
-import { useDeleteVrFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/deleteVRFolder/useDeleteVRFolder';
-import { useMoveVrFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/moveVRFolder/useMoveVRFolder';
 import { useUnshareFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/unshareFolder/useUnshareFolder';
+import { useCopyFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/copyFolder/useCopyFolder';
+import { useMoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/moveFolder/useMoveFolder';
+import { useRemoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFolder/useRemoveFolder';
 import {
   Alert,
   AlertDescription,
@@ -48,7 +48,7 @@ export const VectorFsFolderMoveAction = () => {
   );
 
   const { mutateAsync: moveVrFolder, isPending: isMovingVrFolder } =
-    useMoveVrFolder({
+    useMoveFolder({
       onSuccess: () => {
         setCurrentGlobalPath(destinationFolderPath ?? '/');
         closeDrawerMenu();
@@ -80,15 +80,9 @@ export const VectorFsFolderMoveAction = () => {
           onClick={async () => {
             await moveVrFolder({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFolder?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
@@ -104,7 +98,7 @@ export const VectorFsFolderDeleteAction = () => {
   const auth = useAuth((state) => state.auth);
   const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
 
-  const { mutateAsync: deleteVrFolder, isPending } = useDeleteVrFolder({
+  const { mutateAsync: deleteVrFolder, isPending } = useRemoveFolder({
     onSuccess: () => {
       closeDrawerMenu();
       toast.success(t('vectorFs.success.folderDeleted'));
@@ -135,14 +129,8 @@ export const VectorFsFolderDeleteAction = () => {
           onClick={async () => {
             await deleteVrFolder({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               folderPath: selectedFolder?.path ?? '',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
           variant="destructive"
@@ -167,7 +155,7 @@ export const VectorFsFolderCopyAction = () => {
     (state) => state.destinationFolderPath,
   );
 
-  const { mutateAsync: copyVrFolder, isPending } = useCopyVrFolder({
+  const { mutateAsync: copyVrFolder, isPending } = useCopyFolder({
     onSuccess: () => {
       setCurrentGlobalPath(destinationFolderPath ?? '/');
       closeDrawerMenu();
@@ -199,15 +187,9 @@ export const VectorFsFolderCopyAction = () => {
           onClick={async () => {
             await copyVrFolder({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFolder?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
index 64c994fe3..c99261c9c 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
@@ -21,7 +21,7 @@ import {
   DirectoryTypeIcon,
   SharedFolderIcon,
 } from '@shinkai_network/shinkai-ui/assets';
-import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
+// import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
 import {
   CopyIcon,
@@ -53,7 +53,7 @@ export const VectorFsFolderInfo = ({
       <div className="truncate text-sm font-medium">{folder.name}</div>
       {layout === VectorFSLayout.List && !allowFolderNameOnly && (
         <p className="text-xs font-medium text-gray-100">
-          <span>{formatDateToUSLocaleString(folder.created_datetime)}</span> -{' '}
+          {/*<span>{formatDateToUSLocaleString(folder.created_datetime)}</span> -{' '}*/}
           <span>{totalItem} items</span>
         </p>
       )}
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
index 506766fb1..04ff5c1c0 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { useCopyVrItem } from '@shinkai_network/shinkai-node-state/lib/mutations/copyVRItem/useCopyVrItem';
-import { useDeleteVRItem } from '@shinkai_network/shinkai-node-state/lib/mutations/deleteVRItem/useDeleteVRItem';
-import { useMoveVRItem } from '@shinkai_network/shinkai-node-state/lib/mutations/moveVRItem/useMoveVRItem';
+import { useCopyFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/copyFsItem/useCopyFsItem';
+import { useMoveFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/moveFsItem/useMoveFsItem';
+import { useRemoveFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFsItem/useRemoveFsItem';
 import {
   Button,
   DrawerFooter,
@@ -30,17 +30,16 @@ export const VectorFsItemMoveAction = () => {
     (state) => state.destinationFolderPath,
   );
 
-  const { mutateAsync: moveVrFolder, isPending: isMovingVrFolder } =
-    useMoveVRItem({
-      onSuccess: () => {
-        setCurrentGlobalPath(destinationFolderPath ?? '/');
-        closeDrawerMenu();
-        toast.success(t('vectorFs.success.fileMoved'));
-      },
-      onError: () => {
-        toast.error(t('vectorFs.errors.fileMoved'));
-      },
-    });
+  const { mutateAsync: moveFsItem, isPending: isMovingFsItem } = useMoveFsItem({
+    onSuccess: () => {
+      setCurrentGlobalPath(destinationFolderPath ?? '/');
+      closeDrawerMenu();
+      toast.success(t('vectorFs.success.fileMoved'));
+    },
+    onError: () => {
+      toast.error(t('vectorFs.errors.fileMoved'));
+    },
+  });
 
   return (
     <React.Fragment>
@@ -59,19 +58,13 @@ export const VectorFsItemMoveAction = () => {
         <Button
           className="mt-4"
           disabled={destinationFolderPath === selectedFile?.path}
-          isLoading={isMovingVrFolder}
+          isLoading={isMovingFsItem}
           onClick={async () => {
-            await moveVrFolder({
+            await moveFsItem({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFile?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
@@ -87,7 +80,7 @@ export const VectorFsItemDeleteAction = () => {
   const auth = useAuth((state) => state.auth);
   const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
 
-  const { mutateAsync: deleteVrItem, isPending } = useDeleteVRItem({
+  const { mutateAsync: deleteVrItem, isPending } = useRemoveFsItem({
     onSuccess: () => {
       closeDrawerMenu();
       toast.success(t('vectorFs.success.fileDeleted'));
@@ -119,14 +112,8 @@ export const VectorFsItemDeleteAction = () => {
           onClick={async () => {
             await deleteVrItem({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               itemPath: selectedFile?.path ?? '',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
           variant="destructive"
@@ -150,7 +137,7 @@ export const VectorFsItemCopyAction = () => {
     (state) => state.destinationFolderPath,
   );
 
-  const { mutateAsync: copyVrFolder, isPending } = useCopyVrItem({
+  const { mutateAsync: copyFsItem, isPending } = useCopyFsItem({
     onSuccess: () => {
       setCurrentGlobalPath(destinationFolderPath ?? '/');
       closeDrawerMenu();
@@ -180,17 +167,11 @@ export const VectorFsItemCopyAction = () => {
           disabled={destinationFolderPath === selectedFile?.path}
           isLoading={isPending}
           onClick={async () => {
-            await copyVrFolder({
+            await copyFsItem({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFile?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx
index 12f191068..ad225ad04 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx
@@ -5,11 +5,11 @@ import {
   ShareFolderFormSchema,
   shareFolderFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
-import { useCopyVrFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/copyVRFolder/useCopyVrFolder';
 import { useCreateShareableFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createShareableFolder/useCreateShareableFolder';
-import { useDeleteVrFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/deleteVRFolder/useDeleteVRFolder';
-import { useMoveVrFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/moveVRFolder/useMoveVRFolder';
 import { useUnshareFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/unshareFolder/useUnshareFolder';
+import { useCopyFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/copyFolder/useCopyFolder';
+import { useMoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/moveFolder/useMoveFolder';
+import { useRemoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFolder/useRemoveFolder';
 import {
   Alert,
   AlertDescription,
@@ -48,7 +48,7 @@ export const VectorFsFolderMoveAction = () => {
   );
 
   const { mutateAsync: moveVrFolder, isPending: isMovingVrFolder } =
-    useMoveVrFolder({
+    useMoveFolder({
       onSuccess: () => {
         setCurrentGlobalPath(destinationFolderPath ?? '/');
         closeDrawerMenu();
@@ -80,15 +80,9 @@ export const VectorFsFolderMoveAction = () => {
           onClick={async () => {
             await moveVrFolder({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFolder?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
@@ -104,7 +98,7 @@ export const VectorFsFolderDeleteAction = () => {
   const auth = useAuth((state) => state.auth);
   const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
 
-  const { mutateAsync: deleteVrFolder, isPending } = useDeleteVrFolder({
+  const { mutateAsync: deleteVrFolder, isPending } = useRemoveFolder({
     onSuccess: () => {
       closeDrawerMenu();
       toast.success(t('vectorFs.success.folderDeleted'));
@@ -135,14 +129,8 @@ export const VectorFsFolderDeleteAction = () => {
           onClick={async () => {
             await deleteVrFolder({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               folderPath: selectedFolder?.path ?? '',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
           variant="destructive"
@@ -166,7 +154,7 @@ export const VectorFsFolderCopyAction = () => {
     (state) => state.destinationFolderPath,
   );
 
-  const { mutateAsync: copyVrFolder, isPending } = useCopyVrFolder({
+  const { mutateAsync: copyVrFolder, isPending } = useCopyFolder({
     onSuccess: () => {
       setCurrentGlobalPath(destinationFolderPath ?? '/');
       closeDrawerMenu();
@@ -198,15 +186,9 @@ export const VectorFsFolderCopyAction = () => {
           onClick={async () => {
             await copyVrFolder({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFolder?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-item-options.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-item-options.tsx
index 7115420a5..2a4bf272f 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-item-options.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-item-options.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { useCopyVrItem } from '@shinkai_network/shinkai-node-state/lib/mutations/copyVRItem/useCopyVrItem';
-import { useDeleteVRItem } from '@shinkai_network/shinkai-node-state/lib/mutations/deleteVRItem/useDeleteVRItem';
-import { useMoveVRItem } from '@shinkai_network/shinkai-node-state/lib/mutations/moveVRItem/useMoveVRItem';
+import { useCopyFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/copyFsItem/useCopyFsItem';
+import { useMoveFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/moveFsItem/useMoveFsItem';
+import { useRemoveFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFsItem/useRemoveFsItem';
 import {
   Button,
   DrawerFooter,
@@ -30,8 +30,8 @@ export const VectorFsItemMoveAction = () => {
     (state) => state.destinationFolderPath,
   );
 
-  const { mutateAsync: moveVrFolder, isPending: isMovingVrFolder } =
-    useMoveVRItem({
+  const { mutateAsync: moveFsItem, isPending: isMovingVrFolder } =
+    useMoveFsItem({
       onSuccess: () => {
         setCurrentGlobalPath(destinationFolderPath ?? '/');
         closeDrawerMenu();
@@ -61,17 +61,11 @@ export const VectorFsItemMoveAction = () => {
           disabled={destinationFolderPath === selectedFile?.path}
           isLoading={isMovingVrFolder}
           onClick={async () => {
-            await moveVrFolder({
+            await moveFsItem({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFile?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
@@ -87,7 +81,7 @@ export const VectorFsItemDeleteAction = () => {
   const auth = useAuth((state) => state.auth);
   const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
 
-  const { mutateAsync: deleteVrItem, isPending } = useDeleteVRItem({
+  const { mutateAsync: deleteVrItem, isPending } = useRemoveFsItem({
     onSuccess: () => {
       closeDrawerMenu();
       toast.success(t('vectorFs.success.fileDeleted'));
@@ -119,14 +113,8 @@ export const VectorFsItemDeleteAction = () => {
           onClick={async () => {
             await deleteVrItem({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               itemPath: selectedFile?.path ?? '',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
           variant="destructive"
@@ -150,7 +138,7 @@ export const VectorFsItemCopyAction = () => {
     (state) => state.destinationFolderPath,
   );
 
-  const { mutateAsync: copyVrFolder, isPending } = useCopyVrItem({
+  const { mutateAsync: copyVrFolder, isPending } = useCopyFsItem({
     onSuccess: () => {
       setCurrentGlobalPath(destinationFolderPath ?? '/');
       closeDrawerMenu();
@@ -182,15 +170,9 @@ export const VectorFsItemCopyAction = () => {
           onClick={async () => {
             await copyVrFolder({
               nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
+              token: auth?.api_v2_key ?? '',
               originPath: selectedFile?.path ?? '',
               destinationPath: destinationFolderPath ?? '/',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
             });
           }}
         >
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/index.ts b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
index 7a1f7f381..7c6f2cb7f 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/index.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
@@ -1,6 +1,21 @@
 import { httpClient } from '../../http-client';
 import { urlJoin } from '../../utils/url-join';
-import { RetrieveSourceFileRequest, RetrieveSourceFileResponse } from './types';
+import {
+  CopyFolderRequest,
+  CopyFolderResponse,
+  CopyFsItemRequest,
+  CopyFsItemResponse,
+  MoveFolderRequest,
+  MoveFolderResponse,
+  MoveFsItemRequest,
+  MoveFsItemResponse,
+  RemoveFolderRequest,
+  RemoveFolderResponse,
+  RemoveFsItemRequest,
+  RemoveFsItemResponse,
+  RetrieveSourceFileRequest,
+  RetrieveSourceFileResponse,
+} from './types';
 
 export const retrieveSourceFile = async (
   nodeAddress: string,
@@ -17,3 +32,98 @@ export const retrieveSourceFile = async (
   );
   return response.data as RetrieveSourceFileResponse;
 };
+export const copyFolder = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: CopyFolderRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/copy_folder'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as CopyFolderResponse;
+};
+
+export const moveFolder = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: MoveFolderRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/move_folder'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as MoveFolderResponse;
+};
+
+export const removeFolder = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: RemoveFolderRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/delete_folder'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as RemoveFolderResponse;
+};
+
+export const copyFsItem = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: CopyFsItemRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/copy_item'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as CopyFsItemResponse;
+};
+
+export const moveFsItem = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: MoveFsItemRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/move_folder'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as MoveFsItemResponse;
+};
+
+export const removeFsItem = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: RemoveFsItemRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/delete_item'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as RemoveFsItemResponse;
+};
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/types.ts b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
index 9e6bcf419..7cb6b853b 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/types.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
@@ -3,3 +3,36 @@ export type RetrieveSourceFileRequest = {
 };
 
 export type RetrieveSourceFileResponse = string;
+
+export type MoveFolderRequest = {
+  origin_path: string;
+  destination_path: string;
+};
+export type MoveFolderResponse = string;
+
+export type MoveFsItemRequest = {
+  origin_path: string;
+  destination_path: string;
+};
+export type MoveFsItemResponse = string;
+
+export type CopyFolderRequest = {
+  origin_path: string;
+  destination_path: string;
+};
+export type CopyFolderResponse = string;
+
+export type CopyFsItemRequest = {
+  origin_path: string;
+  destination_path: string;
+};
+export type CopyFsItemResponse = string;
+
+export type RemoveFolderRequest = {
+  path: string;
+};
+export type RemoveFolderResponse = string;
+export type RemoveFsItemRequest = {
+  path: string;
+};
+export type RemoveFsItemResponse = string;
diff --git a/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/index.ts b/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/index.ts
deleted file mode 100644
index 207907661..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { copyFolderVR } from '@shinkai_network/shinkai-message-ts/api';
-
-import { CopyVRFolderInput } from './types';
-
-export const copyVRFolder = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  originPath,
-  destinationPath,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: CopyVRFolderInput) => {
-  return await copyFolderVR(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    originPath,
-    destinationPath,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/types.ts b/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/types.ts
deleted file mode 100644
index ddead75fe..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type CopyVRFolderOutput = {
-  status: string;
-};
-
-export type CopyVRFolderInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  originPath: string;
-  destinationPath: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/copyVRItem/index.ts b/libs/shinkai-node-state/src/lib/mutations/copyVRItem/index.ts
deleted file mode 100644
index fe5080984..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/copyVRItem/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { copyItemVR } from '@shinkai_network/shinkai-message-ts/api';
-
-import { CopyVRItemInput } from './types';
-
-export const copyVRItem = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  originPath,
-  destinationPath,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: CopyVRItemInput) => {
-  return await copyItemVR(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    originPath,
-    destinationPath,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/copyVRItem/types.ts b/libs/shinkai-node-state/src/lib/mutations/copyVRItem/types.ts
deleted file mode 100644
index dcb324ada..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/copyVRItem/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type CopyVRItemOutput = {
-  status: string;
-};
-
-export type CopyVRItemInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  originPath: string;
-  destinationPath: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/index.ts b/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/index.ts
deleted file mode 100644
index 92a5767c8..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { deleteFolderVR } from '@shinkai_network/shinkai-message-ts/api';
-
-import { DeleteVRFolderInput } from './types';
-
-export const deleteVRFolder = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  folderPath,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: DeleteVRFolderInput) => {
-  return await deleteFolderVR(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    folderPath,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/types.ts b/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/types.ts
deleted file mode 100644
index dcdd831c8..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type DeleteVRFolderOutput = {
-  status: string;
-};
-
-export type DeleteVRFolderInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  folderPath: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/index.ts b/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/index.ts
deleted file mode 100644
index 6011d479a..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { deleteItemVR } from '@shinkai_network/shinkai-message-ts/api';
-
-import { DeleteVRItemInput } from './types';
-
-export const deleteVRItem = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  itemPath,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: DeleteVRItemInput) => {
-  return await deleteItemVR(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    itemPath,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/types.ts b/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/types.ts
deleted file mode 100644
index d145fb0ff..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type DeleteVRItemOutput = {
-  status: string;
-};
-
-export type DeleteVRItemInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  itemPath: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/useDeleteVRItem.ts b/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/useDeleteVRItem.ts
deleted file mode 100644
index 5c2fec19d..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/deleteVRItem/useDeleteVRItem.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import {
-  useMutation,
-  type UseMutationOptions,
-  useQueryClient,
-} from '@tanstack/react-query';
-
-import { FunctionKey } from '../../constants';
-import { deleteVRItem } from './index';
-import { DeleteVRItemInput, DeleteVRItemOutput } from './types';
-
-type Options = UseMutationOptions<DeleteVRItemOutput, Error, DeleteVRItemInput>;
-
-export const useDeleteVRItem = (options?: Options) => {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: deleteVRItem,
-    ...options,
-    onSuccess: (response, variables, context) => {
-      queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_VR_FILES],
-      });
-
-      if (options?.onSuccess) {
-        options.onSuccess(response, variables, context);
-      }
-    },
-  });
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/index.ts b/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/index.ts
deleted file mode 100644
index 23f846710..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { moveFolderVR } from '@shinkai_network/shinkai-message-ts/api';
-
-import { MoveVRFolderInput } from './types';
-
-export const moveVRFolder = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  originPath,
-  destinationPath,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: MoveVRFolderInput) => {
-  return await moveFolderVR(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    originPath,
-    destinationPath,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/types.ts b/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/types.ts
deleted file mode 100644
index c7a1c2381..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type MoveVRFolderOutput = {
-  status: string;
-};
-
-export type MoveVRFolderInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  originPath: string;
-  destinationPath: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/moveVRItem/index.ts b/libs/shinkai-node-state/src/lib/mutations/moveVRItem/index.ts
deleted file mode 100644
index 2d6e99e3e..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/moveVRItem/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { moveItemVR } from '@shinkai_network/shinkai-message-ts/api';
-
-import { MoveVRItemInput } from './types';
-
-export const moveVRItem = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  originPath,
-  destinationPath,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: MoveVRItemInput) => {
-  return await moveItemVR(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    originPath,
-    destinationPath,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/moveVRItem/types.ts b/libs/shinkai-node-state/src/lib/mutations/moveVRItem/types.ts
deleted file mode 100644
index 2015d6acb..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/moveVRItem/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type MoveVRItemOutput = {
-  status: string;
-};
-
-export type MoveVRItemInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  originPath: string;
-  destinationPath: string;
-};
diff --git a/libs/shinkai-node-state/src/v2/mutations/copyFolder/index.ts b/libs/shinkai-node-state/src/v2/mutations/copyFolder/index.ts
new file mode 100644
index 000000000..81ac7cb28
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/copyFolder/index.ts
@@ -0,0 +1,15 @@
+import { copyFolder as copyFolderApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { CopyFolderInput } from './types';
+
+export const copyFolder = async ({
+  nodeAddress,
+  token,
+  originPath,
+  destinationPath,
+}: CopyFolderInput) => {
+  return await copyFolderApi(nodeAddress, token, {
+    destination_path: destinationPath,
+    origin_path: originPath,
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/copyFolder/types.ts b/libs/shinkai-node-state/src/v2/mutations/copyFolder/types.ts
new file mode 100644
index 000000000..15daf7200
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/copyFolder/types.ts
@@ -0,0 +1,10 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { CopyFolderResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+
+export type CopyFolderOutput = CopyFolderResponse;
+
+export type CopyFolderInput = Token & {
+  nodeAddress: string;
+  originPath: string;
+  destinationPath: string;
+};
diff --git a/libs/shinkai-node-state/src/lib/mutations/moveVRItem/useMoveVRItem.ts b/libs/shinkai-node-state/src/v2/mutations/copyFolder/useCopyFolder.ts
similarity index 52%
rename from libs/shinkai-node-state/src/lib/mutations/moveVRItem/useMoveVRItem.ts
rename to libs/shinkai-node-state/src/v2/mutations/copyFolder/useCopyFolder.ts
index a68f41e0f..44e92d636 100644
--- a/libs/shinkai-node-state/src/lib/mutations/moveVRItem/useMoveVRItem.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/copyFolder/useCopyFolder.ts
@@ -4,20 +4,20 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { moveVRItem } from './index';
-import { MoveVRItemInput, MoveVRItemOutput } from './types';
+import { FunctionKeyV2 } from '../../constants';
+import { copyFolder } from './index';
+import { CopyFolderInput, CopyFolderOutput } from './types';
 
-type Options = UseMutationOptions<MoveVRItemOutput, Error, MoveVRItemInput>;
+type Options = UseMutationOptions<CopyFolderOutput, Error, CopyFolderInput>;
 
-export const useMoveVRItem = (options?: Options) => {
+export const useCopyFolder = (options?: Options) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: moveVRItem,
+    mutationFn: copyFolder,
     ...options,
     onSuccess: (response, variables, context) => {
       queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_VR_FILES],
+        queryKey: [FunctionKeyV2.GET_VR_FILES],
       });
 
       if (options?.onSuccess) {
diff --git a/libs/shinkai-node-state/src/v2/mutations/copyFsItem/index.ts b/libs/shinkai-node-state/src/v2/mutations/copyFsItem/index.ts
new file mode 100644
index 000000000..66bbf9496
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/copyFsItem/index.ts
@@ -0,0 +1,15 @@
+import { copyFsItem as copyFsItemApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { CopyVRItemInput } from './types';
+
+export const copyFsItem = async ({
+  nodeAddress,
+  token,
+  originPath,
+  destinationPath,
+}: CopyVRItemInput) => {
+  return await copyFsItemApi(nodeAddress, token, {
+    destination_path: destinationPath,
+    origin_path: originPath,
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/copyFsItem/types.ts b/libs/shinkai-node-state/src/v2/mutations/copyFsItem/types.ts
new file mode 100644
index 000000000..b48cbab42
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/copyFsItem/types.ts
@@ -0,0 +1,10 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { CopyFsItemResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+
+export type CopyVRItemOutput = CopyFsItemResponse;
+
+export type CopyVRItemInput = Token & {
+  nodeAddress: string;
+  originPath: string;
+  destinationPath: string;
+};
diff --git a/libs/shinkai-node-state/src/lib/mutations/copyVRItem/useCopyVrItem.ts b/libs/shinkai-node-state/src/v2/mutations/copyFsItem/useCopyFsItem.ts
similarity index 71%
rename from libs/shinkai-node-state/src/lib/mutations/copyVRItem/useCopyVrItem.ts
rename to libs/shinkai-node-state/src/v2/mutations/copyFsItem/useCopyFsItem.ts
index 51ab7e0ac..4c2757182 100644
--- a/libs/shinkai-node-state/src/lib/mutations/copyVRItem/useCopyVrItem.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/copyFsItem/useCopyFsItem.ts
@@ -4,20 +4,20 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { copyVRItem } from './index';
+import { FunctionKeyV2 } from '../../constants';
+import { copyFsItem } from './index';
 import { CopyVRItemInput, CopyVRItemOutput } from './types';
 
 type Options = UseMutationOptions<CopyVRItemOutput, Error, CopyVRItemInput>;
 
-export const useCopyVrItem = (options?: Options) => {
+export const useCopyFsItem = (options?: Options) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: copyVRItem,
+    mutationFn: copyFsItem,
     ...options,
     onSuccess: (response, variables, context) => {
       queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_VR_FILES],
+        queryKey: [FunctionKeyV2.GET_VR_FILES],
       });
 
       if (options?.onSuccess) {
diff --git a/libs/shinkai-node-state/src/v2/mutations/moveFolder/index.ts b/libs/shinkai-node-state/src/v2/mutations/moveFolder/index.ts
new file mode 100644
index 000000000..67042821c
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/moveFolder/index.ts
@@ -0,0 +1,16 @@
+import { moveFolderVR } from '@shinkai_network/shinkai-message-ts/api';
+import { moveFolder as moveFolderApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { MoveVRFolderInput } from './types';
+
+export const moveFolder = async ({
+  nodeAddress,
+  token,
+  originPath,
+  destinationPath,
+}: MoveVRFolderInput) => {
+  return await moveFolderApi(nodeAddress, token, {
+    origin_path: originPath,
+    destination_path: destinationPath,
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/moveFolder/types.ts b/libs/shinkai-node-state/src/v2/mutations/moveFolder/types.ts
new file mode 100644
index 000000000..45fd1fabc
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/moveFolder/types.ts
@@ -0,0 +1,10 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { MoveFolderResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+
+export type MoveFolderOutput = MoveFolderResponse;
+
+export type MoveVRFolderInput = Token & {
+  nodeAddress: string;
+  originPath: string;
+  destinationPath: string;
+};
diff --git a/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/useDeleteVRFolder.ts b/libs/shinkai-node-state/src/v2/mutations/moveFolder/useMoveFolder.ts
similarity index 53%
rename from libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/useDeleteVRFolder.ts
rename to libs/shinkai-node-state/src/v2/mutations/moveFolder/useMoveFolder.ts
index 7fd18c0f6..e6c88fdbb 100644
--- a/libs/shinkai-node-state/src/lib/mutations/deleteVRFolder/useDeleteVRFolder.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/moveFolder/useMoveFolder.ts
@@ -4,24 +4,25 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { deleteVRFolder } from './index';
-import { DeleteVRFolderInput, DeleteVRFolderOutput } from './types';
+import { FunctionKeyV2 } from '../../constants';
+import { APIError } from '../../types';
+import { moveFolder } from './index';
+import { MoveFolderOutput, MoveVRFolderInput } from './types';
 
 type Options = UseMutationOptions<
-  DeleteVRFolderOutput,
-  Error,
-  DeleteVRFolderInput
+  MoveFolderOutput,
+  APIError,
+  MoveVRFolderInput
 >;
 
-export const useDeleteVrFolder = (options?: Options) => {
+export const useMoveFolder = (options?: Options) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: deleteVRFolder,
+    mutationFn: moveFolder,
     ...options,
     onSuccess: (response, variables, context) => {
       queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_VR_FILES],
+        queryKey: [FunctionKeyV2.GET_VR_FILES],
       });
 
       if (options?.onSuccess) {
diff --git a/libs/shinkai-node-state/src/v2/mutations/moveFsItem/index.ts b/libs/shinkai-node-state/src/v2/mutations/moveFsItem/index.ts
new file mode 100644
index 000000000..6548d748f
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/moveFsItem/index.ts
@@ -0,0 +1,15 @@
+import { moveFsItem as moveFsItemApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { MoveFsItemInput } from './types';
+
+export const moveFsItem = async ({
+  nodeAddress,
+  token,
+  originPath,
+  destinationPath,
+}: MoveFsItemInput) => {
+  return await moveFsItemApi(nodeAddress, token, {
+    origin_path: originPath,
+    destination_path: destinationPath,
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/moveFsItem/types.ts b/libs/shinkai-node-state/src/v2/mutations/moveFsItem/types.ts
new file mode 100644
index 000000000..ca626a860
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/moveFsItem/types.ts
@@ -0,0 +1,10 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { MoveFsItemResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+
+export type MoveFsItemOutput = MoveFsItemResponse;
+
+export type MoveFsItemInput = Token & {
+  nodeAddress: string;
+  originPath: string;
+  destinationPath: string;
+};
diff --git a/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/useCopyVrFolder.ts b/libs/shinkai-node-state/src/v2/mutations/moveFsItem/useMoveFsItem.ts
similarity index 52%
rename from libs/shinkai-node-state/src/lib/mutations/copyVRFolder/useCopyVrFolder.ts
rename to libs/shinkai-node-state/src/v2/mutations/moveFsItem/useMoveFsItem.ts
index 5a738bc96..e8bae264d 100644
--- a/libs/shinkai-node-state/src/lib/mutations/copyVRFolder/useCopyVrFolder.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/moveFsItem/useMoveFsItem.ts
@@ -4,20 +4,20 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { copyVRFolder } from './index';
-import { CopyVRFolderInput, CopyVRFolderOutput } from './types';
+import { FunctionKeyV2 } from '../../constants';
+import { moveFsItem } from './index';
+import { MoveFsItemInput, MoveFsItemOutput } from './types';
 
-type Options = UseMutationOptions<CopyVRFolderOutput, Error, CopyVRFolderInput>;
+type Options = UseMutationOptions<MoveFsItemOutput, Error, MoveFsItemInput>;
 
-export const useCopyVrFolder = (options?: Options) => {
+export const useMoveFsItem = (options?: Options) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: copyVRFolder,
+    mutationFn: moveFsItem,
     ...options,
     onSuccess: (response, variables, context) => {
       queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_VR_FILES],
+        queryKey: [FunctionKeyV2.GET_VR_FILES],
       });
 
       if (options?.onSuccess) {
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeFolder/index.ts b/libs/shinkai-node-state/src/v2/mutations/removeFolder/index.ts
new file mode 100644
index 000000000..e4036d0ab
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeFolder/index.ts
@@ -0,0 +1,13 @@
+import { removeFolder as removeFolderApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { RemoveFolderInput } from './types';
+
+export const removeFolder = async ({
+  nodeAddress,
+  token,
+  folderPath,
+}: RemoveFolderInput) => {
+  return await removeFolderApi(nodeAddress, token, {
+    path: folderPath,
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeFolder/types.ts b/libs/shinkai-node-state/src/v2/mutations/removeFolder/types.ts
new file mode 100644
index 000000000..daf34f6e9
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeFolder/types.ts
@@ -0,0 +1,9 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { RemoveFolderResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+
+export type RemoveFolderOutput = RemoveFolderResponse;
+
+export type RemoveFolderInput = Token & {
+  nodeAddress: string;
+  folderPath: string;
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeFolder/useRemoveFolder.ts b/libs/shinkai-node-state/src/v2/mutations/removeFolder/useRemoveFolder.ts
new file mode 100644
index 000000000..1394fcbd0
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeFolder/useRemoveFolder.ts
@@ -0,0 +1,33 @@
+import {
+  useMutation,
+  type UseMutationOptions,
+  useQueryClient,
+} from '@tanstack/react-query';
+
+import { FunctionKeyV2 } from '../../constants';
+import { APIError } from '../../types';
+import { removeFolder } from './index';
+import { RemoveFolderInput, RemoveFolderOutput } from './types';
+
+type Options = UseMutationOptions<
+  RemoveFolderOutput,
+  APIError,
+  RemoveFolderInput
+>;
+
+export const useRemoveFolder = (options?: Options) => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: removeFolder,
+    ...options,
+    onSuccess: (response, variables, context) => {
+      queryClient.invalidateQueries({
+        queryKey: [FunctionKeyV2.GET_VR_FILES],
+      });
+
+      if (options?.onSuccess) {
+        options.onSuccess(response, variables, context);
+      }
+    },
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeFsItem/index.ts b/libs/shinkai-node-state/src/v2/mutations/removeFsItem/index.ts
new file mode 100644
index 000000000..9c3de98d1
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeFsItem/index.ts
@@ -0,0 +1,13 @@
+import { removeFsItem as removeFsItemApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { RemoveFsItemInput } from './types';
+
+export const removeFsItem = async ({
+  nodeAddress,
+  token,
+  itemPath,
+}: RemoveFsItemInput) => {
+  return await removeFsItemApi(nodeAddress, token, {
+    path: itemPath,
+  });
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/removeFsItem/types.ts b/libs/shinkai-node-state/src/v2/mutations/removeFsItem/types.ts
new file mode 100644
index 000000000..c01d1a75b
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/removeFsItem/types.ts
@@ -0,0 +1,8 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { RemoveFsItemResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+
+export type RemoveFsItemOutput = RemoveFsItemResponse;
+export type RemoveFsItemInput = Token & {
+  nodeAddress: string;
+  itemPath: string;
+};
diff --git a/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/useMoveVRFolder.ts b/libs/shinkai-node-state/src/v2/mutations/removeFsItem/useRemoveFsItem.ts
similarity index 51%
rename from libs/shinkai-node-state/src/lib/mutations/moveVRFolder/useMoveVRFolder.ts
rename to libs/shinkai-node-state/src/v2/mutations/removeFsItem/useRemoveFsItem.ts
index 49b24a32d..6fcfed31d 100644
--- a/libs/shinkai-node-state/src/lib/mutations/moveVRFolder/useMoveVRFolder.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/removeFsItem/useRemoveFsItem.ts
@@ -4,20 +4,20 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { moveVRFolder } from './index';
-import { MoveVRFolderInput, MoveVRFolderOutput } from './types';
+import { FunctionKeyV2 } from '../../constants';
+import { removeFsItem } from './index';
+import { RemoveFsItemInput, RemoveFsItemOutput } from './types';
 
-type Options = UseMutationOptions<MoveVRFolderOutput, Error, MoveVRFolderInput>;
+type Options = UseMutationOptions<RemoveFsItemOutput, Error, RemoveFsItemInput>;
 
-export const useMoveVrFolder = (options?: Options) => {
+export const useRemoveFsItem = (options?: Options) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: moveVRFolder,
+    mutationFn: removeFsItem,
     ...options,
     onSuccess: (response, variables, context) => {
       queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_VR_FILES],
+        queryKey: [FunctionKeyV2.GET_VR_FILES],
       });
 
       if (options?.onSuccess) {

From 0cd41450c7cb53ef51419e18c757780fe3318022 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Tue, 31 Dec 2024 18:46:23 -0500
Subject: [PATCH 12/39] temporary fix for listing folders

---
 .../components/vector-fs/components/folder-selection-list.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
index 6027a4197..99af58467 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
@@ -167,7 +167,7 @@ export const FolderSelectionList = () => {
                 key={idx}
               />
             ))}
-          {VRFiles?.child_folders.map((folder) => {
+          {VRFiles?.map((folder) => {
             return (
               <button
                 className={cn(

From 82ddcd11e833a86b35f78447d7cbea55f8ae5b8c Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Tue, 31 Dec 2024 18:54:12 -0500
Subject: [PATCH 13/39] more v2 updates

---
 .../components/vector-fs-general-options.tsx  | 12 ++-----
 .../node-files/vector-fs-general-options.tsx  | 12 ++-----
 .../src/api/vector-fs/index.ts                | 18 ++++++++++
 .../src/api/vector-fs/types.ts                |  6 ++++
 .../src/lib/mutations/createVRFolder/index.ts | 35 -------------------
 .../src/lib/mutations/createVRFolder/types.ts | 13 -------
 .../src/v2/mutations/createFolder/index.ts    | 17 +++++++++
 .../src/v2/mutations/createFolder/types.ts    | 10 ++++++
 .../createFolder/useCreateFolder.ts}          | 18 ++++------
 9 files changed, 64 insertions(+), 77 deletions(-)
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/createVRFolder/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/createVRFolder/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/createFolder/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/mutations/createFolder/types.ts
 rename libs/shinkai-node-state/src/{lib/mutations/createVRFolder/useCreateVRFolder.ts => v2/mutations/createFolder/useCreateFolder.ts} (52%)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
index 34e728b2b..8bd7b14dc 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
@@ -8,7 +8,7 @@ import {
   UploadVRFilesFormSchema,
   uploadVRFilesFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
-import { useCreateVRFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createVRFolder/useCreateVRFolder';
+import { useCreateFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/createFolder/useCreateFolder';
 import { useUploadVRFiles } from '@shinkai_network/shinkai-node-state/v2/mutations/uploadVRFiles/useUploadVRFiles';
 import {
   Button,
@@ -58,7 +58,7 @@ export const AddNewFolderAction = () => {
     isPending,
     mutateAsync: createVRFolder,
     isSuccess,
-  } = useCreateVRFolder({
+  } = useCreateFolder({
     onSuccess: () => {
       toast.success(t('vectorFs.success.folderCreated'));
       createFolderForm.reset();
@@ -74,15 +74,9 @@ export const AddNewFolderAction = () => {
 
     await createVRFolder({
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
+      token: auth?.api_v2_key ?? '',
       folderName: values.name,
       path: currentGlobalPath,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
     });
   };
 
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
index 1febba691..01f70a964 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-general-options.tsx
@@ -8,7 +8,7 @@ import {
   UploadVRFilesFormSchema,
   uploadVRFilesFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
-import { useCreateVRFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createVRFolder/useCreateVRFolder';
+import { useCreateFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/createFolder/useCreateFolder';
 import { useUploadVRFiles } from '@shinkai_network/shinkai-node-state/v2/mutations/uploadVRFiles/useUploadVRFiles';
 import {
   Button,
@@ -57,7 +57,7 @@ export const AddNewFolderAction = () => {
     isPending,
     mutateAsync: createVRFolder,
     isSuccess,
-  } = useCreateVRFolder({
+  } = useCreateFolder({
     onSuccess: () => {
       toast.success(t('vectorFs.success.folderCreated'));
       createFolderForm.reset();
@@ -73,15 +73,9 @@ export const AddNewFolderAction = () => {
 
     await createVRFolder({
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
+      token: auth?.api_v2_key ?? '',
       folderName: values.name,
       path: currentGlobalPath,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
     });
   };
 
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/index.ts b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
index 7c6f2cb7f..6b8dc08b4 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/index.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
@@ -5,6 +5,8 @@ import {
   CopyFolderResponse,
   CopyFsItemRequest,
   CopyFsItemResponse,
+  CreateFolderRequest,
+  CreateFolderResponse,
   MoveFolderRequest,
   MoveFolderResponse,
   MoveFsItemRequest,
@@ -32,6 +34,22 @@ export const retrieveSourceFile = async (
   );
   return response.data as RetrieveSourceFileResponse;
 };
+
+export const createFolder = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: CreateFolderRequest,
+) => {
+  const response = await httpClient.post(
+    urlJoin(nodeAddress, '/v2/create_folder'),
+    payload,
+    {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as CreateFolderResponse;
+};
 export const copyFolder = async (
   nodeAddress: string,
   bearerToken: string,
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/types.ts b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
index 7cb6b853b..bf7f2c03c 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/types.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
@@ -16,6 +16,12 @@ export type MoveFsItemRequest = {
 };
 export type MoveFsItemResponse = string;
 
+export type CreateFolderRequest = {
+  path: string;
+  folder_name: string;
+};
+export type CreateFolderResponse = string;
+
 export type CopyFolderRequest = {
   origin_path: string;
   destination_path: string;
diff --git a/libs/shinkai-node-state/src/lib/mutations/createVRFolder/index.ts b/libs/shinkai-node-state/src/lib/mutations/createVRFolder/index.ts
deleted file mode 100644
index 009def1f5..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/createVRFolder/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { createVRFolder as createVRFolderApi } from '@shinkai_network/shinkai-message-ts/api';
-
-import { CreateVRFolderInput, CreateVRFolderOutput } from './types';
-
-export const createVRFolder = async ({
-  nodeAddress,
-  folderName,
-  path,
-  shinkaiIdentity,
-  profile,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: CreateVRFolderInput): Promise<CreateVRFolderOutput> => {
-  const response = await createVRFolderApi(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    folderName,
-    path,
-    {
-      my_device_encryption_sk: my_device_encryption_sk,
-      my_device_identity_sk: my_device_identity_sk,
-      node_encryption_pk: node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-
-  return response;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/createVRFolder/types.ts b/libs/shinkai-node-state/src/lib/mutations/createVRFolder/types.ts
deleted file mode 100644
index 10623c0f9..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/createVRFolder/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { JobCredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type CreateVRFolderInput = JobCredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  path: string;
-  folderName: string;
-};
-
-export type CreateVRFolderOutput = {
-  status: string;
-};
diff --git a/libs/shinkai-node-state/src/v2/mutations/createFolder/index.ts b/libs/shinkai-node-state/src/v2/mutations/createFolder/index.ts
new file mode 100644
index 000000000..68cf9e3bb
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/createFolder/index.ts
@@ -0,0 +1,17 @@
+import { createFolder as createFolderApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { CreateFolderInput, CreateFolderOutput } from './types';
+
+export const createFolder = async ({
+  nodeAddress,
+  token,
+  folderName,
+  path,
+}: CreateFolderInput): Promise<CreateFolderOutput> => {
+  const response = await createFolderApi(nodeAddress, token, {
+    folder_name: folderName,
+    path,
+  });
+
+  return response;
+};
diff --git a/libs/shinkai-node-state/src/v2/mutations/createFolder/types.ts b/libs/shinkai-node-state/src/v2/mutations/createFolder/types.ts
new file mode 100644
index 000000000..73540db11
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/mutations/createFolder/types.ts
@@ -0,0 +1,10 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { CreateFolderResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+
+export type CreateFolderInput = Token & {
+  nodeAddress: string;
+  path: string;
+  folderName: string;
+};
+
+export type CreateFolderOutput = CreateFolderResponse;
diff --git a/libs/shinkai-node-state/src/lib/mutations/createVRFolder/useCreateVRFolder.ts b/libs/shinkai-node-state/src/v2/mutations/createFolder/useCreateFolder.ts
similarity index 52%
rename from libs/shinkai-node-state/src/lib/mutations/createVRFolder/useCreateVRFolder.ts
rename to libs/shinkai-node-state/src/v2/mutations/createFolder/useCreateFolder.ts
index efe155edb..8c957cdcb 100644
--- a/libs/shinkai-node-state/src/lib/mutations/createVRFolder/useCreateVRFolder.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createFolder/useCreateFolder.ts
@@ -1,24 +1,20 @@
 import { UseMutationOptions, useQueryClient } from '@tanstack/react-query';
 import { useMutation } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { createVRFolder } from '.';
-import { CreateVRFolderInput, CreateVRFolderOutput } from './types';
+import { FunctionKeyV2 } from '../../constants';
+import { createFolder } from '.';
+import { CreateFolderInput, CreateFolderOutput } from './types';
 
-type Options = UseMutationOptions<
-  CreateVRFolderOutput,
-  Error,
-  CreateVRFolderInput
->;
+type Options = UseMutationOptions<CreateFolderOutput, Error, CreateFolderInput>;
 
-export const useCreateVRFolder = (options?: Options) => {
+export const useCreateFolder = (options?: Options) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: createVRFolder,
+    mutationFn: createFolder,
     ...options,
     onSuccess: (response, variables, context) => {
       queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_VR_FILES],
+        queryKey: [FunctionKeyV2.GET_VR_FILES],
       });
 
       if (options?.onSuccess) {

From e1044c0d2071ca2100105ecc7bbd1e99ac433922 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Tue, 31 Dec 2024 18:55:07 -0500
Subject: [PATCH 14/39] clean up

---
 libs/shinkai-message-ts/src/api/methods.ts | 214 +--------------------
 1 file changed, 1 insertion(+), 213 deletions(-)

diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index c95549130..90f2084c9 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -149,7 +149,7 @@ export const sendTextMessageWithFilesToJob = async (
   );
 
   // Extract file paths from the upload responses
-  const filenames = uploadResponses.map(response => response.filename);
+  const filenames = uploadResponses.map((response) => response.filename);
 
   // Prepare the message payload
   const messagePayload = {
@@ -458,42 +458,6 @@ export const archiveJob = async (
   const data = response.data;
   return data;
 };
-export const createVRFolder = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  folderName: string,
-  path = '/',
-  setupDetailsState: CredentialsPayload,
-): Promise<{ status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.createFolder(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    folderName,
-    path,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/vec_fs/create_folder'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
 export const retrieveVRPathSimplified = async (
   nodeAddress: string,
   sender: string,
@@ -693,182 +657,6 @@ export const moveFolderVR = async (
   const data = response.data;
   return data;
 };
-export const copyFolderVR = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  originPath: string,
-  destionationPath: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.copyFolder(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    originPath,
-    destionationPath,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/vec_fs/copy_folder'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
-export const deleteFolderVR = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  folderPath: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.deleteFolder(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    folderPath,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/vec_fs/remove_folder'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
-export const moveItemVR = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  originPath: string,
-  destionationPath: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.moveItem(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    originPath,
-    destionationPath,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/vec_fs/move_item'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
-export const copyItemVR = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  originPath: string,
-  destionationPath: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.copyItem(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    originPath,
-    destionationPath,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/vec_fs/copy_item'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
-export const deleteItemVR = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  itemPath: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.deleteItem(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    itemPath,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/vec_fs/remove_item'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
 export const searchItemsVR = async (
   nodeAddress: string,
   sender: string,

From 17830e3dfc0db0300e4d881b261c30c430bd7a70 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Thu, 2 Jan 2025 11:16:33 -0600
Subject: [PATCH 15/39] update

---
 .../transformations.test.ts                   | 142 +++++++++++-------
 .../getVRPathSimplified/transformations.ts    |   1 +
 .../lib/queries/getVRPathSimplified/types.ts  |   2 +
 .../src/lib/utils/files.test.ts               |  16 +-
 .../shinkai-node-state/src/lib/utils/files.ts |  21 +--
 5 files changed, 103 insertions(+), 79 deletions(-)

diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
index 280995e19..ef625b529 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
@@ -1,91 +1,117 @@
 import { transformFileInfo } from './transformations';
 
 describe('transformFileInfo', () => {
-  it('should add name, extension, and file_size to a file', () => {
-    const data = [{
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
-      is_directory: false,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "nico/file.txt"
-    }];
-
-    const result = transformFileInfo(data);
-    expect(result).toEqual([{
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
-      is_directory: false,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "nico/file.txt",
-      name: "file.txt",
-      extension: "txt",
-      file_size: "0"
-    }]);
-  });
-
-  it('should add name and set extension and file_size to null for a directory', () => {
-    const data = [{
+  it('should handle a directory', () => {
+    const input = [{
+      children: null,
       created_time: "2024-12-30T05:27:59.764041184+00:00",
       has_embeddings: false,
       is_directory: true,
       modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "nico"
+      name: "nico",
+      path: "nico",
+      size: 0
     }];
 
-    const result = transformFileInfo(data);
+    const result = transformFileInfo(input);
     expect(result).toEqual([{
+      children: null,
       created_time: "2024-12-30T05:27:59.764041184+00:00",
       has_embeddings: false,
       is_directory: true,
       modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "nico",
       name: "nico",
+      path: "/nico",
+      size: 0,
       extension: null,
       file_size: null
     }]);
   });
 
-  it('should handle paths with a leading slash', () => {
-    const data = [{
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
+  it('should handle a file', () => {
+    const input = [{
+      children: null,
+      created_time: "2025-01-02T15:06:30.697154651+00:00",
+      has_embeddings: true,
       is_directory: false,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "/nico/file.txt"
+      modified_time: "2025-01-02T15:06:30.697297610+00:00",
+      name: "file.txt",
+      path: "nico/file.txt",
+      size: 956232
     }];
 
-    const result = transformFileInfo(data);
+    const result = transformFileInfo(input);
     expect(result).toEqual([{
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
+      children: null,
+      created_time: "2025-01-02T15:06:30.697154651+00:00",
+      has_embeddings: true,
       is_directory: false,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "/nico/file.txt",
+      modified_time: "2025-01-02T15:06:30.697297610+00:00",
       name: "file.txt",
+      path: "/nico/file.txt",
+      size: 956232,
       extension: "txt",
-      file_size: "0"
+      file_size: "956232"
     }]);
   });
 
-  it('should handle files without an extension', () => {
-    const data = [{
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
-      is_directory: false,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "nico/file"
-    }];
+  it('should handle an empty array', () => {
+    const input = [];
 
-    const result = transformFileInfo(data);
-    expect(result).toEqual([{
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
-      is_directory: false,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      path: "nico/file",
-      name: "file",
-      extension: null,
-      file_size: "0"
-    }]);
+    const result = transformFileInfo(input);
+    expect(result).toEqual([]);
+  });
+
+  it('should handle multiple items', () => {
+    const input = [
+      {
+        children: null,
+        created_time: "2024-12-30T05:27:59.764041184+00:00",
+        has_embeddings: false,
+        is_directory: true,
+        modified_time: "2024-12-30T05:27:59.764041184+00:00",
+        name: "nico",
+        path: "nico",
+        size: 0
+      },
+      {
+        children: null,
+        created_time: "2025-01-02T15:06:30.697154651+00:00",
+        has_embeddings: true,
+        is_directory: false,
+        modified_time: "2025-01-02T15:06:30.697297610+00:00",
+        name: "file.txt",
+        path: "nico/file.txt",
+        size: 956232
+      }
+    ];
+
+    const result = transformFileInfo(input);
+    expect(result).toEqual([
+      {
+        children: null,
+        created_time: "2024-12-30T05:27:59.764041184+00:00",
+        has_embeddings: false,
+        is_directory: true,
+        modified_time: "2024-12-30T05:27:59.764041184+00:00",
+        name: "nico",
+        path: "/nico",
+        size: 0,
+        extension: null,
+        file_size: null
+      },
+      {
+        children: null,
+        created_time: "2025-01-02T15:06:30.697154651+00:00",
+        has_embeddings: true,
+        is_directory: false,
+        modified_time: "2025-01-02T15:06:30.697297610+00:00",
+        name: "file.txt",
+        path: "/nico/file.txt",
+        size: 956232,
+        extension: "txt",
+        file_size: "956232"
+      }
+    ]);
   });
 }); 
\ No newline at end of file
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
index 7d4848b8d..947d3a912 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
@@ -10,6 +10,7 @@ export function transformFileInfo(data: any[]): FileInfo[] {
 
     return {
       ...fileInfo,
+      path: pathWithSlash,
       name,
       extension,
       file_size,
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
index b8c4dac10..8260c0c48 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
@@ -22,12 +22,14 @@ type ResourceKeywords = {
 };
 
 export type FileInfo = {
+  children: null | FileInfo[];
   created_time: string;
   has_embeddings: boolean;
   is_directory: boolean;
   modified_time: string;
   path: string;
   name: string;
+  size: number;
   extension: string | null;
   file_size: string | null;
 };
diff --git a/libs/shinkai-node-state/src/lib/utils/files.test.ts b/libs/shinkai-node-state/src/lib/utils/files.test.ts
index 46f45f364..2c2d4da49 100644
--- a/libs/shinkai-node-state/src/lib/utils/files.test.ts
+++ b/libs/shinkai-node-state/src/lib/utils/files.test.ts
@@ -4,12 +4,14 @@ import { transformDataToTreeNodes } from './files';
 describe('transformDataToTreeNodes', () => {
   it('should handle paths without a leading slash', () => {
     const data: FileInfo[] = [{
+      children: null,
       created_time: "2024-12-30T05:27:59.764041184+00:00",
       has_embeddings: false,
       is_directory: true,
       modified_time: "2024-12-30T05:27:59.764041184+00:00",
       path: "nico",
       name: "nico",
+      size: 0,
       extension: null,
       file_size: null
     }];
@@ -17,7 +19,7 @@ describe('transformDataToTreeNodes', () => {
     const result = transformDataToTreeNodes(data);
     expect(result).toEqual([
       {
-        key: "nico",
+        key: "/nico",
         label: "nico",
         data: data[0],
         icon: "icon-folder",
@@ -28,12 +30,14 @@ describe('transformDataToTreeNodes', () => {
 
   it('should handle paths with a leading slash', () => {
     const data: FileInfo[] = [{
+      children: null,
       created_time: "2024-12-30T05:27:59.764041184+00:00",
       has_embeddings: false,
       is_directory: true,
       modified_time: "2024-12-30T05:27:59.764041184+00:00",
       path: "/nico",
       name: "nico",
+      size: 0,
       extension: null,
       file_size: null
     }];
@@ -53,38 +57,42 @@ describe('transformDataToTreeNodes', () => {
   it('should handle multiple items', () => {
     const data: FileInfo[] = [
       {
+        children: null,
         created_time: "2024-12-30T05:27:59.764041184+00:00",
         has_embeddings: false,
         is_directory: true,
         modified_time: "2024-12-30T05:27:59.764041184+00:00",
         path: "nico",
         name: "nico",
+        size: 0,
         extension: null,
         file_size: null
       },
       {
+        children: null,
         created_time: "2024-12-30T05:27:59.764041184+00:00",
         has_embeddings: false,
         is_directory: false,
         modified_time: "2024-12-30T05:27:59.764041184+00:00",
         path: "nico/file.txt",
         name: "file.txt",
+        size: 956232,
         extension: "txt",
-        file_size: "0"
+        file_size: "956232"
       }
     ];
 
     const result = transformDataToTreeNodes(data);
     expect(result).toEqual([
       {
-        key: "nico",
+        key: "/nico",
         label: "nico",
         data: data[0],
         icon: "icon-folder",
         children: []
       },
       {
-        key: "nico/file.txt",
+        key: "/nico/file.txt",
         label: "file.txt",
         data: data[1],
         icon: "icon-file"
diff --git a/libs/shinkai-node-state/src/lib/utils/files.ts b/libs/shinkai-node-state/src/lib/utils/files.ts
index de20e05b8..60d5a26cb 100644
--- a/libs/shinkai-node-state/src/lib/utils/files.ts
+++ b/libs/shinkai-node-state/src/lib/utils/files.ts
@@ -8,15 +8,13 @@ export function transformDataToTreeNodes(
 ): TreeNode[] {
   const result: TreeNode[] = [];
 
-  // Directly iterate over data assuming it's an array
   data.forEach((fileInfo) => {
     const pathWithSlash = fileInfo.path.startsWith('/') ? fileInfo.path : `/${fileInfo.path}`;
-    const label = pathWithSlash.split('/').pop() || '';
 
     if (fileInfo.is_directory) {
       const folderNode: TreeNode = {
-        key: fileInfo.path,
-        label: label,
+        key: pathWithSlash,
+        label: fileInfo.name,
         data: fileInfo,
         icon: 'icon-folder',
         children: [], // Assuming you will populate this with child nodes
@@ -24,8 +22,8 @@ export function transformDataToTreeNodes(
       result.push(folderNode);
     } else {
       const itemNode: TreeNode = {
-        key: fileInfo.path,
-        label: label,
+        key: pathWithSlash,
+        label: fileInfo.name,
         data: fileInfo,
         icon: 'icon-file',
       };
@@ -38,16 +36,5 @@ export function transformDataToTreeNodes(
 
 export function getFlatChildItems(data: FileInfo[]): FileInfo[] {
   const result: FileInfo[] = [];
-
-  // for (const item of data) {
-  //   if (item.is_directory) {
-  //     // Assuming you have a way to retrieve child items for a directory
-  //     const childItems = getChildItemsForDirectory(item.path);
-  //     result = result.concat(getFlatChildItems(childItems));
-  //   } else {
-  //     result.push(item);
-  //   }
-  // }
-
   return result;
 }

From 78a8e4ce1ea4d6b58981486ba63544ab781161ae Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 13:03:51 -0500
Subject: [PATCH 16/39] fix: move fs item endpoint

---
 libs/shinkai-message-ts/src/api/vector-fs/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/shinkai-message-ts/src/api/vector-fs/index.ts b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
index 6b8dc08b4..f11b0a4c4 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/index.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
@@ -120,7 +120,7 @@ export const moveFsItem = async (
   payload: MoveFsItemRequest,
 ) => {
   const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v2/move_folder'),
+    urlJoin(nodeAddress, '/v2/move_item'),
     payload,
     {
       headers: { Authorization: `Bearer ${bearerToken}` },

From e113578ecb6ddac45b4aede593fc0a38332cfc9d Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 14:27:18 -0500
Subject: [PATCH 17/39] remove simplified_json and update to v2

---
 .../chat/set-conversation-context.tsx         |  21 ++--
 .../use-onboarding-stepper.ts                 |  23 +---
 .../src/components/sheet/data-table-cell.tsx  |  12 +-
 .../vector-fs/components/all-files-tab.tsx    |  36 +++---
 .../components/folder-selection-list.tsx      |  21 ++--
 .../vector-fs/components/vector-fs-folder.tsx |  20 +--
 .../vector-fs/components/vector-fs-item.tsx   |  29 +++--
 .../vector-fs/context/vector-fs-context.tsx   |  13 +-
 .../src/pages/galxe-subscriptions.tsx         |  12 +-
 .../src/components/create-job/create-job.tsx  |  12 +-
 .../src/components/node-files/all-files.tsx   |  12 +-
 .../node-files/folder-selection-list.tsx      |  17 +--
 libs/shinkai-message-ts/src/api/methods.ts    |  48 -------
 .../src/api/vector-fs/index.ts                |  18 +++
 .../src/api/vector-fs/types.ts                |  17 +++
 .../lib/queries/getVRPathSimplified/index.ts  |  36 ------
 .../transformations.test.ts                   | 117 ------------------
 .../getVRPathSimplified/transformations.ts    |  19 ---
 .../lib/queries/getVRPathSimplified/types.ts  |  59 ---------
 .../shinkai-node-state/src/lib/utils/files.ts |  15 ++-
 .../v2/queries/getDirectoryContents/index.ts  |  15 +++
 .../v2/queries/getDirectoryContents/types.ts  |  25 ++++
 .../useGetListDirectoryContents.ts}           |  10 +-
 23 files changed, 173 insertions(+), 434 deletions(-)
 delete mode 100644 libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getDirectoryContents/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getDirectoryContents/types.ts
 rename libs/shinkai-node-state/src/{lib/queries/getVRPathSimplified/useGetVRPathSimplified.ts => v2/queries/getDirectoryContents/useGetListDirectoryContents.ts} (52%)

diff --git a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
index 554a0d97c..c816222fa 100644
--- a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
+++ b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
@@ -6,10 +6,10 @@ import {
   SearchVectorFormSchema,
   searchVectorFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/vector-search';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
 import { useGetVRSeachSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRSearchSimplified/useGetSearchVRItems';
 import { transformDataToTreeNodes } from '@shinkai_network/shinkai-node-state/lib/utils/files';
 import { useUpdateJobScope } from '@shinkai_network/shinkai-node-state/v2/mutations/updateJobScope/useUpdateJobScope';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import {
   Badge,
   Button,
@@ -60,19 +60,12 @@ export const SetJobScopeDrawer = () => {
   const auth = useAuth((state) => state.auth);
   const [nodes, setNodes] = useState<TreeNode[]>([]);
 
-  const { data: fileInfoArray, isSuccess: isVRFilesSuccess } = useGetVRPathSimplified(
-    {
+  const { data: fileInfoArray, isSuccess: isVRFilesSuccess } =
+    useGetListDirectoryContents({
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
+      token: auth?.api_v2_key ?? '',
       path: '/',
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
-    },
-  );
+    });
 
   const { mutateAsync: updateJobScope, isPending: isUpdatingJobScope } =
     useUpdateJobScope({
@@ -170,7 +163,9 @@ export const SetJobScopeDrawer = () => {
                   token: auth?.api_v2_key ?? '',
                   jobScope: {
                     vector_fs_items: Array.from(selectedFileKeysRef.values()),
-                    vector_fs_folders: Array.from(selectedFolderKeysRef.values()),
+                    vector_fs_folders: Array.from(
+                      selectedFolderKeysRef.values(),
+                    ),
                     vector_search_mode: [],
                   },
                 });
diff --git a/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts b/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts
index 8a06ed3ae..a4a73b5a9 100644
--- a/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts
+++ b/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts
@@ -1,6 +1,7 @@
 // import { useGetMySharedFolders } from '@shinkai_network/shinkai-node-state/lib/queries/getMySharedFolders/useGetMySharedFolders';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
+
 import { getFlatChildItems } from '@shinkai_network/shinkai-node-state/lib/utils/files';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import { useGetHealth } from '@shinkai_network/shinkai-node-state/v2/queries/getHealth/useGetHealth';
 import { useGetInboxes } from '@shinkai_network/shinkai-node-state/v2/queries/getInboxes/useGetInboxes';
 import { useGetLLMProviders } from '@shinkai_network/shinkai-node-state/v2/queries/getLLMProviders/useGetLLMProviders';
@@ -33,28 +34,16 @@ export const useOnboardingSteps = () => {
     token: auth?.api_v2_key ?? '',
   });
 
-  const { data: VRFiles } = useGetVRPathSimplified({
+  const { data: VRFiles } = useGetListDirectoryContents({
     nodeAddress: auth?.node_address ?? '',
-    profile: auth?.profile ?? '',
-    shinkaiIdentity: auth?.shinkai_identity ?? '',
+    token: auth?.api_v2_key ?? '',
     path: '/',
-    my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-    my_device_identity_sk: auth?.profile_identity_sk ?? '',
-    node_encryption_pk: auth?.node_encryption_pk ?? '',
-    profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-    profile_identity_sk: auth?.profile_identity_sk ?? '',
   });
 
-  const { data: subscriptionFolder } = useGetVRPathSimplified({
+  const { data: subscriptionFolder } = useGetListDirectoryContents({
     nodeAddress: auth?.node_address ?? '',
-    profile: auth?.profile ?? '',
-    shinkaiIdentity: auth?.shinkai_identity ?? '',
+    token: auth?.api_v2_key ?? '',
     path: '/My Subscriptions',
-    my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-    my_device_identity_sk: auth?.profile_identity_sk ?? '',
-    node_encryption_pk: auth?.node_encryption_pk ?? '',
-    profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-    profile_identity_sk: auth?.profile_identity_sk ?? '',
   });
 
   // const { data: mySharedFolders } = useGetMySharedFolders({
diff --git a/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx b/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
index e13cddf6a..8e0af5cdd 100644
--- a/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
+++ b/apps/shinkai-desktop/src/components/sheet/data-table-cell.tsx
@@ -7,8 +7,8 @@ import {
   ColumnType,
 } from '@shinkai_network/shinkai-message-ts/models/SchemaTypes';
 import { useSetCellSheet } from '@shinkai_network/shinkai-node-state/lib/mutations/setCellSheet/useSetCellSheet';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
 import { transformDataToTreeNodes } from '@shinkai_network/shinkai-node-state/lib/utils/files';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import {
   Badge,
   Button,
@@ -387,16 +387,10 @@ export const VectorFsScopeDrawer = ({
   const auth = useAuth((state) => state.auth);
 
   const { data: fileInfoArray, isSuccess: isVRFilesSuccess } =
-    useGetVRPathSimplified({
+    useGetListDirectoryContents({
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
+      token: auth?.api_v2_key ?? '',
       path: '/',
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
     });
 
   useEffect(() => {
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
index 1dc62a3ad..51d72539d 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
@@ -1,12 +1,8 @@
 import { HomeIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
+import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
 import { useGetSearchVRItems } from '@shinkai_network/shinkai-node-state/lib/queries/getSearchVRItems/useGetSearchVRItems';
-import {
-  FileInfo,
-  VRFolder,
-  VRItem,
-} from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import { useGetMySharedFolders } from '@shinkai_network/shinkai-node-state/v2/queries/getMySharedFolders/useGetMySharedFolders';
 import {
   Breadcrumb,
@@ -89,22 +85,16 @@ const AllFiles = () => {
     isPending: isVRFilesPending,
     data: fileInfoArray,
     isSuccess: isVRFilesSuccess,
-  } = useGetVRPathSimplified(
+  } = useGetListDirectoryContents(
     {
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
+      token: auth?.api_v2_key ?? '',
       path: currentGlobalPath,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
     },
     {
-      select: (data: FileInfo[]) => {
-        return data?.sort((a, b) => a.name.localeCompare(b.name));
-      },
+      // select: (data: FileInfo[]) => {
+      //   return data?.sort((a, b) => a.name.localeCompare(b.name));
+      // },
       refetchInterval: 6000,
     },
   );
@@ -139,8 +129,12 @@ const AllFiles = () => {
   });
 
   const setSelectedFile = useVectorFsStore((state) => state.setSelectedFile);
-  const [selectedFiles, setSelectedFiles] = React.useState<VRItem[]>([]);
-  const [selectedFolders, setSelectedFolders] = React.useState<VRFolder[]>([]);
+  const [selectedFiles, setSelectedFiles] = React.useState<DirectoryContent[]>(
+    [],
+  );
+  const [selectedFolders, setSelectedFolders] = React.useState<
+    DirectoryContent[]
+  >([]);
   const [isMenuOpened, setMenuOpened] = React.useState(false);
 
   useEffect(() => {
@@ -155,7 +149,7 @@ const AllFiles = () => {
       );
     }
   }, [query]);
-  const handleSelectFiles = (file: VRItem) => {
+  const handleSelectFiles = (file: DirectoryContent) => {
     if (selectedFiles.some((selectedFile) => selectedFile.path === file.path)) {
       setSelectedFiles(selectedFiles.filter((item) => item !== file));
     } else {
@@ -163,7 +157,7 @@ const AllFiles = () => {
     }
   };
 
-  const handleSelectFolders = (folder: VRFolder) => {
+  const handleSelectFolders = (folder: DirectoryContent) => {
     if (
       selectedFolders.some(
         (selectedFolder) => selectedFolder.path === folder.path,
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
index 99af58467..789d0da13 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
@@ -1,6 +1,6 @@
 import { HomeIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -85,19 +85,12 @@ export const FolderSelectionList = () => {
     (state) => state.setCurrentSelectedFolderPath,
   );
 
-  const { isPending: isVRFilesPending, data: VRFiles } = useGetVRPathSimplified(
-    {
+  const { isPending: isVRFilesPending, data: VRFiles } =
+    useGetListDirectoryContents({
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
+      token: auth?.api_v2_key ?? '',
       path: currentSelectedFolderPath,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
-    },
-  );
+    });
 
   const splitCurrentPath =
     destinationFolderPath?.split('/').filter(Boolean) ?? [];
@@ -177,7 +170,7 @@ export const FolderSelectionList = () => {
                 )}
                 key={folder.path}
                 onClick={() => {
-                  if (folder.child_folders?.length > 0) {
+                  if ((folder.children ?? []).length > 0) {
                     setCurrentSelectedFolderPath(folder.path);
                     setDestinationFolderPath(folder.path);
                   } else {
@@ -188,7 +181,7 @@ export const FolderSelectionList = () => {
               >
                 <DirectoryTypeIcon />
                 <VectorFsFolderInfo allowFolderNameOnly folder={folder} />
-                {!!folder.child_folders?.length && (
+                {!!(folder?.children ?? []).length && (
                   <ChevronRight className="text-gray-80 h-5 w-5" />
                 )}
               </button>
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
index c99261c9c..65a2d07d6 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
@@ -1,6 +1,6 @@
 import { DotsVerticalIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { VRFolder } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
+import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
 import {
   buttonVariants,
   Checkbox,
@@ -21,7 +21,7 @@ import {
   DirectoryTypeIcon,
   SharedFolderIcon,
 } from '@shinkai_network/shinkai-ui/assets';
-// import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
+import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
 import {
   CopyIcon,
@@ -43,7 +43,7 @@ export const VectorFsFolderInfo = ({
   allowFolderNameOnly,
   layout,
 }: {
-  folder: VRFolder;
+  folder: DirectoryContent;
   totalItem?: number;
   allowFolderNameOnly?: boolean;
   layout?: VectorFSLayout;
@@ -53,8 +53,10 @@ export const VectorFsFolderInfo = ({
       <div className="truncate text-sm font-medium">{folder.name}</div>
       {layout === VectorFSLayout.List && !allowFolderNameOnly && (
         <p className="text-xs font-medium text-gray-100">
-          {/*<span>{formatDateToUSLocaleString(folder.created_datetime)}</span> -{' '}*/}
-          <span>{totalItem} items</span>
+          <span>
+            {formatDateToUSLocaleString(new Date(folder.created_time ?? ''))}
+          </span>{' '}
+          - <span>{totalItem} items</span>
         </p>
       )}
     </div>
@@ -69,8 +71,8 @@ const VectorFsFolder = ({
   isSharedFolder,
 }: {
   onClick: () => void;
-  folder: VRFolder;
-  handleSelectFolders: (folder: VRFolder) => void;
+  folder: DirectoryContent;
+  handleSelectFolders: (folder: DirectoryContent) => void;
   isSelectedFolder: boolean;
   isSharedFolder?: boolean;
 }) => {
@@ -91,9 +93,7 @@ const VectorFsFolder = ({
     'flex items-center justify-between gap-2 truncate rounded-lg py-3.5 pr-2 hover:bg-gradient-to-r hover:from-gray-500 hover:to-gray-400',
     layout === VectorFSLayout.Grid && 'bg-gray-400/30 p-2',
   );
-  const totalItem =
-    // (folder.child_folders?.length ?? 0) + (folder.child_items?.length ?? 0);
-    0;
+  const totalItem = (folder.children ?? []).length;
 
   const FolderIcon = isSharedFolder ? SharedFolderIcon : DirectoryTypeIcon;
 
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index e9b26749d..c823919b6 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -1,6 +1,6 @@
 import { DotsVerticalIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { VRItem } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
+import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
 import {
   buttonVariants,
   Checkbox,
@@ -16,7 +16,10 @@ import {
   TooltipTrigger,
 } from '@shinkai_network/shinkai-ui';
 import { CreateAIIcon, FileTypeIcon } from '@shinkai_network/shinkai-ui/assets';
-import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
+import {
+  formatDateToUSLocaleString,
+  getFileExt,
+} from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
 import { partial } from 'filesize';
 import { CopyIcon, FileInputIcon, TrashIcon } from 'lucide-react';
@@ -29,11 +32,11 @@ import { VectorFsItemAction } from './vector-fs-drawer';
 export const VectorFsItemInfo = ({
   file,
   createdDatetime,
-  // fileSize,
+  fileSize,
 }: {
-  file: VRItem;
+  file: DirectoryContent;
   createdDatetime: string;
-  // fileSize: string;
+  fileSize: string;
 }) => {
   const layout = useVectorFsStore((state) => state.layout);
 
@@ -42,7 +45,7 @@ export const VectorFsItemInfo = ({
       <div className="text-sm font-medium">{file.path}</div>
       {layout === VectorFSLayout.List && (
         <p className="text-xs font-medium text-gray-100">
-          <span>{createdDatetime}</span> - <span>0</span>
+          <span>{createdDatetime}</span> - <span>{fileSize}</span>
         </p>
       )}
     </div>
@@ -56,8 +59,8 @@ const VectorFsItem = ({
   isSelectedFile,
 }: {
   onClick: () => void;
-  file: VRItem;
-  handleSelectFiles: (file: VRItem) => void;
+  file: DirectoryContent;
+  handleSelectFiles: (file: DirectoryContent) => void;
   isSelectedFile: boolean;
 }) => {
   const { t } = useTranslation();
@@ -80,7 +83,7 @@ const VectorFsItem = ({
   const createdDatetime = formatDateToUSLocaleString(
     new Date(file.created_time),
   );
-  // const fileSize = size(file.size);
+  const fileSize = size(file.size);
 
   if (isVRSelectionActive) {
     return (
@@ -96,11 +99,11 @@ const VectorFsItem = ({
           className="flex flex-1 items-center gap-3"
           htmlFor={`item-${file.path}`}
         >
-          <FileTypeIcon type={file?.extension ?? ''} />
+          <FileTypeIcon type={getFileExt(file.name)} />
           <VectorFsItemInfo
             createdDatetime={createdDatetime}
             file={file}
-            // fileSize={fileSize}
+            fileSize={fileSize}
           />
         </label>
       </div>
@@ -109,11 +112,11 @@ const VectorFsItem = ({
 
   return (
     <button className={wrapperClassname} onClick={onClick}>
-      <FileTypeIcon type={file?.extension ?? ''} />
+      <FileTypeIcon type={getFileExt(file.name)} />
       <VectorFsItemInfo
         createdDatetime={createdDatetime}
         file={file}
-        // fileSize={fileSize}
+        fileSize={fileSize}
       />
 
       <TooltipProvider delayDuration={0}>
diff --git a/apps/shinkai-desktop/src/components/vector-fs/context/vector-fs-context.tsx b/apps/shinkai-desktop/src/components/vector-fs/context/vector-fs-context.tsx
index 774f37091..c1050bb01 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/context/vector-fs-context.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/context/vector-fs-context.tsx
@@ -1,7 +1,4 @@
-import {
-  VRFolder,
-  VRItem,
-} from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
+import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
 import React, { createContext, useContext, useState } from 'react';
 import { createStore, useStore } from 'zustand';
 
@@ -24,10 +21,10 @@ type VectorFsStore = {
   setSortByName: (sortByName: boolean) => void;
   isVRSelectionActive: boolean;
   setVRSelectionActive: (isVRSelectionActive: boolean) => void;
-  selectedFile: VRItem | null;
-  setSelectedFile: (selectedFile: VRItem | null) => void;
-  selectedFolder: VRFolder | null;
-  setSelectedFolder: (selectedFolder: VRFolder | null) => void;
+  selectedFile: DirectoryContent | null;
+  setSelectedFile: (selectedFile: DirectoryContent | null) => void;
+  selectedFolder: DirectoryContent | null;
+  setSelectedFolder: (selectedFolder: DirectoryContent | null) => void;
   selectedVectorFsTab: 'all' | 'shared-folders';
   setSelectedVectorFsTab: (
     selectedVectorFsTab: 'all' | 'shared-folders',
diff --git a/apps/shinkai-desktop/src/pages/galxe-subscriptions.tsx b/apps/shinkai-desktop/src/pages/galxe-subscriptions.tsx
index 57ccb868e..134f0da18 100644
--- a/apps/shinkai-desktop/src/pages/galxe-subscriptions.tsx
+++ b/apps/shinkai-desktop/src/pages/galxe-subscriptions.tsx
@@ -2,7 +2,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { CheckCircledIcon, CircleIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
 import { Inbox } from '@shinkai_network/shinkai-message-ts/api/jobs/types';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import { useGetInboxes } from '@shinkai_network/shinkai-node-state/v2/queries/getInboxes/useGetInboxes';
 import { useGetMySubscriptions } from '@shinkai_network/shinkai-node-state/v2/queries/getMySubscriptions/useGetMySubscriptions';
 import {
@@ -50,16 +50,10 @@ export const GalxeSusbcriptions = () => {
     token: auth?.api_v2_key ?? '',
   });
 
-  const { data: subscriptionFolder } = useGetVRPathSimplified({
+  const { data: subscriptionFolder } = useGetListDirectoryContents({
     nodeAddress: auth?.node_address ?? '',
-    profile: auth?.profile ?? '',
-    shinkaiIdentity: auth?.shinkai_identity ?? '',
+    token: auth?.api_v2_key ?? '',
     path: SUBSCRIPTION_PATH,
-    my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-    my_device_identity_sk: auth?.profile_identity_sk ?? '',
-    node_encryption_pk: auth?.node_encryption_pk ?? '',
-    profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-    profile_identity_sk: auth?.profile_identity_sk ?? '',
   });
 
   const { data: subscriptions } = useGetMySubscriptions({
diff --git a/apps/shinkai-visor/src/components/create-job/create-job.tsx b/apps/shinkai-visor/src/components/create-job/create-job.tsx
index d9d0550c4..2ed8b9357 100644
--- a/apps/shinkai-visor/src/components/create-job/create-job.tsx
+++ b/apps/shinkai-visor/src/components/create-job/create-job.tsx
@@ -10,9 +10,9 @@ import {
   VRFolder,
   VRItem,
 } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
 import { transformDataToTreeNodes } from '@shinkai_network/shinkai-node-state/lib/utils/files';
 import { useCreateJob } from '@shinkai_network/shinkai-node-state/v2/mutations/createJob/useCreateJob';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import { useGetLLMProviders } from '@shinkai_network/shinkai-node-state/v2/queries/getLLMProviders/useGetLLMProviders';
 import {
   Badge,
@@ -76,16 +76,10 @@ export const CreateJob = () => {
     // isPending: isVRFilesPending,
     data: VRFiles,
     isSuccess: isVRFilesSuccess,
-  } = useGetVRPathSimplified({
+  } = useGetListDirectoryContents({
     nodeAddress: auth?.node_address ?? '',
-    profile: auth?.profile ?? '',
-    shinkaiIdentity: auth?.shinkai_identity ?? '',
+    token: auth?.api_v2_key ?? '',
     path: '/',
-    my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-    my_device_identity_sk: auth?.profile_identity_sk ?? '',
-    node_encryption_pk: auth?.node_encryption_pk ?? '',
-    profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-    profile_identity_sk: auth?.profile_identity_sk ?? '',
   });
 
   const form = useForm<CreateJobFormSchema>({
diff --git a/apps/shinkai-visor/src/components/node-files/all-files.tsx b/apps/shinkai-visor/src/components/node-files/all-files.tsx
index 260aff9be..7eb8db226 100644
--- a/apps/shinkai-visor/src/components/node-files/all-files.tsx
+++ b/apps/shinkai-visor/src/components/node-files/all-files.tsx
@@ -5,7 +5,7 @@ import {
   VRFolder,
   VRItem,
 } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import { useGetMySharedFolders } from '@shinkai_network/shinkai-node-state/v2/queries/getMySharedFolders/useGetMySharedFolders';
 import {
   Breadcrumb,
@@ -88,17 +88,11 @@ const AllFiles = () => {
     isPending: isVRFilesPending,
     data: VRFiles,
     isSuccess: isVRFilesSuccess,
-  } = useGetVRPathSimplified(
+  } = useGetListDirectoryContents(
     {
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
       path: currentGlobalPath,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
+      token: auth?.api_v2_key ?? '',
     },
     {
       refetchInterval: 6000,
diff --git a/apps/shinkai-visor/src/components/node-files/folder-selection-list.tsx b/apps/shinkai-visor/src/components/node-files/folder-selection-list.tsx
index 0bedd26e6..60ca7e898 100644
--- a/apps/shinkai-visor/src/components/node-files/folder-selection-list.tsx
+++ b/apps/shinkai-visor/src/components/node-files/folder-selection-list.tsx
@@ -1,6 +1,6 @@
 import { HomeIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
+import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -85,19 +85,12 @@ export const FolderSelectionList = () => {
     (state) => state.setCurrentSelectedFolderPath,
   );
 
-  const { isPending: isVRFilesPending, data: VRFiles } = useGetVRPathSimplified(
-    {
+  const { isPending: isVRFilesPending, data: VRFiles } =
+    useGetListDirectoryContents({
       nodeAddress: auth?.node_address ?? '',
-      profile: auth?.profile ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
+      token: auth?.api_v2_key ?? '',
       path: currentSelectedFolderPath,
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
-    },
-  );
+    });
 
   const splitCurrentPath =
     destinationFolderPath?.split('/').filter(Boolean) ?? [];
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 90f2084c9..6aeacef51 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -458,54 +458,6 @@ export const archiveJob = async (
   const data = response.data;
   return data;
 };
-export const retrieveVRPathSimplified = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  path = '/',
-  setupDetailsState: CredentialsPayload,
-): Promise<{
-  data: {
-    created_time: string;
-    has_embeddings: boolean;
-    is_directory: boolean;
-    modified_time: string;
-    path: string;
-  }[];
-  status: string;
-}> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.retrievePathSimplified(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    path,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/vec_fs/retrieve_path_simplified_json'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return typeof data?.data === 'string'
-    ? {
-        data: JSON.parse(data.data),
-        status: data.status,
-      }
-    : data;
-};
 
 export const retrieveVectorSearchSimplified = async (
   nodeAddress: string,
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/index.ts b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
index f11b0a4c4..ebc347359 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/index.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
@@ -7,6 +7,8 @@ import {
   CopyFsItemResponse,
   CreateFolderRequest,
   CreateFolderResponse,
+  GetListDirectoryContentsRequest,
+  GetListDirectoryContentsResponse,
   MoveFolderRequest,
   MoveFolderResponse,
   MoveFsItemRequest,
@@ -35,6 +37,22 @@ export const retrieveSourceFile = async (
   return response.data as RetrieveSourceFileResponse;
 };
 
+export const getListDirectoryContents = async (
+  nodeAddress: string,
+  bearerToken: string,
+  payload: GetListDirectoryContentsRequest,
+) => {
+  const response = await httpClient.get(
+    urlJoin(nodeAddress, '/v2/retrieve_path_simplified'),
+    {
+      params: payload,
+      headers: { Authorization: `Bearer ${bearerToken}` },
+      responseType: 'json',
+    },
+  );
+  return response.data as GetListDirectoryContentsResponse;
+};
+
 export const createFolder = async (
   nodeAddress: string,
   bearerToken: string,
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/types.ts b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
index bf7f2c03c..c48418e8b 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/types.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
@@ -4,6 +4,23 @@ export type RetrieveSourceFileRequest = {
 
 export type RetrieveSourceFileResponse = string;
 
+export type GetListDirectoryContentsRequest = {
+  path: string;
+};
+
+export type DirectoryContent = {
+  children: null | DirectoryContent[];
+  created_time: string;
+  has_embeddings: boolean;
+  is_directory: boolean;
+  modified_time: string;
+  name: string;
+  path: string;
+  size: number;
+};
+
+export type GetListDirectoryContentsResponse = DirectoryContent[];
+
 export type MoveFolderRequest = {
   origin_path: string;
   destination_path: string;
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts
deleted file mode 100644
index 5f41a7b0a..000000000
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/index.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { retrieveVRPathSimplified as retrieveVRPathSimplifiedApi } from '@shinkai_network/shinkai-message-ts/api';
-
-import { transformFileInfo } from './transformations';
-import { FileInfo, GetVRPathSimplifiedInput } from './types';
-
-export const getVRPathSimplified = async ({
-  nodeAddress,
-  path,
-  shinkaiIdentity,
-  profile,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: GetVRPathSimplifiedInput): Promise<FileInfo[]> => {
-  const response = await retrieveVRPathSimplifiedApi(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    path,
-    {
-      my_device_encryption_sk: my_device_encryption_sk,
-      my_device_identity_sk: my_device_identity_sk,
-      node_encryption_pk: node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-
-  const transformedData = transformFileInfo(response.data);
-
-  return transformedData;
-};
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
deleted file mode 100644
index ef625b529..000000000
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { transformFileInfo } from './transformations';
-
-describe('transformFileInfo', () => {
-  it('should handle a directory', () => {
-    const input = [{
-      children: null,
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
-      is_directory: true,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      name: "nico",
-      path: "nico",
-      size: 0
-    }];
-
-    const result = transformFileInfo(input);
-    expect(result).toEqual([{
-      children: null,
-      created_time: "2024-12-30T05:27:59.764041184+00:00",
-      has_embeddings: false,
-      is_directory: true,
-      modified_time: "2024-12-30T05:27:59.764041184+00:00",
-      name: "nico",
-      path: "/nico",
-      size: 0,
-      extension: null,
-      file_size: null
-    }]);
-  });
-
-  it('should handle a file', () => {
-    const input = [{
-      children: null,
-      created_time: "2025-01-02T15:06:30.697154651+00:00",
-      has_embeddings: true,
-      is_directory: false,
-      modified_time: "2025-01-02T15:06:30.697297610+00:00",
-      name: "file.txt",
-      path: "nico/file.txt",
-      size: 956232
-    }];
-
-    const result = transformFileInfo(input);
-    expect(result).toEqual([{
-      children: null,
-      created_time: "2025-01-02T15:06:30.697154651+00:00",
-      has_embeddings: true,
-      is_directory: false,
-      modified_time: "2025-01-02T15:06:30.697297610+00:00",
-      name: "file.txt",
-      path: "/nico/file.txt",
-      size: 956232,
-      extension: "txt",
-      file_size: "956232"
-    }]);
-  });
-
-  it('should handle an empty array', () => {
-    const input = [];
-
-    const result = transformFileInfo(input);
-    expect(result).toEqual([]);
-  });
-
-  it('should handle multiple items', () => {
-    const input = [
-      {
-        children: null,
-        created_time: "2024-12-30T05:27:59.764041184+00:00",
-        has_embeddings: false,
-        is_directory: true,
-        modified_time: "2024-12-30T05:27:59.764041184+00:00",
-        name: "nico",
-        path: "nico",
-        size: 0
-      },
-      {
-        children: null,
-        created_time: "2025-01-02T15:06:30.697154651+00:00",
-        has_embeddings: true,
-        is_directory: false,
-        modified_time: "2025-01-02T15:06:30.697297610+00:00",
-        name: "file.txt",
-        path: "nico/file.txt",
-        size: 956232
-      }
-    ];
-
-    const result = transformFileInfo(input);
-    expect(result).toEqual([
-      {
-        children: null,
-        created_time: "2024-12-30T05:27:59.764041184+00:00",
-        has_embeddings: false,
-        is_directory: true,
-        modified_time: "2024-12-30T05:27:59.764041184+00:00",
-        name: "nico",
-        path: "/nico",
-        size: 0,
-        extension: null,
-        file_size: null
-      },
-      {
-        children: null,
-        created_time: "2025-01-02T15:06:30.697154651+00:00",
-        has_embeddings: true,
-        is_directory: false,
-        modified_time: "2025-01-02T15:06:30.697297610+00:00",
-        name: "file.txt",
-        path: "/nico/file.txt",
-        size: 956232,
-        extension: "txt",
-        file_size: "956232"
-      }
-    ]);
-  });
-}); 
\ No newline at end of file
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
deleted file mode 100644
index 947d3a912..000000000
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/transformations.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { FileInfo } from "./types";
-
-export function transformFileInfo(data: any[]): FileInfo[] {
-  return data.map(fileInfo => {
-    const pathWithSlash = fileInfo.path.startsWith('/') ? fileInfo.path : `/${fileInfo.path}`;
-    const name = pathWithSlash.split('/').pop() || '';
-    const hasDot = name.includes('.');
-    const extension = fileInfo.is_directory || !hasDot ? null : name.split('.').pop();
-    const file_size = fileInfo.is_directory ? null : '0';
-
-    return {
-      ...fileInfo,
-      path: pathWithSlash,
-      name,
-      extension,
-      file_size,
-    };
-  });
-}
\ No newline at end of file
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts b/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
deleted file mode 100644
index 8260c0c48..000000000
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/types.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { JobCredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-import { QueryObserverOptions } from '@tanstack/react-query';
-
-import { FunctionKey } from '../../constants';
-
-type ResourceSource = {
-  Standard: {
-    FileRef: {
-      file_name: string;
-      file_type: {
-        Document: string;
-      };
-      original_creation_datetime: null;
-      text_chunking_strategy: string;
-    };
-  };
-};
-
-type ResourceKeywords = {
-  keyword_list: string[];
-  keywords_embedding: null;
-};
-
-export type FileInfo = {
-  children: null | FileInfo[];
-  created_time: string;
-  has_embeddings: boolean;
-  is_directory: boolean;
-  modified_time: string;
-  path: string;
-  name: string;
-  size: number;
-  extension: string | null;
-  file_size: string | null;
-};
-
-export type VRItem = FileInfo;
-export type VRFolder = FileInfo;
-
-export type GetVRPathSimplifiedInput = JobCredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  path: string;
-};
-export type UseGetMySharedFolders = [
-  FunctionKey.GET_VR_FILES,
-  GetVRPathSimplifiedInput,
-];
-
-export type GetVRPathSimplifiedOutput = FileInfo[];
-
-export type Options = QueryObserverOptions<
-  GetVRPathSimplifiedOutput,
-  Error,
-  GetVRPathSimplifiedOutput,
-  GetVRPathSimplifiedOutput,
-  UseGetMySharedFolders
->;
diff --git a/libs/shinkai-node-state/src/lib/utils/files.ts b/libs/shinkai-node-state/src/lib/utils/files.ts
index 60d5a26cb..a3293b51d 100644
--- a/libs/shinkai-node-state/src/lib/utils/files.ts
+++ b/libs/shinkai-node-state/src/lib/utils/files.ts
@@ -1,15 +1,16 @@
+import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
 import { TreeNode } from 'primereact/treenode';
 
-import { FileInfo } from '../queries/getVRPathSimplified/types';
-
 export function transformDataToTreeNodes(
-  data: FileInfo[],
+  data: DirectoryContent[],
   parentPath = '/',
 ): TreeNode[] {
   const result: TreeNode[] = [];
 
   data.forEach((fileInfo) => {
-    const pathWithSlash = fileInfo.path.startsWith('/') ? fileInfo.path : `/${fileInfo.path}`;
+    const pathWithSlash = fileInfo.path.startsWith('/')
+      ? fileInfo.path
+      : `/${fileInfo.path}`;
 
     if (fileInfo.is_directory) {
       const folderNode: TreeNode = {
@@ -34,7 +35,9 @@ export function transformDataToTreeNodes(
   return result;
 }
 
-export function getFlatChildItems(data: FileInfo[]): FileInfo[] {
-  const result: FileInfo[] = [];
+export function getFlatChildItems(
+  data: DirectoryContent[],
+): DirectoryContent[] {
+  const result: DirectoryContent[] = [];
   return result;
 }
diff --git a/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/index.ts b/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/index.ts
new file mode 100644
index 000000000..116b51e12
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/index.ts
@@ -0,0 +1,15 @@
+import { getListDirectoryContents as getListDirectoryContentsApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
+
+import { GetVRPathSimplifiedInput } from './types';
+
+export const getListDirectoryContents = async ({
+  nodeAddress,
+  path,
+  token,
+}: GetVRPathSimplifiedInput) => {
+  const response = await getListDirectoryContentsApi(nodeAddress, token, {
+    path: path,
+  });
+
+  return response;
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/types.ts b/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/types.ts
new file mode 100644
index 000000000..8d1c027d3
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/types.ts
@@ -0,0 +1,25 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
+import { QueryObserverOptions } from '@tanstack/react-query';
+
+import { FunctionKeyV2 } from '../../constants';
+
+export type GetVRPathSimplifiedInput = Token & {
+  nodeAddress: string;
+  path: string;
+};
+
+export type UseGetDirectoryContents = [
+  FunctionKeyV2.GET_VR_FILES,
+  GetVRPathSimplifiedInput,
+];
+
+export type GetVRPathSimplifiedOutput = DirectoryContent[];
+
+export type Options = QueryObserverOptions<
+  GetVRPathSimplifiedOutput,
+  Error,
+  GetVRPathSimplifiedOutput,
+  GetVRPathSimplifiedOutput,
+  UseGetDirectoryContents
+>;
diff --git a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/useGetVRPathSimplified.ts b/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/useGetListDirectoryContents.ts
similarity index 52%
rename from libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/useGetVRPathSimplified.ts
rename to libs/shinkai-node-state/src/v2/queries/getDirectoryContents/useGetListDirectoryContents.ts
index f27618fbe..832d5383e 100644
--- a/libs/shinkai-node-state/src/lib/queries/getVRPathSimplified/useGetVRPathSimplified.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getDirectoryContents/useGetListDirectoryContents.ts
@@ -1,16 +1,16 @@
 import { useQuery } from '@tanstack/react-query';
 
-import { FunctionKey } from '../../constants';
-import { getVRPathSimplified } from './index';
+import { FunctionKeyV2 } from '../../constants';
+import { getListDirectoryContents } from './index';
 import { GetVRPathSimplifiedInput, Options } from './types';
 
-export const useGetVRPathSimplified = (
+export const useGetListDirectoryContents = (
   input: GetVRPathSimplifiedInput,
   options?: Omit<Options, 'queryKey' | 'queryFn'>,
 ) => {
   const response = useQuery({
-    queryKey: [FunctionKey.GET_VR_FILES, input],
-    queryFn: () => getVRPathSimplified(input),
+    queryKey: [FunctionKeyV2.GET_VR_FILES, input],
+    queryFn: () => getListDirectoryContents(input),
     ...options,
   });
   return response;

From 10e5068e4b2573d3e2b18f9e32f3a29ca141351f Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 16:23:51 -0500
Subject: [PATCH 18/39] fixes

---
 libs/shinkai-message-ts/src/api/jobs/types.ts       | 13 +++----------
 .../src/v2/mutations/createRecurringTask/index.ts   |  1 -
 .../src/v2/mutations/createToolCode/index.ts        |  4 ----
 .../src/v2/mutations/updateRecurringTask/index.ts   |  5 -----
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index ebb519b77..98ac1fc16 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -99,14 +99,7 @@ export type CreateJobResponse = {
 };
 
 export type JobMessageRequest = {
-  job_message: {
-    job_id: string;
-    content: string;
-    parent: string | null;
-    tool_key?: string;
-    fs_files_paths?: string[];
-    job_filenames?: string[];
-  };
+  job_message: JobMessage;
 };
 export type JobMessageResponse = {
   inbox: string;
@@ -150,8 +143,8 @@ export type JobMessage = {
       response?: string;
     }[];
   };
-  fs_files_paths: ShinkaiPath[];
-  job_filenames: string[];
+  fs_files_paths?: ShinkaiPath[];
+  job_filenames?: string[];
 };
 export type ChatMessage = {
   job_message: JobMessage;
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 b9c986379..b7fa82284 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
@@ -47,7 +47,6 @@ export const createRecurringTask = async ({
           job_id: jobId,
           content: message,
           tool_key: toolKey,
-          files_inbox: '',
         },
       },
 
diff --git a/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts b/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts
index 5140a5f5e..7c7556f89 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts
@@ -25,9 +25,6 @@ export const createToolCode = async ({
         scope: {
           vector_fs_items: [],
           vector_fs_folders: [],
-          local_vrpack: [],
-          local_vrkai: [],
-          network_folders: [],
         },
         associated_ui: 'Playground',
         is_hidden: true,
@@ -54,7 +51,6 @@ export const createToolCode = async ({
     message: {
       job_id: currentJobId,
       content: message,
-      files_inbox: '',
     },
     tools,
     language,
diff --git a/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts b/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts
index 49afccedd..b16a9d146 100644
--- a/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts
@@ -31,9 +31,6 @@ export const updateRecurringTask = async ({
           scope: {
             vector_fs_folders: [],
             vector_fs_items: [],
-            local_vrpack: [],
-            local_vrkai: [],
-            network_folders: [],
           },
         },
         llm_provider: llmProvider,
@@ -41,8 +38,6 @@ export const updateRecurringTask = async ({
           job_id: jobId,
           content: message,
           tool_key: toolKey,
-
-          files_inbox: '',
         },
       },
     },

From 939936eb372d57e3a5f893f57486321ebd0d0bed Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 16:58:46 -0500
Subject: [PATCH 19/39] clean up share folders

---
 .../use-onboarding-stepper.ts                 |  23 +-
 .../vector-fs/components/all-files-tab.tsx    |  17 +-
 .../components/my-shared-folders.tsx          | 184 ----------------
 .../vector-fs/components/vector-fs-drawer.tsx |   8 -
 .../components/vector-fs-folder-options.tsx   | 196 ------------------
 .../vector-fs/components/vector-fs-folder.tsx |  27 +--
 .../components/vector-fs-item-detail.tsx      |  29 ++-
 .../vector-fs/components/vector-fs-item.tsx   |   2 +-
 .../src/components/vector-fs/vector-fs.tsx    |  40 +---
 .../node-files/vector-fs-drawer.tsx           |   8 -
 .../node-files/vector-fs-folder-options.tsx   | 194 -----------------
 .../node-files/vector-fs-folder.tsx           |  44 +---
 libs/shinkai-message-ts/src/api/jobs/types.ts |  69 +-----
 libs/shinkai-message-ts/src/api/methods.ts    | 115 ----------
 .../mutations/createShareableFolder/index.ts  |  33 ---
 .../mutations/createShareableFolder/types.ts  |  13 --
 .../useCreateShareableFolder.ts               |  35 ----
 .../src/lib/mutations/unshareFolder/index.ts  |  31 ---
 .../src/lib/mutations/unshareFolder/types.ts  |  12 --
 .../unshareFolder/useUnshareFolder.ts         |  32 ---
 20 files changed, 32 insertions(+), 1080 deletions(-)
 delete mode 100644 apps/shinkai-desktop/src/components/vector-fs/components/my-shared-folders.tsx
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/createShareableFolder/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/createShareableFolder/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/createShareableFolder/useCreateShareableFolder.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/unshareFolder/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/unshareFolder/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/unshareFolder/useUnshareFolder.ts

diff --git a/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts b/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts
index a4a73b5a9..c3b750492 100644
--- a/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts
+++ b/apps/shinkai-desktop/src/components/onboarding-checklist/use-onboarding-stepper.ts
@@ -1,5 +1,3 @@
-// import { useGetMySharedFolders } from '@shinkai_network/shinkai-node-state/lib/queries/getMySharedFolders/useGetMySharedFolders';
-
 import { getFlatChildItems } from '@shinkai_network/shinkai-node-state/lib/utils/files';
 import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
 import { useGetHealth } from '@shinkai_network/shinkai-node-state/v2/queries/getHealth/useGetHealth';
@@ -46,17 +44,6 @@ export const useOnboardingSteps = () => {
     path: '/My Subscriptions',
   });
 
-  // const { data: mySharedFolders } = useGetMySharedFolders({
-  //   nodeAddress: auth?.node_address ?? '',
-  //   shinkaiIdentity: auth?.shinkai_identity ?? '',
-  //   profile: auth?.profile ?? '',
-  //   my_device_encryption_sk: auth?.my_device_encryption_sk ?? '',
-  //   my_device_identity_sk: auth?.my_device_identity_sk ?? '',
-  //   node_encryption_pk: auth?.node_encryption_pk ?? '',
-  //   profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-  //   profile_identity_sk: auth?.profile_identity_sk ?? '',
-  // });
-
   useEffect(() => {
     if (isSuccess && nodeInfo?.status === 'ok') {
       currentStepsMap.set(
@@ -102,19 +89,13 @@ export const useOnboardingSteps = () => {
   }, [inboxes]);
 
   useEffect(() => {
-    if ((subscriptionFolder?.child_folders ?? [])?.length > 0) {
+    if ((subscriptionFolder ?? [])?.length > 0) {
       currentStepsMap.set(
         GetStartedSteps.SubscribeToKnowledge,
         GetStartedStatus.Done,
       );
     }
-  }, [subscriptionFolder?.child_folders]);
-  //
-  // useEffect(() => {
-  //   if ((mySharedFolders ?? [])?.length > 0) {
-  //     currentStepsMap.set(GetStartedSteps.ShareFolder, GetStartedStatus.Done);
-  //   }
-  // }, [mySharedFolders]);
+  }, [subscriptionFolder]);
 
   return currentStepsMap;
 };
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
index 51d72539d..34a5a7a45 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from '@shinkai_network/shinkai-i18n';
 import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
 import { useGetSearchVRItems } from '@shinkai_network/shinkai-node-state/lib/queries/getSearchVRItems/useGetSearchVRItems';
 import { useGetListDirectoryContents } from '@shinkai_network/shinkai-node-state/v2/queries/getDirectoryContents/useGetListDirectoryContents';
-import { useGetMySharedFolders } from '@shinkai_network/shinkai-node-state/v2/queries/getMySharedFolders/useGetMySharedFolders';
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -121,13 +120,6 @@ const AllFiles = () => {
     },
   );
 
-  const { data: sharedFolders } = useGetMySharedFolders({
-    nodeAddress: auth?.node_address ?? '',
-    token: auth?.api_v2_key ?? '',
-    shinkaiIdentity: auth?.shinkai_identity ?? '',
-    profile: auth?.profile ?? '',
-  });
-
   const setSelectedFile = useVectorFsStore((state) => state.setSelectedFile);
   const [selectedFiles, setSelectedFiles] = React.useState<DirectoryContent[]>(
     [],
@@ -208,7 +200,7 @@ const AllFiles = () => {
   }, [fileInfoArray, isSortByName]);
 
   return (
-    <div className="flex h-full flex-col">
+    <div className="relative flex h-full flex-col">
       <DropdownMenu
         modal={false}
         onOpenChange={(value) => setMenuOpened(value)}
@@ -216,7 +208,7 @@ const AllFiles = () => {
       >
         <DropdownMenuTrigger asChild>
           <Button
-            className="absolute left-auto right-0 top-0 flex gap-2 self-end px-6"
+            className="absolute -top-12 right-0 flex gap-2 self-end px-6"
             size="sm"
           >
             <PlusIcon className="h-4 w-4" /> {t('vectorFs.actions.addNew')}
@@ -331,7 +323,7 @@ const AllFiles = () => {
           className={cn(
             'grid flex-1',
             layout === VectorFSLayout.Grid &&
-              'grid-cols-2 gap-3 md:grid-cols-3 lg:grid-cols-3 xl:grid-cols-5',
+              'grid-cols-2 gap-3 md:grid-cols-3',
             layout === VectorFSLayout.List &&
               'grid-cols-1 divide-y divide-gray-400',
             searchQuery && 'pt-4',
@@ -355,9 +347,6 @@ const AllFiles = () => {
                   isSelectedFolder={selectedFolders.some(
                     (selectedFolder) => selectedFolder.path === folder.path,
                   )}
-                  isSharedFolder={sharedFolders?.some(
-                    (sharedFolder) => sharedFolder.path === folder.path,
-                  )}
                   key={index}
                   onClick={() => {
                     setCurrentGlobalPath(folder.path);
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/my-shared-folders.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/my-shared-folders.tsx
deleted file mode 100644
index 9b8ba0093..000000000
--- a/apps/shinkai-desktop/src/components/vector-fs/components/my-shared-folders.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import { DotsVerticalIcon } from '@radix-ui/react-icons';
-import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { useGetMySharedFolders } from '@shinkai_network/shinkai-node-state/v2/queries/getMySharedFolders/useGetMySharedFolders';
-import {
-  buttonVariants,
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-  ScrollArea,
-} from '@shinkai_network/shinkai-ui';
-import { SharedFolderIcon } from '@shinkai_network/shinkai-ui/assets';
-import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
-import { cn } from '@shinkai_network/shinkai-ui/utils';
-import { Link2Off } from 'lucide-react';
-import React from 'react';
-
-import { useAuth } from '../../../store/auth';
-import { useVectorFsStore, VectorFSLayout } from '../context/vector-fs-context';
-import { VectorFsFolderAction } from './vector-fs-drawer';
-import VectorFsToggleLayout from './vector-fs-toggle-layout';
-
-export default function MySharedFolders() {
-  const { t } = useTranslation();
-  const layout = useVectorFsStore((state) => state.layout);
-  const auth = useAuth((state) => state.auth);
-  const { data: sharedFolders, isSuccess } = useGetMySharedFolders({
-    nodeAddress: auth?.node_address ?? '',
-    token: auth?.api_v2_key ?? '',
-    shinkaiIdentity: auth?.shinkai_identity ?? '',
-    profile: auth?.profile ?? '',
-  });
-
-  return (
-    <React.Fragment>
-      <div className="mb-4 flex justify-end">
-        <VectorFsToggleLayout />
-      </div>
-      {isSuccess && !sharedFolders.length && (
-        <p className="text-gray-80 text-center">
-          {t('vectorFs.emptyState.noSharedFolders')}
-        </p>
-      )}
-      {isSuccess && !!sharedFolders.length && (
-        <ScrollArea>
-          <div
-            className={cn(
-              'grid flex-1',
-              layout === VectorFSLayout.Grid &&
-                'grid-cols-2 gap-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5',
-              layout === VectorFSLayout.List &&
-                'grid-cols-1 divide-y divide-gray-400',
-            )}
-          >
-            {sharedFolders?.map((folder) => (
-              <SharedFolderItem
-                key={folder.path}
-                lastModified={formatDateToUSLocaleString(
-                  new Date(folder?.tree?.last_modified ?? ''),
-                )}
-                name={folder.path.replace(/\//g, '')}
-                path={folder.path}
-                totalItems={Object.keys(folder.tree.children || {}).length}
-              />
-            ))}
-          </div>
-        </ScrollArea>
-      )}
-    </React.Fragment>
-  );
-}
-
-function SharedFolderItem({
-  name,
-  lastModified,
-  totalItems,
-  path,
-}: {
-  name: string;
-  lastModified: string;
-  totalItems: number;
-  path: string;
-}) {
-  const { t } = useTranslation();
-
-  const setCurrentGlobalPath = useVectorFsStore(
-    (state) => state.setCurrentGlobalPath,
-  );
-  const layout = useVectorFsStore((state) => state.layout);
-  const setActiveDrawerMenuOption = useVectorFsStore(
-    (state) => state.setActiveDrawerMenuOption,
-  );
-  const setSelectedFolder = useVectorFsStore(
-    (state) => state.setSelectedFolder,
-  );
-  const setSelectedVectorFsTab = useVectorFsStore(
-    (state) => state.setSelectedVectorFsTab,
-  );
-
-  return (
-    <button
-      className={cn(
-        'flex items-center justify-between gap-2 truncate rounded-lg py-3.5 pr-2 hover:bg-gradient-to-r hover:from-gray-500 hover:to-gray-400',
-        layout === VectorFSLayout.Grid && 'rounded-lg bg-gray-400/30 p-2',
-      )}
-      key={path}
-      onClick={() => {
-        setSelectedVectorFsTab('all');
-        setCurrentGlobalPath(path);
-      }}
-      type="button"
-    >
-      <SharedFolderIcon />
-      <div className="flex-1 truncate text-left">
-        <div className="truncate text-sm font-medium">{name}</div>
-        {layout === VectorFSLayout.List && (
-          <p className="text-xs font-medium text-gray-100">
-            <span>{lastModified}</span> - <span>{totalItems} items</span>
-          </p>
-        )}
-      </div>
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <div
-            className={cn(
-              buttonVariants({
-                variant: 'tertiary',
-                size: 'icon',
-              }),
-              'border-0 hover:bg-gray-500/40',
-            )}
-            onClick={(event) => {
-              event.stopPropagation();
-            }}
-            role="button"
-            tabIndex={0}
-          >
-            <span className="sr-only">{t('common.seeOptions')}</span>
-            <DotsVerticalIcon className="text-gray-100" />
-          </div>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent
-          align="end"
-          className="min-w-[160px] border bg-gray-500 px-2.5 py-2"
-        >
-          {[
-            {
-              name: t('vectorFs.actions.unshare'),
-              icon: <Link2Off className="mr-3 h-4 w-4" />,
-              onClick: () => {
-                setActiveDrawerMenuOption(VectorFsFolderAction.Unshare);
-              },
-            },
-          ].map((option) => (
-            <React.Fragment key={option.name}>
-              <DropdownMenuItem
-                key={option.name}
-                onClick={(event) => {
-                  event.stopPropagation();
-                  option.onClick();
-                  setSelectedFolder({
-                    name,
-                    path,
-                    child_folders: [],
-                    child_items: [],
-                    created_datetime: new Date(lastModified),
-                    last_written_datetime: new Date(lastModified),
-                    last_modified_datetime: new Date(lastModified),
-                    last_read_datetime: new Date(lastModified),
-                    merkle_root: '',
-                    merkle_hash: '',
-                  });
-                }}
-              >
-                {option.icon}
-                {option.name}
-              </DropdownMenuItem>
-            </React.Fragment>
-          ))}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </button>
-  );
-}
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
index 0b4294228..aff8834fa 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
@@ -4,10 +4,8 @@ import { useVectorFsStore } from '../context/vector-fs-context';
 import { VectorFolderSelectionProvider } from './folder-selection-list';
 import {
   VectorFsFolderCopyAction,
-  VectorFsFolderCreateShareableAction,
   VectorFsFolderDeleteAction,
   VectorFsFolderMoveAction,
-  VectorFsFolderUnshareAction,
 } from './vector-fs-folder-options';
 import {
   AddNewFolderAction,
@@ -65,8 +63,6 @@ export enum VectorFsFolderAction {
   Move = 'move-folder',
   Copy = 'copy-folder',
   Delete = 'delete-folder',
-  CreateShareable = 'create-shareable-folder',
-  Unshare = 'unshare-folder',
 }
 
 export enum VectorFsItemAction {
@@ -103,10 +99,6 @@ const VectorFSDrawerContent = ({
       return <VectorFsFolderCopyAction />;
     case VectorFsFolderAction.Delete:
       return <VectorFsFolderDeleteAction />;
-    case VectorFsFolderAction.CreateShareable:
-      return <VectorFsFolderCreateShareableAction />;
-    case VectorFsFolderAction.Unshare:
-      return <VectorFsFolderUnshareAction />;
 
     // item actions
     case VectorFsItemAction.Move:
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
index 2b42cb8dd..7a6121373 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
@@ -1,31 +1,14 @@
-import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { isShinkaiIdentityLocalhost } from '@shinkai_network/shinkai-message-ts/utils';
-import {
-  ShareFolderFormSchema,
-  shareFolderFormSchema,
-} from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
-import { useCreateShareableFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createShareableFolder/useCreateShareableFolder';
-import { useUnshareFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/unshareFolder/useUnshareFolder';
 import { useCopyFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/copyFolder/useCopyFolder';
 import { useMoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/moveFolder/useMoveFolder';
 import { useRemoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFolder/useRemoveFolder';
 import {
-  Alert,
-  AlertDescription,
-  AlertTitle,
   Button,
-  Form,
-  FormField,
-  SheetDescription,
   SheetFooter,
   SheetHeader,
   SheetTitle,
-  TextField,
 } from '@shinkai_network/shinkai-ui';
-import { AlertCircle } from 'lucide-react';
 import React from 'react';
-import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
 
 import { useAuth } from '../../../store/auth';
@@ -199,182 +182,3 @@ export const VectorFsFolderCopyAction = () => {
     </React.Fragment>
   );
 };
-
-export const VectorFsFolderCreateShareableAction = () => {
-  const { t } = useTranslation();
-  const selectedFolder = useVectorFsStore((state) => state.selectedFolder);
-  const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
-  const auth = useAuth((state) => state.auth);
-  const shareFolderForm = useForm<ShareFolderFormSchema>({
-    resolver: zodResolver(shareFolderFormSchema),
-  });
-  const destinationFolderPath = useVectorFolderSelectionStore(
-    (state) => state.destinationFolderPath,
-  );
-  const setSelectedVectorFsTab = useVectorFsStore(
-    (state) => state.setSelectedVectorFsTab,
-  );
-
-  const { mutateAsync: createShareableFolder, isPending } =
-    useCreateShareableFolder({
-      onSuccess: () => {
-        closeDrawerMenu();
-        toast.success(t('vectorFs.success.folderShared'));
-        setSelectedVectorFsTab('shared-folders');
-      },
-      onError: () => {
-        toast.error(t('vectorFs.errors.folderShared'));
-      },
-    });
-
-  const onSubmit = async (data: ShareFolderFormSchema) => {
-    await createShareableFolder({
-      nodeAddress: auth?.node_address ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
-      profile: auth?.profile ?? '',
-      folderPath: selectedFolder?.path ?? '',
-      folderDescription: data.folderDescription ?? '',
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
-    });
-  };
-
-  const isIdentityLocalhost = isShinkaiIdentityLocalhost(
-    auth?.shinkai_identity ?? '',
-  );
-
-  return (
-    <React.Fragment>
-      <SheetHeader>
-        <SheetTitle className="line-clamp-1 font-normal">
-          {t('vectorFs.actions.share')}
-          <span className="font-medium">
-            {' '}
-            &quot;{selectedFolder?.name}&quot;
-          </span>{' '}
-        </SheetTitle>
-        <SheetDescription>
-          {t('vectorFs.actions.shareFolderText')}
-        </SheetDescription>
-      </SheetHeader>
-      <Form {...shareFolderForm}>
-        <form
-          className="mt-5 flex flex-col gap-3"
-          onSubmit={shareFolderForm.handleSubmit(onSubmit)}
-        >
-          <FormField
-            control={shareFolderForm.control}
-            name="folderDescription"
-            render={({ field }) => (
-              <TextField
-                autoFocus
-                field={field}
-                label={t('vectorFs.forms.folderDescription')}
-              />
-            )}
-          />
-          <Button
-            className="mt-4"
-            disabled={
-              destinationFolderPath === selectedFolder?.path ||
-              isIdentityLocalhost
-            }
-            isLoading={isPending}
-            type="submit"
-          >
-            {t('vectorFs.actions.share')}
-          </Button>
-
-          {isIdentityLocalhost && (
-            <Alert className="mx-auto w-[98%] shadow-lg" variant="warning">
-              <AlertCircle className="h-4 w-4" />
-              <AlertTitle className="text-sm">
-                {t('vectorFs.shareFolderWarning.title')}
-              </AlertTitle>
-              <AlertDescription className="text-xs">
-                <div className="">
-                  {t('vectorFs.shareFolderWarning.text')}
-
-                  <a
-                    className="underline"
-                    href="https://docs.shinkai.com/for-end-users/register-identity-onchain/"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    {t('vectorFs.shareFolderWarning.action')}{' '}
-                  </a>
-                </div>
-              </AlertDescription>
-            </Alert>
-          )}
-        </form>
-      </Form>
-    </React.Fragment>
-  );
-};
-export const VectorFsFolderUnshareAction = () => {
-  const { t, Trans } = useTranslation();
-  const selectedFolder = useVectorFsStore((state) => state.selectedFolder);
-  const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
-  const auth = useAuth((state) => state.auth);
-  const destinationFolderPath = useVectorFolderSelectionStore(
-    (state) => state.destinationFolderPath,
-  );
-
-  const { mutateAsync: unshareFolder, isPending } = useUnshareFolder({
-    onSuccess: () => {
-      closeDrawerMenu();
-      toast.success(t('vectorFs.success.folderUnshared'));
-    },
-    onError: () => {
-      toast.error(t('vectorFs.errors.folderUnshared'));
-    },
-  });
-
-  return (
-    <React.Fragment>
-      <SheetHeader>
-        <SheetTitle className="line-clamp-1 font-normal">
-          {t('vectorFs.actions.unshare')}
-          <span className="font-medium">
-            {' '}
-            &quot;{selectedFolder?.name}&quot;
-          </span>{' '}
-          ?
-        </SheetTitle>
-        <SheetDescription className="py-3">
-          <Trans
-            components={{ br: <br /> }}
-            i18nKey="vectorFs.actions.unshareFolderText"
-          />
-        </SheetDescription>
-      </SheetHeader>
-
-      <SheetFooter>
-        <Button
-          className="mt-4"
-          disabled={destinationFolderPath === selectedFolder?.path}
-          isLoading={isPending}
-          onClick={async () => {
-            await unshareFolder({
-              nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
-              folderPath: selectedFolder?.path ?? '',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
-            });
-          }}
-        >
-          {t('vectorFs.actions.unshare')}
-        </Button>
-      </SheetFooter>
-    </React.Fragment>
-  );
-};
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
index 65a2d07d6..e8c55654d 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
@@ -23,17 +23,10 @@ import {
 } from '@shinkai_network/shinkai-ui/assets';
 import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
-import {
-  CopyIcon,
-  FolderInputIcon,
-  Link2Off,
-  Share2,
-  TrashIcon,
-} from 'lucide-react';
+import { CopyIcon, FolderInputIcon, TrashIcon } from 'lucide-react';
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import config from '../../../config';
 import { useVectorFsStore, VectorFSLayout } from '../context/vector-fs-context';
 import { VectorFsFolderAction } from './vector-fs-drawer';
 
@@ -212,24 +205,6 @@ const VectorFsFolder = ({
                 });
               },
             },
-            config.isDev &&
-              (isSharedFolder
-                ? {
-                    name: t('vectorFs.actions.unshare'),
-                    icon: <Link2Off className="mr-3 h-4 w-4" />,
-                    onClick: () => {
-                      setActiveDrawerMenuOption(VectorFsFolderAction.Unshare);
-                    },
-                  }
-                : {
-                    name: t('vectorFs.actions.share'),
-                    icon: <Share2 className="mr-3 h-4 w-4" />,
-                    onClick: () => {
-                      setActiveDrawerMenuOption(
-                        VectorFsFolderAction.CreateShareable,
-                      );
-                    },
-                  }),
             {
               name: t('vectorFs.actions.delete'),
               icon: <TrashIcon className="mr-3 h-4 w-4" />,
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
index c03db7149..c8eb556df 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
@@ -11,6 +11,7 @@ import { FileTypeIcon } from '@shinkai_network/shinkai-ui/assets';
 import {
   formatDateToLocaleStringWithTime,
   formatDateToUSLocaleString,
+  getFileExt,
 } from '@shinkai_network/shinkai-ui/helpers';
 import { save } from '@tauri-apps/plugin-dialog';
 import { BaseDirectory } from '@tauri-apps/plugin-fs';
@@ -28,9 +29,8 @@ export const VectorFileDetails = () => {
   const size = partial({ standard: 'jedec' });
   const auth = useAuth((state) => state.auth);
 
-  const fileExtension =
-    selectedFile?.vr_header?.resource_source?.Standard?.FileRef?.file_type
-      ?.Document;
+  const fileExtension = getFileExt(selectedFile?.name ?? '');
+
   const { mutateAsync: retreiveSourceFile } = useRetrieveSourceFile({
     onSuccess: async (response, variables) => {
       if (!fileExtension) {
@@ -100,25 +100,22 @@ export const VectorFileDetails = () => {
           <div>
             <FileTypeIcon
               className="h-10 w-10"
-              type={
-                selectedFile?.vr_header?.resource_source?.Standard?.FileRef
-                  ?.file_type?.Document
-              }
+              type={getFileExt(selectedFile?.name ?? '')}
             />
           </div>
           <p className="break-words text-lg font-medium text-white">
             {selectedFile?.name}
             <Badge className="text-gray-80 ml-2 bg-gray-400 text-xs uppercase">
-              {selectedFile?.vr_header?.resource_source?.Standard?.FileRef
-                ?.file_type?.Document ?? '-'}
+              {getFileExt(selectedFile?.name ?? '') ?? '-'}
             </Badge>
           </p>
           <p className="text-gray-100">
             <span className="text-sm">
-              {formatDateToUSLocaleString(selectedFile?.created_datetime)}
+              {formatDateToUSLocaleString(
+                new Date(selectedFile?.created_time ?? ''),
+              )}
             </span>{' '}
-            -{' '}
-            <span className="text-sm">{size(selectedFile?.vr_size ?? 0)}</span>
+            - <span className="text-sm">{size(selectedFile?.size ?? 0)}</span>
           </p>
         </div>
         <div className="py-6">
@@ -127,14 +124,14 @@ export const VectorFileDetails = () => {
           </h2>
           <div className="divide-y divide-gray-300">
             {[
-              { label: 'Created', value: selectedFile?.created_datetime },
+              { label: 'Created', value: selectedFile?.created_time },
               {
                 label: 'Modified',
-                value: selectedFile?.last_written_datetime,
+                value: selectedFile?.modified_time,
               },
               {
                 label: 'Last Opened',
-                value: selectedFile?.last_read_datetime,
+                value: selectedFile?.modified_time,
               },
             ].map((item) => (
               <div
@@ -143,7 +140,7 @@ export const VectorFileDetails = () => {
               >
                 <span className="text-sm text-gray-100">{item.label}</span>
                 <span className="text-sm text-white">
-                  {formatDateToLocaleStringWithTime(item.value)}
+                  {formatDateToLocaleStringWithTime(new Date(item.value ?? ''))}
                 </span>
               </div>
             ))}
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index c823919b6..e16e5f0ee 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -42,7 +42,7 @@ export const VectorFsItemInfo = ({
 
   return (
     <div className="flex-1 truncate text-left">
-      <div className="text-sm font-medium">{file.path}</div>
+      <div className="text-sm font-medium">{file.name}</div>
       {layout === VectorFSLayout.List && (
         <p className="text-xs font-medium text-gray-100">
           <span>{createdDatetime}</span> - <span>{fileSize}</span>
diff --git a/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx b/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx
index 1c6d2741e..513571302 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx
@@ -1,53 +1,15 @@
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import {
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
-} from '@shinkai_network/shinkai-ui';
 
 import { SimpleLayout } from '../../pages/layout/simple-layout';
 import AllFilesTab from './components/all-files-tab';
-import MySharedFolders from './components/my-shared-folders';
 import VectorFSDrawer from './components/vector-fs-drawer';
-import { useVectorFsStore } from './context/vector-fs-context';
 
 export default function VectorFs() {
   const { t } = useTranslation();
 
-  const selectedVectorFsTab = useVectorFsStore(
-    (state) => state.selectedVectorFsTab,
-  );
-  const setSelectedVectorFsTab = useVectorFsStore(
-    (state) => state.setSelectedVectorFsTab,
-  );
   return (
     <SimpleLayout title={t('vectorFs.label')}>
-      <Tabs
-        className="relative flex h-full flex-col"
-        onValueChange={(value) =>
-          setSelectedVectorFsTab(value as 'all' | 'shared-folders')
-        }
-        value={selectedVectorFsTab}
-      >
-        <TabsList className="max-w-xs">
-          <TabsTrigger className="flex flex-1 items-center gap-2" value="all">
-            {t('vectorFs.allFiles')}
-          </TabsTrigger>
-          <TabsTrigger
-            className="flex flex-1 items-center gap-2"
-            value="shared-folders"
-          >
-            {t('vectorFs.sharedFolders')}{' '}
-          </TabsTrigger>
-        </TabsList>
-        <TabsContent className="h-full" value="all">
-          <AllFilesTab />
-        </TabsContent>
-        <TabsContent className="h-full" value="shared-folders">
-          <MySharedFolders />
-        </TabsContent>
-      </Tabs>
+      <AllFilesTab />
       <VectorFSDrawer />
     </SimpleLayout>
   );
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-drawer.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-drawer.tsx
index bedd5f0d0..8b0dee9c9 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-drawer.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-drawer.tsx
@@ -10,10 +10,8 @@ import { VectorFolderSelectionProvider } from './folder-selection-list';
 import { useVectorFsStore } from './node-file-context';
 import {
   VectorFsFolderCopyAction,
-  VectorFsFolderCreateShareableAction,
   VectorFsFolderDeleteAction,
   VectorFsFolderMoveAction,
-  VectorFsFolderUnshareAction,
 } from './vector-fs-folder-options';
 import {
   AddNewFolderAction,
@@ -74,8 +72,6 @@ export enum VectorFsFolderAction {
   Move = 'move-folder',
   Copy = 'copy-folder',
   Delete = 'delete-folder',
-  CreateShareable = 'create-shareable-folder',
-  Unshare = 'unshare-folder',
 }
 
 export enum VectorFsItemAction {
@@ -112,10 +108,6 @@ const VectorFSDrawerContent = ({
       return <VectorFsFolderCopyAction />;
     case VectorFsFolderAction.Delete:
       return <VectorFsFolderDeleteAction />;
-    case VectorFsFolderAction.CreateShareable:
-      return <VectorFsFolderCreateShareableAction />;
-    case VectorFsFolderAction.Unshare:
-      return <VectorFsFolderUnshareAction />;
 
     // item actions
     case VectorFsItemAction.Move:
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx
index ad225ad04..59b719aa6 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-folder-options.tsx
@@ -1,31 +1,14 @@
-import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { isShinkaiIdentityLocalhost } from '@shinkai_network/shinkai-message-ts/utils';
-import {
-  ShareFolderFormSchema,
-  shareFolderFormSchema,
-} from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
-import { useCreateShareableFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/createShareableFolder/useCreateShareableFolder';
-import { useUnshareFolder } from '@shinkai_network/shinkai-node-state/lib/mutations/unshareFolder/useUnshareFolder';
 import { useCopyFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/copyFolder/useCopyFolder';
 import { useMoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/moveFolder/useMoveFolder';
 import { useRemoveFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFolder/useRemoveFolder';
 import {
-  Alert,
-  AlertDescription,
-  AlertTitle,
   Button,
-  DrawerDescription,
   DrawerFooter,
   DrawerHeader,
   DrawerTitle,
-  Form,
-  FormField,
-  TextField,
 } from '@shinkai_network/shinkai-ui';
-import { AlertCircle } from 'lucide-react';
 import React from 'react';
-import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
 
 import { useAuth } from '../../store/auth/auth';
@@ -198,180 +181,3 @@ export const VectorFsFolderCopyAction = () => {
     </React.Fragment>
   );
 };
-
-export const VectorFsFolderCreateShareableAction = () => {
-  const { t } = useTranslation();
-  const selectedFolder = useVectorFsStore((state) => state.selectedFolder);
-  const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
-  const auth = useAuth((state) => state.auth);
-  const shareFolderForm = useForm<ShareFolderFormSchema>({
-    resolver: zodResolver(shareFolderFormSchema),
-  });
-  const destinationFolderPath = useVectorFolderSelectionStore(
-    (state) => state.destinationFolderPath,
-  );
-  const setSelectedVectorFsTab = useVectorFsStore(
-    (state) => state.setSelectedVectorFsTab,
-  );
-
-  const { mutateAsync: createShareableFolder, isPending } =
-    useCreateShareableFolder({
-      onSuccess: () => {
-        closeDrawerMenu();
-        toast.success(t('vectorFs.success.folderShared'));
-        setSelectedVectorFsTab('shared-folders');
-      },
-      onError: () => {
-        toast.error(t('vectorFs.errors.folderShared'));
-      },
-    });
-
-  const onSubmit = async (data: ShareFolderFormSchema) => {
-    await createShareableFolder({
-      nodeAddress: auth?.node_address ?? '',
-      shinkaiIdentity: auth?.shinkai_identity ?? '',
-      profile: auth?.profile ?? '',
-      folderPath: selectedFolder?.path ?? '',
-      folderDescription: data.folderDescription ?? '',
-      my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-      my_device_identity_sk: auth?.profile_identity_sk ?? '',
-      node_encryption_pk: auth?.node_encryption_pk ?? '',
-      profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-      profile_identity_sk: auth?.profile_identity_sk ?? '',
-    });
-  };
-  const isIdentityLocalhost = isShinkaiIdentityLocalhost(
-    auth?.shinkai_identity ?? '',
-  );
-
-  return (
-    <React.Fragment>
-      <DrawerHeader>
-        <DrawerTitle className="line-clamp-1 font-normal">
-          {t('vectorFs.actions.share')}
-          <span className="font-medium">
-            {' '}
-            &quot;{selectedFolder?.name}&quot;
-          </span>{' '}
-        </DrawerTitle>
-        <DrawerDescription>
-          {t('vectorFs.actions.shareFolderText')}
-        </DrawerDescription>
-      </DrawerHeader>
-      <Form {...shareFolderForm}>
-        <form
-          className="mt-5 flex flex-col gap-3"
-          onSubmit={shareFolderForm.handleSubmit(onSubmit)}
-        >
-          <FormField
-            control={shareFolderForm.control}
-            name="folderDescription"
-            render={({ field }) => (
-              <TextField
-                autoFocus
-                field={field}
-                label={t('vectorFs.forms.folderDescription')}
-              />
-            )}
-          />
-          <Button
-            className="mt-4"
-            disabled={
-              destinationFolderPath === selectedFolder?.path ||
-              isIdentityLocalhost
-            }
-            isLoading={isPending}
-            type="submit"
-          >
-            {t('vectorFs.actions.share')}
-          </Button>
-
-          {isIdentityLocalhost && (
-            <Alert className="mx-auto w-[98%] shadow-lg" variant="warning">
-              <AlertCircle className="h-4 w-4" />
-              <AlertTitle className="text-sm">
-                {t('vectorFs.shareFolderWarning.title')}
-              </AlertTitle>
-              <AlertDescription className="text-xs">
-                <div className="">
-                  {t('vectorFs.shareFolderWarning.text')}
-                  <a
-                    className="underline"
-                    href="https://docs.shinkai.com/for-end-users/register-identity-onchain/"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    {t('vectorFs.shareFolderWarning.action')}{' '}
-                  </a>
-                </div>
-              </AlertDescription>
-            </Alert>
-          )}
-        </form>
-      </Form>
-    </React.Fragment>
-  );
-};
-export const VectorFsFolderUnshareAction = () => {
-  const { t, Trans } = useTranslation();
-  const selectedFolder = useVectorFsStore((state) => state.selectedFolder);
-  const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
-  const auth = useAuth((state) => state.auth);
-  const destinationFolderPath = useVectorFolderSelectionStore(
-    (state) => state.destinationFolderPath,
-  );
-
-  const { mutateAsync: unshareFolder, isPending } = useUnshareFolder({
-    onSuccess: () => {
-      closeDrawerMenu();
-      toast.success(t('vectorFs.success.folderUnshared'));
-    },
-    onError: () => {
-      toast.error(t('vectorFs.errors.folderUnshared'));
-    },
-  });
-
-  return (
-    <React.Fragment>
-      <DrawerHeader>
-        <DrawerTitle className="line-clamp-1 font-normal">
-          {t('vectorFs.actions.unshare')}
-          <span className="font-medium">
-            {' '}
-            &quot;{selectedFolder?.name}&quot;
-          </span>{' '}
-          ?
-        </DrawerTitle>
-        <DrawerDescription className="py-3">
-          <Trans
-            components={{ br: <br /> }}
-            i18nKey="vectorFs.actions.unshareFolderText"
-          />
-        </DrawerDescription>
-      </DrawerHeader>
-
-      <DrawerFooter>
-        <Button
-          className="mt-4"
-          disabled={destinationFolderPath === selectedFolder?.path}
-          isLoading={isPending}
-          onClick={async () => {
-            await unshareFolder({
-              nodeAddress: auth?.node_address ?? '',
-              shinkaiIdentity: auth?.shinkai_identity ?? '',
-              profile: auth?.profile ?? '',
-              folderPath: selectedFolder?.path ?? '',
-              my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
-              my_device_identity_sk: auth?.profile_identity_sk ?? '',
-              node_encryption_pk: auth?.node_encryption_pk ?? '',
-              profile_encryption_sk: auth?.profile_encryption_sk ?? '',
-              profile_identity_sk: auth?.profile_identity_sk ?? '',
-            });
-          }}
-        >
-          {t('vectorFs.actions.unshare')}
-        </Button>
-      </DrawerFooter>
-    </React.Fragment>
-  );
-};
diff --git a/apps/shinkai-visor/src/components/node-files/vector-fs-folder.tsx b/apps/shinkai-visor/src/components/node-files/vector-fs-folder.tsx
index 93c40e0ad..ae64900bb 100644
--- a/apps/shinkai-visor/src/components/node-files/vector-fs-folder.tsx
+++ b/apps/shinkai-visor/src/components/node-files/vector-fs-folder.tsx
@@ -1,6 +1,6 @@
 import { DotsVerticalIcon } from '@radix-ui/react-icons';
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
-import { VRFolder } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/types';
+import { DirectoryContent } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
 import {
   buttonVariants,
   Checkbox,
@@ -17,17 +17,10 @@ import {
 } from '@shinkai_network/shinkai-ui/assets';
 import { formatDateToUSLocaleString } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
-import {
-  CopyIcon,
-  FolderInputIcon,
-  Link2Off,
-  Share2,
-  TrashIcon,
-} from 'lucide-react';
+import { CopyIcon, FolderInputIcon, TrashIcon } from 'lucide-react';
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import config from '../../config';
 import { useVectorFsStore, VectorFSLayout } from './node-file-context';
 import { VectorFsFolderAction } from './vector-fs-drawer';
 
@@ -37,7 +30,7 @@ export const VectorFsFolderInfo = ({
   allowFolderNameOnly,
   layout,
 }: {
-  folder: VRFolder;
+  folder: DirectoryContent;
   totalItem?: number;
   allowFolderNameOnly?: boolean;
   layout?: VectorFSLayout;
@@ -47,8 +40,10 @@ export const VectorFsFolderInfo = ({
       <div className="truncate text-sm font-medium">{folder.name}</div>
       {layout === VectorFSLayout.List && !allowFolderNameOnly && (
         <p className="text-xs font-medium text-gray-100">
-          <span>{formatDateToUSLocaleString(folder.created_datetime)}</span> -{' '}
-          <span>{totalItem} items</span>
+          <span>
+            {formatDateToUSLocaleString(new Date(folder.created_time ?? ''))}
+          </span>{' '}
+          - <span>{totalItem} items</span>
         </p>
       )}
     </div>
@@ -63,8 +58,8 @@ const VectorFsFolder = ({
   isSharedFolder,
 }: {
   onClick: () => void;
-  folder: VRFolder;
-  handleSelectFolders: (folder: VRFolder) => void;
+  folder: DirectoryContent;
+  handleSelectFolders: (folder: DirectoryContent) => void;
   isSelectedFolder: boolean;
   isSharedFolder?: boolean;
 }) => {
@@ -85,8 +80,7 @@ const VectorFsFolder = ({
     'flex items-center justify-between gap-2 truncate rounded-lg py-3.5 pr-2 hover:bg-gradient-to-r hover:from-gray-500 hover:to-gray-400',
     layout === VectorFSLayout.Grid && 'bg-gray-400/30 p-2',
   );
-  const totalItem =
-    (folder.child_folders?.length ?? 0) + (folder.child_items?.length ?? 0);
+  const totalItem = (folder.children ?? [])?.length ?? 0;
 
   const FolderIcon = isSharedFolder ? SharedFolderIcon : DirectoryTypeIcon;
 
@@ -173,24 +167,6 @@ const VectorFsFolder = ({
                 });
               },
             },
-            config.isDev &&
-              (isSharedFolder
-                ? {
-                    name: t('vectorFs.actions.unshare'),
-                    icon: <Link2Off className="mr-3 h-4 w-4" />,
-                    onClick: () => {
-                      setActiveDrawerMenuOption(VectorFsFolderAction.Unshare);
-                    },
-                  }
-                : {
-                    name: t('vectorFs.actions.share'),
-                    icon: <Share2 className="mr-3 h-4 w-4" />,
-                    onClick: () => {
-                      setActiveDrawerMenuOption(
-                        VectorFsFolderAction.CreateShareable,
-                      );
-                    },
-                  }),
             {
               name: t('vectorFs.actions.delete'),
               icon: <TrashIcon className="mr-3 h-4 w-4" />,
diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index 98ac1fc16..e340cacc1 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -1,73 +1,5 @@
 import { AgentInbox } from '../../models/ShinkaiMessage';
 
-type ResourceSource = {
-  Standard: {
-    FileRef: {
-      file_name: string;
-      file_type: {
-        Document: string;
-      };
-      original_creation_datetime: null;
-      text_chunking_strategy: string;
-    };
-  };
-};
-
-type ResourceKeywords = {
-  keyword_list: string[];
-  keywords_embedding: null;
-};
-
-type VRHeader = {
-  resource_name: string;
-  resource_id: string;
-  resource_base_type: 'Document';
-  resource_source: ResourceSource;
-  resource_embedding: null;
-  resource_created_datetime: Date;
-  resource_last_written_datetime: Date;
-  resource_embedding_model_used: {
-    TextEmbeddingsInference: string;
-  };
-  resource_merkle_root: string;
-  resource_keywords: ResourceKeywords;
-  data_tag_names: string[];
-  metadata_index_keys: string[];
-};
-
-export type VRItem = {
-  name: string;
-  path: string;
-  vr_header: VRHeader;
-  created_datetime: Date;
-  last_written_datetime: Date;
-  last_read_datetime: Date;
-  vr_last_saved_datetime: Date;
-  source_file_map_last_saved_datetime: Date;
-  distribution_origin: null;
-  vr_size: number;
-  source_file_map_size: number;
-  merkle_hash: string;
-};
-
-export type VRFolder = {
-  path: string;
-  child_folders: VRFolder[];
-  child_items: Array<VRItem>;
-  created_datetime: Date;
-  last_written_datetime: Date;
-  merkle_root: string;
-  last_modified_datetime: Date;
-  last_read_datetime: Date;
-  merkle_hash: string;
-  name: string;
-};
-
-export type VRFolderScope = Pick<VRFolder, 'name' | 'path'>;
-export type VRItemScope = Pick<VRItem, 'name' | 'path'> & {
-  source: ResourceSource;
-};
-
 export enum VectorSearchMode {
   FillUpTo25k = 'FillUpTo25k',
   MergeSiblings = 'MergeSiblings',
@@ -158,6 +90,7 @@ export type ChatMessage = {
 export type GetLastMessagesResponse = ChatMessage[];
 export type GetLastMessagesWithBranchesResponse = ChatMessage[][];
 export type CreateFilesInboxResponse = string;
+
 export type AddFileToInboxRequest = {
   file_inbox_name: string;
   filename: string;
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 6aeacef51..746f57a14 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -671,121 +671,6 @@ export const getAvailableSharedFolders = async (
   return data;
 };
 
-// TODO: remove this
-export const getMySharedFolders = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  streamer_node_name: string,
-  streamer_profile_name: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.getMySharedFolders(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-    streamer_node_name,
-    streamer_profile_name,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/available_shared_items'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return typeof data?.data === 'string'
-    ? {
-        data: JSON.parse(data.data),
-        status: data.status,
-      }
-    : data;
-};
-
-export const createShareableFolder = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  folderPath: string,
-  folderDescription: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.createShareableFolder(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    folderPath,
-    folderDescription,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/create_shareable_folder'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
-
-// TODO: remove this
-export const unshareFolder = async (
-  nodeAddress: string,
-  sender: string,
-  sender_subidentity: string,
-  receiver: string,
-  receiver_subidentity: string,
-  folderPath: string,
-  setupDetailsState: CredentialsPayload,
-): Promise<{ data: any; status: string }> => {
-  const messageStr = ShinkaiMessageBuilderWrapper.unshareFolder(
-    setupDetailsState.profile_encryption_sk,
-    setupDetailsState.profile_identity_sk,
-    setupDetailsState.node_encryption_pk,
-    folderPath,
-    sender,
-    sender_subidentity,
-    receiver,
-    receiver_subidentity,
-  );
-
-  const message = JSON.parse(messageStr);
-
-  const response = await httpClient.post(
-    urlJoin(nodeAddress, '/v1/unshare_folder'),
-    message,
-
-    {
-      responseType: 'json',
-    },
-  );
-
-  const data = response.data;
-  return data;
-};
 export const subscribeToSharedFolder = async (
   nodeAddress: string,
   sender: string,
diff --git a/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/index.ts b/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/index.ts
deleted file mode 100644
index ae399f078..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { createShareableFolder as createShareableFolderAPI } from '@shinkai_network/shinkai-message-ts/api';
-
-import { CreateShareableFolderInput } from './types';
-
-export const createShareableFolder = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  folderPath,
-  folderDescription,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: CreateShareableFolderInput) => {
-  return await createShareableFolderAPI(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    folderPath,
-    folderDescription,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/types.ts b/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/types.ts
deleted file mode 100644
index f84c99e77..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type CreateShareableFolderOutput = {
-  status: string;
-};
-
-export type CreateShareableFolderInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  folderPath: string;
-  folderDescription: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/useCreateShareableFolder.ts b/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/useCreateShareableFolder.ts
deleted file mode 100644
index 76c760ceb..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/createShareableFolder/useCreateShareableFolder.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {
-  useMutation,
-  type UseMutationOptions,
-  useQueryClient,
-} from '@tanstack/react-query';
-
-import { FunctionKey } from '../../constants';
-import { createShareableFolder } from './index';
-import {
-  CreateShareableFolderInput,
-  CreateShareableFolderOutput,
-} from './types';
-
-type Options = UseMutationOptions<
-  CreateShareableFolderOutput,
-  Error,
-  CreateShareableFolderInput
->;
-
-export const useCreateShareableFolder = (options?: Options) => {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: createShareableFolder,
-    ...options,
-    onSuccess: (response, variables, context) => {
-      queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_AVAILABLE_SHARED_ITEMS],
-      });
-
-      if (options?.onSuccess) {
-        options.onSuccess(response, variables, context);
-      }
-    },
-  });
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/unshareFolder/index.ts b/libs/shinkai-node-state/src/lib/mutations/unshareFolder/index.ts
deleted file mode 100644
index 759a41ce0..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/unshareFolder/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { unshareFolder as unshareFolderAPI } from '@shinkai_network/shinkai-message-ts/api';
-
-import { UnshareFolderInput } from './types';
-
-export const unshareFolder = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  folderPath,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: UnshareFolderInput) => {
-  return await unshareFolderAPI(
-    nodeAddress,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    folderPath,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/unshareFolder/types.ts b/libs/shinkai-node-state/src/lib/mutations/unshareFolder/types.ts
deleted file mode 100644
index 2bc8c8dd7..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/unshareFolder/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type UnshareFolderOutput = {
-  status: string;
-};
-
-export type UnshareFolderInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  folderPath: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/unshareFolder/useUnshareFolder.ts b/libs/shinkai-node-state/src/lib/mutations/unshareFolder/useUnshareFolder.ts
deleted file mode 100644
index 774491915..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/unshareFolder/useUnshareFolder.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {
-  useMutation,
-  type UseMutationOptions,
-  useQueryClient,
-} from '@tanstack/react-query';
-
-import { FunctionKey } from '../../constants';
-import { unshareFolder } from './index';
-import { UnshareFolderInput, UnshareFolderOutput } from './types';
-
-type Options = UseMutationOptions<
-  UnshareFolderOutput,
-  Error,
-  UnshareFolderInput
->;
-
-export const useUnshareFolder = (options?: Options) => {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: unshareFolder,
-    ...options,
-    onSuccess: (response, variables, context) => {
-      queryClient.invalidateQueries({
-        queryKey: [FunctionKey.GET_MY_SHARED_FOLDERS],
-      });
-
-      if (options?.onSuccess) {
-        options.onSuccess(response, variables, context);
-      }
-    },
-  });
-};

From 7f4210eaaac483983d9715a3e900fa94614229e3 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 18:39:17 -0500
Subject: [PATCH 20/39] fixes to download source file

---
 .../components/vector-fs-item-detail.tsx      | 96 +++++++++----------
 libs/shinkai-message-ts/src/api/jobs/index.ts | 10 +-
 libs/shinkai-message-ts/src/api/jobs/types.ts |  5 +
 .../src/api/vector-fs/index.ts                | 18 ----
 .../src/api/vector-fs/types.ts                |  6 --
 .../src/lib/mutations/downloadVRFile/index.ts | 31 ------
 .../src/lib/mutations/downloadVRFile/types.ts | 13 ---
 .../downloadVRFile/useDownloadVRFile.ts       | 17 ----
 .../v2/mutations/retrieveSourceFile/index.ts  | 13 ---
 .../v2/mutations/retrieveSourceFile/types.ts  |  9 --
 .../useRetrieveSourceFile.ts                  | 18 ----
 .../v2/queries/getChatConversation/index.ts   | 14 ++-
 .../src/v2/queries/getDownloadFile/index.ts   | 11 +++
 .../src/v2/queries/getDownloadFile/types.ts   |  8 ++
 .../getDownloadFile/useGetDownloadFile.ts     | 17 ++++
 15 files changed, 101 insertions(+), 185 deletions(-)
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/downloadVRFile/index.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/downloadVRFile/types.ts
 delete mode 100644 libs/shinkai-node-state/src/lib/mutations/downloadVRFile/useDownloadVRFile.ts
 delete mode 100644 libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/index.ts
 delete mode 100644 libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/types.ts
 delete mode 100644 libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/useRetrieveSourceFile.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getDownloadFile/index.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getDownloadFile/types.ts
 create mode 100644 libs/shinkai-node-state/src/v2/queries/getDownloadFile/useGetDownloadFile.ts

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
index c8eb556df..a3000a565 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
@@ -1,5 +1,4 @@
-import { useDownloadVRFile } from '@shinkai_network/shinkai-node-state/lib/mutations/downloadVRFile/useDownloadVRFile';
-import { useRetrieveSourceFile } from '@shinkai_network/shinkai-node-state/v2/mutations/retrieveSourceFile/useRetrieveSourceFile';
+import { useGetDownloadFile } from '@shinkai_network/shinkai-node-state/v2/queries/getDownloadFile/useGetDownloadFile';
 import {
   Badge,
   Button,
@@ -31,7 +30,7 @@ export const VectorFileDetails = () => {
 
   const fileExtension = getFileExt(selectedFile?.name ?? '');
 
-  const { mutateAsync: retreiveSourceFile } = useRetrieveSourceFile({
+  const { mutateAsync: downloadFile } = useGetDownloadFile({
     onSuccess: async (response, variables) => {
       if (!fileExtension) {
         toast.error('File extension not found');
@@ -43,7 +42,7 @@ export const VectorFileDetails = () => {
         );
 
         const savePath = await save({
-          defaultPath: `${variables.filePath.split('/').pop()}.${fileExtension.toLowerCase()}`,
+          defaultPath: `${variables.path.split('/').pop()}.${fileExtension.toLowerCase()}`,
           filters: [
             { name: fileExtension, extensions: [fileExtension.toLowerCase()] },
           ],
@@ -66,29 +65,29 @@ export const VectorFileDetails = () => {
     },
   });
 
-  const { mutateAsync: downloadVRFile } = useDownloadVRFile({
-    onSuccess: async (response, variables) => {
-      const file = new Blob([response.data], {
-        type: 'application/octet-stream',
-      });
-      const dataUrl = await new Promise<string>((resolve) => {
-        const reader = new FileReader();
-        reader.onload = () => resolve(reader.result as string);
-        reader.readAsDataURL(file);
-      });
-
-      const path = await save({
-        defaultPath: variables.path.split('/').at(-1) + '.vrkai',
-      });
-      if (!path) return;
-      const fileContent = await fetch(dataUrl).then((response) =>
-        response.arrayBuffer(),
-      );
-      await fs.writeFile(path, new Uint8Array(fileContent), {
-        baseDir: BaseDirectory.Download,
-      });
-    },
-  });
+  // const { mutateAsync: downloadVRFile } = useDownloadVRFile({
+  //   onSuccess: async (response, variables) => {
+  //     const file = new Blob([response.data], {
+  //       type: 'application/octet-stream',
+  //     });
+  //     const dataUrl = await new Promise<string>((resolve) => {
+  //       const reader = new FileReader();
+  //       reader.onload = () => resolve(reader.result as string);
+  //       reader.readAsDataURL(file);
+  //     });
+  //
+  //     const path = await save({
+  //       defaultPath: variables.path.split('/').at(-1) + '.vrkai',
+  //     });
+  //     if (!path) return;
+  //     const fileContent = await fetch(dataUrl).then((response) =>
+  //       response.arrayBuffer(),
+  //     );
+  //     await fs.writeFile(path, new Uint8Array(fileContent), {
+  //       baseDir: BaseDirectory.Download,
+  //     });
+  //   },
+  // });
 
   return (
     <React.Fragment>
@@ -155,32 +154,33 @@ export const VectorFileDetails = () => {
         </div>
       </div>
       <SheetFooter className="flex flex-row gap-3 [&>*]:flex-1">
+        {/* Hide it til we support it in the node */}
+        {/*<Button*/}
+        {/*  onClick={async () => {*/}
+        {/*    if (!selectedFile || !auth) return;*/}
+        {/*    await downloadVRFile({*/}
+        {/*      nodeAddress: auth.node_address,*/}
+        {/*      shinkaiIdentity: auth?.shinkai_identity,*/}
+        {/*      profile: auth.profile,*/}
+        {/*      path: selectedFile.path,*/}
+        {/*      my_device_encryption_sk: auth.profile_encryption_sk,*/}
+        {/*      my_device_identity_sk: auth.profile_identity_sk,*/}
+        {/*      node_encryption_pk: auth.node_encryption_pk,*/}
+        {/*      profile_encryption_sk: auth.profile_encryption_sk,*/}
+        {/*      profile_identity_sk: auth.profile_identity_sk,*/}
+        {/*    });*/}
+        {/*  }}*/}
+        {/*  size="sm"*/}
+        {/*  variant="outline"*/}
+        {/*>*/}
+        {/*  Download Vector Resource*/}
+        {/*</Button>*/}
         <Button
           onClick={async () => {
             if (!selectedFile || !auth) return;
-            await downloadVRFile({
+            await downloadFile({
               nodeAddress: auth.node_address,
-              shinkaiIdentity: auth?.shinkai_identity,
-              profile: auth.profile,
               path: selectedFile.path,
-              my_device_encryption_sk: auth.profile_encryption_sk,
-              my_device_identity_sk: auth.profile_identity_sk,
-              node_encryption_pk: auth.node_encryption_pk,
-              profile_encryption_sk: auth.profile_encryption_sk,
-              profile_identity_sk: auth.profile_identity_sk,
-            });
-          }}
-          size="sm"
-          variant="outline"
-        >
-          Download Vector Resource
-        </Button>
-        <Button
-          onClick={async () => {
-            if (!selectedFile || !auth) return;
-            await retreiveSourceFile({
-              nodeAddress: auth.node_address,
-              filePath: selectedFile.path,
               token: auth.api_v2_key,
             });
           }}
diff --git a/libs/shinkai-message-ts/src/api/jobs/index.ts b/libs/shinkai-message-ts/src/api/jobs/index.ts
index b61b3375b..b2f5833c6 100644
--- a/libs/shinkai-message-ts/src/api/jobs/index.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/index.ts
@@ -12,6 +12,8 @@ import {
   GetAllInboxesResponse,
   GetChatConfigRequest,
   GetChatConfigResponse,
+  GetDownloadFileRequest,
+  GetDownloadFileResponse,
   GetFileNamesRequest,
   GetFileNamesResponse,
   GetJobFolderNameRequest,
@@ -214,19 +216,19 @@ export const getJobFolderName = async (
   return response.data as GetJobFolderNameResponse;
 };
 
-export const downloadFileFromJob = async (
+export const downloadFile = async (
   nodeAddress: string,
   bearerToken: string,
-  filePath: string,
+  payload: GetDownloadFileRequest,
 ) => {
   const response = await httpClient.get(
     urlJoin(nodeAddress, `/v2/download_file`),
     {
       headers: { Authorization: `Bearer ${bearerToken}` },
-      params: { path: filePath },
+      params: payload,
     },
   );
-  return response.data as string;
+  return response.data as GetDownloadFileResponse;
 };
 
 export const getLLMProviders = async (
diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index e340cacc1..e4faed12f 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -113,6 +113,11 @@ export type LLMProvider = {
   allowed_message_senders: string[];
 };
 
+export type GetDownloadFileRequest = {
+  path: string;
+};
+export type GetDownloadFileResponse = string;
+
 export type GetLLMProvidersResponse = LLMProvider[];
 
 export type LLMProviderInterface = {
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/index.ts b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
index ebc347359..013e6d5c9 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/index.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/index.ts
@@ -17,26 +17,8 @@ import {
   RemoveFolderResponse,
   RemoveFsItemRequest,
   RemoveFsItemResponse,
-  RetrieveSourceFileRequest,
-  RetrieveSourceFileResponse,
 } from './types';
 
-export const retrieveSourceFile = async (
-  nodeAddress: string,
-  bearerToken: string,
-  payload: RetrieveSourceFileRequest,
-) => {
-  const response = await httpClient.get(
-    urlJoin(nodeAddress, '/v2/retrieve_source_file'),
-    {
-      params: payload,
-      headers: { Authorization: `Bearer ${bearerToken}` },
-      responseType: 'json',
-    },
-  );
-  return response.data as RetrieveSourceFileResponse;
-};
-
 export const getListDirectoryContents = async (
   nodeAddress: string,
   bearerToken: string,
diff --git a/libs/shinkai-message-ts/src/api/vector-fs/types.ts b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
index c48418e8b..12e4722ee 100644
--- a/libs/shinkai-message-ts/src/api/vector-fs/types.ts
+++ b/libs/shinkai-message-ts/src/api/vector-fs/types.ts
@@ -1,9 +1,3 @@
-export type RetrieveSourceFileRequest = {
-  path: string;
-};
-
-export type RetrieveSourceFileResponse = string;
-
 export type GetListDirectoryContentsRequest = {
   path: string;
 };
diff --git a/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/index.ts b/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/index.ts
deleted file mode 100644
index b6f265594..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { downloadVectorResource as downloadVRFileAPI } from '@shinkai_network/shinkai-message-ts/api';
-
-import { DownloadVRFileInput } from './types';
-
-export const downloadVRFile = async ({
-  nodeAddress,
-  shinkaiIdentity,
-  profile,
-  path,
-  my_device_encryption_sk,
-  my_device_identity_sk,
-  node_encryption_pk,
-  profile_encryption_sk,
-  profile_identity_sk,
-}: DownloadVRFileInput) => {
-  return await downloadVRFileAPI(
-    nodeAddress,
-    path,
-    shinkaiIdentity,
-    profile,
-    shinkaiIdentity,
-    profile,
-    {
-      my_device_encryption_sk,
-      my_device_identity_sk,
-      node_encryption_pk,
-      profile_encryption_sk,
-      profile_identity_sk,
-    },
-  );
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/types.ts b/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/types.ts
deleted file mode 100644
index b7839c1fd..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { CredentialsPayload } from '@shinkai_network/shinkai-message-ts/models';
-
-export type DownloadVRFileOutput = {
-  status: string;
-  data: string;
-};
-
-export type DownloadVRFileInput = CredentialsPayload & {
-  nodeAddress: string;
-  shinkaiIdentity: string;
-  profile: string;
-  path: string;
-};
diff --git a/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/useDownloadVRFile.ts b/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/useDownloadVRFile.ts
deleted file mode 100644
index 2b4d828ae..000000000
--- a/libs/shinkai-node-state/src/lib/mutations/downloadVRFile/useDownloadVRFile.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useMutation,type UseMutationOptions } from '@tanstack/react-query';
-
-import { downloadVRFile } from './index';
-import { DownloadVRFileInput, DownloadVRFileOutput } from './types';
-
-type Options = UseMutationOptions<
-  DownloadVRFileOutput,
-  Error,
-  DownloadVRFileInput
->;
-
-export const useDownloadVRFile = (options?: Options) => {
-  return useMutation({
-    mutationFn: downloadVRFile,
-    ...options,
-  });
-};
diff --git a/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/index.ts b/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/index.ts
deleted file mode 100644
index 5098e0f68..000000000
--- a/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { retrieveSourceFile as retrieveSourceFileApi } from '@shinkai_network/shinkai-message-ts/api/vector-fs/index';
-
-import { RetrieveSourceFileInput } from './types';
-
-export const retrieveSourceFile = async ({
-  nodeAddress,
-  token,
-  filePath,
-}: RetrieveSourceFileInput) => {
-  return await retrieveSourceFileApi(nodeAddress, token, {
-    path: filePath,
-  });
-};
diff --git a/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/types.ts b/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/types.ts
deleted file mode 100644
index 6848b49d8..000000000
--- a/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
-import { RetrieveSourceFileResponse } from '@shinkai_network/shinkai-message-ts/api/vector-fs/types';
-
-export type RetrieveSourceFileOutput = RetrieveSourceFileResponse;
-
-export type RetrieveSourceFileInput = Token & {
-  nodeAddress: string;
-  filePath: string;
-};
diff --git a/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/useRetrieveSourceFile.ts b/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/useRetrieveSourceFile.ts
deleted file mode 100644
index 81cca42db..000000000
--- a/libs/shinkai-node-state/src/v2/mutations/retrieveSourceFile/useRetrieveSourceFile.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useMutation, type UseMutationOptions } from '@tanstack/react-query';
-
-import { APIError } from '../../types';
-import { retrieveSourceFile } from './index';
-import { RetrieveSourceFileInput, RetrieveSourceFileOutput } from './types';
-
-type Options = UseMutationOptions<
-  RetrieveSourceFileOutput,
-  APIError,
-  RetrieveSourceFileInput
->;
-
-export const useRetrieveSourceFile = (options?: Options) => {
-  return useMutation({
-    mutationFn: retrieveSourceFile,
-    ...options,
-  });
-};
diff --git a/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts b/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
index c93216bbb..77af1404b 100644
--- a/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getChatConversation/index.ts
@@ -1,6 +1,6 @@
 import { ToolStatusType } from '@shinkai_network/shinkai-message-ts/api/general/types';
 import {
-  downloadFileFromJob,
+  downloadFile,
   getJobFolderName,
   getLastMessagesWithBranches,
 } from '@shinkai_network/shinkai-message-ts/api/jobs/index';
@@ -26,11 +26,11 @@ const createUserMessage = async (
 ): Promise<UserMessage> => {
   const text = message.job_message.content;
 
-  const hasFiles = message.job_message?.job_filenames?.length > 0;
+  const hasFiles = (message.job_message?.job_filenames ?? [])?.length > 0;
   const attachments: UserMessage['attachments'] = [];
 
   if (hasFiles) {
-    const fileNames = message.job_message.job_filenames;
+    const fileNames = message.job_message.job_filenames ?? [];
 
     await Promise.all(
       fileNames?.map(async (name) => {
@@ -44,11 +44,9 @@ const createUserMessage = async (
           try {
             const fileNameBase = name.split('/')?.at(-1) ?? 'untitled_tool';
             const fileExtension = fileNameBase.split('.')?.at(-1) ?? '';
-            const base64String = await downloadFileFromJob(
-              nodeAddress,
-              token,
-              `${folderName}/${name}`,
-            );
+            const base64String = await downloadFile(nodeAddress, token, {
+              path: `${folderName}/${name}`,
+            });
             if (base64String) {
               const byteCharacters = atob(base64String);
               const byteNumbers = new Array(byteCharacters.length)
diff --git a/libs/shinkai-node-state/src/v2/queries/getDownloadFile/index.ts b/libs/shinkai-node-state/src/v2/queries/getDownloadFile/index.ts
new file mode 100644
index 000000000..3e1cccdc6
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getDownloadFile/index.ts
@@ -0,0 +1,11 @@
+import { downloadFile as downloadFileApi } from '@shinkai_network/shinkai-message-ts/api/jobs/index';
+
+import { GetDownloadFileInput } from './types';
+
+export const downloadFile = async ({
+  nodeAddress,
+  token,
+  path,
+}: GetDownloadFileInput) => {
+  return await downloadFileApi(nodeAddress, token, { path });
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getDownloadFile/types.ts b/libs/shinkai-node-state/src/v2/queries/getDownloadFile/types.ts
new file mode 100644
index 000000000..561fd3e7e
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getDownloadFile/types.ts
@@ -0,0 +1,8 @@
+import { Token } from '@shinkai_network/shinkai-message-ts/api/general/types';
+
+export type DownloadFileOutput = string;
+
+export type GetDownloadFileInput = Token & {
+  nodeAddress: string;
+  path: string;
+};
diff --git a/libs/shinkai-node-state/src/v2/queries/getDownloadFile/useGetDownloadFile.ts b/libs/shinkai-node-state/src/v2/queries/getDownloadFile/useGetDownloadFile.ts
new file mode 100644
index 000000000..dfc12ef63
--- /dev/null
+++ b/libs/shinkai-node-state/src/v2/queries/getDownloadFile/useGetDownloadFile.ts
@@ -0,0 +1,17 @@
+import { useMutation, type UseMutationOptions } from '@tanstack/react-query';
+
+import { downloadFile } from './index';
+import { DownloadFileOutput, GetDownloadFileInput } from './types';
+
+type Options = UseMutationOptions<
+  DownloadFileOutput,
+  Error,
+  GetDownloadFileInput
+>;
+
+export const useGetDownloadFile = (options?: Options) => {
+  return useMutation({
+    mutationFn: downloadFile,
+    ...options,
+  });
+};

From 102432670ae03839c14ef416e31737dea35611cd Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 18:46:45 -0500
Subject: [PATCH 21/39] add has_embeddings UI

---
 .../vector-fs/components/vector-fs-item.tsx    | 18 ++++++++++++++++--
 .../src/components/vector-fs/vector-fs.tsx     | 11 +++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index e16e5f0ee..d6fe8a4b1 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -22,7 +22,7 @@ import {
 } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
 import { partial } from 'filesize';
-import { CopyIcon, FileInputIcon, TrashIcon } from 'lucide-react';
+import { BadgeCheck, CopyIcon, FileInputIcon, TrashIcon } from 'lucide-react';
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -42,7 +42,21 @@ export const VectorFsItemInfo = ({
 
   return (
     <div className="flex-1 truncate text-left">
-      <div className="text-sm font-medium">{file.name}</div>
+      <div className="flex items-center gap-2">
+        <span className="text-sm font-medium">{file.name}</span>
+        {!!file.has_embeddings && (
+          <Tooltip>
+            <TooltipTrigger>
+              <BadgeCheck className="size-4 text-cyan-500" />{' '}
+            </TooltipTrigger>
+            <TooltipPortal>
+              <TooltipContent side="top">
+                <p>Embeddings Generated</p>
+              </TooltipContent>
+            </TooltipPortal>
+          </Tooltip>
+        )}
+      </div>
       {layout === VectorFSLayout.List && (
         <p className="text-xs font-medium text-gray-100">
           <span>{createdDatetime}</span> - <span>{fileSize}</span>
diff --git a/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx b/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx
index 513571302..6449c5088 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/vector-fs.tsx
@@ -1,4 +1,5 @@
 import { useTranslation } from '@shinkai_network/shinkai-i18n';
+import { TooltipProvider } from '@shinkai_network/shinkai-ui';
 
 import { SimpleLayout } from '../../pages/layout/simple-layout';
 import AllFilesTab from './components/all-files-tab';
@@ -8,9 +9,11 @@ export default function VectorFs() {
   const { t } = useTranslation();
 
   return (
-    <SimpleLayout title={t('vectorFs.label')}>
-      <AllFilesTab />
-      <VectorFSDrawer />
-    </SimpleLayout>
+    <TooltipProvider delayDuration={0}>
+      <SimpleLayout title={t('vectorFs.label')}>
+        <AllFilesTab />
+        <VectorFSDrawer />
+      </SimpleLayout>
+    </TooltipProvider>
   );
 }

From 139709c77be0a5520310e6230a5dc6314fb5a946 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 18:51:34 -0500
Subject: [PATCH 22/39] update

---
 .../vector-fs/components/vector-fs-item.tsx   | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index d6fe8a4b1..82a0d75db 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -22,7 +22,7 @@ import {
 } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
 import { partial } from 'filesize';
-import { BadgeCheck, CopyIcon, FileInputIcon, TrashIcon } from 'lucide-react';
+import { CopyIcon, FileInputIcon, TrashIcon } from 'lucide-react';
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -47,7 +47,35 @@ export const VectorFsItemInfo = ({
         {!!file.has_embeddings && (
           <Tooltip>
             <TooltipTrigger>
-              <BadgeCheck className="size-4 text-cyan-500" />{' '}
+              <svg
+                className="size-4 text-cyan-400"
+                fill={'none'}
+                height={24}
+                viewBox="0 0 24 24"
+                width={24}
+              >
+                <path
+                  d="M19 11.0032V10C19 6.22876 19 4.34315 17.8284 3.17157C16.6569 2 14.7712 2 11 2H10.0082L3 8.98648V14.0062C3 17.7714 3 19.654 4.16811 20.825L4.17504 20.8319C5.34602 22 7.2286 22 10.9938 22"
+                  stroke="currentColor"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5"
+                />
+                <path
+                  d="M3 9.00195H4C6.82843 9.00195 8.24264 9.00195 9.12132 8.12327C10 7.24459 10 5.83038 10 3.00195V2.00195"
+                  stroke="currentColor"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5"
+                />
+                <path
+                  d="M16.4069 21.5983C16.6192 22.1365 17.3808 22.1365 17.5931 21.5983L17.6298 21.5051C18.1482 20.1906 19.1887 19.1502 20.5031 18.6318L20.5964 18.595C21.1345 18.3828 21.1345 17.6211 20.5964 17.4089L20.5031 17.3721C19.1887 16.8537 18.1482 15.8133 17.6298 14.4989L17.5931 14.4056C17.3808 13.8674 16.6192 13.8674 16.4069 14.4056L16.3702 14.4989C15.8518 15.8133 14.8113 16.8537 13.4969 17.3721L13.4036 17.4089C12.8655 17.6211 12.8655 18.3828 13.4036 18.595L13.4969 18.6318C14.8113 19.1502 15.8518 20.1906 16.3702 21.5051L16.4069 21.5983Z"
+                  stroke="currentColor"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5"
+                />
+              </svg>
             </TooltipTrigger>
             <TooltipPortal>
               <TooltipContent side="top">

From 8ea21cb8b65073e07c17adca370d9d073cea80a3 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 18:56:10 -0500
Subject: [PATCH 23/39] update file details

---
 .../components/vector-fs-item-detail.tsx      | 36 +++++++++++++++++++
 .../vector-fs/components/vector-fs-item.tsx   |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
index a3000a565..a38a140d1 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
@@ -116,6 +116,42 @@ export const VectorFileDetails = () => {
             </span>{' '}
             - <span className="text-sm">{size(selectedFile?.size ?? 0)}</span>
           </p>
+          {!!selectedFile?.has_embeddings && (
+            <div className="inline-flex items-center gap-1 rounded-lg border-cyan-600 bg-cyan-900/20 px-2 py-1">
+              <svg
+                className="size-4 text-cyan-400"
+                fill={'none'}
+                height={24}
+                viewBox="0 0 24 24"
+                width={24}
+              >
+                <path
+                  d="M19 11.0032V10C19 6.22876 19 4.34315 17.8284 3.17157C16.6569 2 14.7712 2 11 2H10.0082L3 8.98648V14.0062C3 17.7714 3 19.654 4.16811 20.825L4.17504 20.8319C5.34602 22 7.2286 22 10.9938 22"
+                  stroke="currentColor"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5"
+                />
+                <path
+                  d="M3 9.00195H4C6.82843 9.00195 8.24264 9.00195 9.12132 8.12327C10 7.24459 10 5.83038 10 3.00195V2.00195"
+                  stroke="currentColor"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5"
+                />
+                <path
+                  d="M16.4069 21.5983C16.6192 22.1365 17.3808 22.1365 17.5931 21.5983L17.6298 21.5051C18.1482 20.1906 19.1887 19.1502 20.5031 18.6318L20.5964 18.595C21.1345 18.3828 21.1345 17.6211 20.5964 17.4089L20.5031 17.3721C19.1887 16.8537 18.1482 15.8133 17.6298 14.4989L17.5931 14.4056C17.3808 13.8674 16.6192 13.8674 16.4069 14.4056L16.3702 14.4989C15.8518 15.8133 14.8113 16.8537 13.4969 17.3721L13.4036 17.4089C12.8655 17.6211 12.8655 18.3828 13.4036 18.595L13.4969 18.6318C14.8113 19.1502 15.8518 20.1906 16.3702 21.5051L16.4069 21.5983Z"
+                  stroke="currentColor"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5"
+                />
+              </svg>
+              <span className="text-xs font-medium text-cyan-400">
+                Embeddings Generated
+              </span>
+            </div>
+          )}
         </div>
         <div className="py-6">
           <h2 className="mb-3 text-left text-lg font-medium text-white">
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index 82a0d75db..5ecb5114f 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -46,7 +46,7 @@ export const VectorFsItemInfo = ({
         <span className="text-sm font-medium">{file.name}</span>
         {!!file.has_embeddings && (
           <Tooltip>
-            <TooltipTrigger>
+            <TooltipTrigger className="rounded-lg border-cyan-600 bg-cyan-900/20 p-1">
               <svg
                 className="size-4 text-cyan-400"
                 fill={'none'}

From 24727a9f2f12d82bb8fcd596a8465c3877a9ef67 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 18:58:58 -0500
Subject: [PATCH 24/39] updates

---
 .../components/vector-fs-item-detail.tsx      | 35 +++---------------
 .../vector-fs/components/vector-fs-item.tsx   | 36 ++++---------------
 libs/shinkai-ui/src/assets/icons/general.tsx  | 35 ++++++++++++++++++
 3 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
index a38a140d1..2cc88284c 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-detail.tsx
@@ -6,7 +6,10 @@ import {
   SheetHeader,
   SheetTitle,
 } from '@shinkai_network/shinkai-ui';
-import { FileTypeIcon } from '@shinkai_network/shinkai-ui/assets';
+import {
+  EmbeddingsGeneratedIcon,
+  FileTypeIcon,
+} from '@shinkai_network/shinkai-ui/assets';
 import {
   formatDateToLocaleStringWithTime,
   formatDateToUSLocaleString,
@@ -118,35 +121,7 @@ export const VectorFileDetails = () => {
           </p>
           {!!selectedFile?.has_embeddings && (
             <div className="inline-flex items-center gap-1 rounded-lg border-cyan-600 bg-cyan-900/20 px-2 py-1">
-              <svg
-                className="size-4 text-cyan-400"
-                fill={'none'}
-                height={24}
-                viewBox="0 0 24 24"
-                width={24}
-              >
-                <path
-                  d="M19 11.0032V10C19 6.22876 19 4.34315 17.8284 3.17157C16.6569 2 14.7712 2 11 2H10.0082L3 8.98648V14.0062C3 17.7714 3 19.654 4.16811 20.825L4.17504 20.8319C5.34602 22 7.2286 22 10.9938 22"
-                  stroke="currentColor"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth="1.5"
-                />
-                <path
-                  d="M3 9.00195H4C6.82843 9.00195 8.24264 9.00195 9.12132 8.12327C10 7.24459 10 5.83038 10 3.00195V2.00195"
-                  stroke="currentColor"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth="1.5"
-                />
-                <path
-                  d="M16.4069 21.5983C16.6192 22.1365 17.3808 22.1365 17.5931 21.5983L17.6298 21.5051C18.1482 20.1906 19.1887 19.1502 20.5031 18.6318L20.5964 18.595C21.1345 18.3828 21.1345 17.6211 20.5964 17.4089L20.5031 17.3721C19.1887 16.8537 18.1482 15.8133 17.6298 14.4989L17.5931 14.4056C17.3808 13.8674 16.6192 13.8674 16.4069 14.4056L16.3702 14.4989C15.8518 15.8133 14.8113 16.8537 13.4969 17.3721L13.4036 17.4089C12.8655 17.6211 12.8655 18.3828 13.4036 18.595L13.4969 18.6318C14.8113 19.1502 15.8518 20.1906 16.3702 21.5051L16.4069 21.5983Z"
-                  stroke="currentColor"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth="1.5"
-                />
-              </svg>
+              <EmbeddingsGeneratedIcon className="size-4 text-cyan-400" />
               <span className="text-xs font-medium text-cyan-400">
                 Embeddings Generated
               </span>
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index 5ecb5114f..6d601cdc6 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -15,7 +15,11 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from '@shinkai_network/shinkai-ui';
-import { CreateAIIcon, FileTypeIcon } from '@shinkai_network/shinkai-ui/assets';
+import {
+  CreateAIIcon,
+  EmbeddingsGeneratedIcon,
+  FileTypeIcon,
+} from '@shinkai_network/shinkai-ui/assets';
 import {
   formatDateToUSLocaleString,
   getFileExt,
@@ -47,35 +51,7 @@ export const VectorFsItemInfo = ({
         {!!file.has_embeddings && (
           <Tooltip>
             <TooltipTrigger className="rounded-lg border-cyan-600 bg-cyan-900/20 p-1">
-              <svg
-                className="size-4 text-cyan-400"
-                fill={'none'}
-                height={24}
-                viewBox="0 0 24 24"
-                width={24}
-              >
-                <path
-                  d="M19 11.0032V10C19 6.22876 19 4.34315 17.8284 3.17157C16.6569 2 14.7712 2 11 2H10.0082L3 8.98648V14.0062C3 17.7714 3 19.654 4.16811 20.825L4.17504 20.8319C5.34602 22 7.2286 22 10.9938 22"
-                  stroke="currentColor"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth="1.5"
-                />
-                <path
-                  d="M3 9.00195H4C6.82843 9.00195 8.24264 9.00195 9.12132 8.12327C10 7.24459 10 5.83038 10 3.00195V2.00195"
-                  stroke="currentColor"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth="1.5"
-                />
-                <path
-                  d="M16.4069 21.5983C16.6192 22.1365 17.3808 22.1365 17.5931 21.5983L17.6298 21.5051C18.1482 20.1906 19.1887 19.1502 20.5031 18.6318L20.5964 18.595C21.1345 18.3828 21.1345 17.6211 20.5964 17.4089L20.5031 17.3721C19.1887 16.8537 18.1482 15.8133 17.6298 14.4989L17.5931 14.4056C17.3808 13.8674 16.6192 13.8674 16.4069 14.4056L16.3702 14.4989C15.8518 15.8133 14.8113 16.8537 13.4969 17.3721L13.4036 17.4089C12.8655 17.6211 12.8655 18.3828 13.4036 18.595L13.4969 18.6318C14.8113 19.1502 15.8518 20.1906 16.3702 21.5051L16.4069 21.5983Z"
-                  stroke="currentColor"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth="1.5"
-                />
-              </svg>
+              <EmbeddingsGeneratedIcon className="size-4 text-cyan-400" />
             </TooltipTrigger>
             <TooltipPortal>
               <TooltipContent side="top">
diff --git a/libs/shinkai-ui/src/assets/icons/general.tsx b/libs/shinkai-ui/src/assets/icons/general.tsx
index 2302d40ee..c8202fcc8 100644
--- a/libs/shinkai-ui/src/assets/icons/general.tsx
+++ b/libs/shinkai-ui/src/assets/icons/general.tsx
@@ -1350,3 +1350,38 @@ export const ScheduledTasksComingSoonIcon = ({
     />
   </svg>
 );
+export const EmbeddingsGeneratedIcon = ({
+  className,
+}: {
+  className?: string;
+}) => (
+  <svg
+    className={cn('shrink-0', className)}
+    fill={'none'}
+    height={24}
+    viewBox="0 0 24 24"
+    width={24}
+  >
+    <path
+      d="M19 11.0032V10C19 6.22876 19 4.34315 17.8284 3.17157C16.6569 2 14.7712 2 11 2H10.0082L3 8.98648V14.0062C3 17.7714 3 19.654 4.16811 20.825L4.17504 20.8319C5.34602 22 7.2286 22 10.9938 22"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth="1.5"
+    />
+    <path
+      d="M3 9.00195H4C6.82843 9.00195 8.24264 9.00195 9.12132 8.12327C10 7.24459 10 5.83038 10 3.00195V2.00195"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth="1.5"
+    />
+    <path
+      d="M16.4069 21.5983C16.6192 22.1365 17.3808 22.1365 17.5931 21.5983L17.6298 21.5051C18.1482 20.1906 19.1887 19.1502 20.5031 18.6318L20.5964 18.595C21.1345 18.3828 21.1345 17.6211 20.5964 17.4089L20.5031 17.3721C19.1887 16.8537 18.1482 15.8133 17.6298 14.4989L17.5931 14.4056C17.3808 13.8674 16.6192 13.8674 16.4069 14.4056L16.3702 14.4989C15.8518 15.8133 14.8113 16.8537 13.4969 17.3721L13.4036 17.4089C12.8655 17.6211 12.8655 18.3828 13.4036 18.595L13.4969 18.6318C14.8113 19.1502 15.8518 20.1906 16.3702 21.5051L16.4069 21.5983Z"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth="1.5"
+    />
+  </svg>
+);

From e70a647487d91fbd18c09cc82076c7484a1c5362 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 20:20:33 -0500
Subject: [PATCH 25/39] ui updates

---
 .../chat-action-bar/file-selection-action-bar.tsx     |  3 +--
 .../src/components/chat/conversation-header.tsx       |  8 ++++----
 .../playground-tool/components/tool-playground.tsx    |  3 +--
 .../components/vector-fs-general-options.tsx          |  4 +---
 libs/shinkai-i18n/locales/en-US.json                  |  4 ++++
 libs/shinkai-i18n/locales/es-ES.json                  |  4 ++++
 libs/shinkai-i18n/locales/id-ID.json                  |  4 ++++
 libs/shinkai-i18n/locales/ja-JP.json                  |  4 ++++
 libs/shinkai-i18n/locales/tr-TR.json                  |  4 ++++
 libs/shinkai-i18n/locales/zh-CN.json                  |  4 ++++
 libs/shinkai-i18n/src/lib/default/index.ts            | 11 ++++++++---
 libs/shinkai-message-ts/src/api/jobs/types.ts         |  1 +
 .../src/v2/queries/getJobScope/useGetJobScope.ts      |  1 -
 13 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/chat/chat-action-bar/file-selection-action-bar.tsx b/apps/shinkai-desktop/src/components/chat/chat-action-bar/file-selection-action-bar.tsx
index 78d14a11a..e44e90b41 100644
--- a/apps/shinkai-desktop/src/components/chat/chat-action-bar/file-selection-action-bar.tsx
+++ b/apps/shinkai-desktop/src/components/chat/chat-action-bar/file-selection-action-bar.tsx
@@ -9,7 +9,6 @@ import { cn } from '@shinkai_network/shinkai-ui/utils';
 import { Paperclip } from 'lucide-react';
 import * as React from 'react';
 
-import { allowedFileExtensions } from '../../../lib/constants';
 import { actionButtonClassnames } from '../conversation-footer';
 
 type FileUploadInputProps = {
@@ -38,7 +37,7 @@ export function FileSelectionActionBar({
         <TooltipPortal>
           <TooltipContent align="center" side="top">
             {t('common.uploadFile')} <br />
-            {allowedFileExtensions.join(', ')}
+            {t('common.uploadAFileDescription')}
           </TooltipContent>
         </TooltipPortal>
       </Tooltip>
diff --git a/apps/shinkai-desktop/src/components/chat/conversation-header.tsx b/apps/shinkai-desktop/src/components/chat/conversation-header.tsx
index 70987e6e6..0c1ecf759 100644
--- a/apps/shinkai-desktop/src/components/chat/conversation-header.tsx
+++ b/apps/shinkai-desktop/src/components/chat/conversation-header.tsx
@@ -155,8 +155,8 @@ const ConversationHeaderWithInboxId = () => {
     ) {
       const selectedVRFilesPathMap = jobScope.vector_fs_items.reduce(
         (acc, file) => {
-          selectedFileKeysRef.set(file.path, file);
-          acc[file.path] = {
+          selectedFileKeysRef.set(file, file);
+          acc[file] = {
             checked: true,
           };
           return acc;
@@ -166,8 +166,8 @@ const ConversationHeaderWithInboxId = () => {
 
       const selectedVRFoldersPathMap = jobScope.vector_fs_folders.reduce(
         (acc, folder) => {
-          selectedFolderKeysRef.set(folder.path, folder);
-          acc[folder.path] = {
+          selectedFolderKeysRef.set(folder, folder);
+          acc[folder] = {
             checked: true,
           };
           return acc;
diff --git a/apps/shinkai-desktop/src/components/playground-tool/components/tool-playground.tsx b/apps/shinkai-desktop/src/components/playground-tool/components/tool-playground.tsx
index 4b2a61ac8..698eb1352 100644
--- a/apps/shinkai-desktop/src/components/playground-tool/components/tool-playground.tsx
+++ b/apps/shinkai-desktop/src/components/playground-tool/components/tool-playground.tsx
@@ -70,7 +70,6 @@ import { useDropzone } from 'react-dropzone';
 import { Link, To } from 'react-router-dom';
 import { toast } from 'sonner';
 
-import { allowedFileExtensions } from '../../../lib/constants';
 import { useAuth } from '../../../store/auth';
 import { AIModelSelector } from '../../chat/chat-action-bar/ai-update-selection-action-bar';
 import { ToolErrorFallback } from '../error-boundary';
@@ -1019,7 +1018,7 @@ function ManageToolSourceModal({
             <p className="text-sm text-white">{t('common.clickToUpload')}</p>
 
             <p className="text-gray-80 line-clamp-1 text-xs">
-              Supports {allowedFileExtensions.join(', ')}
+              {t('common.uploadAFileDescription')}
             </p>
           </div>
 
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
index 8bd7b14dc..2fe79cdef 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
@@ -34,7 +34,6 @@ import { useForm } from 'react-hook-form';
 import { useLocation } from 'react-router-dom';
 import { toast } from 'sonner';
 
-import { allowedFileExtensions } from '../../../lib/constants';
 import { useAnalytics } from '../../../lib/posthog-provider';
 import { useAuth } from '../../../store/auth';
 import { useVectorFsStore } from '../context/vector-fs-context';
@@ -209,9 +208,8 @@ export const UploadVRFilesAction = () => {
                   <div className="flex flex-col space-y-1">
                     <div className="flex items-center justify-center">
                       <FileUploader
-                        accept={allowedFileExtensions.join(',')}
                         allowMultiple
-                        descriptionText={`Supports ${allowedFileExtensions.join(', ')} `}
+                        descriptionText={t('common.uploadAFileDescription')}
                         onChange={(acceptedFiles) => {
                           field.onChange(acceptedFiles);
                         }}
diff --git a/libs/shinkai-i18n/locales/en-US.json b/libs/shinkai-i18n/locales/en-US.json
index 274fcd521..7b788b241 100644
--- a/libs/shinkai-i18n/locales/en-US.json
+++ b/libs/shinkai-i18n/locales/en-US.json
@@ -392,6 +392,7 @@
     "clearSearch": "Clear Search",
     "searchPlaceholder": "Search...",
     "uploadFile": "Upload a File",
+    "uploadAFileDescription": "Supports Images, PDF, CSV, TXT, XLSX and more formats",
     "folders": "Folders",
     "folderWithCount_one": "{{count}} Folder",
     "folderWithCount_other": "{{count}} Folders",
@@ -498,6 +499,9 @@
       "deleteAgent": "Error deleting AI"
     }
   },
+  "tasks": {
+    "runNow": "Run Now"
+  },
   "ollama": {
     "version": "Ollama Version",
     "errors": {
diff --git a/libs/shinkai-i18n/locales/es-ES.json b/libs/shinkai-i18n/locales/es-ES.json
index 1654c7ece..05bd73674 100644
--- a/libs/shinkai-i18n/locales/es-ES.json
+++ b/libs/shinkai-i18n/locales/es-ES.json
@@ -141,6 +141,7 @@
     "unselectAll": "Deseleccionar todo",
     "update": "Actualizar",
     "upload": "Subir",
+    "uploadAFileDescription": "Admite imágenes, PDF, CSV, TXT, XLSX y más formatos",
     "uploadFile": "Subir un Archivo"
   },
   "desktop": {
@@ -509,6 +510,9 @@
     "browse": "Explorar Suscripciones Públicas",
     "label": "Mis Suscripciones"
   },
+  "tasks": {
+    "runNow": "Ejecutar ahora"
+  },
   "tools": {
     "emptyState": {
       "search": {
diff --git a/libs/shinkai-i18n/locales/id-ID.json b/libs/shinkai-i18n/locales/id-ID.json
index 6226d49fd..d33a6fd0a 100644
--- a/libs/shinkai-i18n/locales/id-ID.json
+++ b/libs/shinkai-i18n/locales/id-ID.json
@@ -139,6 +139,7 @@
     "unselectAll": "Batalkan Pilihan Semua",
     "update": "Perbarui",
     "upload": "Unggah",
+    "uploadAFileDescription": "Mendukung gambar, PDF, CSV, TXT, XLSX, dan format lainnya",
     "uploadFile": "Unggah Berkas"
   },
   "desktop": {
@@ -507,6 +508,9 @@
     "browse": "Telusuri Langganan Publik",
     "label": "Langganan Saya"
   },
+  "tasks": {
+    "runNow": "Jalankan Sekarang"
+  },
   "tools": {
     "emptyState": {
       "search": {
diff --git a/libs/shinkai-i18n/locales/ja-JP.json b/libs/shinkai-i18n/locales/ja-JP.json
index 537c7a8c7..ef210fb29 100644
--- a/libs/shinkai-i18n/locales/ja-JP.json
+++ b/libs/shinkai-i18n/locales/ja-JP.json
@@ -139,6 +139,7 @@
     "unselectAll": "すべて選択解除",
     "update": "更新",
     "upload": "アップロード",
+    "uploadAFileDescription": "画像、PDF、CSV、TXT、XLSXなどの形式をサポートしています",
     "uploadFile": "ファイルをアップロード"
   },
   "desktop": {
@@ -507,6 +508,9 @@
     "browse": "パブリックサブスクリプションを閲覧",
     "label": "マイサブスクリプション"
   },
+  "tasks": {
+    "runNow": "今すぐ実行"
+  },
   "tools": {
     "emptyState": {
       "search": {
diff --git a/libs/shinkai-i18n/locales/tr-TR.json b/libs/shinkai-i18n/locales/tr-TR.json
index 4c5ee03ae..855b44dd8 100644
--- a/libs/shinkai-i18n/locales/tr-TR.json
+++ b/libs/shinkai-i18n/locales/tr-TR.json
@@ -139,6 +139,7 @@
     "unselectAll": "Hepsini Seçme",
     "update": "Güncelle",
     "upload": "Yükle",
+    "uploadAFileDescription": "Görüntüler, PDF, CSV, TXT, XLSX ve daha fazla formatı destekler",
     "uploadFile": "Bir Dosya Yükle"
   },
   "desktop": {
@@ -507,6 +508,9 @@
     "browse": "Halka Açık Abonelikleri Gözat",
     "label": "Aboneliklerim"
   },
+  "tasks": {
+    "runNow": "Şimdi Çalıştır"
+  },
   "tools": {
     "emptyState": {
       "search": {
diff --git a/libs/shinkai-i18n/locales/zh-CN.json b/libs/shinkai-i18n/locales/zh-CN.json
index 0d6d26874..65b1419b9 100644
--- a/libs/shinkai-i18n/locales/zh-CN.json
+++ b/libs/shinkai-i18n/locales/zh-CN.json
@@ -139,6 +139,7 @@
     "unselectAll": "取消全选",
     "update": "更新",
     "upload": "上传",
+    "uploadAFileDescription": "支持图像、PDF、CSV、TXT、XLSX等多种格式",
     "uploadFile": "上传文件"
   },
   "desktop": {
@@ -507,6 +508,9 @@
     "browse": "浏览公共订阅",
     "label": "我的订阅"
   },
+  "tasks": {
+    "runNow": "立即运行"
+  },
   "tools": {
     "emptyState": {
       "search": {
diff --git a/libs/shinkai-i18n/src/lib/default/index.ts b/libs/shinkai-i18n/src/lib/default/index.ts
index 5fb9ddf06..475444610 100644
--- a/libs/shinkai-i18n/src/lib/default/index.ts
+++ b/libs/shinkai-i18n/src/lib/default/index.ts
@@ -430,6 +430,8 @@ export default {
     clearSearch: 'Clear Search',
     searchPlaceholder: 'Search...',
     uploadFile: 'Upload a File',
+    uploadAFileDescription:
+      'Supports Images, PDF, CSV, TXT, XLSX and more formats',
     folders: 'Folders',
     folderWithCount_one: '{{count}} Folder',
     folderWithCount_other: '{{count}} Folders',
@@ -627,13 +629,16 @@ export default {
     description: 'Connect to {{provider}} to use this tool',
     signIn: 'Sign in with {{provider}}',
     success: 'Connection successful!',
-    successDescription: 'This window will close automatically in {{countdown}} seconds...',
-    navigateToProvider: 'Navigate and follow the authentication steps to continue.',
+    successDescription:
+      'This window will close automatically in {{countdown}} seconds...',
+    navigateToProvider:
+      'Navigate and follow the authentication steps to continue.',
     processing: 'Processing...',
     goToProvider: 'Go to {{provider}}',
     close: 'Close',
     connectionRequired: 'Connection Required',
-    connectionRequiredDescription: 'To use this tool, please connect your {{provider}} account.',
+    connectionRequiredDescription:
+      'To use this tool, please connect your {{provider}} account.',
     connectNow: 'Connect Now',
   },
 };
diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index e4faed12f..884645f34 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -188,6 +188,7 @@ export type UpdateLLMProviderResponse = string;
 export type RemoveLLMProviderRequest = {
   llm_provider_id: string;
 };
+
 export type Inbox = {
   inbox_id: string;
   custom_name: string;
diff --git a/libs/shinkai-node-state/src/v2/queries/getJobScope/useGetJobScope.ts b/libs/shinkai-node-state/src/v2/queries/getJobScope/useGetJobScope.ts
index 5f84bcdeb..8d5ede8bf 100644
--- a/libs/shinkai-node-state/src/v2/queries/getJobScope/useGetJobScope.ts
+++ b/libs/shinkai-node-state/src/v2/queries/getJobScope/useGetJobScope.ts
@@ -20,7 +20,6 @@ export const useGetJobScope = (
 ) => {
   const response = useQuery({
     queryKey: [FunctionKeyV2.GET_JOB_SCOPE, input],
-
     queryFn: () => getJobScope(input),
   });
   return response;

From 7d90067986236406502ae4b1a2cbc750a2a1efaf Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 20:50:46 -0500
Subject: [PATCH 26/39] fix: infinite refetch all inboxes

---
 apps/shinkai-desktop/src/pages/chat/layout.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/shinkai-desktop/src/pages/chat/layout.tsx b/apps/shinkai-desktop/src/pages/chat/layout.tsx
index 375de5bd8..b9b516dde 100644
--- a/apps/shinkai-desktop/src/pages/chat/layout.tsx
+++ b/apps/shinkai-desktop/src/pages/chat/layout.tsx
@@ -439,15 +439,22 @@ const ChatSidebar = () => {
     {
       refetchIntervalInBackground: true,
       refetchInterval: (query) => {
-        const allInboxesAreCompleted = query.state.data?.every((inbox) => {
+        const queryState = query?.state?.data?.filter(
+          (item) => !!item.last_message,
+        );
+        if (!queryState || !auth) return 0;
+
+        const allInboxesAreCompleted = queryState.every((inbox) => {
           return (
             inbox.last_message &&
+            inbox.last_message.sender &&
             !(
               inbox.last_message.sender === auth?.shinkai_identity &&
-              inbox.last_message.sender_subidentity === auth.profile
+              inbox.last_message.sender_subidentity === auth?.profile
             )
           );
         });
+
         return allInboxesAreCompleted ? 0 : 5000;
       },
     },

From 27762361700c32449f50d203da0b2b8fdbf8eb9c Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 21:08:49 -0500
Subject: [PATCH 27/39] fix: job scope

---
 .../shinkai-node-state/src/lib/utils/files.ts | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/libs/shinkai-node-state/src/lib/utils/files.ts b/libs/shinkai-node-state/src/lib/utils/files.ts
index a3293b51d..cb5d20cf9 100644
--- a/libs/shinkai-node-state/src/lib/utils/files.ts
+++ b/libs/shinkai-node-state/src/lib/utils/files.ts
@@ -7,30 +7,18 @@ export function transformDataToTreeNodes(
 ): TreeNode[] {
   const result: TreeNode[] = [];
 
-  data.forEach((fileInfo) => {
-    const pathWithSlash = fileInfo.path.startsWith('/')
-      ? fileInfo.path
-      : `/${fileInfo.path}`;
-
-    if (fileInfo.is_directory) {
-      const folderNode: TreeNode = {
-        key: pathWithSlash,
-        label: fileInfo.name,
-        data: fileInfo,
-        icon: 'icon-folder',
-        children: [], // Assuming you will populate this with child nodes
-      };
-      result.push(folderNode);
-    } else {
-      const itemNode: TreeNode = {
-        key: pathWithSlash,
-        label: fileInfo.name,
-        data: fileInfo,
-        icon: 'icon-file',
-      };
-      result.push(itemNode);
-    }
-  });
+  for (const item of data ?? []) {
+    const itemNode: TreeNode = {
+      key: item.path,
+      label: item.name,
+      data: item,
+      icon: item.is_directory ? 'icon-folder' : 'icon-file',
+      children: item.is_directory
+        ? transformDataToTreeNodes(item.children ?? [], item.path)
+        : undefined,
+    };
+    result.push(itemNode);
+  }
 
   return result;
 }

From b0c5cbba4014adcb98fe5653f6c41b10f4a48e0d Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 21:13:55 -0500
Subject: [PATCH 28/39] fix: job scope update

---
 .../src/components/chat/set-conversation-context.tsx             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
index c816222fa..6a17e6367 100644
--- a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
+++ b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
@@ -166,7 +166,6 @@ export const SetJobScopeDrawer = () => {
                     vector_fs_folders: Array.from(
                       selectedFolderKeysRef.values(),
                     ),
-                    vector_search_mode: [],
                   },
                 });
               }

From d0df2bd7383f58c1b529869f93c0098c241bcc32 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Thu, 2 Jan 2025 21:17:00 -0500
Subject: [PATCH 29/39] fix: ui

---
 .../src/components/vector-fs/components/vector-fs-item.tsx    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index 6d601cdc6..5b6f9b9e1 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -47,7 +47,9 @@ export const VectorFsItemInfo = ({
   return (
     <div className="flex-1 truncate text-left">
       <div className="flex items-center gap-2">
-        <span className="text-sm font-medium">{file.name}</span>
+        <span className="max-w-sm truncate text-sm font-medium">
+          {file.name}
+        </span>
         {!!file.has_embeddings && (
           <Tooltip>
             <TooltipTrigger className="rounded-lg border-cyan-600 bg-cyan-900/20 p-1">

From 8932f873f3f32ed6949073adb4fbc7240f37f9ff Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 3 Jan 2025 14:51:22 -0500
Subject: [PATCH 30/39] fixes destination path

---
 .../vector-fs/components/folder-selection-list.tsx          | 1 +
 .../vector-fs/components/vector-fs-folder-options.tsx       | 6 ++++--
 .../vector-fs/components/vector-fs-general-options.tsx      | 1 -
 .../vector-fs/components/vector-fs-item-options.tsx         | 6 ++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
index 789d0da13..8b7d1fa85 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/folder-selection-list.tsx
@@ -134,6 +134,7 @@ export const FolderSelectionList = () => {
                       const buildPath = splitCurrentPath
                         .slice(0, idx + 1)
                         .join('/');
+
                       setCurrentSelectedFolderPath('/' + buildPath);
                       setDestinationFolderPath(buildPath);
                     }}
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
index 7a6121373..2e6142365 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder-options.tsx
@@ -65,7 +65,8 @@ export const VectorFsFolderMoveAction = () => {
               nodeAddress: auth?.node_address ?? '',
               token: auth?.api_v2_key ?? '',
               originPath: selectedFolder?.path ?? '',
-              destinationPath: destinationFolderPath ?? '/',
+              destinationPath:
+                `${destinationFolderPath}/${selectedFolder?.path}` ?? '/',
             });
           }}
         >
@@ -172,7 +173,8 @@ export const VectorFsFolderCopyAction = () => {
               nodeAddress: auth?.node_address ?? '',
               token: auth?.api_v2_key ?? '',
               originPath: selectedFolder?.path ?? '',
-              destinationPath: destinationFolderPath ?? '/',
+              destinationPath:
+                `${destinationFolderPath}/${selectedFolder?.path}` ?? '/',
             });
           }}
         >
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
index 2fe79cdef..2bd67412b 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
@@ -59,7 +59,6 @@ export const AddNewFolderAction = () => {
     isSuccess,
   } = useCreateFolder({
     onSuccess: () => {
-      toast.success(t('vectorFs.success.folderCreated'));
       createFolderForm.reset();
       closeDrawerMenu();
     },
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
index 04ff5c1c0..682a846a8 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
@@ -64,7 +64,8 @@ export const VectorFsItemMoveAction = () => {
               nodeAddress: auth?.node_address ?? '',
               token: auth?.api_v2_key ?? '',
               originPath: selectedFile?.path ?? '',
-              destinationPath: destinationFolderPath ?? '/',
+              destinationPath:
+                `${destinationFolderPath}/${selectedFile?.name}` ?? '/',
             });
           }}
         >
@@ -171,7 +172,8 @@ export const VectorFsItemCopyAction = () => {
               nodeAddress: auth?.node_address ?? '',
               token: auth?.api_v2_key ?? '',
               originPath: selectedFile?.path ?? '',
-              destinationPath: destinationFolderPath ?? '/',
+              destinationPath:
+                `${destinationFolderPath}/${selectedFile?.name}` ?? '/',
             });
           }}
         >

From 23588b33e0e9d0ab1fcabb310ca9ddcce8ec04cf Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 3 Jan 2025 15:00:54 -0500
Subject: [PATCH 31/39] hide search

---
 .../src/components/vector-fs/components/vector-fs-folder.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
index e8c55654d..7db29406b 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-folder.tsx
@@ -27,6 +27,7 @@ import { CopyIcon, FolderInputIcon, TrashIcon } from 'lucide-react';
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
+import config from '../../../config';
 import { useVectorFsStore, VectorFSLayout } from '../context/vector-fs-context';
 import { VectorFsFolderAction } from './vector-fs-drawer';
 
@@ -194,7 +195,7 @@ const VectorFsFolder = ({
                 setActiveDrawerMenuOption(VectorFsFolderAction.Copy);
               },
             },
-            {
+            config.isDev && {
               name: t('vectorFs.actions.searchWithinFolder'),
               icon: <AISearchContentIcon className="mr-3 h-4 w-4" />,
               onClick: () => {

From 3400348284df243069d203e8aab2c51762342d4e Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 3 Jan 2025 15:38:00 -0500
Subject: [PATCH 32/39] feat: create text file

---
 .../vector-fs/components/all-files-tab.tsx    |  17 ++-
 .../vector-fs/components/vector-fs-drawer.tsx |   4 +
 .../components/vector-fs-general-options.tsx  | 113 +++++++++++++++++-
 libs/shinkai-i18n/src/lib/default/index.ts    |   2 +
 .../src/forms/vector-fs/folder.ts             |   6 +
 5 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
index 34a5a7a45..fd89f4d83 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
@@ -37,7 +37,13 @@ import {
 } from '@shinkai_network/shinkai-ui/assets';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
 import { motion } from 'framer-motion';
-import { ChevronRight, PlusIcon, SearchIcon, XIcon } from 'lucide-react';
+import {
+  ChevronRight,
+  FileType2Icon,
+  PlusIcon,
+  SearchIcon,
+  XIcon,
+} from 'lucide-react';
 import React, { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
@@ -185,6 +191,15 @@ const AllFiles = () => {
         setActiveDrawerMenuOption(VectorFsGlobalAction.GenerateFromDocument);
       },
     },
+
+    {
+      name: t('vectorFs.actions.createTextFile'),
+      icon: <FileType2Icon className="mr-2 h-3.5 w-3.5" />,
+      disabled: currentGlobalPath === '/',
+      onClick: () => {
+        setActiveDrawerMenuOption(VectorFsGlobalAction.CreateTextFile);
+      },
+    },
   ];
 
   const splitCurrentPath = currentGlobalPath.split('/').filter(Boolean);
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
index aff8834fa..a9bbc98e8 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
@@ -9,6 +9,7 @@ import {
 } from './vector-fs-folder-options';
 import {
   AddNewFolderAction,
+  CreateTextFileAction,
   SaveWebpageToVectorFsAction,
   UploadVRFilesAction,
 } from './vector-fs-general-options';
@@ -56,6 +57,7 @@ export enum VectorFsGlobalAction {
   // GenerateFromWeb = 'generate-from-web',
   VectorFileDetails = 'vector-file-details',
   GenerateFromDocumentIncludeFolder = 'generate-from-document-include-folder',
+  CreateTextFile = 'create-text-file',
 }
 
 export enum VectorFsFolderAction {
@@ -87,6 +89,8 @@ const VectorFSDrawerContent = ({
       return <VectorFileDetails />;
     case VectorFsGlobalAction.NewFolder:
       return <AddNewFolderAction />;
+    case VectorFsGlobalAction.CreateTextFile:
+      return <CreateTextFileAction />;
     case VectorFsGlobalAction.GenerateFromDocument:
       return <UploadVRFilesAction />;
     case VectorFsGlobalAction.GenerateFromDocumentIncludeFolder:
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
index 2bd67412b..7ca3fb90a 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
@@ -3,6 +3,8 @@ import { useTranslation } from '@shinkai_network/shinkai-i18n';
 import {
   CreateFolderFormSchema,
   createFolderFormSchema,
+  CreateTextFileFormSchema,
+  createTextFileFormSchema,
   SaveWebpageToVectorFsFormSchema,
   saveWebpageToVectorFsFormSchema,
   UploadVRFilesFormSchema,
@@ -29,13 +31,16 @@ import {
   DirectoryTypeIcon,
   FileTypeIcon,
 } from '@shinkai_network/shinkai-ui/assets';
-import { useEffect } from 'react';
+import { FileType2Icon } from 'lucide-react';
+import { PrismEditor } from 'prism-react-editor';
+import { useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';
 import { useLocation } from 'react-router-dom';
 import { toast } from 'sonner';
 
 import { useAnalytics } from '../../../lib/posthog-provider';
 import { useAuth } from '../../../store/auth';
+import ToolCodeEditor from '../../playground-tool/tool-code-editor';
 import { useVectorFsStore } from '../context/vector-fs-context';
 import {
   FolderSelectionList,
@@ -351,3 +356,109 @@ export const SaveWebpageToVectorFsAction = () => {
     </>
   );
 };
+
+// create a new text file
+export const CreateTextFileAction = () => {
+  const { t } = useTranslation();
+  const auth = useAuth((state) => state.auth);
+  const currentGlobalPath = useVectorFsStore(
+    (state) => state.currentGlobalPath,
+  );
+
+  const textFileContentRef = useRef<PrismEditor | null>(null);
+
+  const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
+  const createTextFileForm = useForm<CreateTextFileFormSchema>({
+    resolver: zodResolver(createTextFileFormSchema),
+  });
+
+  const { isPending, mutateAsync: uploadVRFiles } = useUploadVRFiles({
+    onSuccess: (_) => {
+      createTextFileForm.reset();
+    },
+    onError: (error) => {
+      toast.error(t('vectorFs.errors.filesUploaded'), {
+        id: 'uploading-VR-files',
+        description: error.message,
+      });
+    },
+  });
+
+  const onSubmit = async (values: CreateTextFileFormSchema) => {
+    if (!auth) return;
+    closeDrawerMenu();
+    const textFileContent = textFileContentRef.current?.value;
+    if (!textFileContent) {
+      toast.error('Please enter file content');
+      return;
+    }
+
+    const textFile = new File([textFileContent], `${values.name}.txt`, {
+      type: 'text/plain',
+    });
+
+    await uploadVRFiles({
+      nodeAddress: auth?.node_address ?? '',
+      destinationPath: currentGlobalPath,
+      files: [textFile],
+      token: auth?.api_v2_key ?? '',
+    });
+  };
+
+  return (
+    <>
+      <SheetHeader>
+        <SheetTitle className="flex flex-col items-start gap-1">
+          <FileType2Icon className="h-8 w-8" />
+          {t('vectorFs.actions.createTextFile')}
+        </SheetTitle>
+      </SheetHeader>
+      <Form {...createTextFileForm}>
+        <form
+          className="flex h-[calc(100vh-100px)] flex-col gap-8 pt-4"
+          onSubmit={createTextFileForm.handleSubmit(onSubmit)}
+        >
+          <FormField
+            control={createTextFileForm.control}
+            name="name"
+            render={({ field }) => (
+              <TextField
+                autoFocus
+                field={{
+                  ...field,
+                  onKeyDown: (event) => {
+                    if (
+                      event.key === 'Enter' &&
+                      (event.metaKey || event.ctrlKey)
+                    ) {
+                      createTextFileForm.handleSubmit(onSubmit)();
+                    }
+                  },
+                }}
+                label={t('vectorFs.forms.textFileName')}
+              />
+            )}
+          />
+          <div className="flex flex-1 flex-col space-y-2">
+            <p className="text-gray-80 text-xs font-medium">Content</p>
+            <ToolCodeEditor
+              language="txt"
+              name={'text-file-content'}
+              ref={textFileContentRef}
+              style={{ height: '100%' }}
+              value={''}
+            />
+          </div>
+          <Button
+            className="w-full"
+            disabled={isPending}
+            isLoading={isPending}
+            type="submit"
+          >
+            {t('vectorFs.actions.createTextFile')}
+          </Button>
+        </form>
+      </Form>
+    </>
+  );
+};
diff --git a/libs/shinkai-i18n/src/lib/default/index.ts b/libs/shinkai-i18n/src/lib/default/index.ts
index 475444610..97183fff3 100644
--- a/libs/shinkai-i18n/src/lib/default/index.ts
+++ b/libs/shinkai-i18n/src/lib/default/index.ts
@@ -141,6 +141,7 @@ export default {
       addNew: 'Add New',
       createFolder: 'Add New Folder',
       uploadFile: 'File Upload',
+      createTextFile: 'Create Text File',
       share: 'Share',
       unshare: 'Unshare',
       move: 'Move',
@@ -157,6 +158,7 @@ export default {
     forms: {
       folderName: 'Folder Name',
       folderDescription: 'Folder Description',
+      textFileName: 'Title',
     },
     pending: {
       filesUploading: 'Uploading files',
diff --git a/libs/shinkai-node-state/src/forms/vector-fs/folder.ts b/libs/shinkai-node-state/src/forms/vector-fs/folder.ts
index f7730165d..2a4f9487a 100644
--- a/libs/shinkai-node-state/src/forms/vector-fs/folder.ts
+++ b/libs/shinkai-node-state/src/forms/vector-fs/folder.ts
@@ -26,3 +26,9 @@ export const saveWebpageToVectorFsFormSchema = z.object({
 export type SaveWebpageToVectorFsFormSchema = z.infer<
   typeof saveWebpageToVectorFsFormSchema
 >;
+
+export const createTextFileFormSchema = z.object({
+  name: z.string().min(1, 'File name is required'),
+});
+
+export type CreateTextFileFormSchema = z.infer<typeof createTextFileFormSchema>;

From fe91496aef4c36d26dced6b290855cecc483ad06 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 3 Jan 2025 19:00:02 -0500
Subject: [PATCH 33/39] feat: create/edit text file

---
 .../vector-fs/components/all-files-tab.tsx    |  6 +-
 .../vector-fs/components/vector-fs-drawer.tsx |  4 +
 .../components/vector-fs-general-options.tsx  | 76 ++++++++++++++-----
 .../components/vector-fs-item-options.tsx     | 45 ++++++++++-
 .../vector-fs/components/vector-fs-item.tsx   |  9 ++-
 libs/shinkai-i18n/locales/en-US.json          |  6 +-
 libs/shinkai-i18n/locales/es-ES.json          |  8 +-
 libs/shinkai-i18n/locales/id-ID.json          |  6 +-
 libs/shinkai-i18n/locales/ja-JP.json          |  6 +-
 libs/shinkai-i18n/locales/tr-TR.json          |  6 +-
 libs/shinkai-i18n/locales/zh-CN.json          |  6 +-
 libs/shinkai-i18n/src/lib/default/index.ts    |  2 +
 12 files changed, 147 insertions(+), 33 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
index fd89f4d83..6d023c979 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/all-files-tab.tsx
@@ -97,9 +97,9 @@ const AllFiles = () => {
       path: currentGlobalPath,
     },
     {
-      // select: (data: FileInfo[]) => {
-      //   return data?.sort((a, b) => a.name.localeCompare(b.name));
-      // },
+      select: (data) => {
+        return data?.sort((a, b) => a.name.localeCompare(b.name));
+      },
       refetchInterval: 6000,
     },
   );
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
index a9bbc98e8..ac57ce4f7 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
@@ -17,6 +17,7 @@ import { VectorFileDetails } from './vector-fs-item-detail';
 import {
   VectorFsItemCopyAction,
   VectorFsItemDeleteAction,
+  VectorFsItemEditTextFileAction,
   VectorFsItemMoveAction,
 } from './vector-fs-item-options';
 
@@ -70,6 +71,7 @@ export enum VectorFsFolderAction {
 export enum VectorFsItemAction {
   Move = 'move-item',
   Copy = 'copy-item',
+  Edit = 'edit-item', // txt files
   Delete = 'delete-item',
 }
 
@@ -109,6 +111,8 @@ const VectorFSDrawerContent = ({
       return <VectorFsItemMoveAction />;
     case VectorFsItemAction.Copy:
       return <VectorFsItemCopyAction />;
+    case VectorFsItemAction.Edit:
+      return <VectorFsItemEditTextFileAction />;
     case VectorFsItemAction.Delete:
       return <VectorFsItemDeleteAction />;
 
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
index 7ca3fb90a..7101b6b14 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-general-options.tsx
@@ -11,6 +11,7 @@ import {
   uploadVRFilesFormSchema,
 } from '@shinkai_network/shinkai-node-state/forms/vector-fs/folder';
 import { useCreateFolder } from '@shinkai_network/shinkai-node-state/v2/mutations/createFolder/useCreateFolder';
+import { useRemoveFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFsItem/useRemoveFsItem';
 import { useUploadVRFiles } from '@shinkai_network/shinkai-node-state/v2/mutations/uploadVRFiles/useUploadVRFiles';
 import {
   Button,
@@ -357,8 +358,13 @@ export const SaveWebpageToVectorFsAction = () => {
   );
 };
 
-// create a new text file
-export const CreateTextFileAction = () => {
+export const CreateTextFileAction = ({
+  initialValues,
+  mode = 'create',
+}: {
+  initialValues?: { name: string; content: string; path: string };
+  mode?: 'create' | 'edit';
+}) => {
   const { t } = useTranslation();
   const auth = useAuth((state) => state.auth);
   const currentGlobalPath = useVectorFsStore(
@@ -370,8 +376,15 @@ export const CreateTextFileAction = () => {
   const closeDrawerMenu = useVectorFsStore((state) => state.closeDrawerMenu);
   const createTextFileForm = useForm<CreateTextFileFormSchema>({
     resolver: zodResolver(createTextFileFormSchema),
+    defaultValues: initialValues,
   });
 
+  useEffect(() => {
+    if (initialValues) {
+      createTextFileForm.setValue('name', initialValues.name);
+    }
+  }, [initialValues, createTextFileForm]);
+
   const { isPending, mutateAsync: uploadVRFiles } = useUploadVRFiles({
     onSuccess: (_) => {
       createTextFileForm.reset();
@@ -384,25 +397,48 @@ export const CreateTextFileAction = () => {
     },
   });
 
+  const { mutateAsync: deleteVrItem, isPending: isRemovingItem } =
+    useRemoveFsItem({
+      onError: () => {
+        toast.error(t('vectorFs.errors.fileDeleted'));
+      },
+    });
+
   const onSubmit = async (values: CreateTextFileFormSchema) => {
     if (!auth) return;
-    closeDrawerMenu();
     const textFileContent = textFileContentRef.current?.value;
     if (!textFileContent) {
       toast.error('Please enter file content');
       return;
     }
-
     const textFile = new File([textFileContent], `${values.name}.txt`, {
       type: 'text/plain',
     });
 
-    await uploadVRFiles({
-      nodeAddress: auth?.node_address ?? '',
-      destinationPath: currentGlobalPath,
-      files: [textFile],
-      token: auth?.api_v2_key ?? '',
-    });
+    if (mode === 'create') {
+      await uploadVRFiles({
+        nodeAddress: auth?.node_address ?? '',
+        destinationPath: currentGlobalPath,
+        files: [textFile],
+        token: auth?.api_v2_key ?? '',
+      });
+    }
+
+    if (mode === 'edit') {
+      await deleteVrItem({
+        nodeAddress: auth?.node_address ?? '',
+        token: auth?.api_v2_key ?? '',
+        itemPath: initialValues?.path ?? '',
+      });
+      await uploadVRFiles({
+        nodeAddress: auth?.node_address ?? '',
+        destinationPath: currentGlobalPath,
+        files: [textFile],
+        token: auth?.api_v2_key ?? '',
+      });
+    }
+
+    closeDrawerMenu();
   };
 
   return (
@@ -410,12 +446,13 @@ export const CreateTextFileAction = () => {
       <SheetHeader>
         <SheetTitle className="flex flex-col items-start gap-1">
           <FileType2Icon className="h-8 w-8" />
-          {t('vectorFs.actions.createTextFile')}
+          {mode === 'create' && t('vectorFs.actions.createTextFile')}
+          {mode === 'edit' && t('vectorFs.actions.editTextFile')}
         </SheetTitle>
       </SheetHeader>
       <Form {...createTextFileForm}>
         <form
-          className="flex h-[calc(100vh-100px)] flex-col gap-8 pt-4"
+          className="flex h-[calc(100vh-110px)] flex-col gap-8 pt-4"
           onSubmit={createTextFileForm.handleSubmit(onSubmit)}
         >
           <FormField
@@ -439,23 +476,22 @@ export const CreateTextFileAction = () => {
               />
             )}
           />
-          <div className="flex flex-1 flex-col space-y-2">
-            <p className="text-gray-80 text-xs font-medium">Content</p>
+          <div className="flex flex-1 flex-col space-y-2 overflow-hidden">
+            <p className="text-gray-80 text-xs font-semibold">Content</p>
             <ToolCodeEditor
               language="txt"
-              name={'text-file-content'}
               ref={textFileContentRef}
-              style={{ height: '100%' }}
-              value={''}
+              value={initialValues?.content ?? ''}
             />
           </div>
           <Button
             className="w-full"
-            disabled={isPending}
-            isLoading={isPending}
+            disabled={isPending || isRemovingItem}
+            isLoading={isPending || isRemovingItem}
             type="submit"
           >
-            {t('vectorFs.actions.createTextFile')}
+            {mode === 'create' && t('vectorFs.actions.createTextFile')}
+            {mode === 'edit' && t('vectorFs.actions.editTextFile')}
           </Button>
         </form>
       </Form>
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
index 682a846a8..ec4b117be 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item-options.tsx
@@ -2,13 +2,14 @@ import { useTranslation } from '@shinkai_network/shinkai-i18n';
 import { useCopyFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/copyFsItem/useCopyFsItem';
 import { useMoveFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/moveFsItem/useMoveFsItem';
 import { useRemoveFsItem } from '@shinkai_network/shinkai-node-state/v2/mutations/removeFsItem/useRemoveFsItem';
+import { useGetDownloadFile } from '@shinkai_network/shinkai-node-state/v2/queries/getDownloadFile/useGetDownloadFile';
 import {
   Button,
   DrawerFooter,
   SheetHeader,
   SheetTitle,
 } from '@shinkai_network/shinkai-ui';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { toast } from 'sonner';
 
 import { useAuth } from '../../../store/auth';
@@ -17,6 +18,7 @@ import {
   FolderSelectionList,
   useVectorFolderSelectionStore,
 } from './folder-selection-list';
+import { CreateTextFileAction } from './vector-fs-general-options';
 
 export const VectorFsItemMoveAction = () => {
   const { t } = useTranslation();
@@ -183,3 +185,44 @@ export const VectorFsItemCopyAction = () => {
     </React.Fragment>
   );
 };
+
+export const VectorFsItemEditTextFileAction = () => {
+  const auth = useAuth((state) => state.auth);
+  const selectedFile = useVectorFsStore((state) => state.selectedFile);
+
+  const fileNameWithoutExtension = selectedFile?.name?.split('.')?.[0] ?? '';
+
+  const [initialValues, setInitialValues] = React.useState({
+    name: fileNameWithoutExtension,
+    path: selectedFile?.path ?? '',
+    content: '',
+  });
+
+  const { mutateAsync: downloadFile } = useGetDownloadFile({});
+
+  useEffect(() => {
+    const fetchFileContent = async () => {
+      if (selectedFile && auth) {
+        try {
+          const fileContentBase64 = await downloadFile({
+            nodeAddress: auth.node_address,
+            token: auth.api_v2_key,
+            path: selectedFile.path,
+          });
+          const fileContent = atob(fileContentBase64);
+          setInitialValues({
+            name: fileNameWithoutExtension,
+            path: selectedFile.path,
+            content: fileContent,
+          });
+        } catch (error) {
+          console.error('Error downloading file content:', error);
+        }
+      }
+    };
+
+    fetchFileContent();
+  }, [selectedFile, auth, downloadFile]);
+
+  return <CreateTextFileAction initialValues={initialValues} mode="edit" />;
+};
diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index 5b6f9b9e1..c7c62fbb8 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -26,7 +26,7 @@ import {
 } from '@shinkai_network/shinkai-ui/helpers';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
 import { partial } from 'filesize';
-import { CopyIcon, FileInputIcon, TrashIcon } from 'lucide-react';
+import { CopyIcon, Edit2Icon, FileInputIcon, TrashIcon } from 'lucide-react';
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -196,6 +196,13 @@ const VectorFsItem = ({
           className="w-[160px] border bg-gray-500 px-2.5 py-2"
         >
           {[
+            {
+              name: t('vectorFs.actions.edit'),
+              icon: <Edit2Icon className="mr-3 h-4 w-4" />,
+              onClick: () => {
+                setActiveDrawerMenuOption(VectorFsItemAction.Edit);
+              },
+            },
             {
               name: t('vectorFs.actions.move'),
               icon: <FileInputIcon className="mr-3 h-4 w-4" />,
diff --git a/libs/shinkai-i18n/locales/en-US.json b/libs/shinkai-i18n/locales/en-US.json
index 7b788b241..13294ac72 100644
--- a/libs/shinkai-i18n/locales/en-US.json
+++ b/libs/shinkai-i18n/locales/en-US.json
@@ -121,8 +121,11 @@
       "addNew": "Add New",
       "createFolder": "Add New Folder",
       "uploadFile": "File Upload",
+      "createTextFile": "Create Text File",
+      "editTextFile": "Edit Text File",
       "share": "Share",
       "unshare": "Unshare",
+      "edit": "Edit",
       "move": "Move",
       "copy": "Copy",
       "delete": "Delete",
@@ -133,7 +136,8 @@
     },
     "forms": {
       "folderName": "Folder Name",
-      "folderDescription": "Folder Description"
+      "folderDescription": "Folder Description",
+      "textFileName": "Title"
     },
     "pending": {
       "filesUploading": "Uploading files"
diff --git a/libs/shinkai-i18n/locales/es-ES.json b/libs/shinkai-i18n/locales/es-ES.json
index 05bd73674..2bccd899f 100644
--- a/libs/shinkai-i18n/locales/es-ES.json
+++ b/libs/shinkai-i18n/locales/es-ES.json
@@ -1,6 +1,4 @@
 {
-  "": {
-  },
   "aiFilesSearch": {
     "description": "Busca para encontrar contenido en todos los archivos de tus archivos AI fácilmente",
     "filesSelected": "Seleccionados {{count}} archivos",
@@ -526,7 +524,10 @@
       "addNew": "Añadir nuevo",
       "copy": "Copiar",
       "createFolder": "Añadir nueva carpeta",
+      "createTextFile": "Crear archivo de texto",
       "delete": "Eliminar",
+      "edit": "Editar",
+      "editTextFile": "Editar archivo de texto",
       "move": "Mover",
       "searchWithinFolder": "Buscar dentro de la carpeta",
       "share": "Compartir",
@@ -560,7 +561,8 @@
     "filesSelected": "{{count}} seleccionados",
     "forms": {
       "folderDescription": "Descripción de la carpeta",
-      "folderName": "Nombre de la carpeta"
+      "folderName": "Nombre de la carpeta",
+      "textFileName": "Título"
     },
     "home": "Inicio",
     "label": "Mi Explorador de Archivos de IA",
diff --git a/libs/shinkai-i18n/locales/id-ID.json b/libs/shinkai-i18n/locales/id-ID.json
index d33a6fd0a..c3d96f2b6 100644
--- a/libs/shinkai-i18n/locales/id-ID.json
+++ b/libs/shinkai-i18n/locales/id-ID.json
@@ -524,7 +524,10 @@
       "addNew": "Tambah Baru",
       "copy": "Salin",
       "createFolder": "Tambah Folder Baru",
+      "createTextFile": "Buat Berkas Teks",
       "delete": "Hapus",
+      "edit": "Edit",
+      "editTextFile": "Edit Berkas Teks",
       "move": "Pindah",
       "searchWithinFolder": "Cari dalam folder",
       "share": "Bagikan",
@@ -558,7 +561,8 @@
     "filesSelected": "{{count}} dipilih",
     "forms": {
       "folderDescription": "Deskripsi Folder",
-      "folderName": "Nama Folder"
+      "folderName": "Nama Folder",
+      "textFileName": "Judul"
     },
     "home": "Beranda",
     "label": "Penjelajah File AI Saya",
diff --git a/libs/shinkai-i18n/locales/ja-JP.json b/libs/shinkai-i18n/locales/ja-JP.json
index ef210fb29..2dab6343c 100644
--- a/libs/shinkai-i18n/locales/ja-JP.json
+++ b/libs/shinkai-i18n/locales/ja-JP.json
@@ -524,7 +524,10 @@
       "addNew": "新規追加",
       "copy": "コピー",
       "createFolder": "新しいフォルダを作成",
+      "createTextFile": "テキストファイルを作成",
       "delete": "削除",
+      "edit": "編集",
+      "editTextFile": "テキストファイルを編集",
       "move": "移動",
       "searchWithinFolder": "フォルダ内を検索",
       "share": "共有",
@@ -558,7 +561,8 @@
     "filesSelected": "{{count}} 個選択されました",
     "forms": {
       "folderDescription": "フォルダの説明",
-      "folderName": "フォルダ名"
+      "folderName": "フォルダ名",
+      "textFileName": "タイトル"
     },
     "home": "ホーム",
     "label": "私のAIファイルエクスプローラー",
diff --git a/libs/shinkai-i18n/locales/tr-TR.json b/libs/shinkai-i18n/locales/tr-TR.json
index 855b44dd8..f6c3c2ce1 100644
--- a/libs/shinkai-i18n/locales/tr-TR.json
+++ b/libs/shinkai-i18n/locales/tr-TR.json
@@ -524,7 +524,10 @@
       "addNew": "Yeni Ekle",
       "copy": "Kopyala",
       "createFolder": "Yeni Klasör Oluştur",
+      "createTextFile": "Metin Dosyası Oluştur",
       "delete": "Sil",
+      "edit": "Düzenle",
+      "editTextFile": "Metin Dosyasını Düzenle",
       "move": "Taşı",
       "searchWithinFolder": "Klasör içinde ara",
       "share": "Paylaş",
@@ -558,7 +561,8 @@
     "filesSelected": "{{count}} seçildi",
     "forms": {
       "folderDescription": "Klasör Açıklaması",
-      "folderName": "Klasör Adı"
+      "folderName": "Klasör Adı",
+      "textFileName": "Başlık"
     },
     "home": "Ana Sayfa",
     "label": "AI Dosya Gezgini",
diff --git a/libs/shinkai-i18n/locales/zh-CN.json b/libs/shinkai-i18n/locales/zh-CN.json
index 65b1419b9..0172e4211 100644
--- a/libs/shinkai-i18n/locales/zh-CN.json
+++ b/libs/shinkai-i18n/locales/zh-CN.json
@@ -524,7 +524,10 @@
       "addNew": "添加新文件",
       "copy": "复制",
       "createFolder": "添加新文件夹",
+      "createTextFile": "创建文本文件",
       "delete": "删除",
+      "edit": "编辑",
+      "editTextFile": "编辑文本文件",
       "move": "移动",
       "searchWithinFolder": "文件夹内搜索",
       "share": "分享",
@@ -558,7 +561,8 @@
     "filesSelected": "{{count}} 已选择",
     "forms": {
       "folderDescription": "文件夹描述",
-      "folderName": "文件夹名称"
+      "folderName": "文件夹名称",
+      "textFileName": "标题"
     },
     "home": "主页",
     "label": "我的AI文件资源管理器",
diff --git a/libs/shinkai-i18n/src/lib/default/index.ts b/libs/shinkai-i18n/src/lib/default/index.ts
index 97183fff3..ca3dde37c 100644
--- a/libs/shinkai-i18n/src/lib/default/index.ts
+++ b/libs/shinkai-i18n/src/lib/default/index.ts
@@ -142,8 +142,10 @@ export default {
       createFolder: 'Add New Folder',
       uploadFile: 'File Upload',
       createTextFile: 'Create Text File',
+      editTextFile: 'Edit Text File',
       share: 'Share',
       unshare: 'Unshare',
+      edit: 'Edit',
       move: 'Move',
       copy: 'Copy',
       delete: 'Delete',

From 6adba22650d4d3bf82a011a82c0cd17282911531 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 3 Jan 2025 19:12:59 -0500
Subject: [PATCH 34/39] fixes

---
 .../vector-fs/components/vector-fs-drawer.tsx          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
index ac57ce4f7..709293d6c 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-drawer.tsx
@@ -1,4 +1,5 @@
 import { Sheet, SheetContent } from '@shinkai_network/shinkai-ui';
+import { cn } from '@shinkai_network/shinkai-ui/utils';
 
 import { useVectorFsStore } from '../context/vector-fs-context';
 import { VectorFolderSelectionProvider } from './folder-selection-list';
@@ -32,6 +33,7 @@ const VectorFSDrawer = () => {
     (state) => state.setSelectedFolder,
   );
   const setSelectedFile = useVectorFsStore((state) => state.setSelectedFile);
+  console.log('activeDrawerMenuOption', activeDrawerMenuOption);
   return (
     <Sheet
       onOpenChange={(open) => {
@@ -43,7 +45,13 @@ const VectorFSDrawer = () => {
       }}
       open={!!activeDrawerMenuOption}
     >
-      <SheetContent className="max-w-md">
+      <SheetContent
+        className={cn(
+          activeDrawerMenuOption === VectorFsGlobalAction.CreateTextFile
+            ? 'max-w-2xl'
+            : 'max-w-md',
+        )}
+      >
         <VectorFolderSelectionProvider>
           <VectorFSDrawerContent selectedOption={activeDrawerMenuOption} />
         </VectorFolderSelectionProvider>

From 30583d9738b61607e8bf7a6b0dd54cf89949d375 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 3 Jan 2025 19:17:27 -0500
Subject: [PATCH 35/39] fix types

---
 libs/shinkai-message-ts/src/api/jobs/types.ts                   | 2 +-
 .../src/v2/mutations/createRecurringTask/index.ts               | 1 +
 .../shinkai-node-state/src/v2/mutations/createToolCode/index.ts | 1 +
 .../src/v2/mutations/updateRecurringTask/index.ts               | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/shinkai-message-ts/src/api/jobs/types.ts b/libs/shinkai-message-ts/src/api/jobs/types.ts
index 884645f34..fa0ef685c 100644
--- a/libs/shinkai-message-ts/src/api/jobs/types.ts
+++ b/libs/shinkai-message-ts/src/api/jobs/types.ts
@@ -60,7 +60,7 @@ export type JobMessage = {
   job_id: string;
   callback?: null;
   content: string;
-  parent?: string;
+  parent: string | null;
   sheet_job_data?: null;
   tool_key?: string;
   metadata?: {
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 b7fa82284..35d372081 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createRecurringTask/index.ts
@@ -47,6 +47,7 @@ export const createRecurringTask = async ({
           job_id: jobId,
           content: message,
           tool_key: toolKey,
+          parent: null,
         },
       },
 
diff --git a/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts b/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts
index 7c7556f89..17fe2ffb4 100644
--- a/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/createToolCode/index.ts
@@ -51,6 +51,7 @@ export const createToolCode = async ({
     message: {
       job_id: currentJobId,
       content: message,
+      parent: null,
     },
     tools,
     language,
diff --git a/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts b/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts
index b16a9d146..5f75563dc 100644
--- a/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts
+++ b/libs/shinkai-node-state/src/v2/mutations/updateRecurringTask/index.ts
@@ -38,6 +38,7 @@ export const updateRecurringTask = async ({
           job_id: jobId,
           content: message,
           tool_key: toolKey,
+          parent: null,
         },
       },
     },

From 97db49669262a125ac11f7832c1dde22db9c2af3 Mon Sep 17 00:00:00 2001
From: paulclindo <paulclindo@gmail.com>
Date: Fri, 3 Jan 2025 21:11:06 -0500
Subject: [PATCH 36/39] fix

---
 .../vector-fs/components/vector-fs-item.tsx   | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
index c7c62fbb8..9e885e07a 100644
--- a/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
+++ b/apps/shinkai-desktop/src/components/vector-fs/components/vector-fs-item.tsx
@@ -196,7 +196,7 @@ const VectorFsItem = ({
           className="w-[160px] border bg-gray-500 px-2.5 py-2"
         >
           {[
-            {
+            file.path.includes('.txt') && {
               name: t('vectorFs.actions.edit'),
               icon: <Edit2Icon className="mr-3 h-4 w-4" />,
               onClick: () => {
@@ -224,22 +224,24 @@ const VectorFsItem = ({
                 setActiveDrawerMenuOption(VectorFsItemAction.Delete);
               },
             },
-          ].map((option, idx) => (
-            <React.Fragment key={option.name}>
-              {idx === 2 && <DropdownMenuSeparator className="bg-gray-300" />}
-              <DropdownMenuItem
-                key={option.name}
-                onClick={(event) => {
-                  event.stopPropagation();
-                  option.onClick();
-                  setSelectedFile(file);
-                }}
-              >
-                {option.icon}
-                {option.name}
-              </DropdownMenuItem>
-            </React.Fragment>
-          ))}
+          ]
+            .filter((item) => !!item)
+            .map((option, idx) => (
+              <React.Fragment key={option.name}>
+                {idx === 2 && <DropdownMenuSeparator className="bg-gray-300" />}
+                <DropdownMenuItem
+                  key={option.name}
+                  onClick={(event) => {
+                    event.stopPropagation();
+                    option.onClick();
+                    setSelectedFile(file);
+                  }}
+                >
+                  {option.icon}
+                  {option.name}
+                </DropdownMenuItem>
+              </React.Fragment>
+            ))}
         </DropdownMenuContent>
       </DropdownMenu>
     </button>

From 9f83e2329a0040b143cdb9ecca46770702014e4e Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Fri, 3 Jan 2025 20:32:33 -0600
Subject: [PATCH 37/39] ignroe visor

---
 .github/workflows/release-dev.yml  | 100 ++++++++---------
 .github/workflows/release-prod.yml | 170 ++++++++++++++---------------
 2 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index e89b3bd72..eee073a70 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -25,56 +25,56 @@ jobs:
         id: package-version
         uses: Saionaro/extract-package-version@v1.2.1
 
-  release-shinkai-visor:
-    needs: prebuild
-    runs-on: ubuntu-latest
-    environment: development
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node version
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          check-latest: false
-          cache: "npm"
-          cache-dependency-path: package-lock.json
-
-      - name: Install dependencies
-        run: |
-          npm cache verify
-          npm ci --no-audit --prefer-offline
-
-      - name: Run NX build on shinkai-visor
-        run: npx nx build shinkai-visor --skip-nx-cache
-        env:
-          VERSION: ${{ needs.prebuild.outputs.version }}.${{github.run_number}}
-          NAME_PREFIX: '[Dev]'
-          DESCRIPTION_PREFIX: '[Dev]'
-
-      - name: Zip extension
-        run: cd ./dist/apps && zip -r shinkai-visor.zip shinkai-visor
-
-      - name: Upload & Release
-        uses: mnao305/chrome-extension-upload@v4.0.1
-        continue-on-error: true
-        with:
-          file-path: dist/apps/shinkai-visor.zip
-          extension-id: ${{ secrets.CHROME_EXTENSION_ID }}
-          client-id: ${{ secrets.CHROME_CLIENT_ID }}
-          client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
-          refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}
-          publish: false
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: shinkai-visor
-          path: dist/apps/shinkai-visor
-          if-no-files-found: error
-          retention-days: 5
+  # release-shinkai-visor:
+  #   needs: prebuild
+  #   runs-on: ubuntu-latest
+  #   environment: development
+  #   steps:
+  #     - name: Check out repository
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Setup Node version
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version-file: '.nvmrc'
+  #         check-latest: false
+  #         cache: "npm"
+  #         cache-dependency-path: package-lock.json
+
+  #     - name: Install dependencies
+  #       run: |
+  #         npm cache verify
+  #         npm ci --no-audit --prefer-offline
+
+  #     - name: Run NX build on shinkai-visor
+  #       run: npx nx build shinkai-visor --skip-nx-cache
+  #       env:
+  #         VERSION: ${{ needs.prebuild.outputs.version }}.${{github.run_number}}
+  #         NAME_PREFIX: '[Dev]'
+  #         DESCRIPTION_PREFIX: '[Dev]'
+
+  #     - name: Zip extension
+  #       run: cd ./dist/apps && zip -r shinkai-visor.zip shinkai-visor
+
+  #     - name: Upload & Release
+  #       uses: mnao305/chrome-extension-upload@v4.0.1
+  #       continue-on-error: true
+  #       with:
+  #         file-path: dist/apps/shinkai-visor.zip
+  #         extension-id: ${{ secrets.CHROME_EXTENSION_ID }}
+  #         client-id: ${{ secrets.CHROME_CLIENT_ID }}
+  #         client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
+  #         refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}
+  #         publish: false
+
+  #     - uses: actions/upload-artifact@v3
+  #       with:
+  #         name: shinkai-visor
+  #         path: dist/apps/shinkai-visor
+  #         if-no-files-found: error
+  #         retention-days: 5
 
   release-shinkai-desktop:
     needs: prebuild
diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
index 445e34f02..1c49e46a1 100644
--- a/.github/workflows/release-prod.yml
+++ b/.github/workflows/release-prod.yml
@@ -31,49 +31,49 @@ jobs:
           script: |
             core.setFailed('Version mismatch')
 
-  release-shinkai-visor:
-    needs: prebuild
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node version
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          check-latest: false
-          cache: "npm"
-          cache-dependency-path: package-lock.json
-
-      - name: Install dependencies
-        run: |
-          npm cache verify
-          npm ci --no-audit --prefer-offline
-
-      - name: Run NX build on shinkai-visor
-        run: npx nx build shinkai-visor --skip-nx-cache
-        env:
-          VERSION: ${{ needs.prebuild.outputs.version }}.${{github.run_number}}
-          NAME_PREFIX: ''
-          DESCRIPTION_PREFIX: ''
-          PUBLIC_KEY: ${{ secrets.CHROME_EXTENSION_PUBLIC_KEY }}
-
-      - name: Zip extension
-        run: cd ./dist/apps && zip -r shinkai-visor.zip shinkai-visor
-
-      - name: Upload & Release
-        uses: mnao305/chrome-extension-upload@v4.0.1
-        with:
-          file-path: dist/apps/shinkai-visor.zip
-          extension-id: ${{ secrets.CHROME_EXTENSION_ID }}
-          client-id: ${{ secrets.CHROME_CLIENT_ID }}
-          client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
-          refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}
-          publish: false
+  # release-shinkai-visor:
+  #   needs: prebuild
+  #   runs-on: ubuntu-latest
+  #   environment: production
+  #   steps:
+  #     - name: Check out repository
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Setup Node version
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version-file: '.nvmrc'
+  #         check-latest: false
+  #         cache: "npm"
+  #         cache-dependency-path: package-lock.json
+
+  #     - name: Install dependencies
+  #       run: |
+  #         npm cache verify
+  #         npm ci --no-audit --prefer-offline
+
+  #     - name: Run NX build on shinkai-visor
+  #       run: npx nx build shinkai-visor --skip-nx-cache
+  #       env:
+  #         VERSION: ${{ needs.prebuild.outputs.version }}.${{github.run_number}}
+  #         NAME_PREFIX: ''
+  #         DESCRIPTION_PREFIX: ''
+  #         PUBLIC_KEY: ${{ secrets.CHROME_EXTENSION_PUBLIC_KEY }}
+
+  #     - name: Zip extension
+  #       run: cd ./dist/apps && zip -r shinkai-visor.zip shinkai-visor
+
+  #     - name: Upload & Release
+  #       uses: mnao305/chrome-extension-upload@v4.0.1
+  #       with:
+  #         file-path: dist/apps/shinkai-visor.zip
+  #         extension-id: ${{ secrets.CHROME_EXTENSION_ID }}
+  #         client-id: ${{ secrets.CHROME_CLIENT_ID }}
+  #         client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
+  #         refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}
+  #         publish: false
 
   release-shinkai-desktop:
     needs: prebuild
@@ -380,45 +380,45 @@ jobs:
                 }
               ]
             }
-      - name: Post Shinkai Visor to a Slack channel
-        uses: slackapi/slack-github-action@v1.26.0
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-        with:
-          channel-id: 'C072VJ6E7GC'
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "header",
-                  "text": {
-                    "type": "plain_text",
-                    "text": "📦 New build: Shinkai Visor v${{ needs.prebuild.outputs.version }}.${{ github.run_number }}",
-                    "emoji": true
-                  }
-                },
-                {
-                  "type": "divider"
-                },
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "Found it at <https://chromewebstore.google.com/detail/shinkai-visor-supercharge/${{ secrets.CHROME_EXTENSION_ID }}|Chrome Web Store>"
-                  }
-                },
-                {
-                  "type": "divider"
-                },
-                {
-                  "type": "context",
-                  "elements": [
-                    {
-                      "type": "mrkdwn",
-                      "text": "_💡 Send it for review and publish on <https://chrome.google.com/u/4/webstore/devconsole/f35b7411-6fce-4a2b-8865-c310ce95c89f/${{ secrets.CHROME_EXTENSION_ID }}/edit|Chrome Web Store Developer> to start the rollout_"
-                    }
-                  ]
-                }
-
-              ]
-            }
+      # - name: Post Shinkai Visor to a Slack channel
+      #   uses: slackapi/slack-github-action@v1.26.0
+      #   env:
+      #     SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+      #   with:
+      #     channel-id: 'C072VJ6E7GC'
+      #     payload: |
+      #       {
+      #         "blocks": [
+      #           {
+      #             "type": "header",
+      #             "text": {
+      #               "type": "plain_text",
+      #               "text": "📦 New build: Shinkai Visor v${{ needs.prebuild.outputs.version }}.${{ github.run_number }}",
+      #               "emoji": true
+      #             }
+      #           },
+      #           {
+      #             "type": "divider"
+      #           },
+      #           {
+      #             "type": "section",
+      #             "text": {
+      #               "type": "mrkdwn",
+      #               "text": "Found it at <https://chromewebstore.google.com/detail/shinkai-visor-supercharge/${{ secrets.CHROME_EXTENSION_ID }}|Chrome Web Store>"
+      #             }
+      #           },
+      #           {
+      #             "type": "divider"
+      #           },
+      #           {
+      #             "type": "context",
+      #             "elements": [
+      #               {
+      #                 "type": "mrkdwn",
+      #                 "text": "_💡 Send it for review and publish on <https://chrome.google.com/u/4/webstore/devconsole/f35b7411-6fce-4a2b-8865-c310ce95c89f/${{ secrets.CHROME_EXTENSION_ID }}/edit|Chrome Web Store Developer> to start the rollout_"
+      #               }
+      #             ]
+      #           }
+
+      #         ]
+      #       }

From 9c19f6477764b41e73a6a4a024c14c20bc0062c4 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Fri, 3 Jan 2025 20:36:57 -0600
Subject: [PATCH 38/39] skip build

---
 apps/shinkai-visor/project.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/shinkai-visor/project.json b/apps/shinkai-visor/project.json
index a9acc9c7c..0aff4626c 100644
--- a/apps/shinkai-visor/project.json
+++ b/apps/shinkai-visor/project.json
@@ -21,7 +21,8 @@
         },
         "production": {
           "mode": "production",
-          "force": true
+          "force": true,
+          "buildable": false
         }
       }
     },

From ae07375055ee5b8440effdf42097d35616bd2770 Mon Sep 17 00:00:00 2001
From: Nico Arqueros <nico@dcspark.io>
Date: Fri, 3 Jan 2025 20:45:06 -0600
Subject: [PATCH 39/39] another try

---
 .github/workflows/pr-ci-healchecks.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-ci-healchecks.yml b/.github/workflows/pr-ci-healchecks.yml
index 1af9d6d2d..1e6aecdca 100644
--- a/.github/workflows/pr-ci-healchecks.yml
+++ b/.github/workflows/pr-ci-healchecks.yml
@@ -51,7 +51,8 @@ jobs:
         env:
           OPEN_AI_API_KEY: ${{ secrets.OPEN_AI_API_KEY }}
         run: |
-          npx nx run-many -t lint,build,test --parallel=3 --skip-nx-cache --verbose --exclude=shinkai-desktop
+          npx nx run-many -t lint,test --parallel=3 --skip-nx-cache --verbose --exclude=shinkai-desktop,shinkai-visor
+          npx nx run-many -t build --parallel=3 --skip-nx-cache --verbose --exclude=shinkai-desktop,shinkai-visor
           npx nx lint shinkai-desktop
 
 #      - name: Run E2E for Visor