vimlm 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

vimlm-0.0.7.dist-info/METADATA

@@ -0,0 +1,204 @@
+Metadata-Version: 2.2
+Name: vimlm
+Version: 0.0.7
+Summary: VimLM - LLM-powered Vim assistant
+Home-page: https://github.com/JosefAlbers/vimlm
+Author: Josef Albers
+Author-email: albersj66@gmail.com
+Requires-Python: >=3.12.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: nanollama==0.0.5
+Requires-Dist: mlx_lm_utils==0.0.2
+Requires-Dist: watchfiles==1.0.4
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+
+# VimLM - Local LLM-Powered Coding Assistant for Vim
+
+![vimlm](https://raw.githubusercontent.com/JosefAlbers/VimLM/main/assets/captioned_vimlm.gif)
+
+LLM-powered coding companion for Vim, inspired by GitHub Copilot/Cursor. Integrates contextual code understanding, summarization, and AI assistance directly into your Vim workflow.
+
+## Features
+
+- **Model Agnostic** - Use any MLX-compatible model via a configuration file
+- **Vim-Native UX** - Intuitive keybindings and split-window responses
+- **Deep Context** - Understands code context from:
+    - Current file
+    - Visual selections
+    - Referenced files
+    - Project directory structure
+- **Conversational Coding** - Iterative refinement with follow-up queries
+- **Air-Gapped Security** - 100% offline - no APIs, no tracking, no data leaks
+
+## Requirements
+
+- Apple M-series chip
+- Python 3.12.8
+
+## Quick Start
+
+```zsh
+pip install vimlm
+vimlm
+```
+
+## Basic Usage
+
+### 1. **From Normal Mode**  
+**`Ctrl-l`**: Add current line + file to context
+
+*Example prompt:* `"Regex for removing HTML tags from item.content"`
+
+### 2. **From Visual Mode**  
+Select code → **`Ctrl-l`**: Add selected block + current file to context
+
+*Example prompt:* `"Convert this to async/await syntax"`
+
+### 3. **Follow-Up Conversations**  
+**`Ctrl-j`**: Continue current thread
+
+*Example follow-up:* `"Use Manifest V3 instead"`
+
+### 4. **Code Extraction & Replacement**  
+**`Ctrl-p`**: Insert code blocks from response into:  
+- Last visual selection (Normal mode)  
+- Active selection (Visual mode)  
+
+**Workflow Example**:  
+1. Select a block of code in Visual mode  
+2. Prompt with `Ctrl-l`: `"Convert this to async/await syntax"`  
+3. Press `Ctrl-p` to replace selection with generated code  
+
+### 5. **Inline Commands**  
+
+#### `!include` - Add External Context  
+```text
+!include [PATH]  # Add files/folders to context
+```
+- **`!include`** (no path): Current folder  
+- **`!include ~/projects/utils.py`**: Specific file  
+- **`!include ~/docs/api-specs/`**: Entire folder  
+
+*Example:* `"AJAX-ify this app !include ~/scrap/hypermedia-applications.summ.md"`
+
+#### `!deploy` - Generate Project Files  
+```text
+!deploy [DEST_DIR]  # Extract code blocks to directory
+```
+- **`!deploy`** (no path): Current directory  
+- **`!deploy ./src`**: Specific directory  
+
+*Example:* `"Create REST API endpoint !deploy ./api"`
+
+#### `!continue` - Resume Generation  
+```text
+!continue [MAX_TOKENS]  # Continue stopped response
+```
+- **`!continue`**: Default 2000 tokens  
+- **`!continue 3000`**: Custom token limit  
+
+*Example:* `"tl;dr !include large-file.txt !continue 5000"`
+
+#### `!followup` - Thread Continuation  
+```text
+!followup  # Equivalent to Ctrl-j
+```
+*Example:*  
+
+Initial: `"Create Chrome extension"`  
+
+Follow-up: `"Add dark mode support !followup"`
+
+#### **Command Combinations**
+Chain multiple commands in one prompt:  
+```text
+"Create HTMX component !include ~/lib/styles.css !deploy ./components !continue 4000"
+```  
+
+### 6. **Command-Line Mode `:VimLM`**
+```vim
+:VimLM "prompt" [!command1] [!command2]...
+```
+Use predefined command chains for repetitive tasks:
+
+**Example 1 – CI/CD Fixer Macro**:
+```vim
+" Debug CI failures using error logs
+:VimLM Fix Dockerfile !include .gitlab-ci.yml !include $(tail -n 20 ci.log)
+```
+
+**Example 2 – Test Generation Workflow**:
+```vim
+" Generate unit tests for selected functions and save to test/
+:VimLM Write pytest tests for this !include ./src !deploy ./test
+```
+
+**Example 3 – Documentation Helper**:
+```vim
+" Add docstrings to all Python functions in file
+:VimLM Add Google-style docstrings !include % !continue 4000
+```
+
+### Key Bindings
+
+| Binding    | Mode          | Action                                 |
+|------------|---------------|----------------------------------------|
+| `Ctrl-l`   | Normal/Visual | Send current file + selection to LLM   |
+| `Ctrl-j`   | Normal        | Continue conversation                  |
+| `Ctrl-p`   | Normal/Visual | Replace the selection with generated code |
+| `Esc`      | Prompt        | Cancel input                           |
+
+## Advanced Configuration
+VimLM uses a JSON config file with the following configurable parameters:
+```json
+{
+  "LLM_MODEL": null,
+  "NUM_TOKEN": 2000,
+  "USE_LEADER": false,
+  "KEY_MAP": {},
+  "DO_RESET": true,
+  "SHOW_USER": false,
+  "SEP_CMD": "!",
+  "VERSION": "0.0.7",
+  "DEBUG": true
+} 
+```
+### Custom Model Setup
+1. **Browse models**: [MLX Community Models on Hugging Face](https://huggingface.co/mlx-community)
+2. **Edit config file**:
+```json
+{
+  "LLM_MODEL": "mlx-community/DeepSeek-R1-Distill-Qwen-7B-4bit",
+  "NUM_TOKEN": 9999
+}
+```
+3. **Save to**: `~/vimlm/cfg.json`
+4. **Restart VimLM**
+
+### Custom Key Bindings
+You can also configure shortcuts:
+```json
+{
+  "USE_LEADER": true,   // Swap Ctrl for Leader key
+  "KEY_MAP": {          // Remap default keys (l/j/p)
+    "l": "a",           // <Leader>a instead of <Leader>l
+    "j": "s",           // <Leader>s instead of <Leader>j
+    "p": "d"            // <Leader>d instead of <Leader>p
+  }
+}
+```
+
+## License
+
+VimLM is licensed under the [Apache-2.0 license](LICENSE).
+
+

vimlm-0.0.7.dist-info/RECORD

@@ -0,0 +1,7 @@
+vimlm.py,sha256=QrboU-loWuQjTPO5HTJnt_CCxZcV6cclX6UOz438rEM,23126
+vimlm-0.0.7.dist-info/LICENSE,sha256=f1xgK8fAXg_intwnbc9nLkHf7ODPLtgpHs7DetQHOro,11343
+vimlm-0.0.7.dist-info/METADATA,sha256=0V2b8X4pq2uGlyuxyqCUlCYZ7tmlJhPOLZFaDjG0V6s,5668
+vimlm-0.0.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+vimlm-0.0.7.dist-info/entry_points.txt,sha256=mU5V4MYsuIzCc6YB-Ro-6USSHWN5vHw8UDnTEoq0isw,36
+vimlm-0.0.7.dist-info/top_level.txt,sha256=I8GjqoiP--scYsO3AfLhha-6Ax9ci3IvbWvVbPv8g94,6
+vimlm-0.0.7.dist-info/RECORD,,

vimlm.py

@@ -24,14 +24,23 @@ import argparse
 import tempfile
 from pathlib import Path
 from string import Template
+import re
+
+DEFAULTS = dict(
+    LLM_MODEL = None, # "mlx-community/DeepSeek-R1-Distill-Qwen-7B-4bit"
+    NUM_TOKEN = 2000,
+    USE_LEADER = False,
+    KEY_MAP = {},
+    DO_RESET = True,
+    SHOW_USER = False, 
+    SEP_CMD = '!',
+    VERSION = '0.0.7',
+    DEBUG = True,
+)
 
-DEBUG = True
-LLM_MODEL = "mlx-community/DeepSeek-R1-Distill-Qwen-7B-4bit"
-NUM_TOKEN = 2000
-SEP_CMD = '!@#$'
 VIMLM_DIR = os.path.expanduser("~/vimlm")
 WATCH_DIR = os.path.expanduser("~/vimlm/watch_dir")
-CFG_FILE = "cfg.json"
+CFG_FILE = 'cfg.json'
 LOG_FILE = "log.json"
 LTM_FILE = "cache.json"
 OUT_FILE = "response.md"
@@ -41,10 +50,42 @@ LOG_PATH = os.path.join(VIMLM_DIR, LOG_FILE)
 LTM_PATH = os.path.join(VIMLM_DIR, LTM_FILE)
 OUT_PATH = os.path.join(WATCH_DIR, OUT_FILE) 
 
-def toout(s, key='tovim'):
-    with open(OUT_PATH, 'w', encoding='utf-8') as f:
+def is_old(config):
+    v_str = config.get('VERSION', 0)
+    for min_v, usr_v in zip(DEFAULTS['VERSION'].split('.'), v_str.split('.')):
+        if int(min_v) < int(usr_v):
+            return False
+        elif int(min_v) > int(usr_v): 
+            return True
+    return False
+
+if os.path.exists(WATCH_DIR):
+    shutil.rmtree(WATCH_DIR)
+os.makedirs(WATCH_DIR)
+
+try:
+    with open(CFG_PATH, "r") as f:
+        config = json.load(f)
+    if is_old(config):
+        for p in [CFG_PATH, LOG_PATH, LTM_PATH]:
+            if os.path.isfile(p):
+                os.remove(p)
+        raise ValueError(f'Version mismatch')
+except Exception as e:
+    print(e)
+    config = DEFAULTS
+    with open(CFG_PATH, 'w') as f:
+        json.dump(DEFAULTS, f, indent=2)
+
+for k, v in DEFAULTS.items():
+    globals()[k] = config.get(k, v)
+
+def toout(s, key=None, mode=None):
+    key = '' if key is None else ':'+key
+    mode = 'w' if mode is None else mode
+    with open(OUT_PATH, mode, encoding='utf-8') as f:
         f.write(s)
-    tolog(s, key)
+    tolog(s, key='tovim'+key+':'+mode)
 
 def tolog(log, key='debug'):
     if not DEBUG and key == 'debug':
@@ -58,31 +99,49 @@ def tolog(log, key='debug'):
     with open(LOG_PATH, "w", encoding="utf-8") as log_f:
         json.dump(logs, log_f, indent=2)
 
-if os.path.exists(WATCH_DIR):
-    shutil.rmtree(WATCH_DIR)
-os.makedirs(WATCH_DIR)
-
-try:
-    with open(CFG_PATH, "r") as f:
-        config = json.load(f)
-    DEBUG = config.get("DEBUG", DEBUG)
-    LLM_MODEL = config.get("LLM_MODEL", LLM_MODEL)
-    NUM_TOKEN = config.get("NUM_TOKEN", NUM_TOKEN)
-    SEP_CMD = config.get("SEP_CMD", SEP_CMD)
-except Exception as e:
-    tolog(str(e))
-    with open(CFG_PATH, 'w') as f:
-        json.dump(dict(DEBUG=DEBUG, LLM_MODEL=LLM_MODEL, NUM_TOKEN=NUM_TOKEN, SEP_CMD=SEP_CMD), f, indent=2)
-
 toout('Loading LLM...')
 if LLM_MODEL is None:
-    from nanollama32 import Chat
-    chat = Chat(variant='uncn_llama_32_3b_it')
-    toout('LLM is ready')
+    from nanollama import Chat
+    chat = Chat(model_path='uncn_llama_32_3b_it')
+    toout(f'LLM is ready')
 else:
     from mlx_lm_utils import Chat
     chat = Chat(model_path=LLM_MODEL)
-    toout(f'{LLM_MODEL.split('/')[-1]} is ready')
+    toout(f'{model_path.split('/')[-1]} is ready')
+
+def deploy(dest=None, src=None, reformat=True):
+    prompt_deploy = 'Reformat the text to ensure each code block is preceded by a filename in **filename.ext** format, with only alphanumeric characters, dots, underscores, or hyphens in the filename. Remove any extraneous characters from filenames.'
+    tolog(f'deploy {dest=} {src=} {reformat=}')
+    if src:
+        chat.reset()
+        with open(src, 'r') as f:
+            prompt_deploy = f.read().strip() + '\n\n---\n\n' + prompt_deploy
+    if reformat:
+        response = chat(prompt_deploy, max_new=NUM_TOKEN, verbose=False, stream=False)['text']
+        toout(response, 'deploy')
+        lines = response.splitlines()
+    else:
+        with open(OUT_PATH, 'r') as f:
+            lines = f.readlines()
+    dest = get_path(dest)
+    os.makedirs(dest, exist_ok=True)
+    current_filename = None
+    code_block = []
+    in_code_block = False
+    for line in lines:
+        line = line.rstrip()
+        if line.startswith("```"):
+            if in_code_block and current_filename:
+                with open(os.path.join(dest, os.path.basename(current_filename)), "w", encoding="utf-8") as code_file:
+                    code_file.write("\n".join(code_block) + "\n")
+                code_block = []
+            in_code_block = not in_code_block
+        elif in_code_block:
+            code_block.append(line)
+        else:
+            match = re.match(r"^\*\*(.+?)\*\*$", line)
+            if match:
+                current_filename = re.sub(r"[^a-zA-Z0-9_.-]", "", match.group(1))
 
 def is_binary(file_path):
     try:
@@ -123,7 +182,7 @@ def split_str(doc, max_len=2000, get_len=len):
     return chunks
 
 def retrieve(src_path, max_len=2000, get_len=len):
-    src_path = os.path.expanduser(src_path)
+    src_path = get_path(src_path)
     result = {}
     if not os.path.exists(src_path):
         tolog(f"The path {src_path} does not exist.", 'retrieve')
@@ -134,23 +193,31 @@ def retrieve(src_path, max_len=2000, get_len=len):
                 content = f.read()
             result = {src_path:dict(timestamp=os.path.getmtime(src_path), list_str=split_str(content, max_len=max_len, get_len=get_len))}
         except Exception as e:
-            tolog(f'Skipped {filename} due to {e}', 'retrieve')
-        return result
-    for filename in os.listdir(src_path):
-        try:
-            file_path = os.path.join(src_path, filename)
-            if filename.startswith('.') or is_binary(file_path):
+            tolog(f'Failed to retrieve({filename}) due to {e}')
+    else:
+        for filename in os.listdir(src_path):
+            try:
+                file_path = os.path.join(src_path, filename)
+                if filename.startswith('.') or is_binary(file_path):
+                    continue
+                if os.path.isfile(file_path):
+                    with open(file_path, 'r', encoding='utf-8', errors='ignore') as f:
+                        content = f.read()
+                    result[file_path] = dict(timestamp=os.path.getmtime(file_path), list_str=split_str(content, max_len=max_len, get_len=get_len))
+            except Exception as e:
+                tolog(f'Failed to retrieve({filename}) due to {e}')
                 continue
-            if os.path.isfile(file_path):
-                with open(file_path, 'r', encoding='utf-8', errors='ignore') as f:
-                    content = f.read()
-                result[file_path] = dict(timestamp=os.path.getmtime(file_path), list_str=split_str(content, max_len=max_len, get_len=get_len))
-        except Exception as e:
-            tolog(f'Skipped {filename} due to {e}', 'retrieve')
-            continue
     return result
 
-def ingest(src):
+def get_path(s):
+    if not s:
+        s = '.'
+    s = s.strip()
+    s = os.path.expanduser(s)
+    s = os.path.abspath(s)
+    return s
+
+def ingest(src, max_len=NUM_TOKEN):
     def load_cache(cache_path=LTM_PATH):
         if os.path.exists(cache_path):
             with open(cache_path, 'r', encoding='utf-8') as f:
@@ -163,53 +230,149 @@ def ingest(src):
                 current_data[k] = v
         with open(cache_path, 'w', encoding='utf-8') as f:
             json.dump(current_data, f, indent=2)
-    toout('Ingesting...')
-    format_ingest = '{volat}{incoming}\n\n---\n\nPlease provide a succint bullet point summary for above:'
-    format_volat = 'Here is a summary of part 1 of **{k}**:\n\n---\n\n{newsum}\n\n---\n\nHere is the next part:\n\n---\n\n'
-    dict_doc = retrieve(src, get_len=chat.get_ntok)
+    src = get_path(src)
+    tolog(f'ingest {src=}')
+    result = ''
+    src_base = os.path.basename(src)
+    if os.path.isdir(src):
+        listdir = [i for i in os.listdir(src) if not i.startswith('.') and '.' in i]
+        result = '\n- '.join([f'--- {src_base} ---', *listdir]) + '\n\n'
+    elif os.path.isfile(src):
+        result = ''
+    else:
+        tolog(f'Failed to ingest({src})')
+        return ''
+    dict_doc = retrieve(src, max_len=max_len, get_len=chat.get_ntok)
+    toout(f'Ingesting {src}...')
+    format_ingest = '{volat}{incoming}\n\n---\n\nPlease provide a succint bullet point summary for above:' 
+    format_volat = 'Here is a summary of part 1 of **{k}**:\n\n---\n\n{newsum}\n\n---\n\nHere is the next part:\n\n---\n\n' 
     dict_sum = {}
     cache = load_cache()
+    max_new_accum = int(max_len/len(dict_doc)) if len(dict_doc) > 0 else max_len
     for k, v in dict_doc.items():
-        v_stamp = v['timestamp']
-        if v_stamp == cache.get(k, {}).get('timestamp'):
-            dict_sum[k] = cache[k]
-            continue
         list_str = v['list_str']
+        v_stamp = v['timestamp']
         if len(list_str) == 0:
             continue
-        if len(list_str) > 1:
-            max_new_sum = int(NUM_TOKEN / len(list_str) / 2)
+        if len(list_str) == 1 and chat.get_ntok(list_str[0]) <= max_new_accum:
+            chat_summary = list_str[0]
+        else:
+            k_base = os.path.basename(k)
+            if v_stamp == cache.get(k, {}).get('timestamp'):
+                dict_sum[k] = cache[k]
+                continue
+            max_new_sum = int(max_len/len(list_str))
             volat = f'**{k}**:\n'
             accum = ''
-            for s in list_str:
+            for i, s in enumerate(list_str):
                 chat.reset()
-                newsum = chat(format_ingest.format(volat=volat, incoming=s.strip()), max_new=max_new_sum, verbose=False, stream=None)['text']
+                toout(f'\n\nIngesting {k_base} {i+1}/{len(list_str)}...\n\n', mode='a')
+                tolog(f'{s=}') # DEBUG
+                newsum = chat(format_ingest.format(volat=volat, incoming=s.rstrip()), max_new=max_new_sum, verbose=False, stream=OUT_PATH)['text'].rstrip()
+                tolog(f'{k} {i+1}/{len(list_str)}: {newsum=}') # DEBUG
                 accum += newsum + ' ...\n'
                 volat = format_volat.format(k=k, newsum=newsum)
-        else:
-            accum = list_str[0]
-        chat.reset()
-        toout('')
-        chat_summary = chat(format_ingest.format(volat=f'**{k}**:\n', incoming=accum), max_new=int(NUM_TOKEN/4), verbose=False, stream=OUT_PATH)['text']
-        dict_sum[k] = dict(timestamp=v_stamp, summary=chat_summary)
+            toout(f'\n\nIngesting {k_base}...\n\n', mode='a')
+            tolog(f'{accum=}') # DEBUG
+            if chat.get_ntok(accum) <= max_new_accum:
+                chat_summary = accum.strip()
+            else:
+                chat.reset()
+                chat_summary = chat(format_ingest.format(volat=f'**{k}**:\n', incoming=accum), max_new=max_new_accum, verbose=False, stream=OUT_PATH)['text'].strip()
+        dict_sum[k] = dict(timestamp=v_stamp, summary=chat_summary, ntok=chat.get_ntok(chat_summary))
     dump_cache(dict_sum)
-    result = ''
-    for (k,v) in dict_sum.items():
-        result += f'--- Summary of **{k}** ---\n{v["summary"]}\n\n'
+    for k, v in dict_sum.items():
+        result += f'--- **{os.path.basename(k)}** ---\n{v["summary"].strip()}\n\n'
     result += '---\n\n'
+    toout(result, 'ingest')
     return result
 
-def process_command(data, str_template):
-    try:
-        if len(data['user_command'].strip()) > 0:
-            src = data['user_command']
-        else:
-            src = data['dir']
-        return ingest(src) + str_template
-    except Exception as e:
-        tolog(f'Failed to ingest due to {e}', 'process_command')
-        return str_template
-   
+def process_command(data):
+    if len(data['user']) == 0:
+        response = chat.resume(max_new=NUM_TOKEN, verbose=False, stream=OUT_PATH)
+        toout(response['text'], mode='a')
+        tolog(response)
+        data['user_prompt'] = ''
+        return data
+    if SEP_CMD in data['user']:
+        data['user_prompt'], *cmds = (x.strip() for x in data['user'].split(SEP_CMD))
+    else:
+        data['user_prompt'] = data['user'].strip()
+        cmds = []
+    tolog(f'process_command i {cmds=} {data=}')
+
+    do_reset = False if 'followup' in data else DO_RESET 
+    for cmd in cmds:
+        if cmd.startswith('continue'):
+            arg = cmd.removeprefix('continue').strip('(').strip(')').strip().strip('"').strip("'").strip()
+            data['max_new'] = NUM_TOKEN if len(arg) == 0 else int(arg)
+            response = chat.resume(max_new=data['max_new'], verbose=False, stream=OUT_PATH)
+            toout(response['text'], mode='a')
+            tolog(response)
+            do_reset = False
+            break
+
+        if cmd.startswith('reset'):
+            do_reset = True
+            break
+        if cmd.startswith('followup'):
+            do_reset = False
+            break
+    if do_reset:
+        chat.reset()
+
+    full_path = data['tree']
+    data['dir'] = os.path.dirname(full_path)
+    data['file'] = os.path.basename(full_path)
+    data['ext'] = os.path.splitext(full_path)[1][1:]
+    if chat.stop:
+        data['file'] = ''
+        data['context'] = ''
+    if data['tree'] == OUT_PATH:
+        data['dir'] = os.getcwd()
+        data['file'] = ''
+        data['context'] = ''
+        data['ext'] = ''
+    if data['file'] == '.tmp':
+        data['file'] = ''
+        data['ext'] = ''
+
+    if len(cmds) == 1 and len(cmds[0]) == 0:
+        data['include'] = ingest(data['dir'])
+        return data
+
+    data['include'] = ''
+    for cmd in cmds:
+        if cmd.startswith('include'):
+            arg = cmd.removeprefix('include').strip().strip('(').strip(')').strip().strip('"').strip("'").strip()
+            src = data['dir'] if len(arg) == 0 else arg
+            if arg == '%':
+                continue
+            if src.startswith('`') or src.startswith('$('):
+                shell_cmd = src.strip('`') if src.startswith('`') else src.strip('$()')
+                shell_cmd = shell_cmd.strip()
+                try:
+                    result = subprocess.run(shell_cmd, shell=True, capture_output=True, text=True)
+                    if result.returncode == 0:
+                        data['include'] += f'--- **{shell_cmd}** ---\n```\n{result.stdout.strip()}\n```\n---\n\n'
+                    else:
+                        tolog(f'{shell_cmd} failed {result.stderr.strip()}')
+                except Exception as e:
+                    tolog(f'Error executing {shell_cmd}: {e}')
+            else:
+                data['include'] += ingest(src)
+
+    for cmd in cmds:
+        if cmd.startswith('deploy'):
+            arg = cmd.removeprefix('deploy').strip().strip('(').strip(')').strip().strip('"').strip("'").strip()
+            if len(data['user_prompt']) == 0:
+                deploy(dest=arg)
+                data['user_prompt'] = ''
+                return data
+            data['user_prompt'] += "\n\nEnsure that each code block is preceded by a filename in **filename.ext** format. The filename should only contain alphanumeric characters, dots, underscores, or hyphens. Ensure that any extraneous characters are removed from the filenames."
+            data['deploy_dest'] = arg
+    return data
+    
 async def monitor_directory():
     async for changes in awatch(WATCH_DIR):
         found_files = {os.path.basename(f) for _, f in changes}
@@ -225,48 +388,63 @@ async def monitor_directory():
             if 'followup' in os.listdir(WATCH_DIR):
                 os.remove(os.path.join(WATCH_DIR, 'followup'))
                 data['followup'] = True
-                str_template = '{user}'
+            if 'quit' in os.listdir(WATCH_DIR):
+                os.remove(os.path.join(WATCH_DIR, 'quit'))
+                data['quit'] = True
             await process_files(data)
 
 async def process_files(data):
-    tolog(f'{data=}')
-    if 'followup' in data:
-        str_template = "{user}"
-    else:
-        full_path = data['tree']
-        data['dir'] = os.path.dirname(full_path)
-        data['file'] = os.path.basename(full_path)
-        data['ext'] = os.path.splitext(full_path)[1][1:]
-        str_template = ''
-        if len(data['file']) > 0 and data['file'] != '.tmp':
-            str_template += '**{file}**\n'
-        if len(data['context']) > 0:
-            str_template += '```{ext}\n{context}\n```\n\n'
-        if len(data['yank']) > 0:
-            if '\n' in data['yank']:
-                str_template += "```{ext}\n{yank}\n```\n\n"
+    tolog(f'process_files i {data=}')
+    str_template = '{include}'
+    data = process_command(data)
+    if len(data['user_prompt']) == 0:
+        return    
+    if len(data['file']) > 0:
+        str_template += '**{file}**\n'
+    if len(data['context']) > 0 and data['yank'] != data['context']:
+        str_template += '```{ext}\n{context}\n```\n\n'
+    if len(data['yank']) > 0:
+        if '\n' in data['yank']:
+            str_template += "```{ext}\n{yank}\n```\n\n"
+        else:
+            if data['user'] == 0:
+                str_template += "{yank}"
             else:
                 str_template += "`{yank}` "
-        str_template += '{user_prompt}'
-        if SEP_CMD in data['user']:
-            data['user_prompt'], data['user_command'] = (x.strip() for x in data['user'].split(SEP_CMD))
-            str_template = process_command(data, str_template)
-        else:
-            data['user_prompt'] = data['user']
-        chat.reset()
-    tolog(f'{str_template=}') # DEBUG
+    str_template += '{user_prompt}'
+    tolog(f'process_files o {data=}') # DEBUG
+    tolog(f'process_files {str_template=}') # DEBUG
     prompt = str_template.format(**data)
     tolog(prompt, 'tollm')
     toout('')
-    response = chat(prompt, max_new=NUM_TOKEN - chat.get_ntok(prompt), verbose=False, stream=OUT_PATH)
-    toout(response['text'])
+    max_new = data['max_new'] if 'max_new' in data else max(10, NUM_TOKEN - chat.get_ntok(prompt))
+    response = chat(prompt, max_new=max_new, verbose=False, stream=OUT_PATH)
+    if SHOW_USER:
+        toout(response['text'])
+    else:
+        toout(response['text'])
     tolog(response['benchmark'])
+    if 'deploy_dest' in data:
+        deploy(dest=data['deploy_dest'], reformat=False)
 
+KEYL = KEY_MAP.get('l', 'l')
+KEYJ = KEY_MAP.get('j', 'j')
+KEYP = KEY_MAP.get('p', 'p')
+mapl, mapj, mapp = (f'<Leader>{KEYL}', f'<Leader>{KEYJ}', f'<Leader>{KEYP}') if USE_LEADER else (f'<C-{KEYL}>', f'<C-{KEYJ}>', f'<C-{KEYP}>')
 VIMLMSCRIPT = Template(r"""
+let s:register_names = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u'] 
 let s:watched_dir = expand('$WATCH_DIR')
 
 function! Monitor()
-    write
+    if exists('s:monitor_timer')
+        call timer_stop(s:monitor_timer)
+        unlet s:monitor_timer
+    endif
+    let response_path = s:watched_dir . '/response.md'
+    let bufnum = bufnr(response_path)
+    if bufnum != -1
+        execute 'bwipeout ' . bufnum
+    endif
     let response_path = s:watched_dir . '/response.md'
     rightbelow vsplit | execute 'view ' . response_path
     setlocal autoread
@@ -288,41 +466,17 @@ function! CheckForUpdates(timer)
 endfunction
 
 function! s:CustomInput(prompt) abort
-    let input = ''
-    let clean_prompt = a:prompt
-    let aborted = v:false
-    echohl Question
-    echon clean_prompt
-    echohl None
-    while 1
-        let c = getchar()
-        if type(c) == v:t_number
-            if c == 13 " Enter
-                break
-            elseif c == 27 " Esc
-                let aborted = v:true
-                break
-            elseif c == 8 || c == 127 " Backspace
-                if len(input) > 0
-                    let input = input[:-2]
-                    echon "\r" . clean_prompt . input . ' '
-                    execute "normal! \<BS>"
-                endif
-            else
-                let char = nr2char(c)
-                let input .= char
-                echon char
-            endif
-        endif
-    endwhile
-    let input_length = aborted ? 0 : len(input)
-    let clear_length = len(clean_prompt) + input_length
-    echon "\r" . repeat(' ', clear_length) . "\r"
-    return aborted ? v:null : input
+    call inputsave()
+    let input = input(a:prompt)
+    call inputrestore()
+    if empty(input)
+        return v:null
+    endif
+    return input
 endfunction
 
-function! SaveUserInput()
-    let user_input = s:CustomInput('Ask LLM: ')
+function! SaveUserInput(prompt)
+    let user_input = s:CustomInput(a:prompt)
     if user_input is v:null
         echo "Input aborted"
         return
@@ -334,12 +488,107 @@ function! SaveUserInput()
     call writefile([current_file], tree_file, 'w')
 endfunction
 
-function! SaveUserInput()
-    let user_input = s:CustomInput('Ask LLM: ')
-    if user_input is v:null
-        echo "Input aborted"
+function! VisualPrompt()
+    silent! execute "normal! \<ESC>"
+    silent execute "'<,'>w! " . s:watched_dir . "/yank"
+    silent execute "w! " . s:watched_dir . "/context"
+    " silent! execute "normal! `<V`>"
+    " silent! execute "normal! \<ESC>"
+    call SaveUserInput('VimLM: ')
+endfunction
+
+function! NormalPrompt()
+    silent! execute "normal! V\<ESC>"
+    silent execute "'<,'>w! " . s:watched_dir . "/yank"
+    silent execute "w! " . s:watched_dir . "/context"
+    " silent! execute "normal! \<ESC>"
+    call SaveUserInput('VimLM: ')
+endfunction
+
+function! FollowUpPrompt()
+    call writefile([], s:watched_dir . '/yank', 'w')
+    call writefile([], s:watched_dir . '/context', 'w')
+    call writefile([], s:watched_dir . '/followup', 'w')
+    call SaveUserInput('... ')
+endfunction
+
+function! ExtractAllCodeBlocks()
+    let filepath = s:watched_dir . '/response.md'
+    if !filereadable(filepath)
+        echoerr "File not found: " . filepath
+        return
+    endif
+    let lines = readfile(filepath)
+    let in_code_block = 0
+    let code_blocks = []
+    let current_block = []
+    for line in lines
+        if line =~ '^```'
+            if in_code_block
+                call add(code_blocks, current_block)
+                let current_block = []
+                let in_code_block = 0
+            else
+                let in_code_block = 1
+            endif
+        elseif in_code_block
+            call add(current_block, line)
+        endif
+    endfor
+    if in_code_block
+        call add(code_blocks, current_block)
+    endif
+    for idx in range(len(code_blocks))
+        if idx >= len(s:register_names)
+            break
+        endif
+        let code_block_text = join(code_blocks[idx], "\n")
+        let register_name = s:register_names[idx]
+        call setreg(register_name, code_block_text, 'v') 
+    endfor
+    return len(code_blocks)
+endfunction
+
+function! PasteIntoLastVisualSelection(...)
+    let num_blocks = ExtractAllCodeBlocks()
+    if a:0 > 0
+        let register_name = a:1
+    else
+        echo "Extracted " . num_blocks . " blocks into registers @a-@" . s:register_names[num_blocks - 1] . ". Enter register name: "
+        let register_name = nr2char(getchar())
+    endif
+
+    if register_name !~ '^[a-z]$'
+        echoerr "Invalid register name. Please enter a single lowercase letter (e.g., a, b, c)."
+        return
+    endif
+
+    let register_content = getreg(register_name)
+    if register_content == ''
+        echoerr "Register @" . register_name . " is empty."
+        return
+    endif
+
+    let current_mode = mode()
+    if current_mode == 'v' || current_mode == 'V' || current_mode == ''
+        execute 'normal! "' . register_name . 'p'
+    else
+        normal! gv
+        execute 'normal! "' . register_name . 'p'
+    endif
+endfunction
+
+function! VimLM(...) range
+    let user_input = join(a:000, ' ')
+    if empty(user_input)
+        echo "Usage: :VimLM <prompt> [!command1] [!command2] ..."
         return
     endif
+    if line("'<") == line("'>")
+        silent! execute "normal! V\<ESC>"
+    endif
+    silent execute "'<,'>w! " . s:watched_dir . "/yank"
+    silent execute "w! " . s:watched_dir . "/context"
     let user_file = s:watched_dir . '/user'
     call writefile([user_input], user_file, 'w')
     let current_file = expand('%:p')
@@ -347,24 +596,23 @@ function! SaveUserInput()
     call writefile([current_file], tree_file, 'w')
 endfunction
 
-function! FollowUpInput()
-    call writefile([], s:watched_dir . '/yank', 'w')
-    call writefile([], s:watched_dir . '/context', 'w')
-    call writefile([], s:watched_dir . '/followup', 'w')
-    call SaveUserInput()
-endfunction
-
-vnoremap <C-l> :w! $WATCH_DIR/yank<CR>:w! $WATCH_DIR/context<CR>:call SaveUserInput()<CR>
-nnoremap <C-l> V:w! $WATCH_DIR/yank<CR>:w! $WATCH_DIR/context<CR>:call SaveUserInput()<CR>
-nnoremap <C-r> :call FollowUpInput()<CR>
-
+command! -range -nargs=+ VimLM call VimLM(<f-args>)
+nnoremap $mapp :call PasteIntoLastVisualSelection()<CR>
+vnoremap $mapp <Cmd>:call PasteIntoLastVisualSelection()<CR>
+vnoremap $mapl <Cmd>:call VisualPrompt()<CR>
+nnoremap $mapl :call NormalPrompt()<CR>
+nnoremap $mapj :call FollowUpPrompt()<CR>
 call Monitor()
-""").safe_substitute(dict(WATCH_DIR=WATCH_DIR))
+""").safe_substitute(dict(WATCH_DIR=WATCH_DIR, mapl=mapl, mapj=mapj, mapp=mapp))
 
 async def main():
     parser = argparse.ArgumentParser(description="VimLM - LLM-powered Vim assistant")
+    parser.add_argument('--test', action='store_true')
     parser.add_argument("vim_args", nargs=argparse.REMAINDER, help="Vim arguments")
     args = parser.parse_args()
+    if args.test:
+        test()
+        return
     with tempfile.NamedTemporaryFile(mode='w', suffix='.vim', delete=False) as f:
         f.write(VIMLMSCRIPT)
         vim_script = f.name
@@ -373,14 +621,17 @@ async def main():
         vim_command.extend(args.vim_args)
     else:
         vim_command.append('.tmp')
-    monitor_task = asyncio.create_task(monitor_directory())
-    vim_process = await asyncio.create_subprocess_exec(*vim_command)
-    await vim_process.wait()
-    monitor_task.cancel()
     try:
-        await monitor_task
-    except asyncio.CancelledError:
-        pass
+        monitor_task = asyncio.create_task(monitor_directory())
+        vim_process = await asyncio.create_subprocess_exec(*vim_command)
+        await vim_process.wait()
+    finally:
+        monitor_task.cancel()
+        try:
+            await monitor_task
+        except asyncio.CancelledError:
+            pass
+        os.remove(vim_script)
 
 def run():
     asyncio.run(main())

vimlm-0.0.5.dist-info/METADATA

@@ -1,108 +0,0 @@
-Metadata-Version: 2.2
-Name: vimlm
-Version: 0.0.5
-Summary: VimLM - LLM-powered Vim assistant
-Home-page: https://github.com/JosefAlbers/vimlm
-Author: Josef Albers
-Author-email: albersj66@gmail.com
-Requires-Python: >=3.12.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: nanollama==0.0.5b0
-Requires-Dist: mlx_lm_utils==0.0.1a0
-Requires-Dist: watchfiles==1.0.4
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
-# VimLM - Local LLM-Powered Coding Assistant for Vim
-
-![vimlm](https://github.com/user-attachments/assets/67a97048-48df-40c1-9109-53c759e85d96)
-
-An LLM-powered coding companion for Vim, inspired by GitHub Copilot/Cursor. Integrates contextual code understanding, summarization, and AI assistance directly into your Vim workflow.
-
-## Features
-
-- **Model Agnostic** - Use any MLX-compatible model via config file
-- **Vim-Native UX** - Ctrl-l/Ctrl-r keybindings and split-window responses
-- **Deep Context** - Understands code context from:
-    - Current file
-    - Visual selections
-    - Referenced files (`!@#$` syntax)
-    - Project directory structure
-- **Conversational Coding** - Iterative refinement with follow-up queries
-- **Air-Gapped Security** - 100% offline - no APIs, no tracking, no data leaks
-
-## Requirements
-
-- Apple M-series chip (M1/M2/M3/M4)
-- Python 3.12.8
-
-## Installation
-
-```zsh
-pip install vimlm
-```
-
-## Quick Start
-
-1. Launch with default model (DeepSeek-R1-Distill-Qwen-7B-4bit):
-
-```zsh
-vimlm your_file.js
-```
-
-2. **From Normal Mode**:
-    - `Ctrl-l`: Send current line + file context
-    - Example prompt: "Regex for removing html tags in item.content"
-
-3. **From Visual Mode**:
-    - Select code → `Ctrl-l`: Send selection + file context
-    - Example prompt: "Convert this to async/await syntax"
-
-4. **Add Context**: Use `!@#$` to include additional files/folders:
-    - `!@#$` (no path): Current folder
-    - `!@#$ ~/scrap/jph00/hypermedia-applications.summ.md`: Specific folder
-    - `!@#$ ~/wtm/utils.py`: Specific file
-    - Example prompt: "AJAX-ify this app !@#$ ~/scrap/jph00/hypermedia-applications.summ.md"
-
-5. **Follow-Up**: After initial response:
-    - `Ctrl-r`: Continue thread
-    - Example follow-up: "In Manifest V3"
-
-## Advanced Configuration
-
-### Custom Model Setup
-
-1. **Browse models**: [MLX Community Models on Hugging Face](https://huggingface.co/mlx-community)
-
-2. **Edit config file**:
-
-```json
-{
- "LLM_MODEL": "/path/to/your/mlx_model"
-}
-```
-
-3. **Save to**:
-
-```
-~/vimlm/cfg.json
-```
-
-4. **Restart VimLM**
-
-## Key Bindings
-
-| Binding    | Mode          | Action                                 |
-|------------|---------------|----------------------------------------|
-| `Ctrl-l`   | Normal/Visual | Send current file + selection to LLM   |
-| `Ctrl-r`   | Normal        | Continue conversation                  |
-| `Esc`      | Prompt        | Cancel input                           |
-
-

vimlm-0.0.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-vimlm.py,sha256=6bXIkDHF0fLTT_NRCbDLcP5CDTu5e3uacuMdzyGUrhI,13643
-vimlm-0.0.5.dist-info/LICENSE,sha256=f1xgK8fAXg_intwnbc9nLkHf7ODPLtgpHs7DetQHOro,11343
-vimlm-0.0.5.dist-info/METADATA,sha256=d7xZr9bBIJlYuPVNnFpa8w3-1XSFVMiWwikQVt5sLBw,3009
-vimlm-0.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-vimlm-0.0.5.dist-info/entry_points.txt,sha256=mU5V4MYsuIzCc6YB-Ro-6USSHWN5vHw8UDnTEoq0isw,36
-vimlm-0.0.5.dist-info/top_level.txt,sha256=I8GjqoiP--scYsO3AfLhha-6Ax9ci3IvbWvVbPv8g94,6
-vimlm-0.0.5.dist-info/RECORD,,