markov-cli 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markov-cli",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Markov CLI",
   "type": "module",
   "bin": {

package/src/agent/agentLoop.js

@@ -96,7 +96,15 @@ export async function runAgentLoop(messages, opts = {}) {
 
       if (onToolCall) onToolCall(name ?? 'unknown', args ?? {});
 
-      const isFileEdit = name === 'search_replace';
+      const isFileEdit = [
+        'search_replace',
+        'drive_write_file',
+        'drive_create_folder',
+        'drive_rename',
+        'drive_move',
+        'drive_copy',
+        'drive_delete',
+      ].includes(name);
       let result;
       if (isFileEdit && confirmFileEdit) {
         const ok = await confirmFileEdit(name, args ?? {});

package/src/agent/context.js

@@ -93,10 +93,12 @@ export function buildAgentSystemMessage() {
     // `- create_folder: create directories.\n` +
     `- read_file: read file contents before editing.\n` +
     `- search_replace: replace first occurrence of text in a file (for small, targeted edits).\n` +
+    `- drive_list / drive_read_file / drive_write_file / drive_create_folder / drive_rename / drive_move / drive_copy / drive_delete: manage the logged-in user's remote Drive files through the backend API. These tools are scoped to the authenticated user's own Drive files only.\n` +
     // `- delete_file: delete a file.\n` +
     // `- list_dir: list directory contents (path optional, defaults to current dir).\n` +
     `- web_search: search the web for current information; use when the user asks about recent events, docs, or facts.\n` +
     `When the user asks to run commands, create/edit/delete files, scaffold projects, or to "plan" or "start" an app (e.g. npm run dev), you MUST call the appropriate tool. Do not only describe steps in your reply.\n` +
-    `For file creation or overwriting, use run_terminal_command only (e.g. echo, cat, heredocs, tee). For small edits use search_replace. Never paste full file contents directly in your reply. All file operations must use RELATIVE paths. Do not output modified file contents in chat — apply changes through tool calls only.\n`;
+    `Use local tools for files in the current project folder. Use drive_* tools for the user's remote Drive files. Never try to access remote Drive content with run_terminal_command or local read_file.\n` +
+    `For local file creation or overwriting, use run_terminal_command only (e.g. echo, cat, heredocs, tee). For small local edits use search_replace. Never paste full file contents directly in your reply. Local file operations must use RELATIVE paths. Do not output modified file contents in chat — apply changes through tool calls only.\n`;
   return { role: 'system', content: getSystemMessageBase() + toolInstructions };
 }

package/src/remoteDrive.js

@@ -0,0 +1,149 @@
+import { API_URL, getToken } from './auth.js';
+
+const DRIVE_API_URL = `${API_URL}/files/cli`;
+
+function getAuthHeaders(extraHeaders = {}) {
+  const token = getToken();
+  if (!token) {
+    throw new Error('Not logged in. Use /login to authenticate first.');
+  }
+
+  return {
+    Authorization: `Bearer ${token}`,
+    ...extraHeaders,
+  };
+}
+
+async function parseResponse(res) {
+  if (res.status === 204) {
+    return null;
+  }
+
+  const text = await res.text();
+  if (!text) {
+    return null;
+  }
+
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+
+async function request(path, options = {}) {
+  const res = await fetch(`${DRIVE_API_URL}${path}`, {
+    ...options,
+    headers: getAuthHeaders({
+      'Content-Type': 'application/json',
+      ...(options.headers ?? {}),
+    }),
+  });
+
+  const body = await parseResponse(res);
+  if (!res.ok) {
+    const message =
+      body?.error?.message ??
+      body?.message ??
+      (typeof body === 'string' ? body : `Drive API error (${res.status})`);
+    throw new Error(message);
+  }
+
+  return body?.data ?? body;
+}
+
+export async function listDrive(parentId = null) {
+  const query = parentId ? `?parentId=${encodeURIComponent(parentId)}` : '';
+  const data = await request(`${query}`, { method: 'GET' });
+  return {
+    entries: Array.isArray(data) ? data : [],
+    parentId: parentId ?? null,
+  };
+}
+
+export async function getDriveItem(fileId) {
+  if (!fileId) throw new Error('file_id is required');
+  return request(`/${encodeURIComponent(fileId)}`, { method: 'GET' });
+}
+
+export async function readDriveFile(fileId) {
+  if (!fileId) throw new Error('file_id is required');
+  const data = await request(`/${encodeURIComponent(fileId)}/content`, { method: 'GET' });
+  return {
+    file: data?.file ?? null,
+    content: data?.content ?? '',
+  };
+}
+
+export async function writeDriveFile({ fileId = null, parentId = null, name = null, content = '' } = {}) {
+  if (typeof content !== 'string') {
+    throw new Error('content must be a string');
+  }
+
+  if (fileId) {
+    const data = await request(`/${encodeURIComponent(fileId)}/content`, {
+      method: 'PATCH',
+      body: JSON.stringify({ content }),
+    });
+    return { action: 'updated', file: data?.file ?? null, content: data?.content ?? content };
+  }
+
+  if (!name || typeof name !== 'string' || !name.trim()) {
+    throw new Error('name is required when creating a new remote file');
+  }
+
+  const data = await request('/text', {
+    method: 'POST',
+    body: JSON.stringify({ name: name.trim(), parentId, content }),
+  });
+  return { action: 'created', file: data?.file ?? null, content: data?.content ?? content };
+}
+
+export async function createDriveFolder({ name, parentId = null } = {}) {
+  if (!name || typeof name !== 'string' || !name.trim()) {
+    throw new Error('name is required');
+  }
+
+  return request('/folders', {
+    method: 'POST',
+    body: JSON.stringify({ name: name.trim(), parentId }),
+  });
+}
+
+export async function renameDriveItem(fileId, name) {
+  if (!fileId) throw new Error('file_id is required');
+  if (!name || typeof name !== 'string' || !name.trim()) {
+    throw new Error('name is required');
+  }
+
+  return request(`/${encodeURIComponent(fileId)}/rename`, {
+    method: 'PATCH',
+    body: JSON.stringify({ name: name.trim() }),
+  });
+}
+
+export async function moveDriveItem(fileId, destinationId = null) {
+  if (!fileId) throw new Error('file_id is required');
+
+  return request(`/${encodeURIComponent(fileId)}/move`, {
+    method: 'PATCH',
+    body: JSON.stringify({ destinationId }),
+  });
+}
+
+export async function copyDriveItem(fileId, destinationId) {
+  if (!fileId) throw new Error('file_id is required');
+  if (!destinationId) throw new Error('destination_id is required');
+
+  return request(`/${encodeURIComponent(fileId)}/copy`, {
+    method: 'POST',
+    body: JSON.stringify({ destinationId }),
+  });
+}
+
+export async function deleteDriveItem(fileId) {
+  if (!fileId) throw new Error('file_id is required');
+
+  await request(`/${encodeURIComponent(fileId)}`, { method: 'DELETE' });
+  return { success: true, fileId };
+}

package/src/tools.js

@@ -3,6 +3,16 @@ import { promisify } from 'util';
 import { mkdirSync, readFileSync, writeFileSync, existsSync, unlinkSync, readdirSync, statSync } from 'fs';
 import { resolve, dirname } from 'path';
 import { chatWithTools } from './ollama.js';
+import {
+  listDrive,
+  readDriveFile,
+  writeDriveFile,
+  createDriveFolder,
+  renameDriveItem,
+  moveDriveItem,
+  copyDriveItem,
+  deleteDriveItem,
+} from './remoteDrive.js';
 
 const execAsync = promisify(exec);
 
@@ -118,6 +128,186 @@ export const SEARCH_REPLACE_TOOL = {
   },
 };
 
+/** Ollama-format tool definition for listing authenticated remote-drive contents */
+export const DRIVE_LIST_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_list',
+    description: 'List the authenticated user\'s remote-drive files and folders. Omit parent_id to list the user\'s remote root.',
+    parameters: {
+      type: 'object',
+      required: [],
+      properties: {
+        parent_id: {
+          type: 'string',
+          description: 'Optional remote folder ID to list.',
+        },
+      },
+    },
+  },
+};
+
+/** Ollama-format tool definition for reading a text file from the authenticated user drive */
+export const DRIVE_READ_FILE_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_read_file',
+    description: 'Read a text file from the authenticated user\'s remote drive by file ID.',
+    parameters: {
+      type: 'object',
+      required: ['file_id'],
+      properties: {
+        file_id: {
+          type: 'string',
+          description: 'Remote file ID to read.',
+        },
+      },
+    },
+  },
+};
+
+/** Ollama-format tool definition for creating or overwriting a text file in the authenticated user drive */
+export const DRIVE_WRITE_FILE_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_write_file',
+    description: 'Create a new text file or overwrite an existing text file in the authenticated user\'s remote drive. To update, pass file_id and content. To create, pass name, optional parent_id, and content.',
+    parameters: {
+      type: 'object',
+      required: ['content'],
+      properties: {
+        file_id: {
+          type: 'string',
+          description: 'Existing remote file ID to overwrite.',
+        },
+        parent_id: {
+          type: 'string',
+          description: 'Optional remote folder ID for a newly created file.',
+        },
+        name: {
+          type: 'string',
+          description: 'File name for a newly created file.',
+        },
+        content: {
+          type: 'string',
+          description: 'Full text file content.',
+        },
+      },
+    },
+  },
+};
+
+/** Ollama-format tool definition for creating a remote folder */
+export const DRIVE_CREATE_FOLDER_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_create_folder',
+    description: 'Create a folder in the authenticated user\'s remote drive.',
+    parameters: {
+      type: 'object',
+      required: ['name'],
+      properties: {
+        name: {
+          type: 'string',
+          description: 'Folder name to create.',
+        },
+        parent_id: {
+          type: 'string',
+          description: 'Optional parent remote folder ID.',
+        },
+      },
+    },
+  },
+};
+
+/** Ollama-format tool definition for renaming a remote item */
+export const DRIVE_RENAME_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_rename',
+    description: 'Rename a file or folder in the authenticated user\'s remote drive.',
+    parameters: {
+      type: 'object',
+      required: ['file_id', 'name'],
+      properties: {
+        file_id: {
+          type: 'string',
+          description: 'Remote file or folder ID.',
+        },
+        name: {
+          type: 'string',
+          description: 'New file or folder name.',
+        },
+      },
+    },
+  },
+};
+
+/** Ollama-format tool definition for moving a remote item */
+export const DRIVE_MOVE_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_move',
+    description: 'Move a file or folder in the authenticated user\'s remote drive. Omit destination_id to move it to the remote root.',
+    parameters: {
+      type: 'object',
+      required: ['file_id'],
+      properties: {
+        file_id: {
+          type: 'string',
+          description: 'Remote file or folder ID to move.',
+        },
+        destination_id: {
+          type: 'string',
+          description: 'Optional destination folder ID.',
+        },
+      },
+    },
+  },
+};
+
+/** Ollama-format tool definition for copying a remote item */
+export const DRIVE_COPY_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_copy',
+    description: 'Copy a file or folder into another folder in the authenticated user\'s remote drive.',
+    parameters: {
+      type: 'object',
+      required: ['file_id', 'destination_id'],
+      properties: {
+        file_id: {
+          type: 'string',
+          description: 'Remote file or folder ID to copy.',
+        },
+        destination_id: {
+          type: 'string',
+          description: 'Destination folder ID.',
+        },
+      },
+    },
+  },
+};
+
+/** Ollama-format tool definition for deleting a remote item */
+export const DRIVE_DELETE_TOOL = {
+  type: 'function',
+  function: {
+    name: 'drive_delete',
+    description: 'Delete a file or folder from the authenticated user\'s remote drive.',
+    parameters: {
+      type: 'object',
+      required: ['file_id'],
+      properties: {
+        file_id: {
+          type: 'string',
+          description: 'Remote file or folder ID to delete.',
+        },
+      },
+    },
+  },
+};
+
 /** Ollama-format tool definition for deleting a file */
 // export const DELETE_FILE_TOOL = {
 //   type: 'function',
