ai-workspace-lab/xworkmate-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: load nested bridge skills status

Browse Source
This commit is contained in:
Haitao Pan 2026-06-03 16:53:51 +08:00
parent 604536c11c
commit f5c85d4137
2 changed files with 152 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/runtime/gateway_runtime_api.dart
View File

@ -208,23 +208,35 @@ extension GatewayRuntimeApiInternal on GatewayRuntime {
},
),
);
return asList(payload['skills'])
final statusPayload = skillsStatusPayloadInternal(payload);
return asList(statusPayload['skills'])
.map((item) {
final map = asMap(item);
return GatewaySkillSummary(
name: stringValue(map['name']) ?? 'Skill',
name:
stringValue(map['name']) ??
stringValue(map['title']) ??
stringValue(map['id']) ??
'Skill',
description: stringValue(map['description']) ?? '',
source: stringValue(map['source']) ?? 'workspace',
skillKey:
stringValue(map['skillKey']) ??
stringValue(map['skill_key']) ??
stringValue(map['key']) ??
stringValue(map['id']) ??
stringValue(map['name']) ??
'skill',
primaryEnv: stringValue(map['primaryEnv']),
eligible: boolValue(map['eligible']) ?? false,
disabled: boolValue(map['disabled']) ?? false,
missingBins: stringList(asMap(map['missing'])['bins']),
missingEnv: stringList(asMap(map['missing'])['env']),
missingConfig: stringList(asMap(map['missing'])['config']),
missingBins: skillMissingListInternal(map, 'bins', 'missingBins'),
missingEnv: skillMissingListInternal(map, 'env', 'missingEnv'),
missingConfig: skillMissingListInternal(
map,
'config',
'missingConfig',
),
);
})
.toList(growable: false);
@ -543,3 +555,33 @@ extension GatewayRuntimeApiInternal on GatewayRuntime {
return result.payload;
}
}
Map<String, dynamic> skillsStatusPayloadInternal(Map<String, dynamic> payload) {
if (asList(payload['skills']).isNotEmpty) {
return payload;
}
for (final key in const <String>[
'status',
'skillStatus',
'data',
'payload',
]) {
final nested = asMap(payload[key]);
if (asList(nested['skills']).isNotEmpty) {
return nested;
}
}
return payload;
}
List<String> skillMissingListInternal(
Map<String, dynamic> skill,
String nestedKey,
String flatKey,
) {
final flat = stringList(skill[flatKey]);
if (flat.isNotEmpty) {
return flat;
}
return stringList(asMap(skill['missing'])[nestedKey]);
}

105
test/runtime/gateway_runtime_bridge_skills_test.dart
View File

@ -176,4 +176,109 @@ void main() {
expect(controller.items.first.eligible, isTrue);
},
);
test(
'GatewayRuntime loads skills from nested bridge status payload',
() async {
final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
final subscription = server.listen((request) async {
final body = await utf8.decoder.bind(request).join();
final rpc = jsonDecode(body) as Map<String, dynamic>;
final method = rpc['method']?.toString().trim() ?? '';
request.response.headers.contentType = ContentType.json;
if (method == 'xworkmate.gateway.connect') {
request.response.write(
jsonEncode(<String, dynamic>{
'jsonrpc': '2.0',
'id': rpc['id'],
'result': <String, dynamic>{
'ok': true,
'snapshot': <String, dynamic>{
'status': 'connected',
'mode': 'remote',
'statusText': 'Connected',
'mainSessionKey': 'main',
},
'auth': <String, dynamic>{'role': 'operator'},
'returnedDeviceToken': '',
},
}),
);
await request.response.close();
return;
}
if (method == 'xworkmate.gateway.request') {
request.response.write(
jsonEncode(<String, dynamic>{
'jsonrpc': '2.0',
'id': rpc['id'],
'result': <String, dynamic>{
'ok': true,
'payload': <String, dynamic>{
'status': <String, dynamic>{
'workspaceDir': '/home/ubuntu/.openclaw/workspace',
'managedSkillsDir': '/home/ubuntu/.openclaw/skills',
'skills': <Map<String, dynamic>>[
<String, dynamic>{
'name': 'Browser Automation',
'description': 'Drive browser workflows.',
'source': 'agent',
'id': 'browser-automation',
'eligible': true,
'disabled': false,
'missingBins': <String>[],
'missingEnv': <String>[],
'missingConfig': <String>[],
},
],
},
},
},
}),
);
await request.response.close();
return;
}
request.response.statusCode = HttpStatus.badRequest;
await request.response.close();
});
final tempDir = await Directory.systemTemp.createTemp(
'xworkmate-bridge-skills-nested-test-',
);
final store = SecureConfigStore(
enableSecureStorage: false,
appDataRootPathResolver: () async => '${tempDir.path}/settings.sqlite3',
secretRootPathResolver: () async => tempDir.path,
);
final acpClient = GatewayAcpClient(
endpointResolver: () => Uri.parse('http://127.0.0.1:${server.port}'),
authorizationResolver: (_) async => 'bridge-token',
);
final identityStore = DeviceIdentityStore(store);
final runtime = GatewayRuntime(
store: store,
identityStore: identityStore,
sessionClient: GatewayAcpRuntimeSessionClient(client: acpClient),
);
await runtime.initialize();
addTearDown(() async {
runtime.dispose();
await subscription.cancel();
await server.close(force: true);
await tempDir.delete(recursive: true);
});
final controller = SkillsController(runtime);
await controller.refresh(agentId: 'main');
expect(controller.error, isNull);
expect(controller.items, hasLength(1));
expect(controller.items.single.skillKey, 'browser-automation');
expect(controller.items.single.missingBins, isEmpty);
},
);
}