@githolon/dsl 0.108.0 → 0.108.1

package/dart_types/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.10.0
+
+- Replace the retired Runtime v1 command model with the generated Runtime v2 and custody snapshot
+  Protobuf types used by every Dart and Flutter host.
+- Carry typed workspace summaries, sync results, custody changes, and kernel calls without generic map or
+  JSON command surfaces.
+
 ## 0.9.0
 
 - Replace the opaque admitted-offer result with generated typed kernel messages, so Rust, TypeScript,

package/dart_types/lib/nomos_kernel_protocol.dart

@@ -1,10 +1,11 @@
 // Generated protocol types shared by every Dart and Flutter Nomos host.
 //
-// The source of truth is proto/nomos/{kernel,runtime}/v1. This package owns the
+// The source of truth is proto/nomos/kernel/v1 plus proto/nomos/runtime/v2. This package owns the
 // generated Dart projection so nomos_client and nomos_flutter cannot drift into
 // handwritten copies of the kernel/runtime ABI.
 library;
 
 export 'src/proto/nomos/kernel/v1/kernel.pb.dart';
 export 'src/proto/nomos/kernel/v1/progress.pb.dart';
-export 'src/proto/nomos/runtime/v1/runtime.pb.dart';
+export 'src/proto/nomos/custody/v1/snapshot.pb.dart';
+export 'src/proto/nomos/runtime/v2/runtime.pb.dart';

package/dart_types/lib/src/custody.dart

@@ -7,6 +7,8 @@
 // resolve them. The bridge decodes these from the runner's `custody` events + `custodyStatus` reply.
 library;
 
+import 'proto/nomos/runtime/v2/runtime.pb.dart' as runtime;
+
 /// WHY a chain was superseded — the lineage annotation lifted from the workspace status onto a break.
 class NomosCustodySupersession {
   final String? reason;
@@ -31,9 +33,11 @@ enum NomosCustodyBreakKind {
   superseded,
   diverged;
 
-  static NomosCustodyBreakKind fromWire(String? s) =>
-      s == 'diverged' ? NomosCustodyBreakKind.diverged : NomosCustodyBreakKind.superseded;
-  String get wire => this == NomosCustodyBreakKind.diverged ? 'diverged' : 'superseded';
+  static NomosCustodyBreakKind fromWire(String? s) => s == 'diverged'
+      ? NomosCustodyBreakKind.diverged
+      : NomosCustodyBreakKind.superseded;
+  String get wire =>
+      this == NomosCustodyBreakKind.diverged ? 'diverged' : 'superseded';
 }
 
 /// A CUSTODY BREAK — the remote incarnation is incompatible with this client's local chain. Carries
@@ -67,11 +71,14 @@ class NomosCustodyBreak {
     this.lastSyncedAt,
   });
 