@@ -209,6 +399,14 @@ export const AGENT_TOOLS = [
   READ_FILE_TOOL,
   // WRITE_FILE_TOOL, // disabled: model uses run_terminal_command for file creation/overwrite
   SEARCH_REPLACE_TOOL,
+  DRIVE_LIST_TOOL,
+  DRIVE_READ_FILE_TOOL,
+  DRIVE_WRITE_FILE_TOOL,
+  DRIVE_CREATE_FOLDER_TOOL,
+  DRIVE_RENAME_TOOL,
+  DRIVE_MOVE_TOOL,
+  DRIVE_COPY_TOOL,
+  DRIVE_DELETE_TOOL,
   // DELETE_FILE_TOOL,
   // LIST_DIR_TOOL,
   WEB_SEARCH_TOOL,
@@ -280,6 +478,85 @@ const TOOLS_MAP = {
       return { success: false, error: err.message };
     }
   },
+  drive_list: async (args) => {
+    try {
+      const parentId = typeof args.parent_id === 'string' && args.parent_id.trim() ? args.parent_id.trim() : null;
+      const data = await listDrive(parentId);
+      return { success: true, parent_id: data.parentId, entries: data.entries };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
+  drive_read_file: async (args) => {
+    try {
+      const fileId = typeof args.file_id === 'string' ? args.file_id.trim() : '';
+      const data = await readDriveFile(fileId);
+      return { success: true, file: data.file, content: data.content };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
+  drive_write_file: async (args) => {
+    try {
+      const fileId = typeof args.file_id === 'string' && args.file_id.trim() ? args.file_id.trim() : null;
+      const parentId = typeof args.parent_id === 'string' && args.parent_id.trim() ? args.parent_id.trim() : null;
+      const name = typeof args.name === 'string' && args.name.trim() ? args.name.trim() : null;
+      const content = typeof args.content === 'string' ? args.content : String(args?.content ?? '');
+      const data = await writeDriveFile({ fileId, parentId, name, content });
+      return { success: true, action: data.action, file: data.file, content: data.content };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
+  drive_create_folder: async (args) => {
+    try {
+      const name = typeof args.name === 'string' ? args.name.trim() : '';
+      const parentId = typeof args.parent_id === 'string' && args.parent_id.trim() ? args.parent_id.trim() : null;
+      const folder = await createDriveFolder({ name, parentId });
+      return { success: true, folder };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
+  drive_rename: async (args) => {
+    try {
+      const fileId = typeof args.file_id === 'string' ? args.file_id.trim() : '';
+      const name = typeof args.name === 'string' ? args.name.trim() : '';
+      const file = await renameDriveItem(fileId, name);
+      return { success: true, file };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
+  drive_move: async (args) => {
+    try {
+      const fileId = typeof args.file_id === 'string' ? args.file_id.trim() : '';
+      const destinationId = typeof args.destination_id === 'string' && args.destination_id.trim() ? args.destination_id.trim() : null;
+      const file = await moveDriveItem(fileId, destinationId);
+      return { success: true, file };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
+  drive_copy: async (args) => {
+    try {
+      const fileId = typeof args.file_id === 'string' ? args.file_id.trim() : '';
+      const destinationId = typeof args.destination_id === 'string' ? args.destination_id.trim() : '';
+      const file = await copyDriveItem(fileId, destinationId);
+      return { success: true, file };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
+  drive_delete: async (args) => {
+    try {
+      const fileId = typeof args.file_id === 'string' ? args.file_id.trim() : '';
+      const result = await deleteDriveItem(fileId);
+      return { success: true, file_id: result.fileId };
+    } catch (err) {
+      return { success: false, error: err.message };
+    }
+  },
   delete_file: async (args, opts = {}) => {
     const { path: relPath, absPath } = getPath(args, opts);
     if (!relPath) return { success: false, error: 'Error: empty path' };

package/src/ui/formatting.js

@@ -85,6 +85,30 @@ export function formatFileEditPreview(name, args) {
       chalk.green('  + ' + (newPreview || '(empty)').replace(/\n/g, '\n    '))
     );
   }
+  if (name === 'drive_write_file') {
+    const target = args?.file_id ? `remote file ${args.file_id}` : `new remote file ${args?.name ?? '(no name)'}`;
+    const content = String(args?.content ?? '');
+    const preview = content.length > 120 ? content.slice(0, 120) + '…' : content;
+    return (
+      chalk.cyan(target) + '\n' +
+      chalk.green('  + ' + (preview || '(empty)').replace(/\n/g, '\n    '))
+    );
+  }
+  if (name === 'drive_create_folder') {
+    return chalk.cyan(`remote folder ${args?.name ?? '(no name)'}`) + (args?.parent_id ? chalk.dim(` in ${args.parent_id}`) : '');
+  }
+  if (name === 'drive_rename') {
+    return chalk.cyan(`remote item ${args?.file_id ?? '(no id)'}`) + '\n' + chalk.green(`  + ${args?.name ?? '(no name)'}`);
+  }
+  if (name === 'drive_move') {
+    return chalk.cyan(`remote item ${args?.file_id ?? '(no id)'}`) + '\n' + chalk.green(`  -> ${args?.destination_id ?? '(remote root)'}`);
+  }
+  if (name === 'drive_copy') {
+    return chalk.cyan(`remote item ${args?.file_id ?? '(no id)'}`) + '\n' + chalk.green(`  copy -> ${args?.destination_id ?? '(no destination)'}`);
+  }
+  if (name === 'drive_delete') {
+    return chalk.red(`remote item ${args?.file_id ?? '(no id)'}`);
+  }
   return path;
 }
 
@@ -93,6 +117,14 @@ export function formatToolCallSummary(name, args) {
   const a = args ?? {};
   if (name === 'run_terminal_command') return (a.command ?? '').trim() || '(empty)';
   if (name === 'search_replace') return (a.path ?? '') + (a.old_string ? ` "${String(a.old_string).slice(0, 30)}…"` : '');
+  if (name === 'drive_list') return a.parent_id ?? '(remote root)';
+  if (name === 'drive_read_file') return a.file_id ?? '(no file_id)';
+  if (name === 'drive_write_file') return a.file_id ?? a.name ?? '(remote write)';
+  if (name === 'drive_create_folder') return a.name ?? '(no folder name)';
+  if (name === 'drive_rename') return `${a.file_id ?? '(no file_id)'} -> ${a.name ?? '(no name)'}`;
+  if (name === 'drive_move') return `${a.file_id ?? '(no file_id)'} -> ${a.destination_id ?? '(remote root)'}`;
+  if (name === 'drive_copy') return `${a.file_id ?? '(no file_id)'} -> ${a.destination_id ?? '(no destination)'}`;
+  if (name === 'drive_delete') return a.file_id ?? '(no file_id)';
   if (name === 'read_file' || name === 'delete_file') return a.path ?? '(no path)';
   if (name === 'create_folder') return a.path ?? '(no path)';
   if (name === 'list_dir') return (a.path ?? '.') || '.';
@@ -118,6 +150,17 @@ export function formatToolResultSummary(name, resultJson) {
   if (name === 'search_replace' || name === 'delete_file' || name === 'create_folder') {
     return obj.success !== false ? chalk.green('✓ ' + (obj.path ? obj.path : 'ok')) : chalk.red('✗ ' + (obj.error || 'failed'));
   }
+  if (name === 'drive_list') {
+    return obj.entries ? chalk.green(`✓ ${obj.entries.length ?? 0} remote entries`) : chalk.red('✗ ' + (obj.error || ''));
+  }
+  if (name === 'drive_read_file') {
+    const fileName = obj.file?.name ?? obj.file?.id ?? 'remote file';
+    return obj.content != null ? chalk.green(`✓ ${fileName}`) + chalk.dim(` (${String(obj.content).length} chars)`) : chalk.red('✗ ' + (obj.error || ''));
+  }
+  if (['drive_write_file', 'drive_create_folder', 'drive_rename', 'drive_move', 'drive_copy', 'drive_delete'].includes(name)) {
+    const label = obj.file?.name ?? obj.folder?.name ?? obj.file_id ?? obj.action ?? 'ok';
+    return obj.success !== false ? chalk.green(`✓ ${label}`) : chalk.red('✗ ' + (obj.error || 'failed'));
+  }
   if (name === 'read_file') return obj.content != null ? chalk.green('✓ ' + (obj.path ?? '') + chalk.dim(` (${String(obj.content).length} chars)`)) : chalk.red('✗ ' + (obj.error || ''));
   if (name === 'list_dir') return obj.entries ? chalk.green('✓ ' + (obj.entries.length ?? 0) + ' entries') : chalk.red('✗ ' + (obj.error || ''));
   if (name === 'web_search') return obj.error ? chalk.red('✗ ' + obj.error) : (obj.results ? chalk.green('✓ ' + (obj.results.length ?? 0) + ' results') : chalk.dim('—'));