feat(coder): unified Plan/Ask/Bypass permission picker
Replace the raw per-agent mode dropdown in the BooCoder composer with a curated three-option permission ladder mapped generically onto each provider's native modes: `plan` id -> Plan, default -> Ask, isUnattended -> Bypass (claude bypassPermissions, qwen yolo, opencode full-access). modeId stays the single wire field; the active unified mode is derived from it (no contracts change). Native BooCode gains its own mode set: Ask stages to the pending-changes queue (today's behavior), Bypass auto-applies the queue to disk after the turn (interactive messages path + task dispatcher path), Plan falls back to Ask. The shared apps/server inference engine is left untouched. Also preserve isUnattended on live-probed ACP modes so opencode's bypass mode stays detectable from the wire. Coder 373 tests green; coder + web typecheck clean. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -4,6 +4,7 @@ import type { Sql } from '../db.js';
|
||||
import type { Broker } from '@boocode/server/broker';
|
||||
import type { WsFrame } from '@boocode/contracts/ws-frames';
|
||||
import { resolveChatId } from './chat-resolve.js';
|
||||
import { applyAll } from '../services/pending_changes.js';
|
||||
|
||||
const AnswerUserInputBody = z.object({
|
||||
tool_call_id: z.string().min(1),
|
||||
@@ -247,6 +248,35 @@ export function registerMessageRoutes(
|
||||
|
||||
inference.enqueue(sessionId, chatId, assistantMsg!.id, 'default');
|
||||
|
||||
// Bypass permission mode (native BooCode): auto-apply staged edits to disk
|
||||
// once the turn settles. `enqueue` registers synchronously, so hasActive is
|
||||
// true immediately; poll until it clears, apply, then re-publish
|
||||
// message_complete so the DiffPanel reflects the now-applied (non-pending)
|
||||
// state. Best-effort — failures stay in the pending queue for manual apply.
|
||||
if (mode_id === 'bypass') {
|
||||
const projectId = sessionRows[0]!.project_id;
|
||||
const assistantId = assistantMsg!.id;
|
||||
void (async () => {
|
||||
try {
|
||||
const [proj] = await sql<{ path: string }[]>`SELECT path FROM projects WHERE id = ${projectId}`;
|
||||
if (!proj?.path) return;
|
||||
for (let i = 0; i < 1200 && inference.hasActive(chatId); i++) {
|
||||
await new Promise((r) => setTimeout(r, 1000));
|
||||
}
|
||||
const applied = await applyAll(sql, sessionId, proj.path);
|
||||
if (applied.length > 0) {
|
||||
broker.publishFrame(sessionId, {
|
||||
type: 'message_complete',
|
||||
message_id: assistantId,
|
||||
chat_id: chatId,
|
||||
} as unknown as WsFrame);
|
||||
}
|
||||
} catch {
|
||||
/* best-effort auto-apply — leave staged changes for manual apply */
|
||||
}
|
||||
})();
|
||||
}
|
||||
|
||||
reply.code(202);
|
||||
return { user_message_id: userMsg!.id, assistant_message_id: assistantMsg!.id };
|
||||
},
|
||||
|
||||
@@ -68,11 +68,18 @@ export function deriveModesFromACP(
|
||||
): { modes: ProviderMode[]; currentModeId: string | null } {
|
||||
if (modeState?.availableModes?.length) {
|
||||
return {
|
||||
modes: modeState.availableModes.map((mode) => ({
|
||||
id: mode.id,
|
||||
label: mode.name,
|
||||
description: mode.description ?? undefined,
|
||||
})),
|
||||
// ACP omits the unattended flag; inherit it from the manifest fallback by
|
||||
// id so the unified permission picker can still detect each agent's bypass
|
||||
// mode (e.g. opencode `full-access`) from live-probed modes.
|
||||
modes: modeState.availableModes.map((mode) => {
|
||||
const fb = fallbackModes.find((f) => f.id === mode.id);
|
||||
return {
|
||||
id: mode.id,
|
||||
label: mode.name,
|
||||
description: mode.description ?? undefined,
|
||||
...(fb?.isUnattended ? { isUnattended: true } : {}),
|
||||
};
|
||||
}),
|
||||
currentModeId: modeState.currentModeId ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import type { Broker } from '@boocode/server/broker';
|
||||
import type { WsFrame } from '@boocode/contracts/ws-frames';
|
||||
import type { Config } from '../config.js';
|
||||
import { createWorktree, diffWorktree, cleanupWorktree, ensureSessionWorktree } from './worktrees.js';
|
||||
import { applyAll } from './pending_changes.js';
|
||||
import { createCheckpoint } from './checkpoints.js';
|
||||
import { makeDcpStreamStripper } from './dcp-strip.js';
|
||||
import { dispatchViaAcp } from './acp-dispatch.js';
|
||||
@@ -305,7 +306,7 @@ export function createDispatcher(deps: Deps): {
|
||||
|
||||
// ─── Path A: Native Inference ───────────────────────────────────────────────
|
||||
|
||||
async function runNativeInference(task: { id: string; project_id: string; input: string; agent: string | null; model: string | null; session_id: string | null }): Promise<void> {
|
||||
async function runNativeInference(task: { id: string; project_id: string; input: string; agent: string | null; model: string | null; mode_id: string | null; session_id: string | null }): Promise<void> {
|
||||
const taskId = task.id;
|
||||
log.info({ taskId }, 'dispatcher: starting task (path A — native)');
|
||||
|
||||
@@ -385,6 +386,22 @@ export function createDispatcher(deps: Deps): {
|
||||
WHERE id = ${taskId}
|
||||
`;
|
||||
log.info({ taskId, costTokens }, 'dispatcher: task completed (native)');
|
||||
// Bypass permission mode: auto-apply the staged edits to disk after the
|
||||
// turn. Ask/Plan leave them in the pending-changes queue for review.
|
||||
if (task.mode_id === 'bypass') {
|
||||
try {
|
||||
const [proj] = await sql<{ path: string }[]>`SELECT path FROM projects WHERE id = ${task.project_id}`;
|
||||
if (proj?.path) {
|
||||
const applied = await applyAll(sql, sessionId, proj.path);
|
||||
log.info({ taskId, applied: applied.length }, 'dispatcher: native bypass auto-applied pending changes');
|
||||
}
|
||||
} catch (applyErr) {
|
||||
log.warn(
|
||||
{ taskId, err: applyErr instanceof Error ? applyErr.message : String(applyErr) },
|
||||
'dispatcher: native bypass auto-apply failed',
|
||||
);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const [msg] = await sql<{ content: string | null }[]>`
|
||||
SELECT content FROM messages WHERE id = ${assistantId}
|
||||
|
||||
@@ -32,6 +32,18 @@ const QWEN_PTY_MODES: ProviderMode[] = [
|
||||
{ id: 'yolo', label: 'YOLO', description: 'Auto-approve all tools', isUnattended: true },
|
||||
];
|
||||
|
||||
// Native BooCode (llama-swap) has no agent-native mode vocabulary, so we define
|
||||
// one that matches the unified permission ladder. `bypass` is the only mode that
|
||||
// changes behavior (auto-apply staged edits after the turn — dispatcher.ts);
|
||||
// `plan` falls back to `ask` semantics for native (writes still stage to the
|
||||
// pending-changes queue). External agents map the same three unified modes onto
|
||||
// THEIR native ids via the `plan`-id / default / `isUnattended` shape.
|
||||
const BOOCODE_MODES: ProviderMode[] = [
|
||||
{ id: 'plan', label: 'Plan', description: 'Read-only analysis (native BooCode falls back to Ask)' },
|
||||
{ id: 'ask', label: 'Ask Permission', description: 'Stage edits to the pending-changes queue for review' },
|
||||
{ id: 'bypass', label: 'Bypass', description: 'Auto-apply edits to disk after the turn', isUnattended: true },
|
||||
];
|
||||
|
||||
const CLAUDE_THINKING = [
|
||||
{ id: 'low', label: 'Low' },
|
||||
{ id: 'medium', label: 'Medium' },
|
||||
@@ -41,6 +53,10 @@ const CLAUDE_THINKING = [
|
||||
];
|
||||
|
||||
export const PROVIDER_MANIFEST: Record<string, ProviderManifestEntry> = {
|
||||
boocode: {
|
||||
defaultModeId: 'ask',
|
||||
modes: BOOCODE_MODES,
|
||||
},
|
||||
claude: {
|
||||
defaultModeId: 'default',
|
||||
modes: CLAUDE_MODES,
|
||||
|
||||
@@ -122,12 +122,14 @@ async function buildProviderEntry(
|
||||
};
|
||||
}
|
||||
|
||||
// 2. Native boocode → always ready (llama-swap models).
|
||||
// 2. Native boocode → always ready (llama-swap models). Exposes the unified
|
||||
// permission modes (plan/ask/bypass) so the composer's permission picker works
|
||||
// for native BooCode too; `bypass` auto-applies staged edits (dispatcher.ts).
|
||||
if (isNative) {
|
||||
return {
|
||||
name, label: resolved.label, transport, status: 'ready',
|
||||
enabled: true, installed: true, models: withConfigModels(llamaModels), modes: [],
|
||||
defaultModeId: null, commands: manifestCommands,
|
||||
enabled: true, installed: true, models: withConfigModels(llamaModels),
|
||||
modes: fallbackModes, defaultModeId, commands: manifestCommands,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Check, ChevronDown, RefreshCw, Loader2, Shield, Brain, Bot } from 'lucide-react';
|
||||
import { Check, ChevronDown, RefreshCw, Loader2, Shield, ShieldAlert, Eye, Brain, Bot } from 'lucide-react';
|
||||
import { api } from '@/api/client';
|
||||
import type { AgentSessionConfig, ProviderSnapshotEntry, AgentCommand } from '@/api/types';
|
||||
import { useProviderSnapshot, refreshProviderSnapshot } from '@/hooks/useProviderSnapshot';
|
||||
@@ -14,8 +14,22 @@ import {
|
||||
import { BottomSheet } from '@/components/BottomSheet';
|
||||
import { useViewport } from '@/hooks/useViewport';
|
||||
import { formatModelLabel } from '@/lib/model-label';
|
||||
import {
|
||||
availablePermissionModes,
|
||||
permissionForModeId,
|
||||
nativeModeForPermission,
|
||||
type PermissionMode,
|
||||
} from '@/lib/permission-mode';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
// Permission picker icon — varies with the active mode so the (icon-only) control
|
||||
// is glanceable: Eye = Plan (read-only), Shield = Ask, ShieldAlert = Bypass.
|
||||
function permissionIcon(mode: PermissionMode): React.ReactNode {
|
||||
if (mode === 'plan') return <Eye className="size-3 shrink-0" />;
|
||||
if (mode === 'bypass') return <ShieldAlert className="size-3 shrink-0 text-amber-500" />;
|
||||
return <Shield className="size-3 shrink-0" />;
|
||||
}
|
||||
|
||||
const PREFS_KEY = 'boocode.coder.agent-prefs';
|
||||
|
||||
|
||||
@@ -350,7 +364,11 @@ export function AgentComposerBar({ projectPath, value, onChange, onProviderComma
|
||||
}
|
||||
|
||||
const providerOptions = entries.map((e) => ({ id: e.name, label: e.label }));
|
||||
const modeOptions = (currentEntry?.modes ?? []).map((m) => ({ id: m.id, label: m.label }));
|
||||
// Unified permission ladder (Plan / Ask / Bypass) mapped onto this provider's
|
||||
// native modes. `value.modeId` stays the wire field; the active unified mode is
|
||||
// derived from it.
|
||||
const permissionModes = availablePermissionModes(currentEntry?.modes ?? []);
|
||||
const currentPermission = permissionForModeId(value.modeId, currentEntry?.modes ?? []);
|
||||
const modelOptions = (currentEntry?.models ?? []).map((m) => ({ id: m.id, label: formatModelLabel(m.label) }));
|
||||
const thinkingOpts = thinkingOptions.map((t) => ({ id: t.id, label: t.label }));
|
||||
|
||||
@@ -380,15 +398,25 @@ export function AgentComposerBar({ projectPath, value, onChange, onProviderComma
|
||||
</>
|
||||
}
|
||||
/>
|
||||
{/* Mode (shield) only when the provider actually exposes modes. Native
|
||||
BooCoder has none, so it's hidden rather than shown disabled. */}
|
||||
{modeOptions.length > 0 && (
|
||||
{/* Permission ladder (Plan / Ask / Bypass) — shown when the provider exposes
|
||||
modes. Picks the unified mode; we resolve it to the provider's native
|
||||
modeId. Icon varies with the active mode (Bypass is amber). */}
|
||||
{permissionModes.length > 0 && (
|
||||
<CompactPicker
|
||||
label="Mode"
|
||||
value={value.modeId ?? ''}
|
||||
options={modeOptions}
|
||||
onPick={(modeId) => persist({ ...value, modeId })}
|
||||
icon={<Shield className="size-3 shrink-0" />}
|
||||
label="Permission"
|
||||
value={currentPermission}
|
||||
options={permissionModes}
|
||||
onPick={(perm) =>
|
||||
persist({
|
||||
...value,
|
||||
modeId: nativeModeForPermission(
|
||||
perm as PermissionMode,
|
||||
currentEntry?.modes ?? [],
|
||||
currentEntry?.defaultModeId ?? null,
|
||||
),
|
||||
})
|
||||
}
|
||||
icon={permissionIcon(currentPermission)}
|
||||
iconOnly
|
||||
/>
|
||||
)}
|
||||
|
||||
55
apps/web/src/lib/permission-mode.ts
Normal file
55
apps/web/src/lib/permission-mode.ts
Normal file
@@ -0,0 +1,55 @@
|
||||
// Unified permission ladder shown in the composer's permission picker. Maps a
|
||||
// curated three-option control (Plan / Ask Permission / Bypass) onto each
|
||||
// provider's native mode vocabulary, derived purely from the snapshot's mode
|
||||
// metadata (`plan` id, the default mode, and the `isUnattended` bypass mode).
|
||||
// `modeId` stays the single wire field sent to the dispatcher — there is no
|
||||
// separate persisted permission field; the active unified mode is derived from
|
||||
// the current `modeId`.
|
||||
import type { ProviderMode } from '@/api/types';
|
||||
|
||||
export type PermissionMode = 'plan' | 'ask' | 'bypass';
|
||||
|
||||
export const PERMISSION_LABELS: Record<PermissionMode, string> = {
|
||||
plan: 'Plan',
|
||||
ask: 'Ask Permission',
|
||||
bypass: 'Bypass',
|
||||
};
|
||||
|
||||
/** The native modeId for a unified permission, or null when the provider has no
|
||||
* modes (e.g. goose). `plan` → the `plan`-id mode; `bypass` → the `isUnattended`
|
||||
* mode; `ask` → the non-unattended default. Falls back to defaultModeId. */
|
||||
export function nativeModeForPermission(
|
||||
mode: PermissionMode,
|
||||
modes: ProviderMode[],
|
||||
defaultModeId: string | null,
|
||||
): string | null {
|
||||
if (modes.length === 0) return null;
|
||||
if (mode === 'plan') return modes.find((m) => m.id === 'plan')?.id ?? defaultModeId;
|
||||
if (mode === 'bypass') return modes.find((m) => m.isUnattended)?.id ?? defaultModeId;
|
||||
return (
|
||||
modes.find((m) => m.id === defaultModeId && !m.isUnattended)?.id ??
|
||||
modes.find((m) => !m.isUnattended && m.id !== 'plan')?.id ??
|
||||
defaultModeId
|
||||
);
|
||||
}
|
||||
|
||||
/** Which unified permission a native modeId corresponds to (for picker state). */
|
||||
export function permissionForModeId(modeId: string | null, modes: ProviderMode[]): PermissionMode {
|
||||
if (!modeId) return 'ask';
|
||||
if (modeId === 'plan') return 'plan';
|
||||
if (modes.find((m) => m.id === modeId)?.isUnattended) return 'bypass';
|
||||
return 'ask';
|
||||
}
|
||||
|
||||
/** The unified permission options a provider supports, in fixed Plan→Ask→Bypass
|
||||
* order. Empty when the provider exposes no modes (no picker shown). */
|
||||
export function availablePermissionModes(
|
||||
modes: ProviderMode[],
|
||||
): Array<{ id: PermissionMode; label: string }> {
|
||||
if (modes.length === 0) return [];
|
||||
const out: Array<{ id: PermissionMode; label: string }> = [];
|
||||
if (modes.some((m) => m.id === 'plan')) out.push({ id: 'plan', label: PERMISSION_LABELS.plan });
|
||||
out.push({ id: 'ask', label: PERMISSION_LABELS.ask });
|
||||
if (modes.some((m) => m.isUnattended)) out.push({ id: 'bypass', label: PERMISSION_LABELS.bypass });
|
||||
return out;
|
||||
}
|
||||
Reference in New Issue
Block a user