@beunec/rivine 0.1.4 → 0.2.0

package/README.md

@@ -1,8 +1,11 @@
 # Rivine Code, in your terminal
 
+Requires Node 20 or newer.
+
 ```
 npm install -g @beunec/rivine
 cd your-project
+rivine login
 rivine
 ```
 
@@ -42,8 +45,7 @@ stops it; the agent sees the non-zero exit and decides what to do about it.
 
 The terminal comes from `node-pty`, an optional dependency. If it cannot be
 installed or a PTY cannot be allocated, commands still run and still stream —
-just without a terminal. Nothing fails; `rivine status` is where you look if
-you want to know which one you have. `RIVINE_NO_PTY=1` forces the pipe path.
+just without a terminal. Nothing fails. `RIVINE_NO_PTY=1` forces the pipe path.
 
 What you see and what the model is sent are deliberately different. Escape codes
 are stripped and redrawn lines are collapsed to their final state before the
@@ -51,33 +53,64 @@ output leaves your machine, so a progress bar that repainted four hundred times
 costs one line rather than four hundred. This is why a real terminal does not
 cost more per turn than not having one.
 
-## Permission modes
+## Mode and Rate
+
+Two choices, both required, and neither is inferred from what you type. There is
+no router — no keyword matcher, no classifier, no extra model turn that reads
+your request and picks a lane. A wrong guess sends a database migration to the
+frontend agent and you never see the decision that was made for you.
+
+### Mode — which agent runs
+
+Each Mode is one standalone agent that owns the task end to end: it searches the
+codebase, reads what it needs, writes across as many files as the change
+requires, runs the build and tests, and fixes what the terminal reports.
+
+| Mode | For | How to choose |
+|---|---|---|
+| `frontend` | UI and client tier | `1`, `-m frontend` |
+| `backend` | Server, API, database | `2`, `-m backend` |
+| `fullstack` | A change spanning every tier | `3`, `-m fullstack` |
+| `simple` | Plan, ask, document, refresh, ship | `4`, `-m simple`, `--plan` |
+| `security` | Find, verify, and patch vulnerabilities | `5`, `-m security` |
+
+`simple` is the only Mode with live web access — its work is the work that
+depends on the world outside the repository. The build Modes are measured on
+whether the software runs.
+
+### Rate — how edits apply
 
 The engine runs on our servers. The decision about what happens to your machine
 is made **here**, on your machine, before anything runs — never on our servers.
 
-| Mode | Applies without asking | Press |
+| Rate | Applies without asking | How to choose |
 |---|---|---|
-| `plan` | Reads, and shell commands that provably only read | Shift+Tab |
-| `default` | Reads. Asks before any write, any command, any delete | Shift+Tab |
-| `acceptEdits` | Writes inside the project. Still asks before commands | Shift+Tab |
-| `bypass` | Everything. For CI | `--bypass` only |
-
-Start in a mode with `--plan`, `-m acceptEdits`, or `--bypass`. Shift+Tab
-cycles the first three during a session. **`bypass` is not in the cycle** —
-you cannot arrive at it by pressing a key one time too many.
-
-Four things ask in every mode except `bypass`, however permissive the mode
-otherwise is:
-
-- **Credentials.** `.env`, `*.pem`, `~/.ssh`, `~/.aws`, service-account JSON.
-  These ask on *read* too — reading one puts a live secret into a model prompt.
-- **Anything outside the project.** The jail resolves symlinks before deciding,
-  so a link pointing out of the directory is caught rather than followed.
-- **Commands that are hard to undo.** `rm -rf`, `git push`, `--force`,
-  `git reset --hard`, `sudo`, `npm publish`, any deploy, `terraform apply`.
-- **Batch writes.** Judged by their most dangerous entry, so a safe first file
-  cannot clear a whole batch.
+| `manual` | Reads and read-only commands. Asks before every write, edit, or delete | `1`, `--rate manual` (default) |
+| `bypass` | Writes and ordinary commands inside this project | `2`, `--rate bypass`, `--bypass` |
+
+Three things ask in **both** Rates, because they are what you would want to see
+even having said "just do it": credentials, anything outside the project
+directory, and commands that are hard to undo (`rm -rf`, `git push --force`, a
+deploy).
+
+The first interactive session asks for Mode, then Rate. `-m …` and `--rate …`
+skip the questions because you already answered them. Shift+Tab toggles the
+Rate.
+
+What stays gated:
+
+- **Anything outside the project.** Refused in `bypass` (set
+  `RIVINE_ALLOW_OUTSIDE_PROJECT=1` if you mean it). Other modes ask. The jail
+  resolves symlinks first, so a link pointing out of the directory is caught
+  rather than followed.
+- **Credentials** — every mode except `bypass`. `.env`, `*.pem`, `~/.ssh`,
+  `~/.aws`, service-account JSON. These ask on *read* too — reading one puts
+  a live secret into a model prompt.
+- **Commands that are hard to undo** — every mode except `bypass`. `rm -rf`,
+  `git push`, `--force`, `git reset --hard`, `sudo`, `npm publish`, any
+  deploy, `terraform apply`.
+- **Batch writes** — every mode except `bypass`. Judged by their most
+  dangerous entry, so a safe first file cannot clear a whole batch.
 
 One exemption: `.rivine/` — the agent's own notebook for this project, seeded at
 session start and appended to at the end of each turn. It writes without asking
@@ -90,7 +123,8 @@ session start and appended to at the end of each turn. It writes without asking
 rivine                          start a session in the current directory
 rivine "add tests for auth.ts"  one prompt, then exit
 rivine -p "..."                 the same, explicitly
-rivine --plan                   start read-only
+rivine -m frontend              start in Frontend Only
+rivine --plan                   shorthand for -m simple (Plan/Ask Only)
 rivine -C ../other-project      run against a different directory
 
 rivine login                    sign in (opens your browser)
