dsh-apk-vm 0.8.0 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/client.js CHANGED
@@ -30,7 +30,7 @@ window.__ModuleLoader__.load({
30
30
  var SWIPE_THRESHOLD_PX = 24;
31
31
  var FRAME_INTERVAL_MS = 500;
32
32
  var STATE_INTERVAL_MS = 2000;
33
- var CLIENT_VERSION = '0.8.0';
33
+ var CLIENT_VERSION = '0.10.0';
34
34
 
35
35
  /* ------------------------------------------------------------------ *
36
36
  * Optional dsh-better-sidebar integration.
@@ -113,6 +113,19 @@ window.__ModuleLoader__.load({
113
113
  'pill.boot': 'boot {s}s',
114
114
  'pill.snapshot': 'quick {s}s',
115
115
  'pill.cold': 'cold {s}s',
116
+ 'owner.pill': 'owner: {label}',
117
+ 'owner.shared': 'shared',
118
+ 'owner.conversation': 'conversation VM',
119
+ 'owner.project': 'project VM',
120
+ 'owner.title': 'VM usage',
121
+ 'owner.none': 'unowned',
122
+ 'owner.claim': 'Claim',
123
+ 'owner.release': 'Release',
124
+ 'owner.claimOk': 'VM claimed',
125
+ 'owner.releaseOk': 'VM released',
126
+ 'owner.busy': 'in use by {label}',
127
+ 'owner.scope': 'Scope',
128
+ 'owner.forceHint': 'Another owner holds this VM; release it first.',
116
129
  'action.start': 'Start VM',
117
130
  'action.starting': 'Starting…',
118
131
  'action.stop': 'Stop',
@@ -232,6 +245,7 @@ window.__ModuleLoader__.load({
232
245
  'network.forwardLocal': 'Host port',
233
246
  'network.forwardRemote': 'Guest port',
234
247
  'network.addForward': 'Add forward',
248
+ 'network.presets': 'Presets',
235
249
  'network.remove': 'Remove',
236
250
  'network.mode': 'Mode',
237
251
  'network.isolated': 'Isolated',
@@ -263,6 +277,20 @@ window.__ModuleLoader__.load({
263
277
  'flow.saved': 'Saved {name}',
264
278
  'flow.done': 'Replayed {name}',
265
279
  'flow.count': '{n} step(s)',
280
+ 'skill.title': 'App operation Skills',
281
+ 'skill.start': 'Record Skill',
282
+ 'skill.stop': 'Stop recording',
283
+ 'skill.name': 'Skill name',
284
+ 'skill.target': 'Target code (optional)',
285
+ 'skill.run': 'Run to target',
286
+ 'skill.delete': 'Delete',
287
+ 'skill.empty': 'No App Skills yet',
288
+ 'skill.recording': 'Recording semantic controls…',
289
+ 'skill.saved': 'Saved Skill {name}',
290
+ 'skill.done': 'Ran {name} ({n} steps)',
291
+ 'skill.failed': 'Skill run failed',
292
+ 'skill.meta': '{n} steps · {codes} codes',
293
+ 'skill.hint': 'Agent records code-based controls; replay skips fixed sleeps and stops at target code.',
266
294
  'snapshots.title': 'VM snapshots',
267
295
  'snapshots.placeholder': 'snapshot name',
268
296
  'snapshots.save': 'Save',
@@ -323,6 +351,15 @@ window.__ModuleLoader__.load({
323
351
  'devices.select': 'Select device…',
324
352
  'devices.attach': 'Attach',
325
353
  'devices.remotePlaceholder': 'host:port',
354
+ 'remote.title': 'Remote VM (SSH)',
355
+ 'remote.host': 'SSH host',
356
+ 'remote.user': 'SSH user',
357
+ 'remote.key': 'SSH key path (optional)',
358
+ 'remote.remotePort': 'Remote adb port',
359
+ 'remote.connect': 'Connect tunnel',
360
+ 'remote.disconnect': 'Disconnect',
361
+ 'remote.connected': 'SSH tunnel connected',
362
+ 'remote.disconnected': 'SSH tunnel closed',
326
363
  'devices.detach': 'Detach',
327
364
  'devices.attached': 'Attached {serial}',
328
365
  'devices.detached': 'Detached external device',
@@ -393,6 +430,19 @@ window.__ModuleLoader__.load({
393
430
  'pill.boot': '启动用时 {s} 秒',
394
431
  'pill.snapshot': '快照启动 {s} 秒',
395
432
  'pill.cold': '冷启动 {s} 秒',
433
+ 'owner.pill': '使用者:{label}',
434
+ 'owner.shared': '共享',
435
+ 'owner.conversation': '对话专属',
436
+ 'owner.project': '项目专属',
437
+ 'owner.title': '虚拟机使用',
438
+ 'owner.none': '未占用',
439
+ 'owner.claim': '认领',
440
+ 'owner.release': '释放',
441
+ 'owner.claimOk': '已认领虚拟机',
442
+ 'owner.releaseOk': '已释放虚拟机',
443
+ 'owner.busy': '被 {label} 占用',
444
+ 'owner.scope': '范围',
445
+ 'owner.forceHint': '其他使用者正在占用,请先释放。',
396
446
  'action.start': '启动虚拟机',
397
447
  'action.starting': '正在启动…',
398
448
  'action.stop': '停止',
@@ -512,6 +562,7 @@ window.__ModuleLoader__.load({
512
562
  'network.forwardLocal': '宿主机端口',
513
563
  'network.forwardRemote': 'Guest 端口',
514
564
  'network.addForward': '添加转发',
565
+ 'network.presets': '预设',
515
566
  'network.remove': '删除',
516
567
  'network.mode': '模式',
517
568
  'network.isolated': '隔离',
@@ -543,6 +594,20 @@ window.__ModuleLoader__.load({
543
594
  'flow.saved': '已保存 {name}',
544
595
  'flow.done': '已回放 {name}',
545
596
  'flow.count': '{n} 步',
597
+ 'skill.title': '应用操作 Skill',
598
+ 'skill.start': '录制 Skill',
599
+ 'skill.stop': '停止录制',
600
+ 'skill.name': 'Skill 名称',
601
+ 'skill.target': '目标编码(可选)',
602
+ 'skill.run': '运行到目标',
603
+ 'skill.delete': '删除',
604
+ 'skill.empty': '还没有 App Skill',
605
+ 'skill.recording': '正在录制语义控件…',
606
+ 'skill.saved': '已保存 Skill {name}',
607
+ 'skill.done': '已运行 {name}({n} 步)',
608
+ 'skill.failed': 'Skill 运行失败',
609
+ 'skill.meta': '{n} 步 · {codes} 个编码',
610
+ 'skill.hint': 'Agent 用编码录制操作;回放跳过固定等待,并在目标编码出现时提前结束。',
546
611
  'snapshots.title': 'VM 快照',
547
612
  'snapshots.placeholder': '快照名称',
548
613
  'snapshots.save': '保存',
@@ -603,6 +668,15 @@ window.__ModuleLoader__.load({
603
668
  'devices.select': '选择设备…',
604
669
  'devices.attach': '连接',
605
670
  'devices.remotePlaceholder': '主机:端口',
671
+ 'remote.title': '远程 VM(SSH)',
672
+ 'remote.host': 'SSH 主机',
673
+ 'remote.user': 'SSH 用户',
674
+ 'remote.key': 'SSH 私钥路径(可选)',
675
+ 'remote.remotePort': '远端 adb 端口',
676
+ 'remote.connect': '连接隧道',
677
+ 'remote.disconnect': '断开',
678
+ 'remote.connected': 'SSH 隧道已连接',
679
+ 'remote.disconnected': 'SSH 隧道已关闭',
606
680
  'devices.detach': '断开',
607
681
  'devices.attached': '已连接 {serial}',
608
682
  'devices.detached': '已断开外部设备',
@@ -744,6 +818,49 @@ window.__ModuleLoader__.load({
744
818
  * reject, so a dead Host route only produces an inline error banner.
745
819
  * ------------------------------------------------------------------ */
746
820
 
821
+ var PANEL_OWNER_ID = 'apkvm.panel.id';
822
+ var PANEL_OWNER_SCOPE = 'apkvm.panel.scope';
823
+
824
+ function panelOwnerId() {
825
+ try {
826
+ var stored = window.localStorage.getItem(PANEL_OWNER_ID);
827
+ if (stored) return String(stored).slice(0, 120);
828
+ var created = Math.random().toString(36).slice(2, 10);
829
+ window.localStorage.setItem(PANEL_OWNER_ID, created);
830
+ return created;
831
+ } catch (error) {
832
+ return 'default';
833
+ }
834
+ }
835
+
836
+ function panelOwnerKey() {
837
+ return 'panel:' + panelOwnerScope() + ':' + panelOwnerId();
838
+ }
839
+
840
+ function panelOwnerScope() {
841
+ try {
842
+ var stored = window.localStorage.getItem(PANEL_OWNER_SCOPE);
843
+ return stored === 'conversation' || stored === 'project' ? stored : 'shared';
844
+ } catch (error) {
845
+ return 'shared';
846
+ }
847
+ }
848
+
849
+ function panelOwnerHeaders() {
850
+ return {
851
+ 'x-apk-vm-owner': panelOwnerKey(),
852
+ 'x-apk-vm-scope': panelOwnerScope(),
853
+ 'x-apk-vm-label': '桌面面板',
854
+ };
855
+ }
856
+
857
+ var PORT_PRESETS = [
858
+ { key: 'metro', label: 'Metro 8081', localPort: 8081, remotePort: 8081 },
859
+ { key: 'http', label: 'HTTP 8080', localPort: 8080, remotePort: 8080 },
860
+ { key: 'frida', label: 'Frida 27042', localPort: 27042, remotePort: 27042 },
861
+ { key: 'devtools', label: 'DevTools 9222', localPort: 9222, remotePort: 9222 },
862
+ ];
863
+
747
864
  function requestJson(url, options, T) {
748
865
  var tr = typeof T === 'function' ? T : createTranslator(null);
749
866
  var opts = isObject(options) ? options : {};
@@ -751,10 +868,18 @@ window.__ModuleLoader__.load({
751
868
  return Promise.resolve({ ok: false, status: 0, error: tr('err.noFetch'), data: null });
752
869
  }
753
870
  var init = { method: opts.method ? String(opts.method).toUpperCase() : 'GET', cache: 'no-store' };
871
+ var headers = {};
754
872
  if (opts.body !== undefined) {
755
873
  init.body = opts.body;
756
- init.headers = { 'content-type': 'application/json' };
874
+ headers['content-type'] = 'application/json';
875
+ }
876
+ if (init.method !== 'GET' && init.method !== 'HEAD') {
877
+ var ownerHeaders = panelOwnerHeaders();
878
+ for (var ownerHeader in ownerHeaders) {
879
+ if (Object.prototype.hasOwnProperty.call(ownerHeaders, ownerHeader)) headers[ownerHeader] = ownerHeaders[ownerHeader];
880
+ }
757
881
  }
882
+ if (Object.keys(headers).length) init.headers = headers;
758
883
  return fetch(url, init)
759
884
  .then(function (response) {
760
885
  return response.text().then(function (text) {
@@ -1123,7 +1248,12 @@ window.__ModuleLoader__.load({
1123
1248
  '.apkvm-instactions{display:flex;gap:3px;flex:none}' +
1124
1249
  '.apkvm-mini{font:inherit;font-size:10px;height:19px;padding:0 5px;border-radius:5px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);color:var(--dsw-alias-label-secondary);cursor:pointer}' +
1125
1250
  '.apkvm-mini:hover{color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-brand-primary)}' +
1251
+ '.apkvm-mini.active{color:var(--dsw-alias-brand-primary);border-color:var(--dsw-alias-brand-primary);background:var(--dsw-alias-bg-layer-2)}' +
1252
+ '.apkvm-mini:disabled{opacity:.5;cursor:default}' +
1126
1253
  '.apkvm-mini.danger:hover{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}' +
1254
+ '.apkvm-ownerbody{padding:6px 10px 9px;display:flex;flex-direction:column;gap:7px}' +
1255
+ '.apkvm-ownerrow{font-size:11px;line-height:16px}' +
1256
+ '.apkvm-ownercontrols{display:flex;align-items:center;gap:5px;flex-wrap:wrap}' +
1127
1257
  '.apkvm-appsbody{display:flex;flex-direction:column;gap:5px;padding-top:4px}' +
1128
1258
  '.apkvm-appslist{display:flex;flex-direction:column;gap:3px;max-height:180px}' +
1129
1259
  '.apkvm-approw{display:flex;align-items:center;gap:4px;min-width:0;font-size:11px}' +
@@ -1369,6 +1499,24 @@ window.__ModuleLoader__.load({
1369
1499
  var remoteSerialState = React.useState('');
1370
1500
  var remoteSerial = remoteSerialState[0];
1371
1501
  var setRemoteSerial = remoteSerialState[1];
1502
+ var remoteHostState = React.useState('');
1503
+ var remoteHost = remoteHostState[0];
1504
+ var setRemoteHost = remoteHostState[1];
1505
+ var remoteUserState = React.useState('');
1506
+ var remoteUser = remoteUserState[0];
1507
+ var setRemoteUser = remoteUserState[1];
1508
+ var remoteKeyState = React.useState('');
1509
+ var remoteKey = remoteKeyState[0];
1510
+ var setRemoteKey = remoteKeyState[1];
1511
+ var remotePortState = React.useState('5558');
1512
+ var remotePort = remotePortState[0];
1513
+ var setRemotePort = remotePortState[1];
1514
+ var remoteSshBusyState = React.useState(false);
1515
+ var remoteSshBusy = remoteSshBusyState[0];
1516
+ var setRemoteSshBusy = remoteSshBusyState[1];
1517
+ var remoteSshState = React.useState(null);
1518
+ var remoteSsh = remoteSshState[0];
1519
+ var setRemoteSsh = remoteSshState[1];
1372
1520
  var deviceBusyState = React.useState(false);
1373
1521
  var deviceBusy = deviceBusyState[0];
1374
1522
  var setDeviceBusy = deviceBusyState[1];
@@ -1383,6 +1531,15 @@ window.__ModuleLoader__.load({
1383
1531
  var instancesListState = React.useState([]);
1384
1532
  var instancesList = instancesListState[0];
1385
1533
  var setInstancesList = instancesListState[1];
1534
+ var ownershipState = React.useState(null);
1535
+ var ownership = ownershipState[0];
1536
+ var setOwnership = ownershipState[1];
1537
+ var panelScopeState = React.useState(panelOwnerScope());
1538
+ var panelScope = panelScopeState[0];
1539
+ var setPanelScope = panelScopeState[1];
1540
+ var ownerBusyState = React.useState(false);
1541
+ var ownerBusy = ownerBusyState[0];
1542
+ var setOwnerBusy = ownerBusyState[1];
1386
1543
  var gridOpenState = React.useState(false);
1387
1544
  var gridOpen = gridOpenState[0];
1388
1545
  var setGridOpen = gridOpenState[1];
@@ -1439,6 +1596,21 @@ window.__ModuleLoader__.load({
1439
1596
  var flowBusyState = React.useState('');
1440
1597
  var flowBusy = flowBusyState[0];
1441
1598
  var setFlowBusy = flowBusyState[1];
1599
+ var skillsState = React.useState([]);
1600
+ var skills = skillsState[0];
1601
+ var setSkills = skillsState[1];
1602
+ var skillRecordingState = React.useState(false);
1603
+ var skillRecording = skillRecordingState[0];
1604
+ var setSkillRecording = skillRecordingState[1];
1605
+ var skillNameState = React.useState('');
1606
+ var skillName = skillNameState[0];
1607
+ var setSkillName = skillNameState[1];
1608
+ var skillTargetState = React.useState('');
1609
+ var skillTarget = skillTargetState[0];
1610
+ var setSkillTarget = skillTargetState[1];
1611
+ var skillBusyState = React.useState('');
1612
+ var skillBusy = skillBusyState[0];
1613
+ var setSkillBusy = skillBusyState[1];
1442
1614
 
1443
1615
  var storageState = React.useState(null);
1444
1616
  var storage = storageState[0];
@@ -1638,6 +1810,11 @@ window.__ModuleLoader__.load({
1638
1810
  }
1639
1811
  }
1640
1812
  pillMeta.push('v' + CLIENT_VERSION);
1813
+ var ownerSnapshot = snapshot && isObject(snapshot.owner) ? snapshot.owner : null;
1814
+ if (ownerSnapshot) {
1815
+ var ownerPillLabel = String(ownerSnapshot.label || ownerSnapshot.key || '').slice(0, 48);
1816
+ if (ownerPillLabel) pillMeta.push(T('owner.pill', { label: ownerPillLabel }));
1817
+ }
1641
1818
  var subtitleText = apkInfo
1642
1819
  ? T('apk.current', { name: apkInfo.label || apkInfo.packageName || apkInfo.path })
1643
1820
  : T('subtitle');
@@ -1702,8 +1879,10 @@ window.__ModuleLoader__.load({
1702
1879
  loadState();
1703
1880
  loadApks();
1704
1881
  loadInstances();
1882
+ loadOwnership();
1705
1883
  loadDevices();
1706
1884
  loadFlows();
1885
+ loadSkills();
1707
1886
  loadStorage();
1708
1887
  loadNetwork();
1709
1888
  var pollId = setInterval(function () {
@@ -1714,7 +1893,10 @@ window.__ModuleLoader__.load({
1714
1893
  });
1715
1894
  }, STATE_INTERVAL_MS);
1716
1895
  var instancePollId = setInterval(function () {
1717
- if (mountedRef.current) loadInstances();
1896
+ if (mountedRef.current) {
1897
+ loadInstances();
1898
+ loadOwnership();
1899
+ }
1718
1900
  }, 5000);
1719
1901
  return function () {
1720
1902
  mountedRef.current = false;
@@ -2145,6 +2327,8 @@ window.__ModuleLoader__.load({
2145
2327
  setInspectNodes([]);
2146
2328
  setInspectSelected(null);
2147
2329
  loadFlows();
2330
+ loadSkills();
2331
+ loadOwnership();
2148
2332
  setNetwork(null);
2149
2333
  loadNetwork();
2150
2334
  stopLiveLogcat();
@@ -2162,6 +2346,116 @@ window.__ModuleLoader__.load({
2162
2346
  });
2163
2347
  }
2164
2348
 
2349
+ function loadOwnership() {
2350
+ var id = activeInstanceRef.current || 'default';
2351
+ return requestJson('/apk-vm/ownership?instanceId=' + encodeURIComponent(id), null, T).then(function (result) {
2352
+ if (!mountedRef.current) return result;
2353
+ if (result.ok && isObject(result.data)) setOwnership(result.data);
2354
+ return result;
2355
+ });
2356
+ }
2357
+
2358
+ function panelOwnsCurrentVm() {
2359
+ return Boolean(ownership && isObject(ownership.owner) && ownership.owner.key === panelOwnerKey());
2360
+ }
2361
+
2362
+ function claimPanelOwner(force) {
2363
+ if (ownerBusy) return;
2364
+ var id = activeInstanceRef.current || 'default';
2365
+ setOwnerBusy(true);
2366
+ requestJson('/apk-vm/ownership', {
2367
+ method: 'POST',
2368
+ body: JSON.stringify({
2369
+ action: 'claim',
2370
+ instanceId: id,
2371
+ ownerKey: panelOwnerKey(),
2372
+ ownerScope: panelScope,
2373
+ ownerLabel: '桌面面板',
2374
+ force: force === true,
2375
+ }),
2376
+ }, T).then(function (result) {
2377
+ if (!mountedRef.current) return;
2378
+ setOwnerBusy(false);
2379
+ if (!result.ok) {
2380
+ pushToast('error', (result.error || T('err.action')).slice(0, 400));
2381
+ loadOwnership();
2382
+ return;
2383
+ }
2384
+ pushToast('success', T('owner.claimOk'));
2385
+ loadOwnership();
2386
+ loadState();
2387
+ });
2388
+ }
2389
+
2390
+ function releasePanelOwner() {
2391
+ if (ownerBusy) return;
2392
+ var id = activeInstanceRef.current || 'default';
2393
+ var activeKey = ownership && isObject(ownership.owner) && String(ownership.owner.key || '').indexOf('panel:') === 0
2394
+ ? ownership.owner.key
2395
+ : panelOwnerKey();
2396
+ setOwnerBusy(true);
2397
+ requestJson('/apk-vm/ownership', {
2398
+ method: 'POST',
2399
+ body: JSON.stringify({ action: 'release', instanceId: id, ownerKey: activeKey }),
2400
+ }, T).then(function (result) {
2401
+ if (!mountedRef.current) return;
2402
+ setOwnerBusy(false);
2403
+ if (!result.ok) {
2404
+ pushToast('error', (result.error || T('err.action')).slice(0, 400));
2405
+ loadOwnership();
2406
+ return;
2407
+ }
2408
+ pushToast('success', T('owner.releaseOk'));
2409
+ loadOwnership();
2410
+ loadState();
2411
+ });
2412
+ }
2413
+
2414
+ function changePanelScope(next) {
2415
+ if ((next !== 'shared' && next !== 'conversation' && next !== 'project') || next === panelScope) return;
2416
+ var id = activeInstanceRef.current || 'default';
2417
+ var beforeKey = panelOwnerKey();
2418
+ var owns = Boolean(ownership && isObject(ownership.owner) && ownership.owner.key === beforeKey);
2419
+ try {
2420
+ window.localStorage.setItem(PANEL_OWNER_SCOPE, next);
2421
+ } catch (error) {
2422
+ // ignore storage failures
2423
+ }
2424
+ setPanelScope(next);
2425
+ if (!owns) {
2426
+ loadOwnership();
2427
+ return;
2428
+ }
2429
+ var afterKey = panelOwnerKey();
2430
+ setOwnerBusy(true);
2431
+ requestJson('/apk-vm/ownership', {
2432
+ method: 'POST',
2433
+ body: JSON.stringify({ action: 'release', instanceId: id, ownerKey: beforeKey }),
2434
+ }, T).then(function (result) {
2435
+ if (!mountedRef.current || !result.ok) return result;
2436
+ return requestJson('/apk-vm/ownership', {
2437
+ method: 'POST',
2438
+ body: JSON.stringify({
2439
+ action: 'claim',
2440
+ instanceId: id,
2441
+ ownerKey: afterKey,
2442
+ ownerScope: next,
2443
+ ownerLabel: '桌面面板',
2444
+ }),
2445
+ }, T);
2446
+ }).then(function (result) {
2447
+ if (!mountedRef.current) return;
2448
+ setOwnerBusy(false);
2449
+ if (!result || !result.ok) {
2450
+ pushToast('error', ((result && result.error) || T('err.action')).slice(0, 400));
2451
+ } else {
2452
+ pushToast('success', T('owner.claimOk'));
2453
+ }
2454
+ loadOwnership();
2455
+ loadState();
2456
+ });
2457
+ }
2458
+
2165
2459
  function createInstance() {
2166
2460
  if (instanceBusy) return;
2167
2461
  setInstanceBusy(true);
@@ -2480,8 +2774,87 @@ window.__ModuleLoader__.load({
2480
2774
  });
2481
2775
  }
2482
2776
 
2483
- function toggleMaximized() {
2484
- setIsMaximized(function (value) {
2777
+ function skillPath() {
2778
+ var id = activeInstanceRef.current || 'default';
2779
+ return id === 'default'
2780
+ ? '/apk-vm/skills'
2781
+ : '/apk-vm/instances/' + encodeURIComponent(id) + '/skills';
2782
+ }
2783
+
2784
+ function loadSkills() {
2785
+ return requestJson(skillPath(), null, T).then(function (result) {
2786
+ if (!mountedRef.current) return;
2787
+ if (result.ok && isObject(result.data) && Array.isArray(result.data.skills)) {
2788
+ setSkills(result.data.skills);
2789
+ setSkillRecording(Boolean(result.data.recording));
2790
+ }
2791
+ });
2792
+ }
2793
+
2794
+ function toggleSkillRecording() {
2795
+ var starting = !skillRecording;
2796
+ var action = starting ? 'start' : 'stop';
2797
+ requestJson(skillPath(), {
2798
+ method: 'POST',
2799
+ body: JSON.stringify({ action: action, name: skillName || '', targetCode: skillTarget || '' }),
2800
+ }, T).then(function (result) {
2801
+ if (!mountedRef.current) return;
2802
+ if (!result.ok) {
2803
+ pushToast('error', T('err.action') + ': ' + result.error);
2804
+ return;
2805
+ }
2806
+ setSkillRecording(starting);
2807
+ if (!starting) {
2808
+ setSkillName('');
2809
+ loadSkills();
2810
+ pushToast('success', T('skill.saved', { name: (result.data && result.data.skill && result.data.skill.name) || 'Skill' }));
2811
+ } else {
2812
+ pushToast('success', T('skill.recording'));
2813
+ }
2814
+ });
2815
+ }
2816
+
2817
+ function runAppSkill(skill) {
2818
+ if (!skill || !skill.id || skillBusy) return;
2819
+ setSkillBusy(skill.id);
2820
+ requestJson(skillPath(), {
2821
+ method: 'POST',
2822
+ body: JSON.stringify({
2823
+ action: 'run',
2824
+ skillId: skill.id,
2825
+ untilCode: skillTarget || skill.target || '',
2826
+ speed: 1.5,
2827
+ }),
2828
+ }, T).then(function (result) {
2829
+ if (!mountedRef.current) return;
2830
+ setSkillBusy('');
2831
+ if (!result.ok) {
2832
+ pushToast('error', T('skill.failed') + ': ' + result.error);
2833
+ return;
2834
+ }
2835
+ var data = result.data && result.data.result ? result.data.result : {};
2836
+ pushToast('success', T('skill.done', { name: skill.name, n: data.stepsRun || 0 }));
2837
+ });
2838
+ }
2839
+
2840
+ function deleteAppSkill(skill) {
2841
+ if (!skill || !skill.id || skillBusy) return;
2842
+ setSkillBusy(skill.id);
2843
+ requestJson(skillPath(), {
2844
+ method: 'POST',
2845
+ body: JSON.stringify({ action: 'delete', skillId: skill.id }),
2846
+ }, T).then(function (result) {
2847
+ if (!mountedRef.current) return;
2848
+ setSkillBusy('');
2849
+ if (!result.ok) {
2850
+ pushToast('error', T('err.action') + ': ' + result.error);
2851
+ return;
2852
+ }
2853
+ loadSkills();
2854
+ });
2855
+ }
2856
+
2857
+ function toggleMaximized() { setIsMaximized(function (value) {
2485
2858
  var next = !value;
2486
2859
  writeUiFlag('apk-vm.maximized', next);
2487
2860
  return next;
@@ -2606,6 +2979,18 @@ window.__ModuleLoader__.load({
2606
2979
  });
2607
2980
  }
2608
2981
 
2982
+ function applyPortPreset(preset) {
2983
+ if (!preset) return;
2984
+ setForwardLocal(String(preset.localPort));
2985
+ setForwardRemote(String(preset.remotePort));
2986
+ setForwardShared(false);
2987
+ networkAction('forward-add', {
2988
+ localPort: preset.localPort,
2989
+ remotePort: preset.remotePort,
2990
+ shared: false,
2991
+ });
2992
+ }
2993
+
2609
2994
  function removePortForward(localPort) {
2610
2995
  networkAction('forward-remove', { localPort: localPort });
2611
2996
  }
@@ -2977,6 +3362,49 @@ window.__ModuleLoader__.load({
2977
3362
  });
2978
3363
  }
2979
3364
 
3365
+ function connectRemoteSsh() {
3366
+ if (remoteSshBusy || !remoteHost.trim() || !remoteUser.trim()) return;
3367
+ setRemoteSshBusy(true);
3368
+ requestJson('/apk-vm/remote', {
3369
+ method: 'POST',
3370
+ body: JSON.stringify({
3371
+ action: 'connect',
3372
+ host: remoteHost.trim(),
3373
+ user: remoteUser.trim(),
3374
+ keyPath: remoteKey.trim() || undefined,
3375
+ remotePort: Number(remotePort) || 5558,
3376
+ }),
3377
+ }, T).then(function (result) {
3378
+ if (!mountedRef.current) return;
3379
+ setRemoteSshBusy(false);
3380
+ if (!result.ok) {
3381
+ pushToast('error', (result.error || T('err.action')).slice(0, 500));
3382
+ return;
3383
+ }
3384
+ setRemoteSsh(result.data && result.data.tunnel ? result.data.tunnel : null);
3385
+ pushToast('success', T('remote.connected'));
3386
+ loadState();
3387
+ loadDevices();
3388
+ });
3389
+ }
3390
+
3391
+ function disconnectRemoteSsh() {
3392
+ if (remoteSshBusy) return;
3393
+ setRemoteSshBusy(true);
3394
+ requestJson('/apk-vm/remote', { method: 'POST', body: JSON.stringify({ action: 'disconnect' }) }, T).then(function (result) {
3395
+ if (!mountedRef.current) return;
3396
+ setRemoteSshBusy(false);
3397
+ if (!result.ok) {
3398
+ pushToast('error', (result.error || T('err.action')).slice(0, 500));
3399
+ return;
3400
+ }
3401
+ setRemoteSsh(null);
3402
+ pushToast('success', T('remote.disconnected'));
3403
+ loadState();
3404
+ loadDevices();
3405
+ });
3406
+ }
3407
+
2980
3408
  function detachDevice() {
2981
3409
  if (deviceBusy) return;
2982
3410
  setDeviceBusy(true);
@@ -3508,9 +3936,14 @@ window.__ModuleLoader__.load({
3508
3936
  var id = activeInstanceRef.current || 'default';
3509
3937
  var path = id === 'default' ? '/apk-vm/touch' : '/apk-vm/instances/' + encodeURIComponent(id) + '/touch';
3510
3938
  try {
3939
+ var touchHeaders = { 'content-type': 'application/json' };
3940
+ var ownerHeaders = panelOwnerHeaders();
3941
+ for (var ownerHeader in ownerHeaders) {
3942
+ if (Object.prototype.hasOwnProperty.call(ownerHeaders, ownerHeader)) touchHeaders[ownerHeader] = ownerHeaders[ownerHeader];
3943
+ }
3511
3944
  fetch(path, {
3512
3945
  method: 'POST',
3513
- headers: { 'content-type': 'application/json' },
3946
+ headers: touchHeaders,
3514
3947
  body: JSON.stringify({ action: action, pointerId: pointerId, x: point.x, y: point.y }),
3515
3948
  cache: 'no-store',
3516
3949
  }).catch(function () {});
@@ -4167,7 +4600,7 @@ window.__ModuleLoader__.load({
4167
4600
  color: rootActive ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-label-secondary)',
4168
4601
  whiteSpace: 'nowrap',
4169
4602
  };
4170
- var instancesCard = instancesList.length > 1
4603
+ var instancesCard = instancesList.length > 0
4171
4604
  ? h(
4172
4605
  'details',
4173
4606
  { className: 'apkvm-card apkvm-instances' },
@@ -4183,7 +4616,13 @@ window.__ModuleLoader__.load({
4183
4616
  { className: 'apkvm-instlist' },
4184
4617
  instancesList.map(function (entry) {
4185
4618
  var isDefault = entry.id === 'default';
4186
- var owner = entry.owner ? String(entry.owner).replace(/^agent-/, '').slice(0, 14) : '';
4619
+ var ownerInfo = entry.ownerInfo && isObject(entry.ownerInfo) ? entry.ownerInfo : null;
4620
+ var owner = ownerInfo
4621
+ ? String(ownerInfo.label || ownerInfo.key || '')
4622
+ : entry.owner ? String(entry.owner).replace(/^agent-/, '').slice(0, 14) : '';
4623
+ var ownerScope = ownerInfo && ownerInfo.scope && ownerInfo.scope !== 'shared'
4624
+ ? ' · ' + T('owner.' + ownerInfo.scope)
4625
+ : '';
4187
4626
  var idle = Number(entry.idleMs) >= 0 ? Math.max(0, Math.round(Number(entry.idleMs) / 1000)) : null;
4188
4627
  return h(
4189
4628
  'div',
@@ -4192,7 +4631,7 @@ window.__ModuleLoader__.load({
4192
4631
  'div',
4193
4632
  { className: 'apkvm-instname', title: entry.id },
4194
4633
  isDefault ? T('instances.default') : entry.id,
4195
- h('span', { className: 'apkvm-dim' }, ' · ' + (entry.state || '?') + (owner ? ' · ' + owner : ''))
4634
+ h('span', { className: 'apkvm-dim' }, ' · ' + (entry.state || '?') + (owner ? ' · ' + owner + ownerScope : ''))
4196
4635
  ),
4197
4636
  h(
4198
4637
  'div',
@@ -4237,6 +4676,83 @@ window.__ModuleLoader__.load({
4237
4676
  )
4238
4677
  : null;
4239
4678
 
4679
+ var currentOwner = ownership && isObject(ownership.owner) ? ownership.owner : null;
4680
+ var panelOwns = Boolean(currentOwner && currentOwner.key === panelOwnerKey());
4681
+ var ownerLabel = currentOwner ? String(currentOwner.label || currentOwner.key) : T('owner.none');
4682
+ var ownerCard = h(
4683
+ 'details',
4684
+ { className: 'apkvm-card apkvm-owner', open: true },
4685
+ h(
4686
+ 'summary',
4687
+ { className: 'apkvm-debug-summary' },
4688
+ h('span', { className: 'apkvm-card-title' }, T('owner.title')),
4689
+ h('span', { className: 'apkvm-dim', style: { marginLeft: 'auto' } }, ownerLabel),
4690
+ h('span', { className: 'apkvm-chevron', 'aria-hidden': 'true' }, '▸')
4691
+ ),
4692
+ h(
4693
+ 'div',
4694
+ { className: 'apkvm-ownerbody' },
4695
+ h(
4696
+ 'div',
4697
+ { className: 'apkvm-ownerrow' },
4698
+ h('span', { className: 'apkvm-dim' }, T('owner.pill', { label: ownerLabel })),
4699
+ currentOwner && !panelOwns
4700
+ ? h('span', { className: 'apkvm-dim' }, ' · ' + T('owner.busy', { label: ownerLabel }))
4701
+ : null
4702
+ ),
4703
+ h(
4704
+ 'div',
4705
+ { className: 'apkvm-ownercontrols' },
4706
+ h('span', { className: 'apkvm-dim' }, T('owner.scope')),
4707
+ ['shared', 'conversation', 'project'].map(function (scope) {
4708
+ return h(
4709
+ 'button',
4710
+ {
4711
+ key: scope,
4712
+ type: 'button',
4713
+ className: 'apkvm-mini' + (panelScope === scope ? ' active' : ''),
4714
+ disabled: ownerBusy,
4715
+ onClick: function (event) {
4716
+ event.preventDefault();
4717
+ changePanelScope(scope);
4718
+ },
4719
+ },
4720
+ T('owner.' + scope)
4721
+ );
4722
+ }),
4723
+ h(
4724
+ 'button',
4725
+ {
4726
+ type: 'button',
4727
+ className: 'apkvm-mini',
4728
+ disabled: ownerBusy || panelOwns,
4729
+ onClick: function (event) {
4730
+ event.preventDefault();
4731
+ claimPanelOwner(false);
4732
+ },
4733
+ },
4734
+ T('owner.claim')
4735
+ ),
4736
+ h(
4737
+ 'button',
4738
+ {
4739
+ type: 'button',
4740
+ className: 'apkvm-mini',
4741
+ disabled: ownerBusy || !panelOwns,
4742
+ onClick: function (event) {
4743
+ event.preventDefault();
4744
+ releasePanelOwner();
4745
+ },
4746
+ },
4747
+ T('owner.release')
4748
+ )
4749
+ ),
4750
+ currentOwner && !panelOwns
4751
+ ? h('div', { className: 'apkvm-dim' }, T('owner.forceHint'))
4752
+ : null
4753
+ )
4754
+ );
4755
+
4240
4756
  var appsCard = h(
4241
4757
  'details',
4242
4758
  {
@@ -4654,6 +5170,94 @@ window.__ModuleLoader__.load({
4654
5170
  )
4655
5171
  );
4656
5172
 
5173
+ var skillCard = h(
5174
+ 'details',
5175
+ { className: 'apkvm-card apkvm-debug' },
5176
+ h(
5177
+ 'summary',
5178
+ { className: 'apkvm-debug-summary' },
5179
+ h('span', { className: 'apkvm-card-title' }, T('skill.title')),
5180
+ h('span', { className: 'apkvm-tag' + (skillRecording ? ' ok' : '') }, skillRecording ? T('skill.recording') : T('flow.count', { n: skills.length })),
5181
+ h('span', { className: 'apkvm-chevron', 'aria-hidden': 'true' }, '▸')
5182
+ ),
5183
+ h(
5184
+ 'div',
5185
+ { className: 'apkvm-debug-body' },
5186
+ h(
5187
+ 'div',
5188
+ { style: { display: 'flex', alignItems: 'center', gap: '6px' } },
5189
+ h('input', {
5190
+ className: 'apkvm-input',
5191
+ type: 'text',
5192
+ value: skillName,
5193
+ placeholder: T('skill.name'),
5194
+ disabled: skillRecording,
5195
+ onChange: function (event) {
5196
+ setSkillName(event && event.target ? String(event.target.value) : '');
5197
+ },
5198
+ 'aria-label': T('skill.name'),
5199
+ }),
5200
+ actionBtn(skillRecording ? T('skill.stop') : T('skill.start'), {
5201
+ key: 'skill-record',
5202
+ small: true,
5203
+ variant: skillRecording ? 'danger' : 'primary',
5204
+ disabled: !ready,
5205
+ onClick: toggleSkillRecording,
5206
+ })
5207
+ ),
5208
+ h('input', {
5209
+ className: 'apkvm-input',
5210
+ type: 'text',
5211
+ value: skillTarget,
5212
+ placeholder: T('skill.target'),
5213
+ onChange: function (event) {
5214
+ setSkillTarget(event && event.target ? String(event.target.value) : '');
5215
+ },
5216
+ 'aria-label': T('skill.target'),
5217
+ }),
5218
+ skills.length
5219
+ ? h(
5220
+ 'div',
5221
+ { className: 'apkvm-list', style: { maxHeight: '150px' } },
5222
+ skills.slice(0, 12).map(function (skill) {
5223
+ return h(
5224
+ 'div',
5225
+ { className: 'apkvm-apk', key: skill.id },
5226
+ h('span', { className: 'apkvm-apk-name', title: skill.description || skill.id }, skill.name || skill.id),
5227
+ h(
5228
+ 'span',
5229
+ { style: { display: 'flex', flexDirection: 'column', gap: '4px', alignItems: 'flex-end' } },
5230
+ h('span', { className: 'apkvm-dim' }, T('skill.meta', { n: skill.steps || 0, codes: skill.codes || 0 })),
5231
+ h(
5232
+ 'span',
5233
+ { style: { display: 'flex', gap: '5px' } },
5234
+ actionBtn(T('skill.run'), {
5235
+ key: 'skill-run-' + skill.id,
5236
+ small: true,
5237
+ disabled: !ready || Boolean(skillBusy),
5238
+ onClick: function () {
5239
+ runAppSkill(skill);
5240
+ },
5241
+ }),
5242
+ actionBtn(T('skill.delete'), {
5243
+ key: 'skill-delete-' + skill.id,
5244
+ small: true,
5245
+ variant: 'danger',
5246
+ disabled: Boolean(skillBusy),
5247
+ onClick: function () {
5248
+ deleteAppSkill(skill);
5249
+ },
5250
+ })
5251
+ )
5252
+ )
5253
+ );
5254
+ })
5255
+ )
5256
+ : h('div', { className: 'apkvm-dim' }, T('skill.empty')),
5257
+ h('div', { className: 'apkvm-dim', style: { whiteSpace: 'normal' } }, T('skill.hint'))
5258
+ )
5259
+ );
5260
+
4657
5261
  var networkCard = h(
4658
5262
  'details',
4659
5263
  { className: 'apkvm-card apkvm-debug' },
@@ -4788,6 +5392,21 @@ window.__ModuleLoader__.load({
4788
5392
  );
4789
5393
  })
4790
5394
  : h('div', { className: 'apkvm-dim' }, T('network.forwards')),
5395
+ h(
5396
+ 'div',
5397
+ { style: { display: 'flex', alignItems: 'center', gap: '5px', flexWrap: 'wrap' } },
5398
+ h('span', { className: 'apkvm-dim' }, T('network.presets')),
5399
+ PORT_PRESETS.map(function (preset) {
5400
+ return actionBtn(preset.label, {
5401
+ key: 'forward-preset-' + preset.key,
5402
+ small: true,
5403
+ disabled: !ready || Boolean(networkBusy),
5404
+ onClick: function () {
5405
+ applyPortPreset(preset);
5406
+ },
5407
+ });
5408
+ })
5409
+ ),
4791
5410
  h(
4792
5411
  'div',
4793
5412
  { style: { display: 'flex', alignItems: 'center', gap: '5px' } },
@@ -5148,6 +5767,88 @@ window.__ModuleLoader__.load({
5148
5767
  )
5149
5768
  );
5150
5769
 
5770
+ var remoteCard = h(
5771
+ 'details',
5772
+ { className: 'apkvm-card apkvm-debug' },
5773
+ h(
5774
+ 'summary',
5775
+ { className: 'apkvm-debug-summary' },
5776
+ h('span', { className: 'apkvm-card-title' }, T('remote.title')),
5777
+ h('span', { className: 'apkvm-dim', style: { marginLeft: 'auto' } }, remoteSsh ? remoteSsh.state || '' : ''),
5778
+ h('span', { className: 'apkvm-chevron', 'aria-hidden': 'true' }, '▸')
5779
+ ),
5780
+ h(
5781
+ 'div',
5782
+ { className: 'apkvm-debug-body' },
5783
+ h('input', {
5784
+ className: 'apkvm-input',
5785
+ type: 'text',
5786
+ value: remoteHost,
5787
+ placeholder: T('remote.host'),
5788
+ spellCheck: false,
5789
+ disabled: remoteSshBusy,
5790
+ onChange: function (event) {
5791
+ setRemoteHost(event && event.target ? String(event.target.value) : '');
5792
+ },
5793
+ }),
5794
+ h('input', {
5795
+ className: 'apkvm-input',
5796
+ type: 'text',
5797
+ value: remoteUser,
5798
+ placeholder: T('remote.user'),
5799
+ spellCheck: false,
5800
+ disabled: remoteSshBusy,
5801
+ onChange: function (event) {
5802
+ setRemoteUser(event && event.target ? String(event.target.value) : '');
5803
+ },
5804
+ }),
5805
+ h('input', {
5806
+ className: 'apkvm-input',
5807
+ type: 'text',
5808
+ value: remoteKey,
5809
+ placeholder: T('remote.key'),
5810
+ spellCheck: false,
5811
+ disabled: remoteSshBusy,
5812
+ onChange: function (event) {
5813
+ setRemoteKey(event && event.target ? String(event.target.value) : '');
5814
+ },
5815
+ }),
5816
+ h('input', {
5817
+ className: 'apkvm-input',
5818
+ type: 'text',
5819
+ value: remotePort,
5820
+ placeholder: T('remote.remotePort'),
5821
+ spellCheck: false,
5822
+ disabled: remoteSshBusy,
5823
+ onChange: function (event) {
5824
+ setRemotePort(event && event.target ? String(event.target.value) : '');
5825
+ },
5826
+ }),
5827
+ h(
5828
+ 'div',
5829
+ { style: { display: 'flex', alignItems: 'center', gap: '5px', flexWrap: 'wrap' } },
5830
+ actionBtn(remoteSshBusy ? '…' : T('remote.connect'), {
5831
+ key: 'remote-connect',
5832
+ small: true,
5833
+ disabled: remoteSshBusy || !remoteHost.trim() || !remoteUser.trim(),
5834
+ onClick: connectRemoteSsh,
5835
+ }),
5836
+ remoteSsh
5837
+ ? actionBtn(T('remote.disconnect'), {
5838
+ key: 'remote-disconnect',
5839
+ small: true,
5840
+ variant: 'danger',
5841
+ disabled: remoteSshBusy,
5842
+ onClick: disconnectRemoteSsh,
5843
+ })
5844
+ : null
5845
+ ),
5846
+ remoteSsh && remoteSsh.serial
5847
+ ? h('div', { className: 'apkvm-dim' }, 'adb ' + remoteSsh.serial)
5848
+ : null
5849
+ )
5850
+ );
5851
+
5151
5852
  var primaryAction =
5152
5853
  ready || busyState
5153
5854
  ? actionBtn(vmBusy ? T('action.stopping') : T('action.stop'), {
@@ -5580,11 +6281,14 @@ window.__ModuleLoader__.load({
5580
6281
  setupCard,
5581
6282
  apkCard,
5582
6283
  instancesCard,
6284
+ ownerCard,
5583
6285
  debugCard,
5584
6286
  flowCard,
6287
+ skillCard,
5585
6288
  networkCard,
5586
6289
  storageCard,
5587
6290
  snapshotCard,
6291
+ remoteCard,
5588
6292
  appsCard,
5589
6293
  diagCard,
5590
6294
  h('div', { className: 'apkvm-footnote', title: T('hint.boot') }, T('hint.short')),