@beunec/rivine 0.1.1 → 0.1.2

package/dist/index.js

@@ -43,13 +43,13 @@ program
     .version(readPackageVersion());
 function resolveMode(options) {
     if (options.bypass)
-        return 'bypass';
+        return { mode: 'bypass', explicit: true };
     if (options.plan)
-        return 'plan';
+        return { mode: 'plan', explicit: true };
     const requested = options.mode;
     if (requested && PERMISSION_MODES.includes(requested))
-        return requested;
-    return 'default';
+        return { mode: requested, explicit: true };
+    return { mode: 'default', explicit: false };
 }
 program
     .command('login', { isDefault: false })
@@ -265,7 +265,7 @@ program
     .action(async (prompt, options) => {
     const cwd = options.cwd ? resolvePath(options.cwd) : process.cwd();
     const oneShot = options.print ?? (prompt.length ? prompt.join(' ') : undefined);
-    const mode = resolveMode(options);
+    const { mode, explicit: modeExplicit } = resolveMode(options);
     const format = options.outputFormat === 'json' ? 'json' : 'text';
     if (!isInteractiveTerminal()) {
         if (!oneShot) {
@@ -284,6 +284,7 @@ program
     const { waitUntilExit } = render(React.createElement(App, {
         cwd,
         initialMode: mode,
+        askForMode: !modeExplicit && !oneShot,
         oneShot,
     }), { exitOnCtrlC: false });
     const removeTeardown = installTeardown(() => { });

package/dist/protocol/permissions.js

@@ -91,12 +91,30 @@ export function isNotebookSeedCommand(command) {
 export function isSecretPath(relPath) {
     return SECRET_PATTERNS.some((re) => re.test(relPath));
 }
+const OPAQUE_SHELL = /[<>]|\$\(|`/;
+const COMMAND_SEPARATORS = /\|\||&&|[;|]/;
+const MUTATING_FLAGS = {
+    sed: /(^|\s)-[a-zA-Z]*i/,
+    find: /(^|\s)-(delete|exec|execdir|ok|okdir|fls|fprint|fprintf)(\s|$)/,
+    env: /\S+=\S+/,
+};
 export function isReadOnlyCommand(command) {
     const trimmed = command.trim();
-    if (!trimmed || SHELL_CHAINING.test(trimmed))
+    if (!trimmed || OPAQUE_SHELL.test(trimmed))
         return false;
+    const segments = trimmed
+        .split(COMMAND_SEPARATORS)
+        .map((s) => s.trim())
+        .filter(Boolean);
+    if (segments.length === 0)
+        return false;
+    if (segments.length > 1)
+        return segments.every((s) => isReadOnlyCommand(s));
     const tokens = trimmed.split(/\s+/);
     const head = (tokens[0] ?? '').replace(/^.*\//, '');
+    const mutating = MUTATING_FLAGS[head];
+    if (mutating && mutating.test(trimmed.slice(head.length)))
+        return false;
     if (READ_ONLY_COMMANDS.has(head))
         return true;
     const subcommands = READ_ONLY_SUBCOMMANDS[head];
@@ -160,7 +178,7 @@ export function decide(input) {
         if (isNotebookSeedCommand(cmd) && mode !== 'plan') {
             return { verdict: 'allow' };
         }
-        if (mode === 'acceptEdits' && isReadOnlyCommand(cmd)) {
+        if (mode !== 'plan' && isReadOnlyCommand(cmd)) {
             return { verdict: 'allow' };
         }
         if (mode === 'plan') {

package/dist/ui/App.js

@@ -12,7 +12,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Box, Static, Text, useApp, useInput } from 'ink';
 import { TextInput } from '@inkjs/ui';
-import { InsufficientCredits } from '../api/workspace.js';
+import { fetchCredits, InsufficientCredits } from '../api/workspace.js';
 import { openBrowser } from '../auth/pkce.js';
 import { siteUrl } from '../config.js';
 import { TurnRunner } from '../protocol/runner.js';
@@ -20,8 +20,8 @@ import { describeMode, isBatchable, mcpServerOf, nextMode, } from '../protocol/p
 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, WORDMARK_MIN_COLUMNS, ChoicePrompt, Completions, HelpPanel, StatusBar, TranscriptLine, ShellPane, SHELL_PANE_LINES, } from './components.js';
-import { TokenBuffer, terminalHeight, terminalWidth } from './render.js';
+import { Activity, ApprovalPrompt, Banner, 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';
 function trimToPane(text) {
@@ -35,9 +35,11 @@ function grantKey(category, request) {
         return category;
     return `mcp:${mcpServerOf(String(request.args?.tool ?? '')) ?? 'unknown'}`;
 }
-export function App({ cwd, initialMode, oneShot }) {
+export function App({ cwd, initialMode, askForMode, oneShot }) {
     const { exit } = useApp();
-    const [phase, setPhase] = useState('starting');
+    const [phase, setPhase] = useState(askForMode ? 'mode' : 'starting');
+    const sessionReadyRef = useRef(false);
+    const modeChosenRef = useRef(!askForMode);
     const [lines, setLines] = useState([]);
     const [live, setLive] = useState('');
     const [shellView, setShellView] = useState('');
@@ -68,6 +70,7 @@ export function App({ cwd, initialMode, oneShot }) {
     const shellDirty = useRef(false);
     const shellRef = useRef(null);
     const sessionFactsRef = useRef({ continuing: false, hasLocalMemory: false });
+    const creditsUrlRef = useRef(null);
     const alwaysAllow = useRef(new Set());
     const tokens = useMemo(() => new TokenBuffer((text) => {
         liveText.current += text;
@@ -77,7 +80,8 @@ export function App({ cwd, initialMode, oneShot }) {
         if (!text)
             return;
         lineId.current += 1;
-        setLines((prev) => [...prev, { id: lineId.current, kind, text, detail }]);
+        const id = lineId.current;
+        setLines((prev) => [...prev, { id, kind, text, detail }]);
     }, []);
     const settleLive = useCallback(() => {
         tokens.flush();
@@ -87,6 +91,29 @@ export function App({ cwd, initialMode, oneShot }) {
         if (text)
             push('agent', text);
     }, [push, tokens]);
+    const refreshBalance = useCallback(async () => {
+        const url = creditsUrlRef.current;
+        if (!url)
+            return;
+        try {
+            const credits = await fetchCredits(url);
+            if (credits)
+                setStatus((s) => ({ ...s, balance: credits.balance }));
+        }
+        catch {
+        }
+    }, []);
+    const pickMode = useCallback((chosen) => {
+        setMode(chosen);
+        modeChosenRef.current = true;
+        runnerRef.current?.setMode(chosen);
+        setPhase(sessionReadyRef.current ? 'ready' : 'starting');
+        push('system', `Mode: ${describeMode(chosen)}`);
+        if (chosen === 'bypass') {
+            push('notice', 'Running without prompts. Files outside this project are still refused.');
+        }
+        push('system', 'Ask for anything. /help for commands.');
+    }, [push]);
     const quit = useCallback(() => {
         void runnerRef.current?.shutdown().finally(() => exit());
     }, [exit]);
@@ -148,6 +175,7 @@ export function App({ cwd, initialMode, oneShot }) {
                 const branch = gitBranchLine(cwd);
                 if (branch)
                     push('system', branch);
+                void refreshBalance();
                 return true;
             }
             case '/diff': {
@@ -170,7 +198,7 @@ export function App({ cwd, initialMode, oneShot }) {
                 push('notice', `Unknown command ${cmd} — /help for the list.`);
                 return true;
         }
-    }, [cwd, cycleMode, mode, push, quit, status]);
+    }, [cwd, cycleMode, mode, push, quit, refreshBalance, status]);
     const submit = useCallback(async (message) => {
         const text = message.trim();
         setInput('');
@@ -219,10 +247,11 @@ export function App({ cwd, initialMode, oneShot }) {
             setStage('');
             setTool('');
             setPhase('ready');
+            void refreshBalance();
             if (oneShot)
                 quit();
         }
-    }, [oneShot, push, quit, runCommand, settleLive, status.balance]);
+    }, [oneShot, push, quit, refreshBalance, runCommand, settleLive, status.balance]);
     useEffect(() => {
         let cancelled = false;
         (async () => {
@@ -244,6 +273,7 @@ export function App({ cwd, initialMode, oneShot }) {
                     continuing: session.continuing,
                     hasLocalMemory: session.hasLocalMemory,
                 };
+                creditsUrlRef.current = session.bootstrap.credits_url ?? null;
                 void session.snapshot.then((snap) => {
                     if (!cancelled)
                         snapshotRef.current = snap;
@@ -329,16 +359,20 @@ export function App({ cwd, initialMode, oneShot }) {
                     }
                     runnerRef.current?.setMcpTools(session.mcp.listTools());
                 });
-                setPhase('ready');
-                push('system', `${session.project}${session.bootstrap.created ? ' · new session' : ''} · ${describeMode(mode)}`);
+                sessionReadyRef.current = true;
+                setPhase(modeChosenRef.current ? 'ready' : 'mode');
+                runnerRef.current?.setMode(mode);
+                push('system', `${session.project}${session.bootstrap.created ? ' · new session' : ''}`);
                 if (session.continuing) {
                     push('notice', "Continuing this directory's thread — earlier turns are still in context.");
                 }
                 if (session.hasLocalMemory) {
                     push('notice', 'Project notes found in .rivine/local_memory.md.');
                 }
-                if (!oneShot)
+                if (!oneShot && modeChosenRef.current && !askForMode) {
+                    push('system', `Mode: ${describeMode(mode)}`);
                     push('system', 'Ask for anything. /help for commands.');
+                }
                 if (oneShot)
                     void submit(oneShot);
             }
@@ -428,10 +462,10 @@ export function App({ cwd, initialMode, oneShot }) {
     if (phase === 'fatal') {
         return (_jsx(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: _jsx(Text, { color: color('danger'), children: fatal }) }));
     }
-    const compactBanner = terminalHeight() < 20 || terminalWidth() < WORDMARK_MIN_COLUMNS || Boolean(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: [{ id: 'banner' }], children: (item) => _jsx(Banner, { compact: compactBanner }, item.id) }), _jsx(Static, { items: lines, children: (line) => _jsx(TranscriptLine, { line: line }, 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 === '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: [{ id: 'banner' }], children: (item) => _jsx(Banner, { compact: compactBanner }, item.id) }), _jsx(Static, { items: lines, children: (line) => _jsx(TranscriptLine, { line: line }, 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
                     ? { 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: {
                     mode,

package/dist/ui/components.js

@@ -39,6 +39,25 @@ 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 }) {
+    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' },
+    ];
+    useInput((input, key) => {
+        if (key.return) {
+            onPick('acceptEdits');
+            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) }) })] }));
+}
 export const SHELL_PANE_LINES = 12;
 export function ShellPane({ text, live }) {
     if (!text)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beunec/rivine",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "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",