-  factory NomosCustodyBreak.fromJson(Map<String, dynamic> j) => NomosCustodyBreak(
+  factory NomosCustodyBreak.fromJson(Map<String, dynamic> j) =>
+      NomosCustodyBreak(
         kind: NomosCustodyBreakKind.fromWire(j['kind'] as String?),
         localGenesis: (j['localGenesis'] ?? '') as String,
-        remoteGenesis: (j['remoteGenesis'] ?? j['remoteIncarnation'] ?? '') as String,
-        remoteIncarnation: (j['remoteIncarnation'] ?? j['remoteGenesis'] ?? '') as String,
+        remoteGenesis:
+            (j['remoteGenesis'] ?? j['remoteIncarnation'] ?? '') as String,
+        remoteIncarnation:
+            (j['remoteIncarnation'] ?? j['remoteGenesis'] ?? '') as String,
         supersession: (j['supersession'] is Map)
             ? NomosCustodySupersession.fromJson(
                 (j['supersession'] as Map).cast<String, dynamic>())
@@ -113,7 +120,8 @@ class NomosSupersededChain {
 
   const NomosSupersededChain({this.ref, this.supersededAt, this.reason});
 
-  factory NomosSupersededChain.fromJson(Map<String, dynamic> j) => NomosSupersededChain(
+  factory NomosSupersededChain.fromJson(Map<String, dynamic> j) =>
+      NomosSupersededChain(
         ref: j['ref'] as String?,
         supersededAt: j['supersededAt'] as String?,
         reason: j['reason'] as String?,
@@ -142,16 +150,50 @@ class NomosCustodyEvent {
   /// True when this event is an interactive prompt awaiting a decision.
   bool get isAsk => kind == 'ask';
 
-  static NomosCustodyEvent? fromMessage(Map<String, dynamic> m) {
-    final c = (m['custody'] as Map?)?.cast<String, dynamic>();
-    if (c == null) return null;
-    final b = (c['break'] as Map?)?.cast<String, dynamic>();
+  factory NomosCustodyEvent.fromRuntime(
+    runtime.CustodyChanged event, {
+    String? session,
+  }) {
+    final custodyBreak = event.hasCustodyBreak() ? event.custodyBreak : null;
     return NomosCustodyEvent(
-      kind: (c['kind'] ?? '') as String,
-      session: m['session'] as String?,
-      break_: b != null ? NomosCustodyBreak.fromJson(b) : null,
-      recloned: c['recloned'] as bool?,
-      parkedIntents: (c['parkedIntents'] as num?)?.toInt(),
+      kind: switch (event.kind) {
+        runtime.CustodyChangeKind.CUSTODY_CHANGE_KIND_DETECTED => 'detected',
+        runtime.CustodyChangeKind.CUSTODY_CHANGE_KIND_REJECTED => 'rejected',
+        runtime.CustodyChangeKind.CUSTODY_CHANGE_KIND_ADOPTING => 'adopting',
+        runtime.CustodyChangeKind.CUSTODY_CHANGE_KIND_ADOPT_REFUSED =>
+          'adopt-refused',
+        runtime.CustodyChangeKind.CUSTODY_CHANGE_KIND_ASK => 'ask',
+        _ => 'unspecified',
+      },
+      session: session,
+      break_: custodyBreak == null
+          ? null
+          : NomosCustodyBreak(
+              kind: custodyBreak.kind ==
+                      runtime.CustodyBreakKind.CUSTODY_BREAK_KIND_DIVERGED
+                  ? NomosCustodyBreakKind.diverged
+                  : NomosCustodyBreakKind.superseded,
+              localGenesis: custodyBreak.localGenesis,
+              remoteGenesis: custodyBreak.remoteGenesis,
+              remoteIncarnation: custodyBreak.remoteIncarnation,
+              supersession: custodyBreak.hasSupersession()
+                  ? NomosCustodySupersession(
+                      reason: custodyBreak.supersession.hasReason()
+                          ? custodyBreak.supersession.reason
+                          : null,
+                      supersededAt: custodyBreak.supersession.hasSupersededAt()
+                          ? custodyBreak.supersession.supersededAt
+                          : null,
+                    )
+                  : null,
+              localOnlyIntents: custodyBreak.localOnlyIntents.toInt(),
+              lastSyncedAt: custodyBreak.hasLastSyncedAtMillis()
+                  ? custodyBreak.lastSyncedAtMillis.toInt()
+                  : null,
+            ),
+      recloned: event.hasRecloned() ? event.recloned : null,
+      parkedIntents:
+          event.hasParkedIntents() ? event.parkedIntents.toInt() : null,
     );
   }
 }
@@ -185,7 +227,8 @@ class NomosCustodyStatus {
     this.pendingBreak,
   });
 
-  factory NomosCustodyStatus.fromJson(Map<String, dynamic> j) => NomosCustodyStatus(
+  factory NomosCustodyStatus.fromJson(Map<String, dynamic> j) =>
+      NomosCustodyStatus(
         incarnation: j['incarnation'] as String?,
         localGenesis: j['localGenesis'] as String?,
         remoteIncarnation: j['remoteIncarnation'] as String?,
@@ -194,10 +237,12 @@ class NomosCustodyStatus {
         salvagedIntents: (j['salvagedIntents'] as num?)?.toInt() ?? 0,
         supersessionHistory: ((j['supersessionHistory'] as List?) ?? const [])
             .whereType<Map>()
-            .map((m) => NomosSupersededChain.fromJson(m.cast<String, dynamic>()))
+            .map(
+                (m) => NomosSupersededChain.fromJson(m.cast<String, dynamic>()))
             .toList(),
         pendingBreak: (j['pendingBreak'] is Map)
-            ? NomosCustodyBreak.fromJson((j['pendingBreak'] as Map).cast<String, dynamic>())
+            ? NomosCustodyBreak.fromJson(
+                (j['pendingBreak'] as Map).cast<String, dynamic>())
             : null,
       );
 }

package/dart_types/lib/src/local_work_rejected.dart

@@ -16,6 +16,8 @@
 //            this device's signer enrollment hadn't landed on the chain yet)
 //   false ⇒ "Your changes couldn't be accepted and have been preserved for review — contact support."
 // Never show [NomosRejectedIntent.error] raw to an end user — it is the gate's diagnostic text.
+import 'proto/nomos/runtime/v2/runtime.pb.dart' as runtime;
+
 class NomosRejectedIntent {
   final String? intentId;
   final String? oid;
@@ -36,25 +38,6 @@ class NomosRejectedIntent {
     required this.error,
     required this.retryable,
   });
-
-  factory NomosRejectedIntent.fromJson(Map<String, dynamic> j) =>
-      NomosRejectedIntent(
-        intentId: j['intentId'] as String?,
-        oid: j['oid'] as String?,
-        domain: j['domain'] as String?,
-        directiveId: j['directiveId'] as String?,
-        error: (j['error'] ?? '') as String,
-        retryable: j['retryable'] == true,
-      );
-
-  Map<String, dynamic> toJson() => {
-        'intentId': intentId,
-        'oid': oid,
-        'domain': domain,
-        'directiveId': directiveId,
-        'error': error,
-        'retryable': retryable,
-      };
 }
 
 /// The typed "the cloud refused work your device had accepted" event. See library docs above —
@@ -88,30 +71,32 @@ class NomosLocalWorkRejectedEvent {
     required this.source,
   });
 
-  static NomosLocalWorkRejectedEvent? fromMessage(Map<String, dynamic> m) {
-    final e = (m['localWorkRejected'] as Map?)?.cast<String, dynamic>();
-    if (e == null) return null;
-    return NomosLocalWorkRejectedEvent(
-      workspace: (e['workspace'] ?? '') as String,
-      session: m['session'] as String?,
-      refused: ((e['refused'] as List?) ?? const [])
-          .whereType<Map>()
-          .map((r) => NomosRejectedIntent.fromJson(r.cast<String, dynamic>()))
-          .toList(growable: false),
-      parked: e['parked'] != false,
-      resetTo: e['resetTo'] as String?,
-      retryable: e['retryable'] == true,
-      source: (e['source'] ?? 'sync') as String,
-    );
-  }
-
-  Map<String, dynamic> toJson() => {
-        'workspace': workspace,
-        'session': session,
-        'refused': refused.map((r) => r.toJson()).toList(growable: false),
-        'parked': parked,
-        'resetTo': resetTo,
-        'retryable': retryable,
-        'source': source,
-      };
+  factory NomosLocalWorkRejectedEvent.fromRuntime(
+    runtime.LocalWorkRejected event, {
+    String? session,
+  }) =>
+      NomosLocalWorkRejectedEvent(
+        workspace: event.workspace,
+        session: session,
+        refused: event.refused
+            .map(
+              (item) => NomosRejectedIntent(
+                intentId: item.hasIntentId() ? item.intentId : null,
+                oid: item.hasCommitOid() ? item.commitOid : null,
+                domain: item.hasDomain() ? item.domain : null,
+                directiveId: item.hasDirective() ? item.directive : null,
+                error: item.message,
+                retryable: item.retryable,
+              ),
+            )
+            .toList(growable: false),
+        parked: event.parked,
+        resetTo: event.hasResetTo() ? event.resetTo : null,
+        retryable: event.retryable,
+        source: event.source ==
+                runtime.LocalWorkRejectionSource
+                    .LOCAL_WORK_REJECTION_SOURCE_ADMISSION
+            ? 'admission'
+            : 'sync',
+      );
 }

package/dart_types/lib/src/proto/nomos/custody/v1/snapshot.pb.dart

@@ -0,0 +1,169 @@
+// This is a generated file - do not edit.
+//
+// Generated from nomos/custody/v1/snapshot.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+
+import 'dart:core' as $core;
+
+import 'package:protobuf/protobuf.dart' as $pb;
+
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
+/// Opaque local custody cache. Git tree and checkpoint bytes remain kernel-owned;
+/// the host records only enough typed metadata to offer them back on next open.
+/// Field numbers deliberately match the historical runtime-v1 message so stored
+/// PB3 snapshots remain wire-compatible across this ownership correction.
+class LocalCustodySnapshot extends $pb.GeneratedMessage {
+  factory LocalCustodySnapshot({
+    $core.int? formatVersion,
+    $core.String? workspace,
+    $core.List<$core.int>? tree,
+    $core.List<$core.int>? checkpoint,
+    $core.List<$core.int>? frontier,
+    $core.String? cursor,
+    $core.String? stateRoot,
+    $core.String? syncedBase,
+  }) {
+    final result = create();
+    if (formatVersion != null) result.formatVersion = formatVersion;
+    if (workspace != null) result.workspace = workspace;
+    if (tree != null) result.tree = tree;
+    if (checkpoint != null) result.checkpoint = checkpoint;
+    if (frontier != null) result.frontier = frontier;
+    if (cursor != null) result.cursor = cursor;
+    if (stateRoot != null) result.stateRoot = stateRoot;
+    if (syncedBase != null) result.syncedBase = syncedBase;
+    return result;
+  }
+
+  LocalCustodySnapshot._();
+
+  factory LocalCustodySnapshot.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory LocalCustodySnapshot.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'LocalCustodySnapshot',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'nomos.custody.v1'),
+      createEmptyInstance: create)
+    ..aI(1, _omitFieldNames ? '' : 'formatVersion',
+        fieldType: $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'workspace')
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'tree', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        4, _omitFieldNames ? '' : 'checkpoint', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        5, _omitFieldNames ? '' : 'frontier', $pb.PbFieldType.OY)
+    ..aOS(6, _omitFieldNames ? '' : 'cursor')
+    ..aOS(7, _omitFieldNames ? '' : 'stateRoot')
+    ..aOS(8, _omitFieldNames ? '' : 'syncedBase')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  LocalCustodySnapshot clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  LocalCustodySnapshot copyWith(void Function(LocalCustodySnapshot) updates) =>
+      super.copyWith((message) => updates(message as LocalCustodySnapshot))
+          as LocalCustodySnapshot;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static LocalCustodySnapshot create() => LocalCustodySnapshot._();
+  @$core.override
+  LocalCustodySnapshot createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static LocalCustodySnapshot getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<LocalCustodySnapshot>(create);
+  static LocalCustodySnapshot? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get formatVersion => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set formatVersion($core.int value) => $_setUnsignedInt32(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasFormatVersion() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearFormatVersion() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get workspace => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set workspace($core.String value) => $_setString(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasWorkspace() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearWorkspace() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.List<$core.int> get tree => $_getN(2);
+  @$pb.TagNumber(3)
+  set tree($core.List<$core.int> value) => $_setBytes(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasTree() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearTree() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.List<$core.int> get checkpoint => $_getN(3);
+  @$pb.TagNumber(4)
+  set checkpoint($core.List<$core.int> value) => $_setBytes(3, value);
+  @$pb.TagNumber(4)
+  $core.bool hasCheckpoint() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearCheckpoint() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.List<$core.int> get frontier => $_getN(4);
+  @$pb.TagNumber(5)
+  set frontier($core.List<$core.int> value) => $_setBytes(4, value);
+  @$pb.TagNumber(5)
+  $core.bool hasFrontier() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearFrontier() => $_clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.String get cursor => $_getSZ(5);
+  @$pb.TagNumber(6)
+  set cursor($core.String value) => $_setString(5, value);
+  @$pb.TagNumber(6)
+  $core.bool hasCursor() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearCursor() => $_clearField(6);
+
+  @$pb.TagNumber(7)
+  $core.String get stateRoot => $_getSZ(6);
+  @$pb.TagNumber(7)
+  set stateRoot($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(7)
+  $core.bool hasStateRoot() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearStateRoot() => $_clearField(7);
+
+  @$pb.TagNumber(8)
+  $core.String get syncedBase => $_getSZ(7);
+  @$pb.TagNumber(8)
+  set syncedBase($core.String value) => $_setString(7, value);
+  @$pb.TagNumber(8)
+  $core.bool hasSyncedBase() => $_has(7);
+  @$pb.TagNumber(8)
+  void clearSyncedBase() => $_clearField(8);
+}
+
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');

package/dart_types/lib/src/proto/nomos/custody/v1/snapshot.pbenum.dart

@@ -0,0 +1,11 @@
+// This is a generated file - do not edit.
+//
+// Generated from nomos/custody/v1/snapshot.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names