Merge branch 'main' into flutter/chat-messages

This commit is contained in:
2026-10-21 20:44:02 +01:00
41 changed files with 3618 additions and 222 deletions
+195
View File
@@ -0,0 +1,195 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../core/transport/connection_state.dart';
import 'app_session.dart';
import 'server_endpoint.dart';
/// The full connection screen shown before a destination has ever loaded.
///
/// A missing native endpoint is a configuration state, not a server failure,
/// so it is explained without opening a socket. Otherwise the screen reports
/// connecting, then an honest unavailable state with a native Retry action.
class ConnectionGate extends StatelessWidget {
const ConnectionGate({
super.key,
required this.session,
required this.server,
required this.cupertino,
});
final AppSession session;
final ServerEndpoint server;
final bool cupertino;
@override
Widget build(BuildContext context) {
final state = session.connection;
if (server.requiresConfiguration) {
return _status(
context,
title: 'Server endpoint not configured',
detail:
'Build the native app with an explicit Pipelines endpoint, for '
'example --dart-define=PIPELINES_SERVER_URL=ws://host:port/connect.',
);
}
if (server.error != null) {
return _status(context, title: server.error!, detail: '');
}
// Only the very first attempt is "connecting". A failed attempt keeps the
// same honest unavailable state while the client retries behind it, so the
// screen no longer flickers between unavailable and connecting.
if (state.kind == ConnectionKind.connecting && state.attempt <= 1) {
return _status(
context,
title: 'Connecting to Pipelines…',
detail: '',
progress: true,
);
}
return _status(
context,
title: 'Pipelines server unavailable',
detail: state.retrying
? 'Retrying automatically. Check that the Pipelines server is running.'
: 'Check that the Pipelines server is running, then try again.',
onRetry: session.retry,
);
}
Widget _status(
BuildContext context, {
required String title,
required String detail,
bool progress = false,
VoidCallback? onRetry,
}) {
final theme = Theme.of(context);
return Center(
child: SingleChildScrollView(
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
if (progress)
Padding(
padding: const EdgeInsets.only(bottom: 12),
child: cupertino
? const CupertinoActivityIndicator()
: const CircularProgressIndicator(),
),
Semantics(
liveRegion: true,
child: Text(
title,
textAlign: TextAlign.center,
style: cupertino
? CupertinoTheme.of(context).textTheme.navTitleTextStyle
: theme.textTheme.titleMedium,
),
),
if (detail.isNotEmpty) ...[
const SizedBox(height: 8),
Text(
detail,
textAlign: TextAlign.center,
style: cupertino ? null : theme.textTheme.bodyMedium,
),
],
if (onRetry != null) ...[
const SizedBox(height: 16),
if (cupertino)
CupertinoButton(onPressed: onRetry, child: const Text('Retry'))
else
FilledButton(onPressed: onRetry, child: const Text('Retry')),
],
],
),
),
);
}
}
/// A compact status bar above retained content after the first connection.
class ConnectionBanner extends StatelessWidget {
const ConnectionBanner({
super.key,
required this.session,
required this.cupertino,
});
final AppSession session;
final bool cupertino;
@override
Widget build(BuildContext context) {
final state = session.connection;
final refused = session.subscription == RunSubscriptionState.refused;
final reconnecting =
!session.connected &&
(state.kind == ConnectionKind.connecting || state.retrying);
final String title;
final String detail;
final VoidCallback onRetry;
if (session.connected && refused) {
title = 'Not live — run updates are unavailable.';
detail = session.subscriptionError;
onRetry = session.resubscribe;
} else if (reconnecting) {
title = 'Reconnecting to Pipelines…';
detail = '';
onRetry = session.retry;
} else {
title = 'Not live — Pipelines server unavailable.';
detail = 'Check that the Pipelines server is running.';
onRetry = session.retry;
}
final textStyle = cupertino
? CupertinoTheme.of(context).textTheme.textStyle
: Theme.of(context).textTheme.bodyMedium;
return ColoredBox(
color: cupertino
? CupertinoDynamicColor.resolve(CupertinoColors.systemGrey5, context)
: Theme.of(context).colorScheme.surfaceContainerHighest,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(
children: [
if (reconnecting) ...[
cupertino
? const CupertinoActivityIndicator(radius: 7)
: const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
),
const SizedBox(width: 10),
],
Expanded(
child: Semantics(
liveRegion: true,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title, style: textStyle),
if (detail.isNotEmpty) Text(detail, style: textStyle),
],
),
),
),
const SizedBox(width: 8),
if (cupertino)
CupertinoButton(
padding: EdgeInsets.zero,
onPressed: onRetry,
child: const Text('Retry'),
)
else
TextButton(onPressed: onRetry, child: const Text('Retry')),
],
),
),
);
}
}
+3
View File
@@ -11,6 +11,7 @@ import 'app.dart';
import 'app_route.dart';
import 'app_router.dart';
import 'app_session.dart';
import 'pipelines_destination.dart';
import 'runs_destination.dart';
import 'server_endpoint.dart';
@@ -100,6 +101,8 @@ class _PipelinesAppState extends State<PipelinesApp> {
onDestinationSelected: (destination) =>
_delegate.goTo(_routeOf(destination)),
destinationBodies: {
AppDestination.pipelines: (_) =>
PipelinesDestination(session: _session, server: widget.server),
AppDestination.runs: (_) => RunsDestination(
session: _session,
server: widget.server,
@@ -0,0 +1,61 @@
import 'package:flutter/material.dart';
import '../features/pipelines/screen.dart';
import '../ui/adaptive/host.dart';
import 'app_session.dart';
import 'connection_status.dart';
import 'server_endpoint.dart';
/// The Pipelines destination: the read-only browser plus honest status.
///
/// Before the shared socket accepts its first connection nothing is requested,
/// so an offline launch cannot look like an empty pipeline list. After that the
/// browser stays mounted through drops; a reconnect advances [syncToken] so the
/// list and the open detail refresh in place instead of losing the selection.
class PipelinesDestination extends StatelessWidget {
const PipelinesDestination({
super.key,
required this.session,
required this.server,
});
final AppSession session;
final ServerEndpoint server;
@override
Widget build(BuildContext context) => AnimatedBuilder(
animation: session,
builder: (context, _) {
final cupertino = usesCupertinoHost(context);
if ((server.requiresConfiguration || server.error != null) &&
session.endpoint == null) {
return ConnectionGate(
session: session,
server: server,
cupertino: cupertino,
);
}
if (!session.everConnected) {
if (session.connected) return _pipelinesScreen();
return ConnectionGate(
session: session,
server: server,
cupertino: cupertino,
);
}
return Column(
children: [
if (!session.connected)
ConnectionBanner(session: session, cupertino: cupertino),
Expanded(child: _pipelinesScreen()),
],
);
},
);
Widget _pipelinesScreen() => PipelinesScreen(
gateway: session.gateway,
embedded: true,
syncToken: session.connectionEpoch,
);
}
+4 -184
View File
@@ -1,10 +1,9 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../core/transport/connection_state.dart';
import '../features/runs/screen.dart';
import '../ui/adaptive/host.dart';
import 'app_session.dart';
import 'connection_status.dart';
import 'server_endpoint.dart';
/// The Runs destination: the loaded screen plus an honest connection status.
@@ -36,7 +35,7 @@ class RunsDestination extends StatelessWidget {
final cupertino = usesCupertinoHost(context);
if ((server.requiresConfiguration || server.error != null) &&
session.endpoint == null) {
return _ConnectionScreen(
return ConnectionGate(
session: session,
server: server,
cupertino: cupertino,
@@ -44,7 +43,7 @@ class RunsDestination extends StatelessWidget {
}
if (!session.everConnected) {
if (session.connected) return _runsScreen();
return _ConnectionScreen(
return ConnectionGate(
session: session,
server: server,
cupertino: cupertino,
@@ -54,7 +53,7 @@ class RunsDestination extends StatelessWidget {
children: [
if (!session.connected ||
session.subscription == RunSubscriptionState.refused)
_ConnectionBanner(session: session, cupertino: cupertino),
ConnectionBanner(session: session, cupertino: cupertino),
Expanded(child: _runsScreen()),
],
);
@@ -69,182 +68,3 @@ class RunsDestination extends StatelessWidget {
onBack: onBack,
);
}
class _ConnectionScreen extends StatelessWidget {
const _ConnectionScreen({
required this.session,
required this.server,
required this.cupertino,
});
final AppSession session;
final ServerEndpoint server;
final bool cupertino;
@override
Widget build(BuildContext context) {
final state = session.connection;
if (server.requiresConfiguration) {
return _status(
context,
title: 'Server endpoint not configured',
detail:
'Build the native app with an explicit Pipelines endpoint, for '
'example --dart-define=PIPELINES_SERVER_URL=ws://host:port/connect.',
);
}
if (server.error != null) {
return _status(context, title: server.error!, detail: '');
}
// Only the very first attempt is "connecting". A failed attempt keeps the
// same honest unavailable state while the client retries behind it, so the
// screen no longer flickers between unavailable and connecting.
if (state.kind == ConnectionKind.connecting && state.attempt <= 1) {
return _status(
context,
title: 'Connecting to Pipelines…',
detail: '',
progress: true,
);
}
return _status(
context,
title: 'Pipelines server unavailable',
detail: state.retrying
? 'Retrying automatically. Check that the Pipelines server is running.'
: 'Check that the Pipelines server is running, then try again.',
onRetry: session.retry,
);
}
Widget _status(
BuildContext context, {
required String title,
required String detail,
bool progress = false,
VoidCallback? onRetry,
}) {
final theme = Theme.of(context);
return Center(
child: SingleChildScrollView(
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
if (progress)
Padding(
padding: const EdgeInsets.only(bottom: 12),
child: cupertino
? const CupertinoActivityIndicator()
: const CircularProgressIndicator(),
),
Semantics(
liveRegion: true,
child: Text(
title,
textAlign: TextAlign.center,
style: cupertino
? CupertinoTheme.of(context).textTheme.navTitleTextStyle
: theme.textTheme.titleMedium,
),
),
if (detail.isNotEmpty) ...[
const SizedBox(height: 8),
Text(
detail,
textAlign: TextAlign.center,
style: cupertino ? null : theme.textTheme.bodyMedium,
),
],
if (onRetry != null) ...[
const SizedBox(height: 16),
if (cupertino)
CupertinoButton(onPressed: onRetry, child: const Text('Retry'))
else
FilledButton(onPressed: onRetry, child: const Text('Retry')),
],
],
),
),
);
}
}
/// A compact status bar above the retained Runs screen.
class _ConnectionBanner extends StatelessWidget {
const _ConnectionBanner({required this.session, required this.cupertino});
final AppSession session;
final bool cupertino;
@override
Widget build(BuildContext context) {
final state = session.connection;
final refused = session.subscription == RunSubscriptionState.refused;
final reconnecting =
!session.connected &&
(state.kind == ConnectionKind.connecting || state.retrying);
final String title;
final String detail;
final VoidCallback onRetry;
if (session.connected && refused) {
title = 'Not live — run updates are unavailable.';
detail = session.subscriptionError;
onRetry = session.resubscribe;
} else if (reconnecting) {
title = 'Reconnecting to Pipelines…';
detail = '';
onRetry = session.retry;
} else {
title = 'Not live — Pipelines server unavailable.';
detail = 'Check that the Pipelines server is running.';
onRetry = session.retry;
}
final textStyle = cupertino
? CupertinoTheme.of(context).textTheme.textStyle
: Theme.of(context).textTheme.bodyMedium;
return ColoredBox(
color: cupertino
? CupertinoDynamicColor.resolve(CupertinoColors.systemGrey5, context)
: Theme.of(context).colorScheme.surfaceContainerHighest,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(
children: [
if (reconnecting) ...[
cupertino
? const CupertinoActivityIndicator(radius: 7)
: const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
),
const SizedBox(width: 10),
],
Expanded(
child: Semantics(
liveRegion: true,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title, style: textStyle),
if (detail.isNotEmpty) Text(detail, style: textStyle),
],
),
),
),
const SizedBox(width: 8),
if (cupertino)
CupertinoButton(
padding: EdgeInsets.zero,
onPressed: onRetry,
child: const Text('Retry'),
)
else
TextButton(onPressed: onRetry, child: const Text('Retry')),
],
),
),
);
}
}
@@ -0,0 +1,236 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
import '../../../core/api_gateway.dart';
import '../data/chat_repository.dart';
import '../domain/chat_transcript.dart';
/// One open conversation's transcript and live turn state.
///
/// The controller attaches to exactly one session: it subscribes that session
/// with `chat_subscribe`, then reads the newest history page. Pushed frames for
/// any other session are ignored, a superseded or disposed read never lands, and
/// a reconnect/resync replaces the held turn with the newest authoritative page
/// instead of merging stale state. The server detaches subscriptions when the
/// socket closes, so disposal only cancels the local stream (there is no
/// `chat_unsubscribe`).
class ChatThreadController extends ChangeNotifier {
ChatThreadController(this.gateway, this.sessionId) {
_subscription = gateway.frames.listen(_onFrame);
}
final ApiGateway gateway;
final String sessionId;
late final ChatRepository _repository = ChatRepository(gateway);
StreamSubscription<JsonMap>? _subscription;
List<JsonMap> _messages = const [];
bool _running = false;
bool _loaded = false;
bool _loading = false;
bool _hasMore = false;
String _cursor = '';
String _nativeTurnId = '';
String? _error;
bool _subscribed = false;
String? _subscriptionError;
bool _disposed = false;
int _generation = 0;
bool _resyncing = false;
bool _resyncAgain = false;
List<JsonMap> get messages => _messages;
bool get running => _running;
bool get loaded => _loaded;
bool get loading => _loading;
bool get hasMore => _hasMore;
/// The server's opaque older-page cursor. Never interpreted, only passed back.
String get cursor => _cursor;
String? get error => _error;
bool get subscribed => _subscribed;
String? get subscriptionError => _subscriptionError;
/// Subscribes this session, then loads its newest history page.
Future<void> load() async {
if (_disposed) return;
final token = ++_generation;
_loading = true;
_error = null;
_notify();
await _attach();
if (!_owned(token)) return;
await _readNewest(token, replaceHeldTurn: false);
}
/// Reads the next older page. Only offered while the server says `has_more`;
/// the cursor is the server's own `next_cursor`, passed back verbatim.
Future<void> loadOlder() async {
if (_disposed || _loading || !_hasMore) return;
final token = ++_generation;
_loading = true;
_error = null;
_notify();
try {
final page = await _repository.history(
sessionId,
cursor: _cursor,
limit: 200,
);
if (!_owned(token)) return;
final merged = mergeChatHistory(
{'messages': _messages},
page,
older: true,
);
_applyPage(merged);
} catch (error) {
if (!_owned(token)) return;
_loading = false;
_error = '$error';
}
_notify();
}
/// The reconnect/resync repair: settle the held turn, re-attach the session,
/// then replace the conversation with the newest authoritative page. Activity
/// replayed while re-attaching (a running step) is fresh native state
/// and survives the replacement. A resync frame also lands here.
Future<void> resync() async {
if (_disposed) return;
if (_resyncing) {
_resyncAgain = true;
return;
}
_resyncing = true;
do {
_resyncAgain = false;
await _resyncOnce();
} while (_resyncAgain && !_disposed);
_resyncing = false;
}
Future<void> _resyncOnce() async {
final token = ++_generation;
_loading = true;
// A socket drop removed the frames feeding the turn, so no held turn may
// keep claiming to run until the re-subscribe proves otherwise.
_running = false;
_nativeTurnId = '';
_notify();
await _attach(force: true);
if (!_owned(token)) return;
await _readNewest(token, replaceHeldTurn: true);
}
Future<void> _readNewest(int token, {required bool replaceHeldTurn}) async {
try {
final page = await _repository.history(sessionId, limit: 200);
if (!_owned(token)) return;
if (replaceHeldTurn) {
_messages = (page['messages'] as List? ?? const [])
.whereType<Map>()
.map((message) => Map<String, dynamic>.from(message))
.toList();
_cursor = '${page['nextCursor'] ?? ''}';
_hasMore = page['hasMore'] == true;
} else {
// A live frame may have arrived while the page was loading; merge it
// over the held transcript instead of replacing it.
_applyPage(mergeChatHistory({'messages': _messages}, page));
}
_loaded = true;
_loading = false;
_error = null;
} catch (error) {
if (!_owned(token)) return;
// A refused read is not an empty successful history: the reason stays
// visible and the held transcript is kept.
_loaded = true;
_loading = false;
_error = '$error';
}
_notify();
}
/// Attaches the session stream once per connection. A refusal leaves history
/// usable (the live stream is simply not attached) and is retried on resync.
Future<void> _attach({bool force = false}) async {
if (_disposed || (_subscribed && !force)) return;
try {
await _repository.subscribe(sessionId);
if (_disposed) return;
_subscribed = true;
_subscriptionError = null;
} catch (error) {
// History stays usable, but the UI must report that live updates failed.
if (_disposed) return;
_subscribed = false;
_subscriptionError = '$error';
}
}
void _onFrame(JsonMap envelope) {
if (_disposed) return;
final body = _eventBody(envelope);
if (body == null || body['session_id'] != sessionId) return;
if (body['kind'] == 'resync') {
unawaited(resync());
return;
}
final current = _thread;
final next = applyChatEvent(current, body);
if (identical(next, current)) return;
_messages = (next['messages'] as List? ?? const [])
.whereType<Map>()
.map((message) => Map<String, dynamic>.from(message))
.toList();
_running = next['running'] == true;
_nativeTurnId = '${next['nativeTurnId'] ?? ''}';
_notify();
}
/// The pushed envelope body, or null for another message type. The server
/// wraps `chat_event` in the typed envelope; domain code never sees the
/// transport fields.
JsonMap? _eventBody(JsonMap envelope) {
if (envelope['type'] != 'chat_event') return null;
final body = envelope['chat_event'];
if (body is! Map) return null;
return Map<String, dynamic>.from(body);
}
JsonMap get _thread => {
'sessionId': sessionId,
'messages': _messages,
'running': _running,
'nativeTurnId': _nativeTurnId,
};
void _applyPage(JsonMap page) {
_messages = (page['messages'] as List? ?? const [])
.whereType<Map>()
.map((message) => Map<String, dynamic>.from(message))
.toList();
_cursor = '${page['nextCursor'] ?? ''}';
_hasMore = page['hasMore'] == true;
_loaded = true;
_loading = false;
}
bool _owned(int token) => !_disposed && token == _generation;
void _notify() {
if (!_disposed) notifyListeners();
}
@override
void dispose() {
_disposed = true;
_generation++;
unawaited(_subscription?.cancel());
super.dispose();
}
}
+57 -16
View File
@@ -21,18 +21,31 @@ const double kPipelinesWideBreakpoint = 720;
///
/// [graphBuilder] is the optional integration hook for the later graph item.
/// Without it the Graph tab states that graph rendering is pending.
///
/// Standalone use keeps the screen's own native scaffolding. The application
/// shell sets [embedded] because it already owns the one navigation bar, and
/// supplies [syncToken] so a reconnect refreshes in place.
class PipelinesScreen extends StatefulWidget {
const PipelinesScreen({
super.key,
required this.gateway,
this.graphBuilder,
this.onStageSelected,
this.embedded = false,
this.syncToken = 0,
});
final ApiGateway gateway;
final PipelineGraphBuilder? graphBuilder;
final ValueChanged<PipelineStageRef>? onStageSelected;
/// True under the application shell, which owns the single navigation bar.
final bool embedded;
/// Advances when the shared socket is replaced. The mounted controller
/// reloads the list and the selected detail without losing the selection.
final int syncToken;
@override
State<PipelinesScreen> createState() => _PipelinesScreenState();
}
@@ -54,6 +67,10 @@ class _PipelinesScreenState extends State<PipelinesScreen> {
_controller.dispose();
_controller = PipelinesController(PipelinesRepository(widget.gateway))
..load();
} else if (oldWidget.syncToken != widget.syncToken) {
// The socket was replaced; re-read through the existing controller so the
// selected pipeline and requested version survive the reconnect.
_controller.load();
}
}
@@ -102,6 +119,7 @@ class _PipelinesScreenState extends State<PipelinesScreen> {
);
},
);
if (widget.embedded) return _embeddedBody(context, body);
return useCupertinoControls(context)
? _cupertinoShell(context, body)
: _materialShell(context, body);
@@ -109,6 +127,43 @@ class _PipelinesScreenState extends State<PipelinesScreen> {
);
}
/// The shell owns the navigation bar here, so the content keeps a native
/// Refresh action without adding a second bar.
Widget _embeddedBody(BuildContext context, Widget body) {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Align(
alignment: AlignmentDirectional.centerEnd,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: _refreshButton(context),
),
),
Expanded(child: body),
],
);
}
Widget _refreshButton(BuildContext context) {
if (useCupertinoControls(context)) {
return Semantics(
button: true,
label: 'Refresh',
child: CupertinoButton(
padding: EdgeInsets.zero,
onPressed: _controller.load,
child: const Icon(CupertinoIcons.refresh),
),
);
}
return IconButton(
tooltip: 'Refresh',
onPressed: _controller.load,
icon: const Icon(Icons.refresh),
);
}
Widget _divider(BuildContext context) {
if (useCupertinoControls(context)) {
return Container(
@@ -123,13 +178,7 @@ class _PipelinesScreenState extends State<PipelinesScreen> {
return Scaffold(
appBar: AppBar(
title: const Text('Pipelines'),
actions: [
IconButton(
tooltip: 'Refresh',
onPressed: _controller.load,
icon: const Icon(Icons.refresh),
),
],
actions: [_refreshButton(context)],
),
body: SafeArea(child: body),
);
@@ -139,15 +188,7 @@ class _PipelinesScreenState extends State<PipelinesScreen> {
return CupertinoPageScaffold(
navigationBar: CupertinoNavigationBar(
middle: const Text('Pipelines'),
trailing: Semantics(
button: true,
label: 'Refresh',
child: CupertinoButton(
padding: EdgeInsets.zero,
onPressed: _controller.load,
child: const Icon(CupertinoIcons.refresh),
),
),
trailing: _refreshButton(context),
),
child: SafeArea(top: false, child: body),
);
@@ -0,0 +1,54 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../core/api_gateway.dart';
import '../../../ui/adaptive/host.dart';
import '../actions/decision_action.dart';
import '../actions/decision_wording.dart';
import '../domain/run_decisions.dart';
/// A recorded human checkpoint, never an audit-export/resource wait.
class RunDecisionNotice extends StatelessWidget {
const RunDecisionNotice({
super.key,
required this.run,
required this.gateway,
required this.onRunChanged,
});
final JsonMap run;
final ApiGateway gateway;
final ValueChanged<JsonMap> onRunChanged;
@override
Widget build(BuildContext context) {
final pending = pendingDecision(run);
if (pending == null) return const SizedBox.shrink();
final content = Padding(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Semantics(header: true, child: const Text(decisionWaitingTitle)),
Text(decisionMeta(pending)),
HumanDecisionAction(
run: run,
gateway: gateway,
onRunChanged: onRunChanged,
),
],
),
);
if (usesCupertinoHost(context)) {
return CupertinoListSection.insetGrouped(
children: [
DefaultTextStyle(
style: CupertinoTheme.of(context).textTheme.textStyle,
child: content,
),
],
);
}
return Card(child: content);
}
}
@@ -0,0 +1,44 @@
import 'package:flutter/widgets.dart';
import '../../../core/api_gateway.dart';
import '../actions/cancel_run_action.dart';
import '../actions/title_action.dart';
import 'run_decision_notice.dart';
/// Native actions on the loaded run, all using the app's one gateway and
/// applying only accepted server detail through the same controller callback.
class RunDetailActions extends StatelessWidget {
const RunDetailActions({
super.key,
required this.run,
required this.gateway,
required this.onRunChanged,
});
final JsonMap run;
final ApiGateway gateway;
final ValueChanged<JsonMap> onRunChanged;
@override
Widget build(BuildContext context) => Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Wrap(
children: [
RunTitleAction(
run: run,
gateway: gateway,
onRunChanged: onRunChanged,
),
CancelRunAction(
run: run,
gateway: gateway,
onRunChanged: onRunChanged,
),
],
),
RunDecisionNotice(run: run, gateway: gateway, onRunChanged: onRunChanged),
],
);
}
@@ -10,7 +10,7 @@ import 'run_detail_content.dart';
Widget buildCupertinoRunDetail({
required BuildContext context,
required JsonMap run,
required Widget titleAction,
required Widget headerActions,
required bool detailLoading,
required String? error,
required bool copying,
@@ -65,7 +65,7 @@ Widget buildCupertinoRunDetail({
padding: const EdgeInsetsDirectional.fromSTEB(16, 8, 16, 0),
child: Align(
alignment: AlignmentDirectional.centerStart,
child: titleAction,
child: headerActions,
),
),
if (detailLoading) const _CupertinoNotice('Refreshing run details…'),
@@ -8,7 +8,7 @@ import 'run_detail_content.dart';
Widget buildMaterialRunDetail({
required BuildContext context,
required JsonMap run,
required Widget titleAction,
required Widget headerActions,
required bool detailLoading,
required String? error,
required bool copying,
@@ -42,7 +42,7 @@ Widget buildMaterialRunDetail({
Chip(label: Text(runStatusLabel(run))),
Text('Run ${run['id']}'),
Text('Pipeline ${detailPipeline(run)}'),
titleAction,
headerActions,
],
),
if (detailLoading) const _Notice('Refreshing run details…'),
@@ -4,7 +4,7 @@ import 'package:flutter/services.dart';
import '../../../core/api_gateway.dart';
import '../../../ui/adaptive/host.dart';
import '../actions/title_action.dart';
import 'run_detail_actions.dart';
import 'run_detail_content.dart';
import 'run_detail_cupertino.dart';
import 'run_detail_material.dart';
@@ -40,7 +40,7 @@ class _RunDetailViewState extends State<RunDetailView> {
final run = widget.controller.detail;
if (run == null) return _placeholder(context, cupertino: cupertino);
final prompt = detailPrompt(run);
final titleAction = RunTitleAction(
final headerActions = RunDetailActions(
run: run,
gateway: widget.gateway,
onRunChanged: widget.controller.acceptRunDetail,
@@ -49,7 +49,7 @@ class _RunDetailViewState extends State<RunDetailView> {
? buildCupertinoRunDetail(
context: context,
run: run,
titleAction: titleAction,
headerActions: headerActions,
detailLoading: widget.controller.detailLoading,
error: widget.controller.error,
copying: _copying,
@@ -60,7 +60,7 @@ class _RunDetailViewState extends State<RunDetailView> {
: buildMaterialRunDetail(
context: context,
run: run,
titleAction: titleAction,
headerActions: headerActions,
detailLoading: widget.controller.detailLoading,
error: widget.controller.error,
copying: _copying,
+21 -1
View File
@@ -114,12 +114,32 @@ class RunsController extends ChangeNotifier {
if (id == null) return;
var changed = false;
if (detail?['id'] == id) {
++_detailGeneration;
_cancelDetailRefresh();
detail = run;
detailLoading = false;
error = null;
changed = true;
}
final index = runs.indexWhere((row) => row['id'] == id);
if (index >= 0) {
runs = [...runs]..[index] = {...runs[index], 'title': run['title'] ?? ''};
// A cancel/decision reply changes lifecycle fields as well as title.
// Keep sparse/unknown summary fields, without copying bulky detail-only
// payloads into the held list or inventing missing values.
const detailOnly = {
'steps',
'input',
'output',
'graph',
'usage',
'notifications',
};
runs = [...runs]
..[index] = {
...runs[index],
for (final entry in run.entries)
if (!detailOnly.contains(entry.key)) entry.key: entry.value,
};
changed = true;
}
if (changed) notifyListeners();
@@ -0,0 +1,223 @@
import '../../../../core/api_gateway.dart';
import '../saved_schedule.dart';
import '../schedule_rule.dart';
/// Which half of the timer rule the editor is writing.
enum ScheduleTimerMode { interval, clock }
/// Either a ready-to-send `save_schedule` record or field errors keyed by the
/// draft field the control binds to. [record] is null when any field fails, so
/// an invalid draft can never be mistaken for a save payload.
class ScheduleSaveResult {
ScheduleSaveResult(this.record, this.errors);
final JsonMap? record;
final Map<String, String> errors;
bool get isValid => record != null;
}
/// Core editor state for one saved schedule, mirroring the web editor draft.
///
/// Pure draft only: no network, timer calculation or timezone conversion.
/// [build] mirrors `serializeSchedule` in `web/src/schedules.js` for name,
/// prompt, pinned version, server workspace, timer rule, weekdays and
/// timezone. It starts from a deep copy of the server record, so unknown
/// record/input/rule/run-option fields and the exact revision survive an edit.
class ScheduleDraft {
ScheduleDraft._(this.source, this.pipelineId);
/// The record this draft edits; null for a create.
final SavedSchedule? source;
final int? pipelineId;
String name = '';
String prompt = '';
String version = '';
String workspace = '';
bool enabled = true;
ScheduleTimerMode mode = ScheduleTimerMode.interval;
String every = '24h';
String times = '';
List<String> days = [];
String timezone = '';
String notifyMode = 'auto';
/// New schedule: the server's create sentinel is `id: 0` with no revision.
factory ScheduleDraft.create({
required int pipelineId,
String version = '',
String workspace = '',
String timezone = '',
}) => ScheduleDraft._(null, pipelineId)
..version = version
..workspace = workspace
..timezone = timezone;
/// Existing record: every field starts from the server value, never from a
/// default that could overwrite it.
factory ScheduleDraft.fromSchedule(SavedSchedule s, {int? pipelineId}) {
final rule = s.rule;
return ScheduleDraft._(s, s.pipelineId ?? pipelineId)
..name = s.name
..prompt = s.prompt
..version = s.version?.toString() ?? ''
..workspace = s.workspace
..enabled = s.raw['enabled'] is bool ? s.enabled : true
..mode = rule.isClock
? ScheduleTimerMode.clock
: ScheduleTimerMode.interval
..every = rule.raw['every'] is String ? rule.every : '24h'
..times = rule.times.join(', ')
..days = [...rule.days]
..timezone = rule.timezone
..notifyMode = s.raw['notify_mode'] is String ? s.notifyMode : 'auto';
}
/// Validates every field and assembles the exact `save_schedule` record.
/// The draft and the source snapshot are never mutated.
ScheduleSaveResult build() {
final errors = <String, String>{};
void fail(String field, String message) =>
errors.putIfAbsent(field, () => message);
final selectedPipeline = source?.pipelineId ?? pipelineId;
if (!_validIdentity(selectedPipeline)) {
fail('pipelineId', 'Choose a valid pipeline.');
}
if (source != null &&
(!_validIdentity(source!.id) || !_validIdentity(source!.revision))) {
fail(
'record',
'Schedule identity or revision is missing. Refresh before editing.',
);
}
if (name.trim().isEmpty) fail('name', 'Enter a schedule name.');
if (prompt.trim().isEmpty) fail('prompt', 'Enter a prompt.');
final pinned = int.tryParse(version);
if (!_digits.hasMatch(version) ||
pinned == null ||
pinned < 1 ||
pinned > _maxSafeInteger) {
fail('version', 'Choose a positive pinned version, not latest (0).');
}
if (!workspace.startsWith('/') || _workspaceBreaks.hasMatch(workspace)) {
fail('workspace', 'Enter an absolute workspace path on the server.');
}
if (!const {'auto', 'on', 'off'}.contains(notifyMode)) {
fail('notifyMode', 'Choose a notification mode.');
}
if (days.any((day) => !scheduleDays.contains(day)) ||
days.toSet().length != days.length) {
fail('days', 'Choose valid, distinct weekdays.');
}
List<String>? clock;
if (mode == ScheduleTimerMode.interval) {
if (!_validDuration(every)) {
fail(
'every',
'Interval must be at least 1m (for example 24h or 1h30m).',
);
}
} else {
clock = [for (final time in times.split(',')) time.trim()];
if (clock.any((time) => !_timeOfDay.hasMatch(time)) ||
clock.toSet().length != clock.length) {
fail('times', 'Enter distinct 24-hour times, such as 09:00, 17:30.');
}
}
if (!_validTimezone(timezone.trim())) {
fail('timezone', 'Enter a valid IANA timezone.');
}
if (errors.isNotEmpty) return ScheduleSaveResult(null, errors);
final record = source?.toJson() ?? <String, dynamic>{};
if (source == null) record['id'] = 0;
record['name'] = name.trim();
record['pipeline_id'] = selectedPipeline;
record['version'] = pinned;
record['enabled'] = enabled;
record['input'] = (source?.input ?? <String, dynamic>{})
..['prompt'] = prompt;
// Untrimmed like `workspace: draft.workspace`; validation also runs on the
// untrimmed value, so a valid workspace is sent exactly as the operator
// entered it.
record['workspace'] = workspace;
final rule = source?.rule.toJson() ?? <String, dynamic>{};
for (final key in const ['every', 'times', 'days', 'timezone']) {
rule.remove(key);
}
if (mode == ScheduleTimerMode.interval) {
rule['every'] = every.trim();
} else {
rule['times'] = clock;
}
if (days.isNotEmpty) {
final prior = source?.rule.days ?? const <String>[];
final unchanged =
prior.length == days.length && prior.every(days.contains);
rule['days'] = unchanged ? [...prior] : [...days];
}
if (timezone.trim().isNotEmpty) rule['timezone'] = timezone.trim();
record['rule'] = rule;
record['notify_mode'] = notifyMode;
return ScheduleSaveResult(record, const {});
}
}
const _maxSafeInteger = 9007199254740991;
bool _validIdentity(int? value) =>
value != null && value > 0 && value <= _maxSafeInteger;
final _digits = RegExp(r'^\d+$');
final _timeOfDay = RegExp(r'^([01]\d|2[0-3]):[0-5]\d$');
final _workspaceBreaks = RegExp(r'[\x00\r\n]');
final _zonePart = RegExp(r'^[A-Za-z0-9_+\-]+$');
const _durationPart = r'((?:\d+(?:\.\d*)?|\.\d+))(ms|us|µs|ns|h|m|s)';
final _areas =
'Africa America Antarctica Arctic Asia Atlantic Australia '
'Brazil Canada Chile Etc Europe Indian Mexico Pacific US'
.split(' ');
final _singleZones =
'UTC GMT UCT Zulu Universal Greenwich CET EET EST HST '
'MST WET GB NZ PRC ROC ROK W-SU Egypt Eire Iceland Iran Israel Jamaica '
'Japan Kwajalein Libya Navajo Poland Portugal Singapore Turkey Cuba '
'Hongkong'
.split(' ');
double? _unit(String unit) => switch (unit) {
'h' => 3600000,
'm' => 60000,
's' => 1000,
'ms' => 1,
'us' || 'µs' => .001,
'ns' => .000001,
_ => null,
};
/// Go-style compound duration, at least one minute, as the web client accepts.
bool _validDuration(String text) {
final every = text.trim();
final parts = RegExp(_durationPart).allMatches(every).toList();
final duration = parts.fold<double>(
0,
(sum, part) => sum + double.parse(part[1]!) * _unit(part[2]!)!,
);
return parts.map((part) => part[0]!).join() == every &&
duration.isFinite &&
duration >= 60000;
}
/// Structural IANA check. Dart carries no timezone database, so a known area
/// plus a well-formed location is the strongest pure check; the server stays
/// the final validator.
bool _validTimezone(String value) {
if (value.isEmpty || value == 'Local' || _singleZones.contains(value)) {
return true;
}
final parts = value.split('/');
return parts.length > 1 &&
_areas.contains(parts.first) &&
parts.every(_zonePart.hasMatch);
}