reslop 0.3.1 → 0.3.3

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 ## [Unreleased][unreleased]
 
+## [0.3.3][] - 2026-10-16
+
+- Add Junie by JetBrains support
+- Add GitHub Copilot support
+- Add Pi coding agent support with its ACP adapter
+- Add Kiro by AWS support, installed with its vendor script
+- Add Cline support
+- Add Windsurf support through Devin CLI, its current agent
+- Add Kilo Code support
+- Show agents in two columns on the dashboard, without models
+
+## [0.3.2][] - 2026-10-15
+
+- Communicate with agents over the Agent Client Protocol instead of CLI
+- Listed models from the agent session, with effort, context, fast
+- Answer agent permission requests
+- Installing a missing agent's and ACP for them
+- Add Google Antigravity's support
+- Started a new agent session or continued the selected one
+- Showed a plan heading or task as the session caption
+- Support git worktrees at branches screen
+- Added pop-up menus on tables and UI controls
+- Add new hotkeys for better UX
+- Improve command and agent background runners
+
 ## [0.3.1][] - 2026-10-13
 
 - Allow agents to write to work with git
@@ -199,7 +224,9 @@
 - Feedback and todos that produce a repair plan for an agent
 - Intra-line highlighting in unified, mixed, and side-by-side layouts
 
