From c635356622b9ef2d875897d3d9c55e2c490345db Mon Sep 17 00:00:00 2001
From: laburnumT <laburnumtec@gmail.com>
Date: Wed, 8 Jul 2026 23:32:06 +0200
Subject: [PATCH 1/2] RFC: Add session option

Adds a session option to codeblocks so previous results can be used.

To check that a command is done running, we wait for an eof_token to
appear. This allows us to not cut off commands with output early, but
also doesn't rely on using sleep.

**This commit does not support neovim**
---
 autoload/medieval.vim | 96 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 91 insertions(+), 5 deletions(-)

diff --git a/autoload/medieval.vim b/autoload/medieval.vim
index 593a01c..f127d26 100644
--- a/autoload/medieval.vim
+++ b/autoload/medieval.vim
@@ -1,5 +1,5 @@
 const s:fences = [#{start: '\([`~]\{3,}\)\s*\%({\s*\.\?\)\?\(\a\+\)\?', end: '\1', lang: 2,}, #{start: '\$\$'}]
-let s:opts = ['name', 'target', 'require', 'tangle']
+let s:opts = ['name', 'target', 'require', 'tangle', 'session']
 let s:optspat = '\(' . join(s:opts, '\|') . '\):\s*\([0-9A-Za-z_+.$#&/-]\+\)'
 let s:optionfmt = '<!-- %s -->'
 let s:optionpat = '^\s*<!--\s*'
@@ -265,6 +265,87 @@ function! medieval#evalrange(line1, line2, target) abort
     call winrestview(view)
 endfunction
 
+function! s:session_read_cb(channel, msg) abort
+    let key = ''
+    for [k, s] in items(s:active_sessions)
+        if s.channel == a:channel
+            let key = k
+            break
+        endif
+    endfor
+
+    if empty(key)
+        return
+    endif
+
+    let session = s:active_sessions[key]
+    let session.buffer += [a:msg]
+
+    if !empty(session.token) && match(session.buffer, session.token) >= 0
+        let output = session.buffer
+        let token = session.token
+        let context = session.context
+
+        let session.token = ''
+        let session.context = {}
+
+        let token_idx = match(output, token)
+        if token_idx > 0
+            let output = output[:token_idx - 1]
+        elseif token_idx == 0
+            let output = []
+        endif
+
+        call context.cb(output)
+    endif
+endfunction
+
+function! s:eval_session(lang, session_name, block, cb) abort
+    if !exists('s:active_sessions')
+        let s:active_sessions = {}
+    endif
+
+    if !exists('s:session_buffers')
+        let s:session_buffers = {}
+    endif
+
+    let key = a:lang . ':' . a:session_name
+    let eof_token = '__MEDIEVAL_SESSION_EOF__' . reltimestr(reltime())
+    if !has_key(s:active_sessions, key) || job_status(ch_getjob(s:active_sessions[key].channel)) !=# 'run'
+        let cmd = [a:lang]
+        if a:lang ==# 'python' || a:lang ==# 'python3'
+            let cmd += ['-i', '-q']
+        endif
+        let job = job_start(l:cmd, {
+                    \ 'out_cb': function('s:session_read_cb'),
+                    \ 'err_cb': function('s:session_read_cb'),
+                    \ 'mode': 'nl',
+                    \ })
+        let s:active_sessions[key] = {
+                    \ 'channel': job_getchannel(job),
+                    \ 'buffer': [],
+                    \ 'token': '',
+                    \ 'context': {},
+                    \ }
+    endif
+
+    let session = s:active_sessions[key]
+    let session.buffer = []
+    let session.token = eof_token
+    let session.context = {'cb': a:cb}
+
+    for line in a:block
+        call ch_sendraw(session.channel, line . "\n")
+    endfor
+
+    let use_token = v:true
+    if a:lang =~# 'python'
+        call ch_sendraw(session.channel, 'print("' . eof_token . '")' . "\n")
+    else
+        call ch_sendraw(session.channel, 'echo "' . eof_token . '"' . "\n")
+    endif
+endfunction
+
 function! medieval#eval(...) abort
     if !exists('g:medieval_langs')
         call s:error('g:medieval_langs is unset')
@@ -378,11 +459,16 @@ function! medieval#eval(...) abort
     if has_key(opts, 'setup')
         call opts.setup(context, block)
     endif
-    call writefile(block, fname)
-    if lang == "cmd"
-        call s:jobstart([fname], function('s:callback', [context]))
+
+    if has_key(opts, 'session')
+        call s:eval_session(lang, opts.session, block, function('s:callback', [context]))
     else
-        call s:jobstart([lang, fname], function('s:callback', [context]))
+        call writefile(block, fname)
+        if lang == "cmd"
+            call s:jobstart([fname], function('s:callback', [context]))
+        else
+            call s:jobstart([lang, fname], function('s:callback', [context]))
+        endif
     endif
     call winrestview(view)
 endfunction

From 7872fcc6280bda8935876ac534baf9d02991135c Mon Sep 17 00:00:00 2001
From: laburnumT <laburnumtec@gmail.com>
Date: Thu, 9 Jul 2026 11:55:39 +0200
Subject: [PATCH 2/2] RFC: Add session support for neovim

Splits up retrieving the data from s:session_read_cb into separate
helper functions for vim and nvim.
---
 autoload/medieval.vim | 125 +++++++++++++++++++++++++++++++-----------
 1 file changed, 94 insertions(+), 31 deletions(-)

diff --git a/autoload/medieval.vim b/autoload/medieval.vim
index f127d26..f9220aa 100644
--- a/autoload/medieval.vim
+++ b/autoload/medieval.vim
@@ -265,21 +265,23 @@ function! medieval#evalrange(line1, line2, target) abort
     call winrestview(view)
 endfunction
 
-function! s:session_read_cb(channel, msg) abort
-    let key = ''
-    for [k, s] in items(s:active_sessions)
-        if s.channel == a:channel
-            let key = k
-            break
-        endif
-    endfor
-
-    if empty(key)
+function! s:session_read(key, lines) abort
+    if !has_key(s:active_sessions, a:key)
         return
     endif
 
-    let session = s:active_sessions[key]
-    let session.buffer += [a:msg]
+    let session = s:active_sessions[a:key]
+
+    if type(a:lines) == v:t_list
+        let data = a:lines
+        if !empty(data) && data[-1] ==# ''
+            let data = data[:-2]
+            let session.buffer += data
+        endif
+    else
+        let session.buffer += [a:lines]
+    endif
+
 
     if !empty(session.token) && match(session.buffer, session.token) >= 0
         let output = session.buffer
@@ -300,6 +302,33 @@ function! s:session_read_cb(channel, msg) abort
     endif
 endfunction
 
+function! s:vim_cb(channel, msg) abort
+    for [k, s] in items(s:active_sessions)
+        if s.id == a:channel
+            call s:session_read(k, a:msg)
+            break
+        endif
+    endfor
+endfunction
+
+function! s:nvim_cb(job_id, data, event) abort
+    for [k, s] in items(s:active_sessions)
+        if s.id == a:job_id
+            call s:session_read(k, a:data)
+            break
+        endif
+    endfor
+endfunction
+
+function! s:nvim_session_exit_cb(job_id, exit_code, event) abort
+    for [k, s] in items(s:active_sessions)
+        if s.id == a:job_id
+            call remove(s:active_sessions, k)
+            break
+        endif
+    endfor
+endfunction
+
 function! s:eval_session(lang, session_name, block, cb) abort
     if !exists('s:active_sessions')
         let s:active_sessions = {}
@@ -311,22 +340,52 @@ function! s:eval_session(lang, session_name, block, cb) abort
 
     let key = a:lang . ':' . a:session_name
     let eof_token = '__MEDIEVAL_SESSION_EOF__' . reltimestr(reltime())
-    if !has_key(s:active_sessions, key) || job_status(ch_getjob(s:active_sessions[key].channel)) !=# 'run'
+    let running = has_key(s:active_sessions, key)
+
+    if running
+        let session = s:active_sessions[key]
+        if !has('nvim')
+            let running = job_status(session.job) ==# 'run'
+        endif
+    endif
+
+    if !running
         let cmd = [a:lang]
         if a:lang ==# 'python' || a:lang ==# 'python3'
             let cmd += ['-i', '-q']
         endif
-        let job = job_start(l:cmd, {
-                    \ 'out_cb': function('s:session_read_cb'),
-                    \ 'err_cb': function('s:session_read_cb'),
-                    \ 'mode': 'nl',
-                    \ })
-        let s:active_sessions[key] = {
-                    \ 'channel': job_getchannel(job),
-                    \ 'buffer': [],
-                    \ 'token': '',
-                    \ 'context': {},
-                    \ }
+
+        if has('nvim')
+            let id = jobstart(cmd, {
+                        \ 'on_stdout': function('s:nvim_cb'),
+                        \ 'on_stderr': function('s:nvim_cb'),
+                        \ 'on_exit': function('s:nvim_session_exit_cb'),
+                        \ 'stdout_buffered': 0,
+                        \ 'stderr_buffered': 0,
+                        \ })
+            if id <= 0
+                return s:error('Failed to start job for ' . a:lang)
+            endif
+            let s:active_sessions[key] = {
+                        \ 'id': id,
+                        \ 'buffer': [],
+                        \ 'token': '',
+                        \ 'context': {},
+                        \ }
+        else
+            let job = job_start(l:cmd, {
+                        \ 'out_cb': function('s:vim_cb'),
+                        \ 'err_cb': function('s:vim_cb'),
+                        \ 'mode': 'nl',
+                        \ })
+            let s:active_sessions[key] = {
+                        \ 'id': job_getchannel(job),
+                        \ 'job': job,
+                        \ 'buffer': [],
+                        \ 'token': '',
+                        \ 'context': {},
+                        \ }
+        endif
     endif
 
     let session = s:active_sessions[key]
@@ -334,15 +393,19 @@ function! s:eval_session(lang, session_name, block, cb) abort
     let session.token = eof_token
     let session.context = {'cb': a:cb}
 
-    for line in a:block
-        call ch_sendraw(session.channel, line . "\n")
-    endfor
-
-    let use_token = v:true
+    let new_block = copy(a:block)
     if a:lang =~# 'python'
-        call ch_sendraw(session.channel, 'print("' . eof_token . '")' . "\n")
+        let new_block += ['print("' . eof_token . '")']
     else
-        call ch_sendraw(session.channel, 'echo "' . eof_token . '"' . "\n")
+        let new_block += ['echo "' . eof_token . '"']
+    endif
+
+    if has('nvim')
+        call chansend(session.id, new_block + [''])
+    else
+        for line in new_block
+            call ch_sendraw(session.id, line . "\n")
+        endfor
     endif
 endfunction