@agent-vm/agent-vm 0.0.81 → 0.0.84

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.
Files changed (101) hide show
  1. package/dist/cli/commands/create-app.d.ts +336 -334
  2. package/dist/cli/commands/create-app.d.ts.map +1 -1
  3. package/dist/cli/commands/doctor-definition.d.ts +2 -0
  4. package/dist/cli/commands/doctor-definition.d.ts.map +1 -1
  5. package/dist/cli/commands/doctor-definition.js +7 -3
  6. package/dist/cli/commands/doctor-definition.js.map +1 -1
  7. package/dist/cli/controller-operation-commands.d.ts.map +1 -1
  8. package/dist/cli/controller-operation-commands.js +39 -2
  9. package/dist/cli/controller-operation-commands.js.map +1 -1
  10. package/dist/cli/manual-templates.d.ts.map +1 -1
  11. package/dist/cli/manual-templates.js +40 -22
  12. package/dist/cli/manual-templates.js.map +1 -1
  13. package/dist/config/system-config.d.ts +18 -10
  14. package/dist/config/system-config.d.ts.map +1 -1
  15. package/dist/config/system-config.js +53 -10
  16. package/dist/config/system-config.js.map +1 -1
  17. package/dist/controller/controller-runtime-operations.d.ts +3 -0
  18. package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
  19. package/dist/controller/controller-runtime-operations.js.map +1 -1
  20. package/dist/controller/controller-runtime-types.d.ts +5 -1
  21. package/dist/controller/controller-runtime-types.d.ts.map +1 -1
  22. package/dist/controller/controller-runtime.d.ts.map +1 -1
  23. package/dist/controller/controller-runtime.js +63 -15
  24. package/dist/controller/controller-runtime.js.map +1 -1
  25. package/dist/controller/health/gateway-service-health-monitor.d.ts +24 -0
  26. package/dist/controller/health/gateway-service-health-monitor.d.ts.map +1 -0
  27. package/dist/controller/health/gateway-service-health-monitor.js +68 -0
  28. package/dist/controller/health/gateway-service-health-monitor.js.map +1 -0
  29. package/dist/controller/health/health-event-store.d.ts +19 -0
  30. package/dist/controller/health/health-event-store.d.ts.map +1 -0
  31. package/dist/controller/health/health-event-store.js +54 -0
  32. package/dist/controller/health/health-event-store.js.map +1 -0
  33. package/dist/controller/http/controller-health-event-routes.d.ts +9 -0
  34. package/dist/controller/http/controller-health-event-routes.d.ts.map +1 -0
  35. package/dist/controller/http/controller-health-event-routes.js +47 -0
  36. package/dist/controller/http/controller-health-event-routes.js.map +1 -0
  37. package/dist/controller/http/controller-http-route-support.d.ts +3 -4
  38. package/dist/controller/http/controller-http-route-support.d.ts.map +1 -1
  39. package/dist/controller/http/controller-http-route-support.js +3 -4
  40. package/dist/controller/http/controller-http-route-support.js.map +1 -1
  41. package/dist/controller/http/controller-http-routes.d.ts +17 -10
  42. package/dist/controller/http/controller-http-routes.d.ts.map +1 -1
  43. package/dist/controller/http/controller-http-routes.js +192 -75
  44. package/dist/controller/http/controller-http-routes.js.map +1 -1
  45. package/dist/controller/http/controller-lease-response-types.d.ts +3 -3
  46. package/dist/controller/http/controller-lease-response-types.d.ts.map +1 -1
  47. package/dist/controller/http/controller-lease-response-types.js +3 -3
  48. package/dist/controller/http/controller-lease-response-types.js.map +1 -1
  49. package/dist/controller/http/controller-request-schemas.d.ts +97 -9
  50. package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
  51. package/dist/controller/http/controller-request-schemas.js +38 -22
  52. package/dist/controller/http/controller-request-schemas.js.map +1 -1
  53. package/dist/controller/http/controller-zone-operation-routes.d.ts +3 -0
  54. package/dist/controller/http/controller-zone-operation-routes.d.ts.map +1 -1
  55. package/dist/controller/http/controller-zone-operation-routes.js +13 -0
  56. package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
  57. package/dist/controller/leases/agent-sandbox-seeding.d.ts +0 -7
  58. package/dist/controller/leases/agent-sandbox-seeding.d.ts.map +1 -1
  59. package/dist/controller/leases/agent-sandbox-seeding.js +0 -6
  60. package/dist/controller/leases/agent-sandbox-seeding.js.map +1 -1
  61. package/dist/controller/leases/idle-reaper.d.ts +0 -1
  62. package/dist/controller/leases/idle-reaper.d.ts.map +1 -1
  63. package/dist/controller/leases/idle-reaper.js +1 -1
  64. package/dist/controller/leases/idle-reaper.js.map +1 -1
  65. package/dist/controller/leases/lease-idle-policy.d.ts +13 -9
  66. package/dist/controller/leases/lease-idle-policy.d.ts.map +1 -1
  67. package/dist/controller/leases/lease-idle-policy.js +23 -25
  68. package/dist/controller/leases/lease-idle-policy.js.map +1 -1
  69. package/dist/controller/leases/lease-manager.d.ts +20 -9
  70. package/dist/controller/leases/lease-manager.d.ts.map +1 -1
  71. package/dist/controller/leases/lease-manager.js +107 -31
  72. package/dist/controller/leases/lease-manager.js.map +1 -1
  73. package/dist/controller/leases/lease-work-mount-paths.d.ts +7 -2
  74. package/dist/controller/leases/lease-work-mount-paths.d.ts.map +1 -1
  75. package/dist/controller/leases/lease-work-mount-paths.js +48 -31
  76. package/dist/controller/leases/lease-work-mount-paths.js.map +1 -1
  77. package/dist/controller/leases/openclaw-gateway-lease-path-mapping.d.ts +7 -0
  78. package/dist/controller/leases/openclaw-gateway-lease-path-mapping.d.ts.map +1 -0
  79. package/dist/controller/leases/openclaw-gateway-lease-path-mapping.js +71 -0
  80. package/dist/controller/leases/openclaw-gateway-lease-path-mapping.js.map +1 -0
  81. package/dist/controller/zone-runtimes/openclaw-zone-runtime.d.ts.map +1 -1
  82. package/dist/controller/zone-runtimes/openclaw-zone-runtime.js +3 -0
  83. package/dist/controller/zone-runtimes/openclaw-zone-runtime.js.map +1 -1
  84. package/dist/controller/zone-runtimes/zone-runtime-types.d.ts +3 -0
  85. package/dist/controller/zone-runtimes/zone-runtime-types.d.ts.map +1 -1
  86. package/dist/gateway/gateway-health-check.d.ts +3 -0
  87. package/dist/gateway/gateway-health-check.d.ts.map +1 -1
  88. package/dist/gateway/gateway-health-check.js +10 -0
  89. package/dist/gateway/gateway-health-check.js.map +1 -1
  90. package/dist/integration-tests/smoke-harness.d.ts +1 -0
  91. package/dist/integration-tests/smoke-harness.d.ts.map +1 -1
  92. package/dist/integration-tests/smoke-harness.js +5 -0
  93. package/dist/integration-tests/smoke-harness.js.map +1 -1
  94. package/dist/operations/openclaw-deployment-doctor.d.ts.map +1 -1
  95. package/dist/operations/openclaw-deployment-doctor.js +12 -3
  96. package/dist/operations/openclaw-deployment-doctor.js.map +1 -1
  97. package/package.json +12 -11
  98. package/dist/controller/leases/lease-scope.d.ts +0 -12
  99. package/dist/controller/leases/lease-scope.d.ts.map +0 -1
  100. package/dist/controller/leases/lease-scope.js +0 -19
  101. package/dist/controller/leases/lease-scope.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"lease-idle-policy.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-idle-policy.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,4EAOlB,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE9D,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACxE,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACzD;AAWD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IACzC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B,GAAG,MAAM,CAWT"}
