@beunec/rivine 0.2.0 → 0.3.0

package/README.md

@@ -60,11 +60,11 @@ 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
+### Mode — what Rivine Code works on
 
-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.
+Each Mode 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 |
 |---|---|---|
@@ -93,9 +93,14 @@ 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.
+The first interactive session asks for Mode, then Rate, before the prompt
+opens — including for a one-shot `rivine "..."`, which used to assume Full
+Stack. `-m …` and `--rate …` skip the question you already answered on the
+command line. Shift+Tab toggles the Rate. `/mode` and `/rate` reopen either
+picker later.
+
+Without a terminal to ask on — a pipe, CI, another agent driving this — `-m`
+is required and the run stops with the list rather than guessing.
 
 What stays gated:
 
@@ -138,9 +143,10 @@ rivine mcp login <name>         sign in to a remote MCP server
 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`. `/mode` opens the
-permission picker. Shift+Tab cycles plan / default / accept edits. Ctrl+C
+In a session: type `/` and press Tab. `/help` `/mode` `/rate` `/plan` `/accept`
+`/status` `/diff` `/pr` `/mcp` `/credits` `/clear` `/exit`. Startup asks for
+**Mode** (what Rivine Code works on) then **Rate** (Manual or Bypass); `/mode`
+and `/rate` reopen those pickers. Shift+Tab toggles Manual ⇄ Bypass. Ctrl+C
 quits cleanly.
 
 `/diff` shows what changed in the working tree. `/pr` prepares a pull request

package/dist/api/workspace.js

@@ -120,12 +120,20 @@ export async function resumeTurn(args) {
             decision: args.approved ? 'approved' : 'rejected',
             feedback: args.feedback ?? '',
             modified_args: args.modifiedArgs ?? null,
+            code_mode: args.codeMode ?? null,
+            code_rate: args.codeRate ?? null,
             cli_session_key: args.sessionKey ?? null,
             cli_session_id: args.sessionId,
         }),
     });
     if (!res.ok) {
-        throw new Error(`Could not resume the turn (HTTP ${res.status}).`);
+        const detail = await res
+            .json()
+            .then((b) => String(b?.detail ?? b?.error ?? '').trim())
+            .catch(() => '');
+        throw new Error(detail
+            ? `Could not resume the turn (HTTP ${res.status}): ${detail}`
+            : `Could not resume the turn (HTTP ${res.status}).`);
     }
     return (await res.json());
 }

package/dist/index.js

@@ -10,6 +10,7 @@
  * redistribution or derivative works.
  */
 import { readFileSync } from 'node:fs';
+import { realpath } from 'node:fs/promises';
 import { dirname, join, resolve as resolvePath } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { render } from 'ink';
@@ -18,6 +19,7 @@ import { Command } from 'commander';
 import { App } from './ui/App.js';
 import { runHeadless } from './runHeadless.js';
 import { isInteractiveTerminal, installTeardown } from './ui/headless.js';
+import { emitNotice } from './ui/notices.js';
 import { login, logout, status } from './auth/session.js';
 import { openBrowser } from './auth/pkce.js';
 import { apiUrl, siteUrl } from './config.js';
@@ -262,14 +264,15 @@ 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>', `which agent runs: ${CODE_MODES.join(' | ')}`)
-    .option('--rate <rate>', `how edits apply: ${RATES.join(' | ')}`, 'manual')
+    .option('-m, --mode <mode>', `what Rivine Code works on: ${CODE_MODES.join(' | ')}`)
+    .option('--rate <rate>', `how edits apply: ${RATES.join(' | ')}`)
     .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')
     .action(async (prompt, options) => {
-    const cwd = options.cwd ? resolvePath(options.cwd) : process.cwd();
+    const requested = options.cwd ? resolvePath(options.cwd) : process.cwd();
+    const cwd = await realpath(requested).catch(() => requested);
     const oneShot = options.print ?? (prompt.length ? prompt.join(' ') : undefined);
     const { mode, explicit: modeExplicit } = resolveMode(options);
     const codeMode = resolveCodeMode(options);
@@ -298,19 +301,29 @@ program
         return;
     }
     if (format === 'json' && oneShot) {
-        process.exitCode = await runHeadless({
-            cwd, mode, codeMode: codeMode ?? 'fullstack', prompt: oneShot, format,
-        });
+        if (!codeMode) {
+            console.error('\n  --mode is required with --output-format json.\n' +
+                `  Choose one of: ${CODE_MODES.join(', ')}\n` +
+                '  e.g. rivine -m backend --output-format json -p "add tests for auth.ts"\n');
+            process.exitCode = 2;
+            return;
+        }
+        process.exitCode = await runHeadless({ cwd, mode, codeMode, prompt: oneShot, format });
         return;
     }
     const { waitUntilExit } = render(React.createElement(App, {
         cwd,
         initialMode: mode,
         askForMode: !modeExplicit && !oneShot,
-        initialCodeMode: codeMode ?? (oneShot ? 'fullstack' : undefined),
+        initialCodeMode: codeMode ?? undefined,
         oneShot,
     }), { exitOnCtrlC: false });
-    const removeTeardown = installTeardown(() => { });
+    const removeTeardown = installTeardown(() => { }, {
+        onRejection: (err) => {
+            const message = err?.message ?? String(err);
+            emitNotice(`Background task failed: ${message}`);
+        },
+    });
     try {
         await waitUntilExit();
     }

package/dist/protocol/permissions.js

@@ -47,7 +47,6 @@ export function parseCodeMode(raw) {
     return table[key] ?? null;
 }
 export const PERMISSION_MODES = ['plan', 'default', 'acceptEdits', 'bypass'];
-export const CYCLE_MODES = ['plan', 'default', 'acceptEdits'];
 export function isBatchable(category) {
     return category === 'write' || category === 'mcp';
 }
@@ -251,17 +250,13 @@ export function nextMode(current) {
         ? 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';
+            return 'manual';
         case 'bypass':
             return 'bypass';
     }
@@ -271,10 +266,23 @@ export function describeMode(mode) {
         case 'plan':
             return 'plan · reads only';
         case 'default':
-            return 'default · asks before changes';
         case 'acceptEdits':
-            return 'accept edits · writes apply, commands ask';
+            return 'manual · asks before edits';
         case 'bypass':
-            return 'bypass · no prompts';
+            return 'bypass · edits without asking';
+    }
+}
+export function codeModeName(mode) {
+    switch (mode) {
+        case 'frontend':
+            return 'Frontend';
+        case 'backend':
+            return 'Backend';
+        case 'fullstack':
+            return 'Full Stack';
+        case 'simple':
+            return 'Plan/Ask';
+        case 'security':
+            return 'Security';
     }
 }

package/dist/protocol/runner.js

@@ -16,6 +16,7 @@ import { isSealedEnvelope, SessionKey } from './sessionKey.js';
 import { permissionModeToRate } from './permissions.js';
 import { selectRelevantTools } from '../mcp/relevance.js';
 import { readTurnStream } from './stream.js';
+import { displayStage } from '../ui/render.js';
 const PENDING_POLL_MS = 1200;
 export class TurnRunner {
     ctx;
@@ -72,6 +73,14 @@ export class TurnRunner {
         this.ctx.mcpTools = tools;
     }
     async run(message, snapshot) {
+        if (!this.ctx.codeMode) {
+            return {
+                answer: '',
+                cancelled: false,
+                error: 'No Mode selected. Pick one with /mode — Frontend Only, Backend Only, ' +
+                    'Full Stack, Plan/Ask Only, or Security Scan/Fix.',
+            };
+        }
         this.stopped = false;
         this.startPolling();
         const selection = selectRelevantTools(message, this.ctx.mcpTools ?? []);
@@ -112,9 +121,12 @@ export class TurnRunner {
                     answer += event.content ?? '';
                     this.cb.onToken(event.content ?? '');
                     break;
-                case 'stage':
-                    this.cb.onStage(String(event.label ?? ''));
+                case 'stage': {
+                    const label = displayStage(String(event.label ?? ''));
+                    if (label)
+                        this.cb.onStage(label);
                     break;
+                }
                 case 'tool_call_start': {
                     const e = event;
                     const detail = e.args?.command ?? e.args?.filename ?? '';
@@ -158,6 +170,7 @@ export class TurnRunner {
                         options: extractOptions(e),
                         multi: Boolean(e.ui_schema?.multi ?? e.args?.multi),
                         threadId: String(e.thread_id ?? `${this.ctx.workspaceId}_${this.ctx.chatSpaceId}`),
+                        kind: hitlKind(e.hitl_type, e.args),
                     };
                     break;
                 }
@@ -184,6 +197,8 @@ export class TurnRunner {
         let answer = '';
         for (let round = 0; current && round < 25; round += 1) {
             const decision = await this.enqueuePrompt(() => this.cb.requestDecision(current));
+            if (decision.codeMode)
+                this.setCodeMode(decision.codeMode);
             const body = (await resumeTurn({
                 workspaceId: this.ctx.workspaceId,
                 chatSpaceId: this.ctx.chatSpaceId,
@@ -193,6 +208,8 @@ export class TurnRunner {
                 approved: decision.approved,
                 feedback: decision.feedback,
                 modifiedArgs: decision.modifiedArgs,
+                codeMode: decision.codeMode ?? null,
+                codeRate: decision.codeMode ? permissionModeToRate(this.ctx.mode) : null,
             }));
             answer = String(body.response ?? answer);
             const meta = body.context_metadata ?? {};
@@ -203,6 +220,7 @@ export class TurnRunner {
                     options: extractOptions({ ui_schema: meta.hitl_ui_schema, args: meta.hitl_args }),
                     multi: Boolean(meta.hitl_ui_schema?.multi),
                     threadId: String(meta.thread_id ?? current.threadId),
+                    kind: hitlKind(meta.hitl_type, meta.hitl_args),
                 }
                 : null;
         }
@@ -339,9 +357,26 @@ export class TurnRunner {
         await closeSession(this.ctx.sessionId);
     }
 }
-function extractOptions(event) {
+export function hitlKind(hitlType, args) {
+    const field = args && typeof args === 'object' ? String(args.field ?? '') : '';
+    return String(hitlType ?? '') === 'code_clarification' && field === 'mode'
+        ? 'code_mode'
+        : 'other';
+}
+export function extractOptions(event) {
+    const schemaEnum = (() => {
+        const props = event?.ui_schema?.properties;
+        if (!props || typeof props !== 'object')
+            return undefined;
+        for (const value of Object.values(props)) {
+            if (Array.isArray(value?.enum) && value.enum.length)
+                return value.enum;
+        }
+        return undefined;
+    })();
     const raw = event?.ui_schema?.options ??
         event?.ui_schema?.choices ??
+        schemaEnum ??
         event?.args?.options ??
         event?.options;
     if (!Array.isArray(raw) || raw.length === 0)

package/dist/runHeadless.js

@@ -11,6 +11,7 @@
 import { InsufficientCredits } from './api/workspace.js';
 import { siteUrl } from './config.js';
 import { TurnRunner } from './protocol/runner.js';
+import { permissionModeToRate } from './protocol/permissions.js';
 import { creditShortfall, startSession } from './session.js';
 import { HeadlessRenderer, installTeardown } from './ui/headless.js';
 export async function runHeadless(options) {
@@ -84,7 +85,9 @@ export async function runHeadless(options) {
             },
             requestDecision: async (request) => {
                 out.endAnswer();
-                out.line('notice', `Approval needed but no terminal to ask on: ${request.message}`);
+                out.line('notice', request.kind === 'code_mode'
+                    ? 'No Mode selected. Pass -m frontend|backend|fullstack|simple|security.'
+                    : `Approval needed but no terminal to ask on: ${request.message}`);
                 return { approved: false, feedback: 'No interactive terminal available.' };
             },
             askQuestion: async (question) => {
@@ -111,7 +114,7 @@ export async function runHeadless(options) {
         if (out.refusalCount > 0) {
             const advice = options.mode === 'plan'
                 ? 'plan mode makes no changes — re-run without --plan'
-                : `re-run with -m acceptEdits, or --bypass in CI (mode was ${options.mode})`;
+                : `re-run with --rate bypass (Rate was ${permissionModeToRate(options.mode)})`;
             const message = `${out.refusalCount} operation(s) were skipped because there is no terminal ` +
                 `to approve them: ${advice}.`;
             out.line('error', message);

package/dist/ui/App.js

@@ -20,10 +20,12 @@ import { CODE_MODE_LABELS, describeMode, isBatchable, mcpServerOf, nextMode, } f
 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, CodeModePicker, ModePicker, WORDMARK_MIN_COLUMNS, ChoicePrompt, Completions, HelpPanel, StatusBar, TranscriptLine, ShellPane, SHELL_PANE_LINES, } from './components.js';
+import { Activity, ApprovalPrompt, Banner, CodeModePicker, RatePicker, WORDMARK_MIN_COLUMNS, ChoicePrompt, Completions, HelpPanel, StatusBar, TranscriptLine, ShellPane, SHELL_PANE_LINES, } from './components.js';
 import { TokenBuffer, terminalWidth } from './render.js';
+import { initialPhase, phaseAfterBootstrap, phaseAfterModePicked, phaseAfterRatePicked, } from './phase.js';
 import { color } from './theme.js';
 import { completeInput, completionsFor } from './slashCommands.js';
+import { setNoticeSink } from './notices.js';
 function trimToPane(text) {
     const lines = text.split('\n');
     return lines.length > SHELL_PANE_LINES * 2
@@ -40,7 +42,7 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
     const { exit } = useApp();
     const [codeMode, setCodeMode] = useState(initialCodeMode);
     const codeModeChosenRef = useRef(Boolean(initialCodeMode));
-    const [phase, setPhase] = useState(initialCodeMode ? (askForMode ? 'mode' : 'starting') : 'codeMode');
+    const [phase, setPhase] = useState(initialPhase(Boolean(initialCodeMode), Boolean(askForMode)));
     const sessionReadyRef = useRef(false);
     const modeChosenRef = useRef(!askForMode);
     const [lines, setLines] = useState([]);
@@ -74,6 +76,8 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
     const mcpRef = useRef(null);
     const snapshotRef = useRef(null);
     const snapshotSentRef = useRef(false);
+    const minCreditsRef = useRef({ rivine_code: 10 });
+    const queuedPromptRef = useRef(null);
     const answerRef = useRef(null);
     const lineId = useRef(0);
     const liveText = useRef('');
@@ -119,9 +123,10 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
         codeModeChosenRef.current = true;
         runnerRef.current?.setCodeMode(chosen);
         push('system', `Mode: ${CODE_MODE_LABELS[chosen]}`);
-        setPhase(modeChosenRef.current
-            ? (sessionReadyRef.current ? 'ready' : 'starting')
-            : 'mode');
+        setPhase(phaseAfterModePicked({
+            sessionReady: sessionReadyRef.current,
+            rateChosen: modeChosenRef.current,
+        }));
     }, [push]);
     const cancelCodeModePick = useCallback(() => {
         setPhase(sessionReadyRef.current ? 'ready' : 'starting');
@@ -130,8 +135,11 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
         setMode(chosen);
         modeChosenRef.current = true;
         runnerRef.current?.setMode(chosen);
-        setPhase(sessionReadyRef.current ? 'ready' : 'starting');
-        push('system', `Mode: ${describeMode(chosen)}`);
+        setPhase(phaseAfterRatePicked({
+            sessionReady: sessionReadyRef.current,
+            rateChosen: true,
+        }));
+        push('system', `Rate: ${describeMode(chosen)}`);
         if (chosen === 'bypass') {
             push('notice', 'Running without prompts. Files outside this project are still refused.');
         }
@@ -140,13 +148,21 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
     const cancelModePick = useCallback(() => {
         setPhase(sessionReadyRef.current ? 'ready' : 'starting');
     }, []);
+    useEffect(() => {
+        setNoticeSink((text) => push('notice', text));
+        return () => setNoticeSink(null);
+    }, [push]);
     const quit = useCallback(() => {
-        void runnerRef.current?.shutdown().finally(() => exit());
+        void runnerRef.current
+            ?.shutdown()
+            .catch(() => {
+        })
+            .finally(() => exit());
     }, [exit]);
     const cycleMode = useCallback(() => {
         setMode((current) => {
             const next = nextMode(current);
-            push('system', `Mode: ${describeMode(next)}`);
+            push('system', `Rate: ${describeMode(next)}`);
             return next;
         });
     }, [push]);
@@ -169,15 +185,26 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
                 setScreenGeneration((n) => n + 1);
                 return true;
             case '/mode':
+                setPhase('codeMode');
+                return true;
+            case '/rate':
                 setPhase('mode');
                 return true;
             case '/plan':
-                setMode('plan');
-                push('system', `Mode: ${describeMode('plan')}`);
+                setCodeMode('simple');
+                codeModeChosenRef.current = true;
+                runnerRef.current?.setCodeMode('simple');
+                push('system', `Mode: ${CODE_MODE_LABELS.simple}`);
+                setPhase(phaseAfterModePicked({
+                    sessionReady: sessionReadyRef.current,
+                    rateChosen: modeChosenRef.current,
+                }));
                 return true;
             case '/accept':
-                setMode('acceptEdits');
-                push('system', `Mode: ${describeMode('acceptEdits')}`);
+                setMode('bypass');
+                runnerRef.current?.setMode('bypass');
+                push('system', `Rate: ${describeMode('bypass')}`);
+                push('notice', 'Accept-edits is gone — Bypass applies in-project edits without asking.');
                 return true;
             case '/credits':
                 openBrowser(`${siteUrl()}/credits`);
@@ -197,7 +224,8 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
             }
             case '/status': {
                 push('system', `${status.cloudhandle || 'signed in'} ${status.bcidMasked} · ${status.project} · ` +
-                    `${status.balance !== null ? `${status.balance.toFixed(2)}` : 'balance unknown'} · ${describeMode(mode)}`);
+                    `${status.balance !== null ? `${status.balance.toFixed(2)}` : 'balance unknown'} · ` +
+                    `${codeMode ? CODE_MODE_LABELS[codeMode] : 'Mode unset'} · ${describeMode(mode)}`);
                 const facts = sessionFactsRef.current;
                 push('system', `${facts.continuing ? "continuing this directory's thread" : 'new thread'} · ` +
                     `${facts.hasLocalMemory ? 'project notes on disk' : 'no project notes yet'}`);
@@ -227,7 +255,7 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
                 push('notice', `Unknown command ${cmd} — /help for the list.`);
                 return true;
         }
-    }, [cwd, cycleMode, mode, push, quit, refreshBalance, status]);
+    }, [codeMode, cwd, cycleMode, mode, push, quit, refreshBalance, status]);
     const submit = useCallback(async (message) => {
         const text = message.trim();
         setPromptText('');
@@ -241,7 +269,13 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
             return;
         if (runCommand(text))
             return;
-        const needed = creditShortfall(status.balance, { rivine_code: 10 });
+        if (!codeMode) {
+            queuedPromptRef.current = text;
+            push('notice', 'Pick a Mode first — it decides what Rivine Code works on. Your message is saved.');
+            setPhase('codeMode');
+            return;
+        }
+        const needed = creditShortfall(status.balance, minCreditsRef.current);
         if (needed !== null) {
             push('error', `Rivine Code needs $${needed.toFixed(2)} in credits to run.`);
             push('notice', `Top up at ${siteUrl()}/credits`);
@@ -280,7 +314,16 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
             if (oneShot)
                 quit();
         }
-    }, [oneShot, push, quit, refreshBalance, runCommand, settleLive, status.balance]);
+    }, [codeMode, oneShot, push, quit, refreshBalance, runCommand, settleLive, status.balance]);
+    useEffect(() => {
+        if (phase !== 'ready' || !codeMode)
+            return;
+        const queued = queuedPromptRef.current;
+        if (!queued)
+            return;
+        queuedPromptRef.current = null;
+        void submit(queued);
+    }, [phase, codeMode, submit]);
     useEffect(() => {
         let cancelled = false;
         (async () => {
@@ -392,20 +435,29 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
                         setPhase('question');
                     }),
                 }, session.mcp);
-                void session.mcpReady.then((reports) => {
+                void session.mcpReady
+                    .then((reports) => {
                     if (cancelled || reports.length === 0)
                         return;
                     const good = reports.filter((r) => r.ok);
                     const tools = session.mcp.listTools().length;
-                    if (good.length)
+                    if (good.length) {
                         push('system', `MCP: ${good.length} server(s), ${tools} tool(s) available.`);
+                    }
                     for (const bad of reports.filter((r) => !r.ok)) {
                         push('notice', `MCP server "${bad.name}" did not start: ${bad.error}`);
                     }
                     runnerRef.current?.setMcpTools(session.mcp.listTools());
+                })
+                    .catch((err) => {
+                    push('notice', `MCP servers could not be listed: ${err.message}`);
                 });
+                minCreditsRef.current = session.bootstrap.engine_min_credits ?? minCreditsRef.current;
                 sessionReadyRef.current = true;
-                setPhase(modeChosenRef.current ? 'ready' : 'mode');
+                setPhase((current) => phaseAfterBootstrap(current, {
+                    sessionReady: true,
+                    rateChosen: modeChosenRef.current,
+                }));
                 runnerRef.current?.setMode(mode);
                 push('system', `${session.project}${session.bootstrap.created ? ' · new session' : ''}`);
                 if (session.continuing) {
@@ -415,7 +467,7 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, oneShot })
                     push('notice', 'Project notes found in .rivine/local_memory.md.');
                 }
                 if (!oneShot && modeChosenRef.current && !askForMode) {
-                    push('system', `Mode: ${describeMode(mode)}`);
+                    push('system', `Rate: ${describeMode(mode)}`);
                     push('system', 'Ask for anything. /help for commands.');
                 }
                 if (oneShot)
@@ -517,10 +569,17 @@ export function App({ cwd, initialMode, askForMode, initialCodeMode, 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)) }, 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
+    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(RatePicker, { 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 ? (hitl.kind === 'code_mode' ? (_jsx(CodeModePicker, { onPick: (chosen) => {
+                    setCodeMode(chosen);
+                    codeModeChosenRef.current = true;
+                    runnerRef.current?.setCodeMode(chosen);
+                    push('system', `Mode: ${CODE_MODE_LABELS[chosen]}`);
+                    answerHitl({ approved: true, feedback: CODE_MODE_LABELS[chosen], codeMode: chosen });
+                }, current: codeMode })) : (_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, { 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: {
+                    : { 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,
+                    codeMode,
                     project: status.project,
                     cloudhandle: status.cloudhandle,
                     bcidMasked: status.bcidMasked,

package/dist/ui/components.js

@@ -15,7 +15,7 @@ import { Spinner } from '@inkjs/ui';
 import { ASCII_ONLY, BOX, color, glyph, lineColor } from './theme.js';
 import { fit, terminalWidth, wrap, terminalColumns } from './render.js';
 import { SLASH_COMMANDS } from './slashCommands.js';
-import { describeMode, modeName } from '../protocol/permissions.js';
+import { codeModeName, describeMode, modeName, } from '../protocol/permissions.js';
 const WORDMARK = [
     '█▀▄ ▀█▀ █   █ ▀█▀ █▄ █ █▀▀    █▀▀ █▀█ █▀▄ █▀▀',
     '█▀▄  █  ▀▄ ▄▀  █  █ ▀█ █▀     █   █ █ █ █ █▀ ',
@@ -62,16 +62,16 @@ export function CodeModePicker({ onPick, current, onCancel, }) {
         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) => {
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsx(Text, { color: color('text'), bold: true, children: "Mode \u2014 what should Rivine Code work on?" }), _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, }) {
+export function RatePicker({ 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' },
+        { key: '1', mode: 'default', label: 'Manual', detail: 'ask before each edit' },
+        { key: '2', mode: 'bypass', label: 'Bypass', detail: 'edit in this project without asking' },
     ];
     useInput((input, key) => {
         if (key.escape && onCancel) {
@@ -88,11 +88,10 @@ export function ModePicker({ onPick, current, onCancel, }) {
     });
     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));
+                    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(8) }), _jsx(Text, { color: color('faint'), children: " \u2014 " }), _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(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) }) })] }));
+                        ? `press a number · enter keeps ${options.find((o) => o.mode === current)?.label ?? 'this'} · esc cancels`
+                        : 'press a number · enter for Manual · shift+tab toggles later', width - 4) }) })] }));
 }
 export const SHELL_PANE_LINES = 12;
 export function ShellPane({ text, live }) {
@@ -137,7 +136,7 @@ export function Completions({ matches }) {
     return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [matches.slice(0, 6).map((c) => (_jsxs(Box, { children: [_jsx(Text, { color: color('accent'), children: c.name.padEnd(10) }), _jsx(Text, { color: color('faint'), children: fit(c.summary, width - 14) })] }, c.name))), matches.length === 1 ? (_jsx(Text, { color: color('faint'), children: "  tab to complete" })) : null] }));
 }
 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" })] })] }));
+    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: "  Mode  what Rivine Code works on \u2014 /mode" }), _jsx(Text, { color: color('faint'), children: "  Rate  how edits apply \u2014 /rate, or shift+tab" })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: color('faint'), children: "  shift+tab   toggle Rate (Manual \u21C4 Bypass)" }), _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 = terminalColumns();
@@ -157,18 +156,27 @@ export function StatusBar({ info }) {
         segments.push({ node, text });
         return true;
     };
-    const modeText = describeMode(info.mode);
-    const modeShort = modeName(info.mode);
+    const rateText = describeMode(info.mode);
+    const rateShort = modeName(info.mode);
+    const agentText = info.codeMode ? codeModeName(info.codeMode) : '';
     const brand = 'Rivine';
-    const fitsBrandAndFullMode = 2 + brand.length + 3 + modeText.length <= width - 2;
-    if (2 + brand.length + 3 + modeShort.length <= width - 2) {
+    const fitsBrandAndFullRate = 2 +
+        brand.length +
+        (agentText ? 3 + agentText.length : 0) +
+        3 +
+        rateText.length <=
+        width - 2;
+    if (2 + brand.length + 3 + rateShort.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;
+    if (agentText) {
+        add(agentText, _jsx(Text, { color: color('accent'), children: agentText }));
+    }
+    const shownRate = fitsBrandAndFullRate ? rateText : rateShort;
+    used += (segments.length > 0 ? 3 : 0) + shownRate.length;
     segments.push({
-        node: _jsx(Text, { color: color('muted'), children: shownMode }),
-        text: shownMode,
+        node: _jsx(Text, { color: color('muted'), children: shownRate }),
+        text: shownRate,
     });
     if (info.balance !== null) {
         const money = `$${info.balance.toFixed(2)}`;

package/dist/ui/headless.js

@@ -73,7 +73,7 @@ export class HeadlessRenderer {
     refuseApproval(approval) {
         const fix = this.mode === 'plan'
             ? 'plan mode makes no changes; re-run without --plan'
-            : 'no terminal to ask on — re-run with -m acceptEdits, or --bypass in CI';
+            : 'no terminal to ask on — re-run with --rate bypass';
         this.refused += 1;
         this.line('notice', `Skipped: ${approval.summary}`);
         this.line('notice', `  ${approval.reason} (${fix})`);
@@ -85,7 +85,7 @@ export class HeadlessRenderer {
         return '';
     }
 }
-export function installTeardown(onExit) {
+export function installTeardown(onExit, options = {}) {
     let finished = false;
     const restore = () => {
         try {
@@ -116,15 +116,18 @@ export function installTeardown(onExit) {
         process.stderr.write(`\n  ${err?.message ?? String(err)}\n\n`);
         void finish(1);
     };
+    const onRejection = options.onRejection
+        ? (err) => options.onRejection(err)
+        : onFatal;
     process.on('SIGINT', onSigint);
     process.on('SIGTERM', onSigterm);
     process.on('uncaughtException', onFatal);
-    process.on('unhandledRejection', onFatal);
+    process.on('unhandledRejection', onRejection);
     return () => {
         process.off('SIGINT', onSigint);
         process.off('SIGTERM', onSigterm);
         process.off('uncaughtException', onFatal);
-        process.off('unhandledRejection', onFatal);
+        process.off('unhandledRejection', onRejection);
         restore();
     };
 }

package/dist/ui/notices.js

@@ -0,0 +1,20 @@
+/*!
+ * Rivine Code CLI
+ * Licensed and owned by Beunec Technologies, Inc.
+ *
+ * https://aselius.beunec.com
+ *
+ * This software is proprietary. Use is governed by the licence agreement
+ * accompanying it; it is not open source and is not licensed for
+ * redistribution or derivative works.
+ */
+let sink = null;
+export function setNoticeSink(next) {
+    sink = next;
+}
+export function emitNotice(text) {
+    if (!sink || !text)
+        return false;
+    sink(text);
+    return true;
+}

package/dist/ui/phase.js

@@ -0,0 +1,28 @@
+/*!
+ * Rivine Code CLI
+ * Licensed and owned by Beunec Technologies, Inc.
+ *
+ * https://aselius.beunec.com
+ *
+ * This software is proprietary. Use is governed by the licence agreement
+ * accompanying it; it is not open source and is not licensed for
+ * redistribution or derivative works.
+ */
+export function phaseAfterBootstrap(current, s) {
+    if (current === 'codeMode' || current === 'mode')
+        return current;
+    return s.rateChosen ? 'ready' : 'mode';
+}
+export function phaseAfterModePicked(s) {
+    if (!s.rateChosen)
+        return 'mode';
+    return s.sessionReady ? 'ready' : 'starting';
+}
+export function phaseAfterRatePicked(s) {
+    return s.sessionReady ? 'ready' : 'starting';
+}
+export function initialPhase(hasMode, askRate) {
+    if (!hasMode)
+        return 'codeMode';
+    return askRate ? 'mode' : 'starting';
+}

package/dist/ui/render.js

@@ -111,3 +111,6 @@ export function tail(text, max) {
         return { lines, hidden: 0 };
     return { lines: lines.slice(-max), hidden: lines.length - max };
 }
+export function displayStage(label) {
+    return /^routed to\b/i.test(label.trim()) ? '' : label;
+}

package/dist/ui/slashCommands.js

@@ -12,12 +12,25 @@ export const SLASH_COMMANDS = [
     { name: '/help', summary: 'show these commands' },
     {
         name: '/mode',
-        summary: 'show or cycle the permission mode',
-        detail: 'Shift+Tab cycles plan → default → accept edits.',
+        summary: 'pick the Mode — what Rivine Code works on',
+        detail: 'Frontend Only, Backend Only, Full Stack, Plan/Ask Only, or Security Scan/Fix.',
     },
-    { name: '/plan', summary: 'switch to plan mode (reads only)' },
-    { name: '/accept', summary: 'switch to accept-edits mode' },
-    { name: '/status', summary: 'account, project and balance' },
+    {
+        name: '/rate',
+        summary: 'pick the Rate — Manual or Bypass',
+        detail: 'Manual asks before each edit; Bypass applies them. Shift+Tab toggles.',
+    },
+    {
+        name: '/plan',
+        summary: 'switch to Plan/Ask Only Mode',
+        detail: 'Same as picking Plan/Ask Only in /mode.',
+    },
+    {
+        name: '/accept',
+        summary: 'switch Rate to Bypass',
+        detail: 'Accept-edits is gone; Bypass applies in-project edits without asking.',
+    },
+    { name: '/status', summary: 'account, project, Mode, Rate and balance' },
     { name: '/diff', summary: 'what changed in the working tree' },
     {
         name: '/pr',

package/package.json

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