@@ -105,8 +139,9 @@ rivine --output-format json     one JSON object on stdout, for CI
 ```
 
 In a session: type `/` and press Tab. `/help` `/mode` `/plan` `/accept`
-`/status` `/diff` `/pr` `/mcp` `/credits` `/clear` `/exit`. Shift+Tab changes
-permission mode; Ctrl+C quits cleanly.
+`/status` `/diff` `/pr` `/mcp` `/credits` `/clear` `/exit`. `/mode` opens the
+permission picker. Shift+Tab cycles plan / default / accept edits. Ctrl+C
+quits cleanly.
 
 `/diff` shows what changed in the working tree. `/pr` prepares a pull request
 through your own `gh` CLI. It **never pushes without being asked**: on a
@@ -139,8 +174,8 @@ names the flag that would have allowed it. Granting write access because nobody
 was watching is exactly backwards.
 
 ```
-rivine -p "run the tests and fix what fails" -m acceptEdits
-rivine -p "..." --bypass    # CI, on a machine you accept changes to
+rivine -m backend -p "run the tests and fix what fails"
+rivine -m fullstack --rate bypass -p "..."   # CI, on a machine you accept changes to
 ```
 
 ## Sign-in
@@ -262,11 +297,12 @@ pipe into `jq`:
 { "ok": true, "answer": "…", "error": null, "exit_code": 0, "files_written": ["src/a.ts"] }
 ```
 
-Exit codes are `0` success, `1` error, `2` out of credits, and `3`
-nothing could be done — every operation needed approval and there was no
-terminal to give it. `3` exists because that run still costs a turn: without
-it the step would go green having changed nothing. The result object carries
-`refused` alongside `files_written` so a workflow can tell the two apart.
+Exit codes are `0` success, `1` error, `2` out of credits (also if you run
+`rivine` with no prompt and no terminal), and `3` nothing could be done —
+every operation needed approval and there was no terminal to give it. `3`
+exists because that run still costs a turn: without it the step would go
+green having changed nothing. The result object carries `refused` alongside
+`files_written` so a workflow can tell the two apart.
 
 There is a composite action in `action.yml`:
 
@@ -315,10 +351,11 @@ is one, it will be linked here rather than described.
 
 ## Credits
 
-The same wallet as the web app, checked by the same gate. Rivine Code needs
-**$10.00** in credits to start a turn; below that the CLI says so and links to
-the top-up page rather than starting work it cannot finish. `rivine status` and
-the status bar show your balance.
+The same wallet as the web app, checked by the same gate. Rivine Code needs a
+minimum balance to start a turn (usually **$10.00**); below that the CLI says
+so and links to the top-up page rather than starting work it cannot finish.
+`rivine status` and the status bar show your balance. The bar refreshes after
+each turn.
 
 ## Configuration
 
@@ -330,6 +367,9 @@ deployments:
 | `RIVINE_API_URL` | `https://workspace.beunec.com` |
 | `RIVINE_SITE_URL` | `https://aselius.beunec.com` |
 | `RIVINE_TOKEN` | unset — a pre-issued token for CI |
+| `RIVINE_NO_PTY` | unset — set to `1` to run commands without a PTY |
+| `RIVINE_ALLOW_OUTSIDE_PROJECT` | unset — set to `1` only if `bypass` should be allowed to leave the project directory |
+| `RIVINE_ASCII` | unset — set to `1` for ASCII glyphs (narrow panes, no Unicode) |
 
 Auth0 parameters are fetched from `GET /api/cli/config` at sign-in, so this
 package carries no tenant configuration and a client-id change never requires

package/action.yml

@@ -38,8 +38,16 @@ inputs:
     required: true
   mode:
     description: >-
-      Permission mode. `bypass` is the default because there is nobody to
-      approve anything; every other mode refuses operations that would prompt.
+      Which standalone agent runs: frontend, backend, fullstack, simple, or
+      security. Required — there is no router, and guessing would send a
+      database migration to the frontend agent without anyone seeing the
+      decision.
+    required: true
+  rate:
+    description: >-
+      How edits apply: manual or bypass. `bypass` is the default here because
+      there is nobody to approve anything; `manual` refuses every operation
+      that would prompt, which in CI means it stops.
     required: false
     default: bypass
   working-directory:
@@ -98,6 +106,7 @@ runs:
         # concerned. They are read as variables and never spliced into it.
         RIVINE_PROMPT: ${{ inputs.prompt }}
         RIVINE_MODE: ${{ inputs.mode }}
+        RIVINE_RATE: ${{ inputs.rate }}
         # Read by the CLI in place of an interactive sign-in. Store it as a
         # repository secret; it is an access token for a real account with a
         # real credit balance.
@@ -115,13 +124,21 @@ runs:
           exit 1
         fi
 
-        # An allowlist, not a quoted interpolation: a mode is one of four
-        # words, and anything else is a mistake worth stopping on rather than
-        # passing to the CLI to reject later.
+        # An allowlist, not a quoted interpolation: each of these is one of a
+        # closed set of words, and anything else is a mistake worth stopping on
+        # rather than passing to the CLI to reject later.
         case "$RIVINE_MODE" in
-          plan|default|acceptEdits|bypass) ;;
+          frontend|backend|fullstack|simple|security) ;;
+          *)
+            echo "::error::Unknown mode '$RIVINE_MODE'. Use frontend, backend, fullstack, simple or security."
+            exit 1
+            ;;
+        esac
+
+        case "$RIVINE_RATE" in
+          manual|bypass) ;;
           *)
-            echo "::error::Unknown mode '$RIVINE_MODE'. Use plan, default, acceptEdits or bypass."
+            echo "::error::Unknown rate '$RIVINE_RATE'. Use manual or bypass."
             exit 1
             ;;
         esac