1
+ {"version":3,"file":"lease-idle-policy.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-idle-policy.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,QAAkB,CAAC;AAE3D,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,MAAM,+BAA+B,GACxC;IACA,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACtB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACxB,CAAC;AAEL,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IACpD,QAAQ,CAAC,MAAM,EAAE,wBAAwB,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjD,GAAG,+BAA+B,CA0BlC"}
@@ -1,28 +1,26 @@
1
- export const leaseScopeKinds = [
2
- 'agent',
3
- 'discord',
4
- 'project',
5
- 'session',
6
- 'shared',
7
- 'workspace',
8
- ];
9
- function scopePrefixes(scopeKey) {
10
- const segments = scopeKey.split(':').filter((segment) => segment.length > 0);
11
- return segments.map((_segment, index) => segments.slice(0, index + 1).join(':')).toReversed();
12
- }
13
- function isLeaseScopeKind(scopeKind) {
14
- return leaseScopeKinds.some((candidate) => candidate === scopeKind);
15
- }
16
- export function ttlForLeaseScope(options) {
17
- for (const prefix of scopePrefixes(options.scopeKey)) {
18
- const ttl = options.policy.byScopePrefix[prefix];
19
- if (ttl !== undefined) {
20
- return ttl;
21
- }
1
+ export const defaultToolVmLeaseIdleTtlMs = 100 * 60 * 1000;
2
+ export function resolveToolVmLeaseIdleTtlMs(options) {
3
+ if (options.requestedIdleTtlMs === undefined) {
4
+ return {
5
+ kind: 'ok',
6
+ value: options.policy.defaultMs,
7
+ };
8
+ }
9
+ if (options.requestedIdleTtlMs < options.policy.minRequestedMs) {
10
+ return {
11
+ kind: 'invalid',
12
+ message: `Requested idleTtlMs must be at least ${String(options.policy.minRequestedMs)}ms.`,
13
+ };
14
+ }
15
+ if (options.requestedIdleTtlMs > options.policy.maxRequestedMs) {
16
+ return {
17
+ kind: 'invalid',
18
+ message: `Requested idleTtlMs must be at most ${String(options.policy.maxRequestedMs)}ms.`,
19
+ };
22
20
  }
23
- const scopeKind = options.scopeKey.split(':')[0] ?? '';
24
- return isLeaseScopeKind(scopeKind)
25
- ? (options.policy.byScopeKind[scopeKind] ?? options.policy.defaultMs)
26
- : options.policy.defaultMs;
21
+ return {
22
+ kind: 'ok',
23
+ value: options.requestedIdleTtlMs,
24
+ };
27
25
  }
28
26
  //# sourceMappingURL=lease-idle-policy.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"lease-idle-policy.js","sourceRoot":"","sources":["../../../src/controller/leases/lease-idle-policy.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC9B,OAAO;IACP,SAAS;IACT,SAAS;IACT,SAAS;IACT,QAAQ;IACR,WAAW;CACF,CAAC;AAYX,SAAS,aAAa,CAAC,QAAgB;IACtC,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7E,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;AAC/F,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAiB;IAC1C,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAGhC;IACA,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,GAAG,CAAC;QACZ,CAAC;IACF,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,OAAO,gBAAgB,CAAC,SAAS,CAAC;QACjC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QACrE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;AAC7B,CAAC"}
1
+ {"version":3,"file":"lease-idle-policy.js","sourceRoot":"","sources":["../../../src/controller/leases/lease-idle-policy.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;AAkB3D,MAAM,UAAU,2BAA2B,CAAC,OAG3C;IACA,IAAI,OAAO,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO;YACN,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS;SAC/B,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAChE,OAAO;YACN,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,wCAAwC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK;SAC3F,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAChE,OAAO;YACN,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,uCAAuC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK;SAC1F,CAAC;IACH,CAAC;IAED,OAAO;QACN,IAAI,EAAE,IAAI;QACV,KAAK,EAAE,OAAO,CAAC,kBAAkB;KACjC,CAAC;AACH,CAAC"}
@@ -1,4 +1,4 @@
1
- import { type EndToolVmActiveUseRequest, type HeartbeatToolVmActiveUseResponse, type StartToolVmActiveUseRequest, type StartToolVmActiveUseResponse } from '@agent-vm/gateway-interface';
1
+ import { type EndToolVmActiveUseRequest, type HeartbeatToolVmActiveUseRequest, type HeartbeatToolVmActiveUseResponse, type StartToolVmActiveUseRequest, type StartToolVmActiveUseResponse, type ToolVmActiveUseCorrelation, type ToolVmActiveUseOperationReport } from '@agent-vm/gateway-interface';
2
2
  import type { ManagedVm } from '@agent-vm/gondolin-adapter';
3
3
  import type { readProcessIdentity as defaultReadProcessIdentity } from '../../shared/managed-vm-process.js';
4
4
  import type { ZoneGitToolVmMount } from '../zone-git/zone-git-paths.js';
@@ -20,7 +20,6 @@ export interface Lease {
20
20
  readonly lastUsedAt: number;
21
21
  readonly profileId: string;
22
22
  readonly runtimeRecordId: string;
23
- readonly scopeKey: string;
24
23
  readonly sshAccess: {
25
24
  readonly command?: string;
26
25
  readonly host: string;
@@ -34,15 +33,26 @@ export interface Lease {
34
33
  readonly zoneGitMount?: ZoneGitToolVmMount;
35
34
  readonly zoneId: string;
36
35
  }
37
- export interface LeaseRenewal {
36
+ export type LeaseRenewal = {
38
37
  readonly kind: 'renewed';
39
38
  readonly lastUsedAt: number;
40
39
  readonly lease: Lease;
41
- }
40
+ } | {
41
+ readonly kind: 'not-found';
42
+ readonly reason: 'dead' | 'expired' | 'missing';
43
+ };
42
44
  export interface LeaseSnapshot {
43
45
  readonly kind: 'snapshot';
44
46
  readonly lease: Lease;
45
47
  }
48
+ export interface ToolVmActiveUseSnapshot {
49
+ readonly correlation?: ToolVmActiveUseCorrelation;
50
+ readonly expiresAt: number;
51
+ readonly latestReport?: ToolVmActiveUseOperationReport;
52
+ readonly leaseId: string;
53
+ readonly startedAt: number;
54
+ readonly useId: string;
55
+ }
46
56
  export interface LeaseManager {
47
57
  createLease(options: {
48
58
  readonly agentId: string;
@@ -50,7 +60,6 @@ export interface LeaseManager {
50
60
  readonly effectiveIdleTtlMs?: number;
51
61
  readonly profile: ToolVmProfile;
52
62
  readonly profileId: string;
53
- readonly scopeKey: string;
54
63
  readonly guestWorkdir: string;
55
64
  readonly hostWorkMountDir: string;
56
65
  readonly zoneGitMount?: ZoneGitToolVmMount;
@@ -59,11 +68,13 @@ export interface LeaseManager {
59
68
  endActiveUse(leaseId: string, useId: string, request: EndToolVmActiveUseRequest): {
60
69
  readonly kind: 'ended' | 'unknown-use';
61
70
  } | undefined;
71
+ getActiveUses(leaseId: string): readonly ToolVmActiveUseSnapshot[];
62
72
  getActiveUseCount(leaseId: string): number;
63
- heartbeatActiveUse(leaseId: string, useId: string): HeartbeatToolVmActiveUseResponse | undefined;
64
- renewLease(leaseId: string): LeaseRenewal | undefined;
65
- listLeases(): Lease[];
73
+ heartbeatActiveUse(leaseId: string, useId: string, request: HeartbeatToolVmActiveUseRequest): HeartbeatToolVmActiveUseResponse | undefined;
74
+ renewLease(leaseId: string): Promise<LeaseRenewal>;
75
+ listLeases(): readonly Lease[];
66
76
  peekLease(leaseId: string): LeaseSnapshot | undefined;
77
+ reapDeadIdleLeases(): Promise<void>;
67
78
  reapExpiredActiveUses(): void;
68
79
  releaseLease(leaseId: string, options?: {
69
80
  readonly force?: boolean;
@@ -84,6 +95,7 @@ export interface ToolVmUsePolicy {
84
95
  }
85
96
  export declare function createLeaseManager(options: {
86
97
  readonly controllerPort: number;
98
+ readonly createLeaseId?: () => string;
87
99
  readonly createRuntimeRecordId?: () => string;
88
100
  readonly createManagedVm: (leaseOptions: {
89
101
  readonly agentWorkspaceDir: string;
@@ -91,7 +103,6 @@ export declare function createLeaseManager(options: {
91
103
  readonly agentId: string;
92
104
  readonly profile: ToolVmProfile;
93
105
  readonly profileId: string;
94
- readonly scopeKey: string;
95
106
  readonly tcpSlot: number;
96
107
  readonly guestWorkdir: string;
97
108
  readonly hostWorkMountDir: string;
@@ -1 +1 @@
1
- {"version":3,"file":"lease-manager.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lease-manager.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-manager.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { randomUUID } from 'node:crypto';
2
- import { isToolVmActiveUseId, } from '@agent-vm/gateway-interface';
2
+ import { createToolVmLeaseId, isToolVmActiveUseId, } from '@agent-vm/gateway-interface';
3
+ import { defaultToolVmLeaseIdleTtlMs } from './lease-idle-policy.js';
3
4
  import { buildToolVmRuntimeRecord, deleteToolVmRuntimeRecord, writeToolVmRuntimeRecord, } from './tool-vm-runtime-record.js';
4
5
  export class AgentLeaseCompatibilityConflictError extends Error {
5
6
  mismatchedFields;
@@ -11,7 +12,6 @@ export class AgentLeaseCompatibilityConflictError extends Error {
11
12
  }
12
13
  export class LeaseActiveUseConflictError extends Error {
13
14
  }
14
- const defaultLeaseEffectiveIdleTtlMs = 30 * 60 * 1000;
15
15
  const defaultToolVmUsePolicy = {
16
16
  endedUseTombstoneTtlMs: 10 * 60 * 1000,
17
17
  heartbeatAfterMs: 30 * 1000,
@@ -73,14 +73,30 @@ function zoneGitMountsEqual(leftMount, rightMount) {
73
73
  leftMount.hostZoneGitRoot === rightMount.hostZoneGitRoot);
74
74
  }
75
75
  async function isLeaseVmLive(lease) {
76
+ const abortController = new AbortController();
77
+ let timeoutHandle;
76
78
  try {
77
- const result = await lease.vm.exec('true');
78
- return result.exitCode === 0;
79
+ const timeoutResult = new Promise((resolve) => {
80
+ timeoutHandle = setTimeout(() => {
81
+ abortController.abort();
82
+ resolve(false);
83
+ }, 5_000);
84
+ });
85
+ const probeResult = await Promise.race([
86
+ lease.vm.exec('true', { signal: abortController.signal }),
87
+ timeoutResult,
88
+ ]);
89
+ return probeResult !== false && probeResult.exitCode === 0;
79
90
  }
80
91
  catch (error) {
81
92
  writeLeaseManagerWarning(`liveness check failed for lease '${lease.id}' in zone '${lease.zoneId}': ${formatLeaseManagerError(error)}`);
82
93
  return false;
83
94
  }
95
+ finally {
96
+ if (timeoutHandle !== undefined) {
97
+ clearTimeout(timeoutHandle);
98
+ }
99
+ }
84
100
  }
85
101
  function agentLeaseIndexKey(agentLease) {
86
102
  return `${agentLease.zoneId}\0${agentLease.agentId}`;
@@ -132,7 +148,22 @@ export function createLeaseManager(options) {
132
148
  storeLease(touchedLease);
133
149
  return touchedLease;
134
150
  }
135
- async function withScopeLock(agentLease, fn) {
151
+ function activeUseCountForLease(leaseId) {
152
+ let count = 0;
153
+ for (const activeUse of activeUses.values()) {
154
+ if (activeUse.leaseId === leaseId) {
155
+ count += 1;
156
+ }
157
+ }
158
+ return count;
159
+ }
160
+ function isLeaseIdleExpired(lease) {
161
+ return lease.lastUsedAt + lease.effectiveIdleTtlMs < options.now();
162
+ }
163
+ function isLeaseExpired(lease) {
164
+ return isLeaseIdleExpired(lease) && activeUseCountForLease(lease.id) === 0;
165
+ }
166
+ async function withAgentLeaseLock(agentLease, fn) {
136
167
  const lockKey = `${agentLease.zoneId}\0${agentLease.agentId}`;
137
168
  const previousLock = agentLeaseLocks.get(lockKey) ?? Promise.resolve();
138
169
  let releaseCurrentLock;
@@ -153,6 +184,7 @@ export function createLeaseManager(options) {
153
184
  }
154
185
  const writeRuntimeRecord = options.writeToolVmRuntimeRecord ?? writeToolVmRuntimeRecord;
155
186
  const deleteRuntimeRecord = options.deleteToolVmRuntimeRecord ?? deleteToolVmRuntimeRecord;
187
+ const createLeaseId = options.createLeaseId ?? createToolVmLeaseId;
156
188
  const createRuntimeRecordId = options.createRuntimeRecordId ?? randomUUID;
157
189
  async function evictLease(lease) {
158
190
  deleteLease(lease);
@@ -183,18 +215,23 @@ export function createLeaseManager(options) {
183
215
  }
184
216
  return {
185
217
  async createLease(leaseOptions) {
186
- return await withScopeLock(leaseOptions, async () => {
218
+ return await withAgentLeaseLock(leaseOptions, async () => {
187
219
  assertValidLeaseAgentId(leaseOptions.agentId);
188
220
  const existingLease = findLeaseForAgent({
189
221
  agentId: leaseOptions.agentId,
190
222
  zoneId: leaseOptions.zoneId,
191
223
  });
192
224
  if (existingLease) {
193
- assertCompatibleAgentLeaseRequest(existingLease, leaseOptions);
194
- if (await isLeaseVmLive(existingLease)) {
195
- return touchLease(existingLease);
225
+ if (isLeaseExpired(existingLease)) {
226
+ await evictLease(existingLease);
227
+ }
228
+ else {
229
+ assertCompatibleAgentLeaseRequest(existingLease, leaseOptions);
230
+ if (await isLeaseVmLive(existingLease)) {
231
+ return touchLease(existingLease);
232
+ }
233
+ await evictLease(existingLease);
196
234
  }
197
- await evictLease(existingLease);
198
235
  }
199
236
  const tcpSlot = options.tcpPool.allocate();
200
237
  // Tracks whether the slot is safe to release after partial-create
@@ -218,13 +255,12 @@ export function createLeaseManager(options) {
218
255
  agentId: leaseOptions.agentId,
219
256
  agentWorkspaceDir: leaseOptions.agentWorkspaceDir,
220
257
  createdAt,
221
- effectiveIdleTtlMs: leaseOptions.effectiveIdleTtlMs ?? defaultLeaseEffectiveIdleTtlMs,
258
+ effectiveIdleTtlMs: leaseOptions.effectiveIdleTtlMs ?? defaultToolVmLeaseIdleTtlMs,
222
259
  guestWorkdir: leaseOptions.guestWorkdir,
223
- id: `${leaseOptions.zoneId}-${leaseOptions.agentId}-${createdAt}`,
260
+ id: createLeaseId(),
224
261
  lastUsedAt: createdAt,
225
262
  profileId: leaseOptions.profileId,
226
263
  runtimeRecordId,
227
- scopeKey: leaseOptions.scopeKey,
228
264
  sshAccess,
229
265
  tcpSlot,
230
266
  vm,
@@ -267,7 +303,7 @@ export function createLeaseManager(options) {
267
303
  vmCreatedButNotClosed = false;
268
304
  }
269
305
  catch (closeError) {
270
- writeLeaseManagerWarning(`failed to close partially-created lease VM for zone '${leaseOptions.zoneId}' scope '${leaseOptions.scopeKey}': ${formatLeaseManagerError(closeError)}. Quarantining tcp slot ${tcpSlot}.`);
306
+ writeLeaseManagerWarning(`failed to close partially-created lease VM for zone '${leaseOptions.zoneId}' agent '${leaseOptions.agentId}': ${formatLeaseManagerError(closeError)}. Quarantining tcp slot ${tcpSlot}.`);
271
307
  }
272
308
  throw error;
273
309
  }
@@ -304,25 +340,33 @@ export function createLeaseManager(options) {
304
340
  return { kind: 'unknown-use' };
305
341
  },
306
342
  getActiveUseCount(leaseId) {
307
- let count = 0;
308
- for (const activeUse of activeUses.values()) {
309
- if (activeUse.leaseId === leaseId) {
310
- count += 1;
311
- }
312
- }
313
- return count;
343
+ return activeUseCountForLease(leaseId);
314
344
  },
315
- heartbeatActiveUse(leaseId, useId) {
345
+ getActiveUses(leaseId) {
346
+ return [...activeUses.values()]
347
+ .filter((activeUse) => activeUse.leaseId === leaseId)
348
+ .map((activeUse) => Object.assign({
349
+ expiresAt: activeUse.expiresAt,
350
+ leaseId: activeUse.leaseId,
351
+ startedAt: activeUse.startedAt,
352
+ useId: activeUse.useId,
353
+ }, activeUse.correlation ? { correlation: activeUse.correlation } : {}, activeUse.latestReport ? { latestReport: activeUse.latestReport } : {}));
354
+ },
355
+ heartbeatActiveUse(leaseId, useId, request) {
316
356
  const lease = leases.get(leaseId);
317
357
  const activeUse = activeUses.get(activeUseKey(leaseId, useId));
318
358
  if (!lease || !activeUse) {
319
359
  return undefined;
320
360
  }
361
+ if (isLeaseExpired(lease)) {
362
+ return undefined;
363
+ }
321
364
  const now = options.now();
322
365
  const updatedUse = {
323
366
  ...activeUse,
324
367
  expiresAt: now + toolVmUsePolicy.heartbeatStaleMs,
325
368
  lastHeartbeatAt: now,
369
+ ...(request.report === undefined ? {} : { latestReport: request.report }),
326
370
  };
327
371
  activeUses.set(activeUseKey(leaseId, useId), updatedUse);
328
372
  touchLease(lease);
@@ -331,17 +375,31 @@ export function createLeaseManager(options) {
331
375
  heartbeatAfterMs: toolVmUsePolicy.heartbeatAfterMs,
332
376
  };
333
377
  },
334
- renewLease(leaseId) {
378
+ async renewLease(leaseId) {
335
379
  const lease = leases.get(leaseId);
336
380
  if (!lease) {
337
- return undefined;
381
+ return { kind: 'not-found', reason: 'missing' };
338
382
  }
339
- const renewedLease = touchLease(lease);
340
- return {
341
- kind: 'renewed',
342
- lastUsedAt: renewedLease.lastUsedAt,
343
- lease: renewedLease,
344
- };
383
+ return await withAgentLeaseLock(lease, async () => {
384
+ const currentLease = leases.get(leaseId);
385
+ if (!currentLease) {
386
+ return { kind: 'not-found', reason: 'missing' };
387
+ }
388
+ if (isLeaseExpired(currentLease)) {
389
+ await evictLease(currentLease);
390
+ return { kind: 'not-found', reason: 'expired' };
391
+ }
392
+ if (!(await isLeaseVmLive(currentLease))) {
393
+ await evictLease(currentLease);
394
+ return { kind: 'not-found', reason: 'dead' };
395
+ }
396
+ const renewedLease = touchLease(currentLease);
397
+ return {
398
+ kind: 'renewed',
399
+ lastUsedAt: renewedLease.lastUsedAt,
400
+ lease: renewedLease,
401
+ };
402
+ });
345
403
  },
346
404
  listLeases() {
347
405
  return [...leases.values()];
@@ -350,6 +408,20 @@ export function createLeaseManager(options) {
350
408
  const lease = leases.get(leaseId);
351
409
  return lease ? { kind: 'snapshot', lease } : undefined;
352
410
  },
411
+ async reapDeadIdleLeases() {
412
+ for (const lease of leases.values()) {
413
+ // oxlint-disable-next-line eslint/no-await-in-loop -- per-agent lock serializes eviction with renew/create/release
414
+ await withAgentLeaseLock(lease, async () => {
415
+ const currentLease = leases.get(lease.id);
416
+ if (!currentLease || activeUseCountForLease(currentLease.id) > 0) {
417
+ return;
418
+ }
419
+ if (!(await isLeaseVmLive(currentLease))) {
420
+ await evictLease(currentLease);
421
+ }
422
+ });
423
+ }
424
+ },
353
425
  reapExpiredActiveUses() {
354
426
  const now = options.now();
355
427
  for (const [key, activeUse] of activeUses.entries()) {
@@ -373,7 +445,7 @@ export function createLeaseManager(options) {
373
445
  if (!lease) {
374
446
  return;
375
447
  }
376
- await withScopeLock(lease, async () => {
448
+ await withAgentLeaseLock(lease, async () => {
377
449
  const currentLease = leases.get(leaseId);
378
450
  if (!currentLease) {
379
451
  return;
@@ -427,6 +499,9 @@ export function createLeaseManager(options) {
427
499
  if (!lease) {
428
500
  return undefined;
429
501
  }
502
+ if (isLeaseExpired(lease)) {
503
+ return undefined;
504
+ }
430
505
  if (releasingLeaseIds.has(leaseId)) {
431
506
  throw new LeaseActiveUseConflictError(`Tool VM lease '${leaseId}' is releasing.`);
432
507
  }
@@ -451,6 +526,7 @@ export function createLeaseManager(options) {
451
526
  ...(request.correlation ? { correlation: request.correlation } : {}),
452
527
  expiresAt: now + toolVmUsePolicy.heartbeatStaleMs,
453
528
  lastHeartbeatAt: now,
529
+ ...(request.report === undefined ? {} : { latestReport: request.report }),
454
530
  leaseId,
455
531
  startedAt: now,
456
532
  useId: request.useId,
@@ -1 +1 @@
1
- {"version":3,"file":"lease-manager.js","sourceRoot":"","sources":["../../../src/controller/leases/lease-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lease-manager.js","sourceRoot":"","sources":["../../../src/controller/leases/lease-manager.ts"],"names":[],"mappings":"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"}
@@ -2,10 +2,14 @@ import type { SystemConfig } from '../../config/system-config.js';
2
2
  import { type ZoneGitToolVmMount } from '../zone-git/zone-git-paths.js';
3
3
  export declare const OPENCLAW_TOOL_VM_WORKSPACE_MOUNT = "/workspace";
4
4
  type ZoneConfig = SystemConfig['zones'][number];
5
- export type LeaseWorkMountValidationErrorKind = 'allowed-root-realpath-failed' | 'host-not-absolute' | 'host-outside-allowed-roots' | 'host-parent-traversal' | 'outside-allowed-roots' | 'realpath-failed' | 'root-mount-target' | 'unsupported-gateway' | 'work-mount-not-absolute' | 'work-mount-parent-traversal';
5
+ export type LeaseWorkMountValidationErrorKind = 'allowed-root-realpath-failed' | 'host-not-absolute' | 'host-outside-allowed-roots' | 'host-parent-traversal' | 'outside-allowed-roots' | 'realpath-failed' | 'root-mount-target' | 'unsupported-gateway' | 'work-mount-not-absolute' | 'work-mount-parent-traversal' | 'work-mount-purpose-not-allowed' | 'work-mount-unknown-runtime-path';
6
+ interface LeaseWorkMountValidationErrorOptions extends ErrorOptions {
7
+ readonly guidance?: string;
8
+ }
6
9
  export declare class LeaseWorkMountValidationError extends Error {
10
+ readonly guidance: string | undefined;
7
11
  readonly kind: LeaseWorkMountValidationErrorKind;
8
- constructor(kind: LeaseWorkMountValidationErrorKind, message: string, options?: ErrorOptions);
12
+ constructor(kind: LeaseWorkMountValidationErrorKind, message: string, options?: LeaseWorkMountValidationErrorOptions);
9
13
  }
10
14
  export interface ResolvedLeaseWorkMount {
11
15
  readonly guestWorkdir: string;
@@ -17,6 +21,7 @@ export declare function validateResolvedToolWorkMountDir(options: {
17
21
  readonly zone: ZoneConfig;
18
22
  }): Promise<string>;
19
23
  export declare function resolveLeaseWorkMountDir(options: {
24
+ readonly agentId: string;
20
25
  readonly runtimeDir: string;
21
26
  readonly workMountDir: string;
22
27
  readonly zone: ZoneConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"lease-work-mount-paths.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-work-mount-paths.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAIN,KAAK,kBAAkB,EACvB,MAAM,+BAA+B,CAAC;AAQvC,eAAO,MAAM,gCAAgC,eAAe,CAAC;AAE7D,KAAK,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,MAAM,MAAM,iCAAiC,GAC1C,8BAA8B,GAC9B,mBAAmB,GACnB,4BAA4B,GAC5B,uBAAuB,GACvB,uBAAuB,GACvB,iBAAiB,GACjB,mBAAmB,GACnB,qBAAqB,GACrB,yBAAyB,GACzB,6BAA6B,CAAC;AAEjC,qBAAa,6BAA8B,SAAQ,KAAK;IACvD,QAAQ,CAAC,IAAI,EAAE,iCAAiC,CAAC;gBAErC,IAAI,EAAE,iCAAiC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAI5F;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AAuFD,wBAAsB,gCAAgC,CAAC,OAAO,EAAE;IAC/D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBlB;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE;IACvD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAyElC"}
1
+ {"version":3,"file":"lease-work-mount-paths.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-work-mount-paths.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAIN,KAAK,kBAAkB,EACvB,MAAM,+BAA+B,CAAC;AASvC,eAAO,MAAM,gCAAgC,eAA+B,CAAC;AAE7E,KAAK,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,MAAM,MAAM,iCAAiC,GAC1C,8BAA8B,GAC9B,mBAAmB,GACnB,4BAA4B,GAC5B,uBAAuB,GACvB,uBAAuB,GACvB,iBAAiB,GACjB,mBAAmB,GACnB,qBAAqB,GACrB,yBAAyB,GACzB,6BAA6B,GAC7B,gCAAgC,GAChC,iCAAiC,CAAC;AAErC,UAAU,oCAAqC,SAAQ,YAAY;IAClE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,6BAA8B,SAAQ,KAAK;IACvD,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,iCAAiC,CAAC;gBAGhD,IAAI,EAAE,iCAAiC,EACvC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,oCAAoC;CAO/C;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AAkGD,wBAAsB,gCAAgC,CAAC,OAAO,EAAE;IAC/D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBlB;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE;IACvD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA0ElC"}