-[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.3.1...HEAD
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/tshemsedinov/reslop/compare/v0.3.2...v0.3.3
+[0.3.2]: https://github.com/tshemsedinov/reslop/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/tshemsedinov/reslop/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/tshemsedinov/reslop/compare/v0.2.7...v0.3.0
 [0.2.7]: https://github.com/tshemsedinov/reslop/compare/v0.2.6...v0.2.7

package/README.md

@@ -25,14 +25,15 @@ Review → Plan → Repair → Verify
 - Auto-reload local diffs when files change, keeping the current screen
 - Import GitHub PR and GitLab MR review comments, and GitHub/GitLab issues, into tasks and the local plan
 - Commits list: brief and full, view a commit's diff, commit, update, amend, apply, edit, fixup, and delete
-- Branches: checkout, create, rebase, delete, pull, and push
+- Branches: checkout, create, rebase, delete, pull, and push; git worktrees as tiles above the branches
+- Pop-up menus on tables and controls
 - npm scripts and bins: run, edit, and reorder; double-click to run; clean logs older than 5 days
 - Reduced test and lint output for agents: failures and a short summary, not passing noise
 - Review, renew, audit and update npm dependencies in `package.json` and the lockfile
 - Auto-update reslop patch and minor releases; confirm a new major
 - Work with git, npm, and fetch in the background; run tests in the background while you review
-- Execute the plan in local CLI agents: pick agent, model, and effort; watch progress; sessions, history, and continue or new runs
-- Agent defaults and extras in `.reslop` (grouped settings sections)
+- Execute the plan in local agents over ACP: pick agent, model, and effort; watch progress; sessions, history, and continue or new runs. The dashboard lists agents in two columns, without models
+- Agent defaults in `.reslop` (grouped settings sections)
 - Optional line numbers in diff and file views (`Ctrl+L`)
 
 ## Install
@@ -47,6 +48,8 @@ Requires Node.js `>=18.15.0`.
 ## Usage
 
 - `reslop` live dashboard of this repository; press a block key to open its screen
+- `reslop folder` tiles of the repositories in a folder, each with its git worktrees
+- git worktrees of a repository are tiles above its branches when there are several: `←` `→` select a tile, `↑` `↓` go through the branches, `enter` or a click shows that worktree, `insert` and `delete` create and remove one
 - `reslop path/file` show only that path or file (starts on the file list)
 - `reslop 7ac260c` show that commit (read-only)
 - `reslop https://github.com/metarhia/metacom/pull/555` GitHub/GitLab PR/MR
@@ -64,7 +67,7 @@ Prefix each program in an npm script with `reslop t --`. Keep `&&` between those
 
 The report is Markdown: failures, diagnostics, and a short summary. Passing results are omitted and similar problems are grouped. The reduced report is saved as `.log/<name>.log` and the raw output as `.log/<name>.raw`. The report names the raw file for an agent to read when a detail is missing. Set `RESLOP_OUTPUT=raw` to pass the command through unchanged. The review screen runs scripts in raw mode and applies its own filter once.
 
-Run the full check with `npm t`. Run one or more test files with `reslop t -- node --test <files>`. New reviews include those two commands in the agent instructions.
+`npm t` runs lint and the tests that do not start a process. Run a test file that starts git, node, or npm with `node --test <file>`. New reviews include both commands in the agent instructions.
 
 `reslop t` records each run as `.log/<name>.json` beside those files so that the dashboard can show commands started by an agent in another terminal.
 
@@ -76,6 +79,29 @@ Reviews go in `.plan/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
 `ready` and `pending` in older reviews are read as `editing`.
 
+## Agents
+
+reslop runs a plan in an agent over the [Agent Client Protocol](https://agentclientprotocol.com). An agent is listed as available when the command that serves ACP is on `PATH`:
+
+| Agent       | Command              | Install                                           |
+| ----------- | -------------------- | ------------------------------------------------- |
+| Claude Code | `claude-agent-acp`   | `npm i -g @agentclientprotocol/claude-agent-acp`  |
+| Codex       | `codex-acp`          | `npm i -g @agentclientprotocol/codex-acp`         |
+| Cursor      | `cursor-agent acp`   | comes with the Cursor CLI                         |
+| OpenCode    | `opencode acp`       | `npm i -g opencode-ai`                            |
+| Antigravity | `agy_acp_server.par` | downloaded from the official ACP registry         |
+| Junie       | `junie --acp=true`   | `npm i -g @jetbrains/junie`                       |
+| Copilot     | `copilot --acp`      | `npm i -g @github/copilot`                        |
+| Pi          | `pi-acp` and `pi`    | `npm i -g pi-acp @earendil-works/pi-coding-agent` |
+| Kiro        | `kiro-cli acp`       | install script from cli.kiro.dev                  |
+| Cline       | `cline --acp`        | `npm i -g cline`                                  |
+| Windsurf    | `devin acp`          | install script from cli.devin.ai                  |
+| Kilo Code   | `kilo acp`           | `npm i -g @kilocode/cli`                          |
+
+A missing agent shows what it needs, in the warning color; `i` on that row proposes installing it. npm adapters are installed globally, together with the agent's own CLI when the adapter runs it and it is not on `PATH`, while Google Antigravity's official ACP runtime is downloaded from the ACP registry into reslop's user data directory. Windsurf is listed as `devin`: Cognition's Devin CLI is now the agent of Windsurf, and the Windsurf editor does not serve ACP. An agent CLI published with an install script, such as Kiro's or Devin's, is installed by running the vendor's script, and its command is also found in `~/.local/bin`. reslop also discovers that runtime on `PATH` and in Zed's registry directory. After confirmation, reslop lists the agent as soon as the install finishes and does not restart. [docs/acp-adapters.md](docs/acp-adapters.md) describes the integrations.
+
+Models are the ones the agent lists; efforts, context sizes, and fast mode are the ones it offers for the picked model. When a run ends, the session is set back to what it was, so the defaults of the agent's own CLI stay as they were. A run has nobody to ask, so reslop answers permission requests itself: edits inside the repository and `npm`, `npx`, `node`, `reslop`, and `git` commands, piped through read-only filters such as `grep` or `tail`, are allowed; everything else is refused.
+
 ## Future
 
 - Search, blame, and file history in the review

package/lib/agents/acp.js

@@ -0,0 +1,309 @@
+'use strict';
+
+const { spawn } = require('node:child_process');
+const { jsonParse, isHashObject } = require('metautil');
+
+const PROTOCOL_VERSION = 1;
+const METHOD_NOT_FOUND = -32601;
+const INTERNAL_ERROR = -32603;
+const AUTH_REQUIRED = -32000;
+const STDERR_KEEP = 2000;
+const SECRET_AUTH = ['env_var', 'terminal'];
+
+const errorText = (error) => {
+  const data = isHashObject(error.data) ? error.data : {};
+  const detail = data.message ?? data.details ?? error.data;
+  const text = typeof detail === 'string' ? detail.trim() : '';
+  return text || `${error.message ?? 'agent error'}`;
+};
+
+class AcpError extends Error {
+  constructor(error) {
+    super(errorText(error));
+    this.code = error.code;
+    this.data = error.data;
+  }
+}
+
+const rpcError = (message, code) => Object.assign(new Error(message), { code });
+
+const methodMissing = (method) =>
+  rpcError(`Method not found: ${method}`, METHOD_NOT_FOUND);
+
+const exitMessage = (status, stderr) => {
+  const code = typeof status === 'number' ? ` with code ${status}` : '';
+  const tail = stderr.trim();
+  return tail ? `agent exited${code}\n${tail}` : `agent exited${code}`;
+};
+
+// JSON-RPC over the stdio of one agent process, a message per line
+class AcpConnection {
+  constructor(handlers = {}) {
+    this.onNotify = handlers.notify ?? (() => {});
+    this.onRequest = handlers.request ?? null;
+    this.child = null;
+    this.pending = new Map();
+    this.nextId = 1;
+    this.buffer = '';
+    this.stderr = '';
+    this.failure = null;
+  }
+
+  start(cmd, args, options) {
+    const stdio = ['pipe', 'pipe', 'pipe'];
+    const child = spawn(cmd, args, { ...options, stdio });
+    this.child = child;
+    child.stdout.setEncoding('utf8');
+    child.stdout.on('data', (chunk) => this.read(chunk));
+    child.stderr.setEncoding('utf8');
+    child.stderr.on('data', (chunk) => {
+      this.stderr = `${this.stderr}${chunk}`.slice(-STDERR_KEEP);
+    });
+    // A closed pipe is reported by the exit of the process
+    child.stdin.on('error', () => {});
+    child.on('error', (error) => this.fail(error));
+    child.on('close', (status) => {
+      this.fail(new Error(exitMessage(status, this.stderr)));
+    });
+    return this;
+  }
+
+  fail(error) {
+    if (this.failure) return;
+    this.failure = error;
+    for (const waiter of this.pending.values()) waiter.reject(error);
+    this.pending.clear();
+  }
+
+  send(message) {
+    const stdin = this.child && this.child.stdin;
+    if (this.failure || !stdin || !stdin.writable) return;
+    stdin.write(`${JSON.stringify({ jsonrpc: '2.0', ...message })}\n`);
+  }
+
+  request(method, params) {
+    if (this.failure) return Promise.reject(this.failure);
+    const id = this.nextId;
+    this.nextId += 1;
+    return new Promise((resolve, reject) => {
+      this.pending.set(id, { resolve, reject });
+      this.send({ id, method, params });
+    });
+  }
+
+  notify(method, params) {
+    this.send({ method, params });
+  }
+
+  read(chunk) {
+    const lines = `${this.buffer}${chunk}`.split('\n');
+    this.buffer = lines.pop();
+    for (const line of lines) {
+      const message = line.trim() ? jsonParse(line) : null;
+      if (isHashObject(message)) this.dispatch(message);
+    }
+  }
+
+  dispatch(message) {
+    const { id, method } = message;
+    if (typeof method !== 'string') return void this.settle(message);
+    if (id === undefined || id === null) {
+      return void this.onNotify(method, message.params ?? {});
+    }
+    this.answer(id, method, message.params ?? {});
+  }
+
+  settle(message) {
+    const waiter = this.pending.get(message.id);
+    if (!waiter) return;
+    this.pending.delete(message.id);
+    if (message.error) waiter.reject(new AcpError(message.error));
+    else waiter.resolve(message.result ?? {});
+  }
+
+  async answer(id, method, params) {
+    try {
+      if (!this.onRequest) throw methodMissing(method);
+      const result = await this.onRequest(method, params);
+      this.send({ id, result: result ?? {} });
+    } catch (error) {
+      const code = typeof error.code === 'number' ? error.code : INTERNAL_ERROR;
+      this.send({ id, error: { code, message: error.message } });
+    }
+  }
+}
+
+const authMethod = (init) => {
+  const methods = Array.isArray(init.authMethods) ? init.authMethods : [];
+  const open = (method) => {
+    if (!isHashObject(method) || typeof method.id !== 'string') return false;
+    if (SECRET_AUTH.includes(method.type)) return false;
+    const meta = isHashObject(method._meta) ? method._meta : {};
+    return !Object.keys(meta).some((key) => /api.?key/i.test(key));
+  };
+  return methods.find(open) ?? null;
+};
+
+const sessionState = (sessionId, result) => ({
+  sessionId,
+  configOptions: Array.isArray(result.configOptions)
+    ? result.configOptions
+    : [],
+  models: isHashObject(result.models) ? result.models : null,
+  modes: isHashObject(result.modes) ? result.modes : null,
+});
+
+// One agent session: opened or continued, configured, then prompted
+class AcpSession {
+  constructor(connection, cwd, info) {
+    this.connection = connection;
+    this.cwd = cwd;
+    this.info = info;
+    this.init = {};
+    this.state = sessionState('', {});
+    this.replaying = false;
+    this.undone = [];
+    this.onAuth = () => {};
+  }
+
+  get id() {
+    return this.state.sessionId;
+  }
+
+  request(method, params = {}) {
+    const sessionId = this.id;
+    return this.connection.request(method, { sessionId, ...params });
+  }
+
+  async handshake() {
+    this.init = await this.connection.request('initialize', {
+      protocolVersion: PROTOCOL_VERSION,
+      clientCapabilities: {
+        fs: { readTextFile: false, writeTextFile: false },
+        terminal: false,
+        // Cursor lists the settings of a model only to a client that asks
+        _meta: { parameterizedModelPicker: true },
+      },
+      clientInfo: this.info,
+    });
+  }
+
+  // Signing in can open a browser, so only a run is allowed to start it
+  async signedIn(call, login) {
+    try {
+      return await call();
+    } catch (error) {
+      const asked = login && error.code === AUTH_REQUIRED;
+      const method = asked ? authMethod(this.init) : null;
+      if (!method) throw error;
+      this.onAuth(method);
+      await this.connection.request('authenticate', { methodId: method.id });
+      return call();
+    }
+  }
+
+  continueMethod() {
+    const caps = this.init.agentCapabilities ?? {};
+    const session = caps.sessionCapabilities ?? {};
+    if (isHashObject(session.resume)) return 'session/resume';
+    if (caps.loadSession === true) return 'session/load';
+    throw new Error('agent cannot continue a session');
+  }
+
+  async open(sessionId = '', login = false) {
+    await this.handshake();
+    const params = { cwd: this.cwd, mcpServers: [] };
+    if (!sessionId) {
+      const start = () => this.connection.request('session/new', params);
+      const result = await this.signedIn(start, login);
+      this.state = sessionState(`${result.sessionId ?? ''}`, result);
+      return this.state;
+    }
+    const method = this.continueMethod();
+    const resume = () =>
+      this.connection.request(method, { ...params, sessionId });
+    // A loaded session replays its history as updates before it answers
+    this.replaying = true;
+    try {
+      const result = await this.signedIn(resume, login);
+      this.state = sessionState(sessionId, result);
+    } finally {
+      this.replaying = false;
+    }
+    return this.state;
+  }
+
+  // The request that puts back what a change is about to replace
+  undoOf(step) {
+    const { state } = this;
+    const { configId, modelId, modeId } = step.params;
+    const option = state.configOptions.find(
+      (item) => isHashObject(item) && item.id === configId,
+    );
+    const params = {};
+    if (option) Object.assign(params, { configId, value: option.currentValue });
+    if (modelId && state.models) params.modelId = state.models.currentModelId;
+    if (modeId && state.modes) params.modeId = state.modes.currentModeId;
+    return Object.keys(params).length ? { method: step.method, params } : null;
+  }
+
+  async apply(step) {
+    const result = await this.request(step.method, step.params);
+    const state = { ...this.state };
+    if (Array.isArray(result.configOptions)) {
+      state.configOptions = result.configOptions;
+    }
+    const { modelId, modeId } = step.params;
+    if (modelId && state.models) {
+      state.models = { ...state.models, currentModelId: modelId };
+    }
+    if (modeId && state.modes) {
+      state.modes = { ...state.modes, currentModeId: modeId };
+    }
+    this.state = state;
+  }
+
+  async change(step) {
+    if (!step) return;
+    const undo = this.undoOf(step);
+    await this.apply(step);
+    if (undo) this.undone.push(undo);
+  }
+
+  // An agent can keep what a session was set to as the defaults of the user
+  async revert() {
+    const steps = this.undone.reverse();
+    this.undone = [];
+    for (const step of steps) {
+      try {
+        await this.apply(step);
+      } catch {
+        // an agent that is gone has nothing left to put back
+      }
+    }
+  }
+
+  absorb(update) {
+    if (update.sessionUpdate !== 'config_option_update') return;
+    if (!Array.isArray(update.configOptions)) return;
+    this.state = { ...this.state, configOptions: update.configOptions };
+  }
+
+  cancel() {
+    const sessionId = this.id;
+    if (sessionId) this.connection.notify('session/cancel', { sessionId });
+  }
+
+  prompt(text) {
+    return this.request('session/prompt', {
+      prompt: [{ type: 'text', text }],
+    });
+  }
+}
+
+module.exports = {
+  AcpConnection,
+  AcpSession,
+  methodMissing,
+  authMethod,
+};