@@ -129,7 +146,7 @@ runs:
         # stdout is exactly one JSON object in this mode; the readable
         # transcript and any command output go to stderr, which is what shows
         # up in the workflow log.
-        rivine --output-format json -m "$RIVINE_MODE" -p "$RIVINE_PROMPT" > "$RUNNER_TEMP/rivine.json"
+        rivine --output-format json -m "$RIVINE_MODE" --rate "$RIVINE_RATE" -p "$RIVINE_PROMPT" > "$RUNNER_TEMP/rivine.json"
         status=$?
 
         if [ ! -s "$RUNNER_TEMP/rivine.json" ]; then

package/dist/api/workspace.js

@@ -76,6 +76,9 @@ export async function openTurn(req) {
             client: 'cli',
             cli_session_id: req.sessionId,
             permission_mode: req.permissionMode,
+            code_mode: req.codeMode ?? null,
+            code_rate: req.codeRate ?? null,
+            specialty: req.codeMode ?? null,
             cwd_snapshot: req.cwdSnapshot ?? null,
             mcp_tools: req.mcpTools ?? null,
             cli_session_key: req.sessionKey ?? null,

package/dist/index.js

@@ -25,7 +25,7 @@ import { describeServer, loadServers, removeServer, saveServer } from './mcp/con
 import { McpManager } from './mcp/manager.js';
 import { loginToServer } from './mcp/oauth.js';
 import { clearSession, mcpAccount } from './auth/keychain.js';
-import { PERMISSION_MODES } from './protocol/permissions.js';
+import { CODE_MODES, RATES, parseCodeMode, rateToPermissionMode, resolveRate, } from './protocol/permissions.js';
 const program = new Command();
 function readPackageVersion() {
     try {
@@ -45,11 +45,16 @@ function resolveMode(options) {
     if (options.bypass)
         return { mode: 'bypass', explicit: true };
     if (options.plan)
-        return { mode: 'plan', explicit: true };
-    const requested = options.mode;
-    if (requested && PERMISSION_MODES.includes(requested))
-        return { mode: requested, explicit: true };
-    return { mode: 'default', explicit: false };
+        return { mode: 'default', explicit: true };
+    const rate = resolveRate(options.rate);
+    return { mode: rateToPermissionMode(rate), explicit: Boolean(options.rate) };
+}
+function resolveCodeMode(options) {
+    if (options.mode)
+        return parseCodeMode(options.mode);
+    if (options.plan)
+        return 'simple';
+    return null;
 }
 program
     .command('login', { isDefault: false })
@@ -257,8 +262,9 @@ function collect(value, previous) {
 program
     .argument('[prompt...]', 'send one prompt and exit')
     .option('-p, --print <prompt>', 'send one prompt, print the answer, and exit')
-    .option('-m, --mode <mode>', `permission mode: ${PERMISSION_MODES.join(' | ')}`)
-    .option('--plan', 'start in plan mode (reads only)')
+    .option('-m, --mode <mode>', `which agent runs: ${CODE_MODES.join(' | ')}`)
+    .option('--rate <rate>', `how edits apply: ${RATES.join(' | ')}`, 'manual')
+    .option('--plan', 'shorthand for --mode simple (Plan/Ask Only)')
     .option('--bypass', 'never ask for approval — for CI only, on a machine you are willing to have changed')
     .option('-C, --cwd <dir>', 'run against a different directory')
     .option('--output-format <format>', 'text | json — json puts one object on stdout and everything else on stderr', 'text')
@@ -266,25 +272,42 @@ program
     const cwd = options.cwd ? resolvePath(options.cwd) : process.cwd();
     const oneShot = options.print ?? (prompt.length ? prompt.join(' ') : undefined);
     const { mode, explicit: modeExplicit } = resolveMode(options);
+    const codeMode = resolveCodeMode(options);
+    if (options.mode && !codeMode) {
+        console.error(`\n  Unknown mode ${JSON.stringify(options.mode)}.\n` +
+            `  Choose one of: ${CODE_MODES.join(', ')}\n`);
+        process.exitCode = 2;
+        return;
+    }
     const format = options.outputFormat === 'json' ? 'json' : 'text';
     if (!isInteractiveTerminal()) {
         if (!oneShot) {
             console.error('\n  No interactive terminal detected.\n' +
-                '  Pass a prompt to run once: rivine -p "add tests for auth.ts"\n');
+                '  Pass a prompt to run once: rivine -m backend -p "add tests for auth.ts"\n');
             process.exitCode = 2;
             return;
         }
-        process.exitCode = await runHeadless({ cwd, mode, prompt: oneShot, format });
+        if (!codeMode) {
+            console.error('\n  --mode is required without a terminal to ask on.\n' +
+                `  Choose one of: ${CODE_MODES.join(', ')}\n` +
+                '  e.g. rivine -m backend --rate bypass -p "add tests for auth.ts"\n');
+            process.exitCode = 2;
+            return;
+        }
+        process.exitCode = await runHeadless({ cwd, mode, codeMode, prompt: oneShot, format });
         return;
     }
     if (format === 'json' && oneShot) {
-        process.exitCode = await runHeadless({ cwd, mode, prompt: oneShot, format });
+        process.exitCode = await runHeadless({
+            cwd, mode, codeMode: codeMode ?? 'fullstack', prompt: oneShot, format,
+        });
         return;
     }
     const { waitUntilExit } = render(React.createElement(App, {
         cwd,
         initialMode: mode,
         askForMode: !modeExplicit && !oneShot,
+        initialCodeMode: codeMode ?? (oneShot ? 'fullstack' : undefined),
         oneShot,
     }), { exitOnCtrlC: false });
     const removeTeardown = installTeardown(() => { });

package/dist/protocol/permissions.js

@@ -8,6 +8,44 @@
  * accompanying it; it is not open source and is not licensed for
  * redistribution or derivative works.
  */
+export const RATES = ['manual', 'bypass'];
+export const CYCLE_RATES = ['manual', 'bypass'];
+export function resolveRate(raw) {
+    const key = (raw ?? '').trim().toLowerCase().replace(/[\s_\-]+/g, '');
+    if (key === 'bypass' || key === 'auto' || key === 'yolo' || key === 'bypasspermissions') {
+        return 'bypass';
+    }
+    return 'manual';
+}
+export function rateToPermissionMode(rate) {
+    return rate === 'bypass' ? 'bypass' : 'default';
+}
+export function permissionModeToRate(mode) {
+    return mode === 'bypass' ? 'bypass' : 'manual';
+}
+export const CODE_MODES = [
+    'frontend', 'backend', 'fullstack', 'simple', 'security',
+];
+export const CODE_MODE_LABELS = {
+    frontend: 'Frontend Only',
+    backend: 'Backend Only',
+    fullstack: 'Full Stack',
+    simple: 'Plan/Ask Only',
+    security: 'Security Scan/Fix',
+};
+export function parseCodeMode(raw) {
+    const key = (raw ?? '').trim().toLowerCase().replace(/[\s_\-\/]+/g, '');
+    const table = {
+        frontend: 'frontend', frontendonly: 'frontend', fe: 'frontend',
+        backend: 'backend', backendonly: 'backend', database: 'backend', be: 'backend',
+        backenddatabase: 'backend', backendanddatabase: 'backend', db: 'backend',
+        fullstack: 'fullstack', hybrid: 'fullstack', softwareengineer: 'fullstack',
+        frontendbackenddatabase: 'fullstack',
+        simple: 'simple', plan: 'simple', ask: 'simple', planaskonly: 'simple', docs: 'simple',
+        security: 'security', securityscanfix: 'security', audit: 'security', sec: 'security',
+    };
+    return table[key] ?? null;
+}
 export const PERMISSION_MODES = ['plan', 'default', 'acceptEdits', 'bypass'];
 export const CYCLE_MODES = ['plan', 'default', 'acceptEdits'];
 export function isBatchable(category) {
@@ -209,10 +247,24 @@ export function decide(input) {
     return { verdict: 'ask', category: 'command', reason: 'unrecognised operation' };
 }
 export function nextMode(current) {
-    const index = CYCLE_MODES.indexOf(current);
-    if (index === -1)
-        return 'default';
-    return CYCLE_MODES[(index + 1) % CYCLE_MODES.length];
+    return permissionModeToRate(current) === 'bypass'
+        ? rateToPermissionMode('manual')
+        : rateToPermissionMode('bypass');
+}
+export function nextRate(current) {
+    return current === 'bypass' ? 'manual' : 'bypass';
+}
+export function modeName(mode) {
+    switch (mode) {
+        case 'plan':
+            return 'plan';
+        case 'default':
+            return 'default';
+        case 'acceptEdits':
+            return 'accept edits';
+        case 'bypass':
+            return 'bypass';
+    }
 }
 export function describeMode(mode) {
     switch (mode) {

package/dist/protocol/runner.js

@@ -13,6 +13,7 @@ import { apiUrl } from '../config.js';
 import { accessToken } from '../auth/session.js';
 import { classify, execute } from './fsExecutor.js';
 import { isSealedEnvelope, SessionKey } from './sessionKey.js';
+import { permissionModeToRate } from './permissions.js';
 import { selectRelevantTools } from '../mcp/relevance.js';
 import { readTurnStream } from './stream.js';
 const PENDING_POLL_MS = 1200;
@@ -36,6 +37,9 @@ export class TurnRunner {
     setMode(mode) {
         this.ctx.mode = mode;
     }
+    setCodeMode(mode) {
+        this.ctx.codeMode = mode;
+    }
     writeToShell(data) {
         if (!this.shell)
             return false;
@@ -82,6 +86,8 @@ export class TurnRunner {
                 sessionId: this.ctx.sessionId,
                 message,
                 permissionMode: this.ctx.mode,
+                codeMode: this.ctx.codeMode ?? null,
+                codeRate: permissionModeToRate(this.ctx.mode),
                 cwdSnapshot: snapshot,
                 mcpTools: selection.tools.map(({ name, description, input_schema }) => ({
                     name,
@@ -115,6 +121,23 @@ export class TurnRunner {
                     this.cb.onTool(String(e.name ?? 'tool'), String(detail));
                     break;
                 }
+                case 'file_diff': {
+                    const e = event;
+                    const path = String(e.path ?? '').trim();
+                    if (!path)
+                        break;
+                    this.cb.onFileDiff?.({
+                        path: path.replace(/^\/workspace\/?/, ''),
+                        stat: String(e.stat ?? ''),
+                        patch: String(e.patch ?? ''),
+                        added: Number(e.added ?? 0),
+                        removed: Number(e.removed ?? 0),
+                        isNew: Boolean(e.is_new),
+                        isDelete: Boolean(e.is_delete),
+                        binary: Boolean(e.binary),
+                    });
+                    break;
+                }
                 case 'code_file': {
                     const e = event;
                     const path = String(e.path ?? '').trim();

package/dist/runHeadless.js

@@ -57,6 +57,7 @@ export async function runHeadless(options) {
             sessionId: session.bootstrap.session_id,
             root: options.cwd,
             mode: options.mode,
+            codeMode: options.codeMode,
         }, {
             onToken: (text) => out.token(text),
             onStage: (label) => out.status(label),

package/dist/ui/App.js

@@ -16,28 +16,31 @@ import { fetchCredits, InsufficientCredits } from '../api/workspace.js';
 import { openBrowser } from '../auth/pkce.js';
 import { siteUrl } from '../config.js';
 import { TurnRunner } from '../protocol/runner.js';
-import { describeMode, isBatchable, mcpServerOf, nextMode, } from '../protocol/permissions.js';
+import { CODE_MODE_LABELS, describeMode, isBatchable, mcpServerOf, nextMode, } from '../protocol/permissions.js';
 import { creditShortfall, startSession } from '../session.js';
 import { sanitizeForModel } from '../protocol/shell.js';
 import { diff as gitDiff, gitBranchLine, prCreate } from '../protocol/git.js';
-import { Activity, ApprovalPrompt, Banner, ModePicker, WORDMARK_MIN_COLUMNS, ChoicePrompt, Completions, HelpPanel, StatusBar, TranscriptLine, ShellPane, SHELL_PANE_LINES, } from './components.js';
+import { Activity, ApprovalPrompt, Banner, CodeModePicker, ModePicker, WORDMARK_MIN_COLUMNS, ChoicePrompt, Completions, HelpPanel, StatusBar, TranscriptLine, ShellPane, SHELL_PANE_LINES, } from './components.js';
 import { TokenBuffer, terminalWidth } from './render.js';
 import { color } from './theme.js';
-import { completionsFor } from './slashCommands.js';
+import { completeInput, completionsFor } from './slashCommands.js';
 function trimToPane(text) {
     const lines = text.split('\n');
     return lines.length > SHELL_PANE_LINES * 2
         ? lines.slice(-SHELL_PANE_LINES * 2).join('\n')
         : text;
 }
+const ESC = String.fromCharCode(27);
 function grantKey(category, request) {
     if (category !== 'mcp')
         return category;
     return `mcp:${mcpServerOf(String(request.args?.tool ?? '')) ?? 'unknown'}`;
 }
-export function App({ cwd, initialMode, askForMode, oneShot }) {
+export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot }) {
     const { exit } = useApp();
-    const [phase, setPhase] = useState(askForMode ? 'mode' : 'starting');
+    const [codeMode, setCodeMode] = useState(initialCodeMode);
+    const codeModeChosenRef = useRef(Boolean(initialCodeMode));
+    const [phase, setPhase] = useState(initialCodeMode ? (askForMode ? 'mode' : 'starting') : 'codeMode');
     const sessionReadyRef = useRef(false);
     const modeChosenRef = useRef(!askForMode);
     const [lines, setLines] = useState([]);
@@ -48,6 +51,14 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
     const [tool, setTool] = useState('');
     const [mode, setMode] = useState(initialMode);
     const [input, setInput] = useState('');
+    const [inputSeed, setInputSeed] = useState('');
+    const [inputNonce, setInputNonce] = useState(0);
+    const [screenGeneration, setScreenGeneration] = useState(0);
+    const setPromptText = useCallback((text) => {
+        setInput(text);
+        setInputSeed(text);
+        setInputNonce((n) => n + 1);
+    }, []);
     const [showHelp, setShowHelp] = useState(false);
     const [approval, setApproval] = useState(null);
     const [question, setQuestion] = useState(null);
@@ -103,6 +114,18 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
         catch {
         }
     }, []);
+    const pickCodeMode = useCallback((chosen) => {
+        setCodeMode(chosen);
+        codeModeChosenRef.current = true;
+        runnerRef.current?.setCodeMode(chosen);
+        push('system', `Mode: ${CODE_MODE_LABELS[chosen]}`);
+        setPhase(modeChosenRef.current
+            ? (sessionReadyRef.current ? 'ready' : 'starting')
+            : 'mode');
+    }, [push]);
+    const cancelCodeModePick = useCallback(() => {
+        setPhase(sessionReadyRef.current ? 'ready' : 'starting');
+    }, []);
     const pickMode = useCallback((chosen) => {
         setMode(chosen);
         modeChosenRef.current = true;
@@ -114,6 +137,9 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
         }
         push('system', 'Ask for anything. /help for commands.');
     }, [push]);
+    const cancelModePick = useCallback(() => {
+        setPhase(sessionReadyRef.current ? 'ready' : 'starting');
+    }, []);
     const quit = useCallback(() => {
         void runnerRef.current?.shutdown().finally(() => exit());
     }, [exit]);
@@ -137,10 +163,13 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
                 quit();
                 return true;
             case '/clear':
+                process.stdout.write(ESC + '[2J' + ESC + '[3J' + ESC + '[H');
                 setLines([]);
+                setShowHelp(false);
+                setScreenGeneration((n) => n + 1);
                 return true;
             case '/mode':
-                cycleMode();
+                setPhase('mode');
                 return true;
             case '/plan':
                 setMode('plan');
@@ -201,7 +230,7 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
     }, [cwd, cycleMode, mode, push, quit, refreshBalance, status]);
     const submit = useCallback(async (message) => {
         const text = message.trim();
-        setInput('');
+        setPromptText('');
         if (!runnerRef.current)
             return;
         if (runnerRef.current.interactiveShell) {
@@ -309,6 +338,22 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
                             push('file', path.replace(/^\/workspace\//, ''));
                         }
                     },
+                    onFileDiff: (diff) => {
+                        settleLive();
+                        if (diff.binary) {
+                            push('file', `${diff.path}  (binary)`);
+                            return;
+                        }
+                        push('file', diff.stat || diff.path);
+                        for (const line of diff.patch.split('\n')) {
+                            if (!line || line.startsWith('---') || line.startsWith('+++'))
+                                continue;
+                            push(line.startsWith('+') ? 'diff-add'
+                                : line.startsWith('-') ? 'diff-del'
+                                    : line.startsWith('@@') ? 'diff-hunk'
+                                        : 'diff-ctx', line);
+                        }
+                    },
                     onNotice: (text) => push('notice', text),
                     onOutput: (text) => {
                         shellBuf.current = trimToPane(shellBuf.current + sanitizeForModel(text));
@@ -418,6 +463,12 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
             cycleMode();
             return;
         }
+        if (key.tab) {
+            const completed = completeInput(input);
+            if (completed !== input)
+                setPromptText(completed);
+            return;
+        }
         if (key.escape && runnerRef.current?.killShell()) {
             push('notice', 'Stopped the running command.');
             return;
@@ -466,9 +517,9 @@ export function App({ cwd, initialMode, askForMode, oneShot }) {
     const compactBanner = terminalWidth() < WORDMARK_MIN_COLUMNS || Boolean(oneShot);
     const matches = completionsFor(input);
     const busy = phase !== 'ready';
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: staticItems, children: (item) => item.kind === 'banner' ? (_jsx(Banner, { compact: compactBanner }, "banner")) : (_jsx(TranscriptLine, { line: item.line }, item.line.id)) }), live ? (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: color('text'), children: live }) })) : null, shellView ? _jsx(ShellPane, { text: shellView, live: shellActive }) : null, phase === 'running' && stage ? _jsx(Activity, { stage: stage, tool: tool }) : null, phase === 'mode' ? _jsx(ModePicker, { onPick: pickMode }) : null, phase === 'approval' && approval ? (_jsx(ApprovalPrompt, { approval: approval, allowAlways: isBatchable(approval.category), onChoice: answerApproval })) : null, phase === 'question' && question ? (question.options?.length ? (_jsx(ChoicePrompt, { prompt: question.prompt, options: question.options, onPick: answerQuestion })) : (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsx(Text, { color: color('accent'), bold: true, children: question.prompt }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: color('user'), children: '› ' }), _jsx(TextInput, { placeholder: "your answer", onSubmit: answerQuestion })] })] }))) : null, phase === 'hitl' && hitl ? (_jsx(ChoicePrompt, { prompt: hitl.tool ? `${hitl.tool} — ${hitl.message}` : hitl.message, options: hitl.options?.length ? hitl.options : ['Approve', 'Decline'], onPick: (value) => answerHitl(hitl.options?.length
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: staticItems, children: (item) => item.kind === 'banner' ? (_jsx(Banner, { compact: compactBanner }, "banner")) : (_jsx(TranscriptLine, { line: item.line }, item.line.id)) }, screenGeneration), live ? (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: color('text'), children: live }) })) : null, shellView ? _jsx(ShellPane, { text: shellView, live: shellActive }) : null, phase === 'running' && stage ? _jsx(Activity, { stage: stage, tool: tool }) : null, phase === 'codeMode' ? (_jsx(CodeModePicker, { onPick: pickCodeMode, current: codeModeChosenRef.current ? codeMode : undefined, onCancel: codeModeChosenRef.current ? cancelCodeModePick : undefined })) : null, phase === 'mode' ? (_jsx(ModePicker, { onPick: pickMode, current: modeChosenRef.current ? mode : undefined, onCancel: modeChosenRef.current ? cancelModePick : undefined })) : null, phase === 'approval' && approval ? (_jsx(ApprovalPrompt, { approval: approval, allowAlways: isBatchable(approval.category), onChoice: answerApproval })) : null, phase === 'question' && question ? (question.options?.length ? (_jsx(ChoicePrompt, { prompt: question.prompt, options: question.options, onPick: answerQuestion })) : (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsx(Text, { color: color('accent'), bold: true, children: question.prompt }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: color('user'), children: '› ' }), _jsx(TextInput, { placeholder: "your answer", onSubmit: answerQuestion })] })] }))) : null, phase === 'hitl' && hitl ? (_jsx(ChoicePrompt, { prompt: hitl.tool ? `${hitl.tool} — ${hitl.message}` : hitl.message, options: hitl.options?.length ? hitl.options : ['Approve', 'Decline'], onPick: (value) => answerHitl(hitl.options?.length
                     ? { approved: true, feedback: value }
-                    : { approved: value === 'Approve' }) })) : null, showHelp && phase === 'ready' ? _jsx(HelpPanel, {}) : null, phase === 'ready' && !oneShot ? (_jsxs(_Fragment, { children: [_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { color: color('user'), children: '› ' }), _jsx(TextInput, { placeholder: "What should Rivine build?", onChange: setInput, onSubmit: (value) => void submit(value) })] }), _jsx(Completions, { matches: matches })] })) : null, phase === 'starting' ? _jsx(Activity, { stage: "Starting\u2026", tool: "" }) : null, _jsx(StatusBar, { info: {
+                    : { approved: value === 'Approve' }) })) : null, showHelp && phase === 'ready' ? _jsx(HelpPanel, {}) : null, phase === 'ready' && !oneShot ? (_jsxs(_Fragment, { children: [_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { color: color('user'), children: '› ' }), _jsx(TextInput, { defaultValue: inputSeed, placeholder: "What should Rivine build?", onChange: setInput, onSubmit: (value) => void submit(value) }, inputNonce)] }), _jsx(Completions, { matches: matches })] })) : null, phase === 'starting' ? _jsx(Activity, { stage: "Starting\u2026", tool: "" }) : null, _jsx(StatusBar, { info: {
                     mode,
                     project: status.project,
                     cloudhandle: status.cloudhandle,

package/dist/ui/components.js

@@ -9,12 +9,13 @@
  * redistribution or derivative works.
  */
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import React from 'react';
 import { Box, Text, useInput } from 'ink';
 import { Spinner } from '@inkjs/ui';
 import { ASCII_ONLY, BOX, color, glyph, lineColor } from './theme.js';
-import { fit, terminalWidth, wrap } from './render.js';
+import { fit, terminalWidth, wrap, terminalColumns } from './render.js';
 import { SLASH_COMMANDS } from './slashCommands.js';
-import { describeMode } from '../protocol/permissions.js';
+import { describeMode, modeName } from '../protocol/permissions.js';
 const WORDMARK = [
     '█▀▄ ▀█▀ █   █ ▀█▀ █▄ █ █▀▀    █▀▀ █▀█ █▀▄ █▀▀',
     '█▀▄  █  ▀▄ ▄▀  █  █ ▀█ █▀     █   █ █ █ █ █▀ ',
@@ -39,24 +40,59 @@ export function Activity({ stage, tool }) {
     const label = tool ? `${stage} · ${tool}` : stage;
     return (_jsx(Box, { paddingX: 1, children: _jsx(Spinner, { label: fit(label, width - 6) }) }));
 }
-export function ModePicker({ onPick }) {
+export function CodeModePicker({ onPick, current, onCancel, }) {
     const width = terminalWidth();
     const options = [
-        { key: '1', mode: 'plan', label: 'Plan', detail: 'reads and answers, changes nothing' },
-        { key: '2', mode: 'default', label: 'Ask me', detail: 'approve each write and command' },
-        { key: '3', mode: 'acceptEdits', label: 'Accept edits', detail: 'writes apply, commands still ask' },
-        { key: '4', mode: 'bypass', label: 'Full speed', detail: 'no prompts inside this project' },
+        { key: '1', mode: 'frontend', label: 'Frontend Only', detail: 'UI and client tier' },
+        { key: '2', mode: 'backend', label: 'Backend Only', detail: 'server, API, and database' },
+        { key: '3', mode: 'fullstack', label: 'Full Stack', detail: 'across every tier in one turn' },
+        { key: '4', mode: 'simple', label: 'Plan/Ask Only', detail: 'plan, answer, document, refresh, ship' },
+        { key: '5', mode: 'security', label: 'Security Scan/Fix', detail: 'find, verify, and patch' },
     ];
     useInput((input, key) => {
+        if (key.escape && onCancel) {
+            onCancel();
+            return;
+        }
+        if (key.return && current) {
+            onPick(current);
+            return;
+        }
+        const found = options.find((o) => o.key === input);
+        if (found)
+            onPick(found.mode);
+    });
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsx(Text, { color: color('text'), bold: true, children: "Mode \u2014 which agent should handle this?" }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: options.map((o) => {
+                    const active = o.mode === current;
+                    return (_jsxs(Box, { children: [_jsx(Text, { color: active ? color('success') : color('faint'), children: active ? ' \u203a' : '  ' }), _jsx(Text, { color: color('accent'), children: o.key }), _jsx(Text, { color: color('faint'), children: " \u00B7 " }), _jsx(Text, { color: active ? color('text') : color('muted'), bold: active, children: o.label }), _jsx(Text, { color: color('faint'), children: " \u2014 " }), _jsx(Text, { color: color('faint'), children: fit(o.detail, Math.max(10, width - 34)) })] }, o.key));
+                }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: color('faint'), children: current ? 'esc keeps the current mode' : 'pick a number to begin' }) })] }));
+}
+export function ModePicker({ onPick, current, onCancel, }) {
+    const width = terminalWidth();
+    const options = [
+        { key: '1', mode: 'default', label: 'Manual', detail: 'ask for approval before each edit' },
+        { key: '2', mode: 'bypass', label: 'Bypass', detail: 'edit files in this project without asking' },
+    ];
+    useInput((input, key) => {
+        if (key.escape && onCancel) {
+            onCancel();
+            return;
+        }
         if (key.return) {
-            onPick('acceptEdits');
+            onPick(current ?? 'default');
             return;
         }
         const found = options.find((o) => o.key === input);
         if (found)
             onPick(found.mode);
     });
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsx(Text, { color: color('text'), bold: true, children: "How should Rivine work in this project?" }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: options.map((o) => (_jsxs(Box, { children: [_jsx(Text, { color: color('accent'), children: `  ${o.key}` }), _jsx(Text, { color: color('faint'), children: " \u00B7 " }), _jsx(Text, { color: color('text'), children: o.label.padEnd(13) }), _jsx(Text, { color: color('muted'), children: fit(o.detail, Math.max(10, width - 24)) })] }, o.key))) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: color('faint'), children: fit('press a number · enter for accept edits · shift+tab changes it later', width - 4) }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsx(Text, { color: color('text'), bold: true, children: "Rate \u2014 how should Rivine apply edits?" }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: options.map((o) => {
+                    const active = o.mode === current;
+                    return (_jsxs(Box, { children: [_jsx(Text, { color: active ? color('success') : color('faint'), children: active ? ' ›' : '  ' }), _jsx(Text, { color: color('accent'), children: o.key }), _jsx(Text, { color: color('faint'), children: " \u00B7 " }), _jsx(Text, { color: active ? color('text') : color('muted'), bold: active, children: o.label.padEnd(13) }), _jsx(Text, { color: color('muted'), children: fit(o.detail, Math.max(10, width - 26)) })] }, o.key));
+                }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: color('faint'), children: fit(current
+                        ?
+                            `press a number · enter keeps ${options.find((o) => o.mode === current)?.label ?? 'this'} · esc cancels`
+                        : 'press a number · enter for accept edits · shift+tab changes it later', width - 4) }) })] }));
 }
 export const SHELL_PANE_LINES = 12;
 export function ShellPane({ text, live }) {
@@ -104,8 +140,51 @@ export function HelpPanel() {
     return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsx(Text, { color: color('text'), bold: true, children: "Commands" }), SLASH_COMMANDS.map((c) => (_jsxs(Box, { children: [_jsx(Text, { color: color('accent'), children: `  ${c.name}`.padEnd(12) }), _jsx(Text, { color: color('muted'), children: c.summary })] }, c.name))), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: color('faint'), children: "  shift+tab   change permission mode" }), _jsx(Text, { color: color('faint'), children: "  esc         stop the current turn" }), _jsx(Text, { color: color('faint'), children: "  ctrl+c      quit" })] })] }));
 }
 export function StatusBar({ info }) {
-    const width = terminalWidth();
-    const narrow = width < 76;
+    const width = terminalColumns();
     const dot = info.busy ? color('warn') : color('success');
-    return (_jsxs(Box, { paddingX: 1, children: [_jsxs(Text, { color: dot, children: [BOX.dot, " "] }), !narrow ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: color('brand'), bold: true, children: "Rivine" }), _jsx(Text, { color: color('faint'), children: " \u00B7 " })] })) : null, _jsx(Text, { color: color('muted'), children: describeMode(info.mode) }), info.project ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: color('faint'), children: " \u00B7 " }), _jsx(Text, { color: color('muted'), children: fit(info.project, 18, true) })] })) : null, !narrow && info.cloudhandle ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: color('faint'), children: " \u00B7 " }), _jsx(Text, { color: color('brand'), children: fit(info.cloudhandle, 22) }), info.bcidMasked ? _jsx(Text, { color: color('faint'), children: ` ${info.bcidMasked}` }) : null] })) : null, info.balance !== null ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: color('faint'), children: " \u00B7 " }), _jsxs(Text, { color: info.balance < 10 ? color('warn') : color('muted'), children: ["$", info.balance.toFixed(2)] })] })) : null, !narrow ? _jsx(Text, { color: color('faint'), children: '  /help' }) : null] }));
+    const segments = [];
+    let used = 2;
+    let full = true;
+    const add = (text, node) => {
+        if (!full)
+            return false;
+        const cost = (segments.length > 0 ? 3 : 0) + text.length;
+        if (used + cost > width - 2) {
+            full = false;
+            return false;
+        }
+        used += cost;
+        segments.push({ node, text });
+        return true;
+    };
+    const modeText = describeMode(info.mode);
+    const modeShort = modeName(info.mode);
+    const brand = 'Rivine';
+    const fitsBrandAndFullMode = 2 + brand.length + 3 + modeText.length <= width - 2;
+    if (2 + brand.length + 3 + modeShort.length <= width - 2) {
+        add(brand, (_jsx(Text, { color: color('brand'), bold: true, children: brand })));
+    }
+    const shownMode = fitsBrandAndFullMode ? modeText : modeShort;
+    used += (segments.length > 0 ? 3 : 0) + shownMode.length;
+    segments.push({
+        node: _jsx(Text, { color: color('muted'), children: shownMode }),
+        text: shownMode,
+    });
+    if (info.balance !== null) {
+        const money = `$${info.balance.toFixed(2)}`;
+        add(money, _jsx(Text, { color: info.balance < 10 ? color('warn') : color('muted'), children: money }));
+    }
+    if (info.project) {
+        const project = fit(info.project, 18, true);
+        add(project, _jsx(Text, { color: color('muted'), children: project }));
+    }
+    if (info.cloudhandle) {
+        const handle = fit(info.cloudhandle, 22);
+        const masked = info.bcidMasked ? ` ${info.bcidMasked}` : '';
+        add(handle + masked, _jsxs(_Fragment, { children: [_jsx(Text, { color: color('brand'), children: handle }), masked ? _jsx(Text, { color: color('faint'), children: masked }) : null] }));
+    }
+    if (used + 8 <= width - 2) {
+        segments.push({ node: _jsx(Text, { color: color('faint'), children: '  /help' }), text: '  /help' });
+    }
+    return (_jsxs(Box, { paddingX: 1, children: [_jsxs(Text, { color: dot, children: [BOX.dot, " "] }), segments.map((segment, i) => (_jsxs(React.Fragment, { children: [i > 0 && segment.text !== '  /help' ? (_jsx(Text, { color: color('faint'), children: " \u00B7 " })) : null, segment.node] }, i)))] }));
 }

