From 41a8d1a75b54b9295188610e28b5a3e4ff985c18 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Sun, 5 Oct 2025 15:36:28 -0400 Subject: [PATCH] feat: interactive mode --- .github/workflows/quality.yml | 9 +++--- lua/cp/commands/init.lua | 12 ++++++-- lua/cp/ui/panel.lua | 54 ++++++++++++++++++++++++-------- lua/cp/utils.lua | 23 ++++++++++++++ plugin/cp.lua | 7 +++++ scripts/interact.py | 58 +++++++++++++++++++++++++++++++++++ 6 files changed, 144 insertions(+), 19 deletions(-) create mode 100644 scripts/interact.py diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 97b7786..8b6432f 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -29,8 +29,9 @@ jobs: - '.luarc.json' - '*.toml' python: - - 'scrapers/**' - - 'tests/scrapers/**' + - 'scripts/**/.py' + - 'scrapers/**/*.py' + - 'tests/**/*.py' - 'pyproject.toml' - 'uv.lock' markdown: @@ -103,7 +104,7 @@ jobs: - name: Install ruff run: uv tool install ruff - name: Lint Python files with ruff - run: ruff check scrapers/ tests/scrapers/ + run: ruff check scripts/ scrapers/ tests/scrapers/ python-typecheck: name: Python Type Check @@ -117,7 +118,7 @@ jobs: - name: Install dependencies with mypy run: uv sync --dev - name: Type check Python files with mypy - run: uv run mypy scrapers/ tests/scrapers/ + run: uv run mypy scripts/ scrapers/ tests/scrapers/ markdown-format: name: Markdown Format Check diff --git a/lua/cp/commands/init.lua b/lua/cp/commands/init.lua index 73f3338..4a6946f 100644 --- a/lua/cp/commands/init.lua +++ b/lua/cp/commands/init.lua @@ -15,6 +15,7 @@ local actions = constants.ACTIONS ---@field contest? string ---@field platform? string ---@field problem_id? string +---@field interactor_cmd? string --- Turn raw args into normalized structure to later dispatch ---@param args string[] The raw command-line mode args @@ -32,7 +33,7 @@ local function parse_command(args) if first == 'cache' then local subcommand = args[2] if not subcommand then - return { type = 'error', message = 'cache command requires subcommand: clear' } + return { type = 'error', message = 'cache command requires subcommand' } end if vim.tbl_contains({ 'clear', 'read' }, subcommand) then local platform = args[3] @@ -44,6 +45,13 @@ local function parse_command(args) else return { type = 'error', message = 'unknown cache subcommand: ' .. subcommand } end + elseif first == 'interact' then + local inter = args[2] + if inter and inter ~= '' then + return { type = 'action', action = 'interact', interactor_cmd = inter } + else + return { type = 'action', action = 'interact' } + end else return { type = 'action', action = first } end @@ -99,7 +107,7 @@ function M.handle_command(opts) local ui = require('cp.ui.panel') if cmd.action == 'interact' then - ui.toggle_interactive() + ui.toggle_interactive(cmd.interactor_cmd) elseif cmd.action == 'run' then ui.toggle_run_panel() elseif cmd.action == 'debug' then diff --git a/lua/cp/ui/panel.lua b/lua/cp/ui/panel.lua index 949d503..910214d 100644 --- a/lua/cp/ui/panel.lua +++ b/lua/cp/ui/panel.lua @@ -28,7 +28,8 @@ function M.disable() end end -function M.toggle_interactive() +---@param interactor_cmd? string +function M.toggle_interactive(interactor_cmd) if state.get_active_panel() == 'interactive' then if state.interactive_buf and vim.api.nvim_buf_is_valid(state.interactive_buf) then local job = vim.b[state.interactive_buf].terminal_job_id @@ -42,7 +43,6 @@ function M.toggle_interactive() state.saved_interactive_session = nil end state.set_active_panel(nil) - logger.log('Interactive panel closed.') return end @@ -52,12 +52,10 @@ function M.toggle_interactive() end local platform, contest_id = state.get_platform(), state.get_contest_id() - if not platform then logger.log('No platform configured.', vim.log.levels.ERROR) return end - if not contest_id then logger.log( ('No contest %s configured for platform %s.'):format(contest_id, platform), @@ -68,7 +66,7 @@ function M.toggle_interactive() local problem_id = state.get_problem_id() if not problem_id then - logger.log(('No problem found for the current problem id %s'):format(problem_id)) + logger.log('No problem is active.', vim.log.levels.ERROR) return end @@ -76,10 +74,12 @@ function M.toggle_interactive() cache.load() local contest_data = cache.get_contest_data(platform, contest_id) if - contest_data - and not contest_data.problems[contest_data.index_map[state.get_problem_id()]].interactive + not contest_data + or not contest_data.index_map + or not contest_data.problems[contest_data.index_map[problem_id]] + or not contest_data.problems[contest_data.index_map[problem_id]].interactive then - logger.log('This is NOT an interactive problem. Use :CP run instead.', vim.log.levels.WARN) + logger.log('This problem is not interactive. Use :CP run.', vim.log.levels.ERROR) return end @@ -95,20 +95,48 @@ function M.toggle_interactive() end local binary = state.get_binary_file() - if not binary then - logger.log('no binary path found', vim.log.levels.ERROR) + if not binary or binary == '' then + logger.log('No binary produced.', vim.log.levels.ERROR) return end - vim.cmd('terminal') + local cmdline + if interactor_cmd and interactor_cmd ~= '' then + local interactor = interactor_cmd + if not interactor:find('/') then + interactor = './' .. interactor + end + if vim.fn.executable(interactor) ~= 1 then + logger.log(('Interactor not executable: %s'):format(interactor_cmd), vim.log.levels.ERROR) + if state.saved_interactive_session then + vim.cmd(('source %s'):format(state.saved_interactive_session)) + vim.fn.delete(state.saved_interactive_session) + state.saved_interactive_session = nil + end + return + end + local orchestrator = vim.fn.fnamemodify(utils.get_plugin_path() .. '/scripts/interact.py', ':p') + cmdline = table.concat({ + 'uv', + 'run', + vim.fn.shellescape(orchestrator), + vim.fn.shellescape(interactor), + vim.fn.shellescape(binary), + }, ' ') + else + cmdline = vim.fn.shellescape(binary) + end + + vim.cmd('terminal ' .. cmdline) local term_buf = vim.api.nvim_get_current_buf() local term_win = vim.api.nvim_get_current_win() - vim.fn.chansend(vim.b.terminal_job_id, binary .. '\n') - vim.keymap.set('t', '', function() M.toggle_interactive() end, { buffer = term_buf, silent = true }) + vim.keymap.set('n', '', function() + M.toggle_interactive() + end, { buffer = term_buf, silent = true }) state.interactive_buf = term_buf state.interactive_win = term_win diff --git a/lua/cp/utils.lua b/lua/cp/utils.lua index 5fa7c73..e78b056 100644 --- a/lua/cp/utils.lua +++ b/lua/cp/utils.lua @@ -228,4 +228,27 @@ function M.timeout_capability() return { ok = path ~= nil, path = path, reason = reason } end +function M.cwd_executables() + local uv = vim.uv or vim.loop + local req = uv.fs_scandir('.') + if not req then + return {} + end + local out = {} + while true do + local name, t = uv.fs_scandir_next(req) + if not name then + break + end + if t == 'file' or t == 'link' then + local path = './' .. name + if vim.fn.executable(path) == 1 then + out[#out + 1] = name + end + end + end + table.sort(out) + return out +end + return M diff --git a/plugin/cp.lua b/plugin/cp.lua index 7081f15..5d4df32 100644 --- a/plugin/cp.lua +++ b/plugin/cp.lua @@ -3,6 +3,8 @@ if vim.g.loaded_cp then end vim.g.loaded_cp = 1 +local utils = require('cp.utils') + vim.api.nvim_create_user_command('CP', function(opts) local cp = require('cp') cp.handle_command(opts) @@ -51,6 +53,11 @@ end, { return vim.tbl_filter(function(cmd) return cmd:find(ArgLead, 1, true) == 1 end, { 'clear', 'read' }) + elseif args[2] == 'interact' then + local cands = utils.cwd_executables() + return vim.tbl_filter(function(cmd) + return cmd:find(ArgLead, 1, true) == 1 + end, cands) end elseif num_args == 4 then if args[2] == 'cache' and args[3] == 'clear' then diff --git a/scripts/interact.py b/scripts/interact.py new file mode 100644 index 0000000..4c24173 --- /dev/null +++ b/scripts/interact.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python3 +import asyncio +import shlex +import sys +from collections.abc import Sequence + + +async def pump( + reader: asyncio.StreamReader, writer: asyncio.StreamWriter | None +) -> None: + while True: + data = await reader.readline() + if not data: + break + sys.stdout.buffer.write(data) + sys.stdout.flush() + if writer: + writer.write(data) + await writer.drain() + + +async def main(interactor_cmd: Sequence[str], interactee_cmd: Sequence[str]) -> None: + interactor = await asyncio.create_subprocess_exec( + *interactor_cmd, + stdin=asyncio.subprocess.PIPE, + stdout=asyncio.subprocess.PIPE, + ) + interactee = await asyncio.create_subprocess_exec( + *interactee_cmd, + stdin=asyncio.subprocess.PIPE, + stdout=asyncio.subprocess.PIPE, + ) + + assert ( + interactor.stdout + and interactor.stdin + and interactee.stdout + and interactee.stdin + ) + + tasks = [ + asyncio.create_task(pump(interactor.stdout, interactee.stdin)), + asyncio.create_task(pump(interactee.stdout, interactor.stdin)), + ] + await asyncio.wait(tasks, return_when=asyncio.ALL_COMPLETED) + await interactor.wait() + await interactee.wait() + + +if __name__ == "__main__": + if len(sys.argv) != 3: + print("Usage: interact.py ", file=sys.stderr) + sys.exit(1) + + interactor_cmd = shlex.split(sys.argv[1]) + interactee_cmd = shlex.split(sys.argv[2]) + + asyncio.run(main(interactor_cmd, interactee_cmd))