package/dist/ui/render.js

@@ -49,6 +49,10 @@ export class TokenBuffer {
         this.pending = '';
     }
 }
+export function terminalColumns() {
+    const columns = process.stdout.columns;
+    return Math.max(20, columns && columns > 0 ? columns : 80);
+}
 export function terminalWidth() {
     const columns = process.stdout.columns;
     return Math.max(48, Math.min(columns && columns > 0 ? columns : 80, 120));

package/dist/ui/theme.js

@@ -49,6 +49,10 @@ const GLYPHS_UNICODE = {
     notice: '!',
     error: '✗',
     system: '◆',
+    'diff-add': ' ',
+    'diff-del': ' ',
+    'diff-hunk': ' ',
+    'diff-ctx': ' ',
 };
 const GLYPHS_ASCII = {
     user: '>',
@@ -59,6 +63,10 @@ const GLYPHS_ASCII = {
     notice: '!',
     error: 'x',
     system: '#',
+    'diff-add': ' ',
+    'diff-del': ' ',
+    'diff-hunk': ' ',
+    'diff-ctx': ' ',
 };
 export const ASCII_ONLY = process.env.RIVINE_ASCII === '1';
 export function glyph(kind) {
@@ -73,6 +81,10 @@ const LINE_ROLE = {
     notice: 'warn',
     error: 'danger',
     system: 'brand',
+    'diff-add': 'success',
+    'diff-del': 'danger',
+    'diff-hunk': 'brand',
+    'diff-ctx': 'faint',
 };
 export function lineColor(kind) {
     return color(LINE_ROLE[kind]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@beunec/rivine",
-  "version": "0.1.4",
-  "description": "Rivine Code in your terminal — Beunec's software engineering runtime constructs, working on the files you already have open.",
+  "version": "0.2.0",
+  "description": "Rivine Code in your terminal \u2014 Beunec's software engineering runtime constructs, working on the files you already have open.",
   "license": "UNLICENSED",
   "author": "Beunec Technologies",
   "homepage": "https://aselius.beunec.com",