@farmslot/agent-runtime 0.39.17 → 0.39.19
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/CHANGELOG.md +8 -0
- package/dist/native/checkpoint.d.ts +62 -0
- package/dist/native/checkpoint.d.ts.map +1 -0
- package/dist/native/checkpoint.js +206 -0
- package/dist/native/checkpoint.js.map +1 -0
- package/dist/native/client.d.ts +3 -0
- package/dist/native/client.d.ts.map +1 -1
- package/dist/native/client.js +14 -1
- package/dist/native/client.js.map +1 -1
- package/dist/native/codex.d.ts.map +1 -1
- package/dist/native/codex.js +19 -1
- package/dist/native/codex.js.map +1 -1
- package/dist/native/host.js +9 -1
- package/dist/native/host.js.map +1 -1
- package/dist/native/index.d.ts +1 -1
- package/dist/native/index.d.ts.map +1 -1
- package/dist/native/index.js +1 -1
- package/dist/native/index.js.map +1 -1
- package/dist/native/ipc.d.ts +3 -3
- package/dist/native/ipc.d.ts.map +1 -1
- package/dist/native/ipc.js +4 -3
- package/dist/native/ipc.js.map +1 -1
- package/dist/native/manager.d.ts +25 -0
- package/dist/native/manager.d.ts.map +1 -1
- package/dist/native/manager.js +199 -3
- package/dist/native/manager.js.map +1 -1
- package/dist/native/process.d.ts +6 -0
- package/dist/native/process.d.ts.map +1 -1
- package/dist/native/process.js +7 -1
- package/dist/native/process.js.map +1 -1
- package/dist/native/service.d.ts +2 -0
- package/dist/native/service.d.ts.map +1 -1
- package/dist/native/service.js +43 -3
- package/dist/native/service.js.map +1 -1
- package/dist/native/types.d.ts +2 -0
- package/dist/native/types.d.ts.map +1 -1
- package/dist/native/worker-history.d.ts.map +1 -1
- package/dist/native/worker-history.js +2 -1
- package/dist/native/worker-history.js.map +1 -1
- package/dist/native/worker-launch.d.ts +2 -0
- package/dist/native/worker-launch.d.ts.map +1 -1
- package/dist/native/worker-launch.js +3 -0
- package/dist/native/worker-launch.js.map +1 -1
- package/dist/native/worker-service.d.ts.map +1 -1
- package/dist/native/worker-service.js +4 -1
- package/dist/native/worker-service.js.map +1 -1
- package/dist/native/workspace.d.ts +8 -0
- package/dist/native/workspace.d.ts.map +1 -1
- package/dist/native/workspace.js +21 -10
- package/dist/native/workspace.js.map +1 -1
- package/package.json +2 -2
package/dist/native/index.d.ts
CHANGED
|
@@ -3,5 +3,5 @@ export { cursorNativeAdapter } from './cursor.js';
|
|
|
3
3
|
export { grokNativeAdapter } from './grok.js';
|
|
4
4
|
export { NativeSessionManager, resolveNativeExecutable } from './manager.js';
|
|
5
5
|
export type { NativeAdapter, NativeAdapterOptions, NativeAdapterSession, NativeEventInput, } from './types.js';
|
|
6
|
-
export { NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_METHODS, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_STATE, NATIVE_WORKER_TRANSFER, type NativeWorkerCancelResult, type NativeWorkerCancelTarget, type NativeWorkerLaunch, type NativeWorkerResumeParams, type NativeWorkerTarget, } from './worker-launch.js';
|
|
6
|
+
export { NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_METHODS, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_STATE, NATIVE_WORKER_STEER, NATIVE_WORKER_TRANSFER, type NativeWorkerCancelResult, type NativeWorkerCancelTarget, type NativeWorkerLaunch, type NativeWorkerResumeParams, type NativeWorkerTarget, } from './worker-launch.js';
|
|
7
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC7E,YAAY,EACV,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,GACxB,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC7E,YAAY,EACV,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,GACxB,MAAM,oBAAoB,CAAC"}
|
package/dist/native/index.js
CHANGED
|
@@ -2,5 +2,5 @@ export { NativeSessionClient } from './client.js';
|
|
|
2
2
|
export { cursorNativeAdapter } from './cursor.js';
|
|
3
3
|
export { grokNativeAdapter } from './grok.js';
|
|
4
4
|
export { NativeSessionManager, resolveNativeExecutable } from './manager.js';
|
|
5
|
-
export { NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_METHODS, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_STATE, NATIVE_WORKER_TRANSFER, } from './worker-launch.js';
|
|
5
|
+
export { NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_METHODS, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_STATE, NATIVE_WORKER_STEER, NATIVE_WORKER_TRANSFER, } from './worker-launch.js';
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
package/dist/native/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAO7E,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,GAMvB,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAO7E,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,GAMvB,MAAM,oBAAoB,CAAC"}
|
package/dist/native/ipc.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type NativeSessionCreateParams, type NativeSessionEnsureParams, type NativeSessionResponse } from '@farmslot/protocol';
|
|
2
|
-
import { NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_TRANSFER, type NativeWorkerLaunch, type NativeWorkerResumeParams } from './worker-launch.js';
|
|
2
|
+
import { NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_STEER, NATIVE_WORKER_TRANSFER, type NativeWorkerLaunch, type NativeWorkerResumeParams } from './worker-launch.js';
|
|
3
3
|
export interface HostIdentity {
|
|
4
4
|
executionNodeId?: string;
|
|
5
5
|
supportsEnsure?: boolean;
|
|
@@ -46,7 +46,7 @@ export type HostRequest = {
|
|
|
46
46
|
leaseId: string;
|
|
47
47
|
launch: NativeWorkerLaunch;
|
|
48
48
|
} | {
|
|
49
|
-
method: typeof NATIVE_WORKER_SEND;
|
|
49
|
+
method: typeof NATIVE_WORKER_SEND | typeof NATIVE_WORKER_STEER;
|
|
50
50
|
owner: string;
|
|
51
51
|
id: string;
|
|
52
52
|
generation: string;
|
|
@@ -92,7 +92,7 @@ export type HostRequest = {
|
|
|
92
92
|
after?: number;
|
|
93
93
|
limit?: number;
|
|
94
94
|
} | {
|
|
95
|
-
method: 'send';
|
|
95
|
+
method: 'send' | 'steer';
|
|
96
96
|
owner: string;
|
|
97
97
|
id: string;
|
|
98
98
|
commandId: string;
|
package/dist/native/ipc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipc.d.ts","sourceRoot":"","sources":["../../src/native/ipc.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC3B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAEL,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,uBAAuB,EACvB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,YAAY;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,MAAM,WAAW,GACnB;IACE,MAAM,EAAE,OAAO,kBAAkB,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACD;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,yBAAyB,CAAA;CAAE,GACtE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,yBAAyB,CAAA;CAAE,GACtE;IACE,MAAM,EAAE,OAAO,oBAAoB,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,yBAAyB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B,GACD;IACE,MAAM,EAAE,OAAO,oBAAoB,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,wBAAwB,CAAC;IACjC,MAAM,EAAE,kBAAkB,CAAC;CAC5B,GACD;IACE,MAAM,EAAE,OAAO,sBAAsB,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,kBAAkB,CAAC;CAC5B,GACD;IACE,MAAM,EAAE,OAAO,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ipc.d.ts","sourceRoot":"","sources":["../../src/native/ipc.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC3B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAEL,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,uBAAuB,EACvB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,YAAY;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,MAAM,WAAW,GACnB;IACE,MAAM,EAAE,OAAO,kBAAkB,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACD;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,yBAAyB,CAAA;CAAE,GACtE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,yBAAyB,CAAA;CAAE,GACtE;IACE,MAAM,EAAE,OAAO,oBAAoB,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,yBAAyB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B,GACD;IACE,MAAM,EAAE,OAAO,oBAAoB,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,wBAAwB,CAAC;IACjC,MAAM,EAAE,kBAAkB,CAAC;CAC5B,GACD;IACE,MAAM,EAAE,OAAO,sBAAsB,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,kBAAkB,CAAC;CAC5B,GACD;IACE,MAAM,EAAE,OAAO,kBAAkB,GAAG,OAAO,mBAAmB,CAAC;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,MAAM,EAAE,OAAO,4BAA4B,CAAC;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IACE,MAAM,EACF,OAAO,mBAAmB,GAC1B,OAAO,uBAAuB,GAC9B,OAAO,6BAA6B,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,MAAM,EAAE,OAAO,oBAAoB,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,OAAO,qBAAqB,CAAC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,qBAAqB,CAAC;CACjC,GACD;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7E;IAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxF;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACzE;IACE,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,qBAAqB,CAAC;CACjC,GACD;IAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AACjE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKpD;AACD,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAMxE;AACD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAI9D;AAKD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,WAAW,CAgJzD;AACD,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CA6BnF"}
|
package/dist/native/ipc.js
CHANGED
|
@@ -2,7 +2,7 @@ import { createHash, timingSafeEqual } from 'node:crypto';
|
|
|
2
2
|
import { connect } from 'node:net';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { isNativeResultSchema, } from '@farmslot/protocol';
|
|
5
|
-
import { decodeNativeWorkerLaunch, NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_TRANSFER, } from './worker-launch.js';
|
|
5
|
+
import { decodeNativeWorkerLaunch, NATIVE_WORKER_CANCEL, NATIVE_WORKER_CANCEL_COMMAND, NATIVE_WORKER_CLOSE, NATIVE_WORKER_CONFIRM_STOPPED, NATIVE_WORKER_ENSURE, NATIVE_WORKER_INTERRUPT, NATIVE_WORKER_READ, NATIVE_WORKER_RESPOND, NATIVE_WORKER_RESUME, NATIVE_WORKER_SEND, NATIVE_WORKER_STEER, NATIVE_WORKER_TRANSFER, } from './worker-launch.js';
|
|
6
6
|
export function socketDirectory(root) {
|
|
7
7
|
return join('/tmp', `fsn-${process.getuid?.()}-${createHash('sha256').update(root).digest('hex').slice(0, 20)}`);
|
|
8
8
|
}
|
|
@@ -97,6 +97,7 @@ export function decodeRequest(value) {
|
|
|
97
97
|
};
|
|
98
98
|
if ([
|
|
99
99
|
NATIVE_WORKER_SEND,
|
|
100
|
+
NATIVE_WORKER_STEER,
|
|
100
101
|
NATIVE_WORKER_CANCEL_COMMAND,
|
|
101
102
|
NATIVE_WORKER_CLOSE,
|
|
102
103
|
NATIVE_WORKER_CONFIRM_STOPPED,
|
|
@@ -111,7 +112,7 @@ export function decodeRequest(value) {
|
|
|
111
112
|
};
|
|
112
113
|
if (method === NATIVE_WORKER_TRANSFER)
|
|
113
114
|
return { method, ...target, launch: decodeNativeWorkerLaunch(p.launch) };
|
|
114
|
-
if (method === NATIVE_WORKER_SEND)
|
|
115
|
+
if (method === NATIVE_WORKER_SEND || method === NATIVE_WORKER_STEER)
|
|
115
116
|
return { method, ...target, commandId: string(p, 'commandId'), text: string(p, 'text') };
|
|
116
117
|
if (method === NATIVE_WORKER_CANCEL_COMMAND)
|
|
117
118
|
return { method, ...target, commandId: string(p, 'commandId') };
|
|
@@ -128,7 +129,7 @@ export function decodeRequest(value) {
|
|
|
128
129
|
return { method, owner, id, leaseId: string(p, 'leaseId'), after: p.after, limit: p.limit };
|
|
129
130
|
return { method, owner, id, after: p.after, limit: p.limit };
|
|
130
131
|
}
|
|
131
|
-
if (method === 'send')
|
|
132
|
+
if (method === 'send' || method === 'steer')
|
|
132
133
|
return { method, owner, id, commandId: string(p, 'commandId'), text: string(p, 'text') };
|
|
133
134
|
if (method === 'cancelCommand')
|
|
134
135
|
return { method, owner, id, commandId: string(p, 'commandId') };
|
package/dist/native/ipc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipc.js","sourceRoot":"","sources":["../../src/native/ipc.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ipc.js","sourceRoot":"","sources":["../../src/native/ipc.ts"],"names":[],"mappings":"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"}
|
package/dist/native/manager.d.ts
CHANGED
|
@@ -51,6 +51,7 @@ export declare class NativeSessionManager {
|
|
|
51
51
|
submitted: boolean;
|
|
52
52
|
accepted: boolean;
|
|
53
53
|
queued?: boolean;
|
|
54
|
+
steered?: true;
|
|
54
55
|
outcome?: "completed" | "failed" | "interrupted" | "cancelled";
|
|
55
56
|
structuredResult?: import("@farmslot/protocol").NativeStructuredResult;
|
|
56
57
|
}[];
|
|
@@ -67,6 +68,13 @@ export declare class NativeSessionManager {
|
|
|
67
68
|
};
|
|
68
69
|
private assertAccountCurrent;
|
|
69
70
|
send(owner: string, id: string, commandId: string, text: string): Promise<NativeSessionSendResult>;
|
|
71
|
+
/**
|
|
72
|
+
* Adds the message to the running turn when the runner can take it there: the adapter steers,
|
|
73
|
+
* a turn runs, no request is pending and no submission is in flight. Otherwise it is an
|
|
74
|
+
* ordinary send. The intent is journaled before the runner write, like any submission; a
|
|
75
|
+
* refusal fails the command and nothing is resent. It completes with the turn it joined.
|
|
76
|
+
*/
|
|
77
|
+
steer(owner: string, id: string, commandId: string, text: string): Promise<NativeSessionSendResult>;
|
|
70
78
|
private submitCommand;
|
|
71
79
|
/**
|
|
72
80
|
* Removes a command still waiting in the queue. Synchronous, like the queue's pick and the first
|
|
@@ -77,5 +85,22 @@ export declare class NativeSessionManager {
|
|
|
77
85
|
respond(owner: string, id: string, requestId: string, response: NativeSessionResponse): Promise<void>;
|
|
78
86
|
interrupt(owner: string, id: string): Promise<void>;
|
|
79
87
|
close(owner: string, id: string): Promise<void>;
|
|
88
|
+
/**
|
|
89
|
+
* The session's checkpoints, opened once and found again after a host restart (they are kept
|
|
90
|
+
* under the session's refs). A failure to open is not kept: the next use tries again.
|
|
91
|
+
*/
|
|
92
|
+
private checkpointsOf;
|
|
93
|
+
private checkpointDirectory;
|
|
94
|
+
/** Waits until `deadline` for the last turn's `turn.changes`; later, reports it unavailable. */
|
|
95
|
+
private finishTurnChanges;
|
|
96
|
+
/**
|
|
97
|
+
* The checkpoint a turn starts from, before the runner write. Delivery waits for it until
|
|
98
|
+
* `deadline`; slower, the turn reports its changes unavailable and the late result is unused.
|
|
99
|
+
*/
|
|
100
|
+
private checkpointBefore;
|
|
101
|
+
/** The turn's checkpoint after it, and `turn.changes` between the two, once. */
|
|
102
|
+
private checkpointAfter;
|
|
103
|
+
/** Deletes the session's checkpoints; a failure is shown and the next close tries again. */
|
|
104
|
+
private dropCheckpoints;
|
|
80
105
|
}
|
|
81
106
|
//# sourceMappingURL=manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/native/manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,KAAK,oBAAoB,EAEzB,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAC9B,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/native/manager.ts"],"names":[],"mappings":"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"}
|
package/dist/native/manager.js
CHANGED
|
@@ -7,6 +7,8 @@ import { basename, delimiter, dirname, isAbsolute, join, resolve } from 'node:pa
|
|
|
7
7
|
import { promisify } from 'node:util';
|
|
8
8
|
import { nativeStructuredResult, } from '@farmslot/protocol';
|
|
9
9
|
import { assertNativeProfileCurrent, nativeProfileEnvironment, requireNativeProfile, } from './account-profiles.js';
|
|
10
|
+
import { NATIVE_CHECKPOINT_WAIT_MS, NativeCheckpoints, withinMs } from './checkpoint.js';
|
|
11
|
+
import { NativeRequestRefused } from './process.js';
|
|
10
12
|
import { journalProcesses } from './process-tree.js';
|
|
11
13
|
import { nativeRunnerDefinitions as adapters } from './registry.js';
|
|
12
14
|
import { hostReviewSandboxAvailable, reviewProcessSandbox } from './review-sandbox.js';
|
|
@@ -482,6 +484,8 @@ export class NativeSessionManager {
|
|
|
482
484
|
throw error;
|
|
483
485
|
}
|
|
484
486
|
try {
|
|
487
|
+
// A read-only checkout is never written, so its turns change nothing to checkpoint.
|
|
488
|
+
record.readOnlyCheckout = !!filesystemPolicy;
|
|
485
489
|
record.startupAbort = new AbortController();
|
|
486
490
|
record.startup = transport.adapter.start({
|
|
487
491
|
...params,
|
|
@@ -832,12 +836,22 @@ export class NativeSessionManager {
|
|
|
832
836
|
if (record.info.state !== 'closing')
|
|
833
837
|
record.info.state = 'idle';
|
|
834
838
|
record.pendingRequests.clear();
|
|
835
|
-
const
|
|
836
|
-
if (command) {
|
|
839
|
+
const settle = (command) => {
|
|
837
840
|
command.state = event.status === 'completed' ? 'completed' : 'failed';
|
|
838
841
|
command.outcome = event.status;
|
|
842
|
+
};
|
|
843
|
+
const command = event.commandId && record.commands.get(event.commandId);
|
|
844
|
+
if (command) {
|
|
845
|
+
settle(command);
|
|
839
846
|
command.structuredResult = structuredResult;
|
|
840
847
|
}
|
|
848
|
+
// Messages added to this turn end with it, so they never hold up queued input.
|
|
849
|
+
for (const id of record.steering ?? []) {
|
|
850
|
+
const steered = record.commands.get(id);
|
|
851
|
+
if (steered && ['unknown', 'accepted'].includes(steered.state))
|
|
852
|
+
settle(steered);
|
|
853
|
+
}
|
|
854
|
+
record.steering?.clear();
|
|
841
855
|
}
|
|
842
856
|
if (event.type === 'session.closed') {
|
|
843
857
|
if (event.data?.processStopped === true)
|
|
@@ -890,8 +904,14 @@ export class NativeSessionManager {
|
|
|
890
904
|
}
|
|
891
905
|
}
|
|
892
906
|
this.persist(record, enriched);
|
|
893
|
-
if (event.type === 'turn.completed')
|
|
907
|
+
if (event.type === 'turn.completed') {
|
|
908
|
+
const start = record.turnStart;
|
|
909
|
+
record.turnStart = undefined;
|
|
910
|
+
// Only once turn.completed is durable: its changes follow it in the journal.
|
|
911
|
+
if (start)
|
|
912
|
+
this.checkpointAfter(record, start);
|
|
894
913
|
this.scheduleQueuedInput(record);
|
|
914
|
+
}
|
|
895
915
|
}
|
|
896
916
|
owned(owner, id, observations) {
|
|
897
917
|
const record = this.sessions.get(id);
|
|
@@ -1015,6 +1035,7 @@ export class NativeSessionManager {
|
|
|
1015
1035
|
state: existing.state,
|
|
1016
1036
|
commandId,
|
|
1017
1037
|
...(existing.queued ? { queued: true } : {}),
|
|
1038
|
+
...(existing.steered ? { steered: true } : {}),
|
|
1018
1039
|
};
|
|
1019
1040
|
}
|
|
1020
1041
|
if (!record.adapter || ['starting', 'closing', 'closed', 'failed'].includes(record.info.state))
|
|
@@ -1047,6 +1068,63 @@ export class NativeSessionManager {
|
|
|
1047
1068
|
leaseId: record.info.workerLeaseId,
|
|
1048
1069
|
});
|
|
1049
1070
|
}
|
|
1071
|
+
/**
|
|
1072
|
+
* Adds the message to the running turn when the runner can take it there: the adapter steers,
|
|
1073
|
+
* a turn runs, no request is pending and no submission is in flight. Otherwise it is an
|
|
1074
|
+
* ordinary send. The intent is journaled before the runner write, like any submission; a
|
|
1075
|
+
* refusal fails the command and nothing is resent. It completes with the turn it joined.
|
|
1076
|
+
*/
|
|
1077
|
+
async steer(owner, id, commandId, text) {
|
|
1078
|
+
const record = this.owned(owner, id);
|
|
1079
|
+
const adapter = record.adapter;
|
|
1080
|
+
if (record.commands.has(commandId) ||
|
|
1081
|
+
!adapter?.steer ||
|
|
1082
|
+
!record.info.capabilities.steer ||
|
|
1083
|
+
record.info.state !== 'running' ||
|
|
1084
|
+
record.pendingRequests.size ||
|
|
1085
|
+
record.sending)
|
|
1086
|
+
return this.send(owner, id, commandId, text);
|
|
1087
|
+
this.assertAccountCurrent(record);
|
|
1088
|
+
const command = {
|
|
1089
|
+
text,
|
|
1090
|
+
commandId,
|
|
1091
|
+
generation: record.info.generation,
|
|
1092
|
+
state: 'unknown',
|
|
1093
|
+
submitted: true,
|
|
1094
|
+
accepted: false,
|
|
1095
|
+
steered: true,
|
|
1096
|
+
leaseId: record.info.workerLeaseId,
|
|
1097
|
+
};
|
|
1098
|
+
record.commands.set(commandId, command);
|
|
1099
|
+
(record.steering ??= new Set()).add(commandId);
|
|
1100
|
+
// A crash after this durable reservation must never trigger a resend.
|
|
1101
|
+
this.append(record, { type: 'command.submitted', commandId, text });
|
|
1102
|
+
try {
|
|
1103
|
+
await adapter.steer(text, commandId);
|
|
1104
|
+
}
|
|
1105
|
+
catch (error) {
|
|
1106
|
+
// Only a refusal proves the runner did not take it; a lost reply (exit, timeout) may have.
|
|
1107
|
+
const refused = error instanceof NativeRequestRefused;
|
|
1108
|
+
if (refused) {
|
|
1109
|
+
command.state = 'failed';
|
|
1110
|
+
command.outcome = 'failed';
|
|
1111
|
+
}
|
|
1112
|
+
this.append(record, {
|
|
1113
|
+
type: 'error',
|
|
1114
|
+
commandId,
|
|
1115
|
+
text: refused
|
|
1116
|
+
? `The runner did not add the message to its turn: ${error.message}`
|
|
1117
|
+
: `No reply from the runner; whether it added the message is unknown: ${error.message}`,
|
|
1118
|
+
});
|
|
1119
|
+
}
|
|
1120
|
+
return {
|
|
1121
|
+
commandId,
|
|
1122
|
+
submitted: command.submitted,
|
|
1123
|
+
accepted: command.accepted,
|
|
1124
|
+
state: command.state,
|
|
1125
|
+
steered: true,
|
|
1126
|
+
};
|
|
1127
|
+
}
|
|
1050
1128
|
async submitCommand(record, command) {
|
|
1051
1129
|
record.sending = true;
|
|
1052
1130
|
record.info.state = 'waiting';
|
|
@@ -1056,8 +1134,13 @@ export class NativeSessionManager {
|
|
|
1056
1134
|
command.submitted = true;
|
|
1057
1135
|
record.commands.set(commandId, command);
|
|
1058
1136
|
try {
|
|
1137
|
+
// The previous turn's changes come first, and nothing this turn writes can reach them.
|
|
1138
|
+
const deadline = Date.now() + NATIVE_CHECKPOINT_WAIT_MS;
|
|
1139
|
+
if (record.turnEnd)
|
|
1140
|
+
await this.finishTurnChanges(record, deadline);
|
|
1059
1141
|
// A crash after this durable reservation must never trigger a resend.
|
|
1060
1142
|
this.append(record, { type: 'command.submitted', commandId, text });
|
|
1143
|
+
await this.checkpointBefore(record, commandId, deadline);
|
|
1061
1144
|
await record.adapter.send(text, commandId);
|
|
1062
1145
|
return {
|
|
1063
1146
|
submitted: command.submitted,
|
|
@@ -1195,10 +1278,14 @@ export class NativeSessionManager {
|
|
|
1195
1278
|
if (record.info.processPid && !record.info.processStopped)
|
|
1196
1279
|
throw new Error('Native process cleanup is unconfirmed; close outcome is unknown');
|
|
1197
1280
|
cancelQueued();
|
|
1281
|
+
await this.dropCheckpoints(record);
|
|
1198
1282
|
return;
|
|
1199
1283
|
}
|
|
1200
1284
|
record.info.state = 'closing';
|
|
1201
1285
|
this.persist(record);
|
|
1286
|
+
// The last turn's changes are reported before the session closes.
|
|
1287
|
+
if (record.turnEnd)
|
|
1288
|
+
await this.finishTurnChanges(record, Date.now() + NATIVE_CHECKPOINT_WAIT_MS);
|
|
1202
1289
|
if (!record.adapter && record.startup) {
|
|
1203
1290
|
record.startupAbort?.abort();
|
|
1204
1291
|
try {
|
|
@@ -1209,6 +1296,7 @@ export class NativeSessionManager {
|
|
|
1209
1296
|
// adapter has independently confirmed that its entire owned tree stopped.
|
|
1210
1297
|
if (record.info.processStopped && ['closed', 'failed'].includes(record.info.state)) {
|
|
1211
1298
|
cancelQueued();
|
|
1299
|
+
await this.dropCheckpoints(record);
|
|
1212
1300
|
return;
|
|
1213
1301
|
}
|
|
1214
1302
|
throw error;
|
|
@@ -1221,6 +1309,114 @@ export class NativeSessionManager {
|
|
|
1221
1309
|
cancelQueued();
|
|
1222
1310
|
if (!['closed', 'failed'].includes(this.owned(owner, id).info.state))
|
|
1223
1311
|
this.append(record, { type: 'session.closed' });
|
|
1312
|
+
await this.dropCheckpoints(record);
|
|
1313
|
+
}
|
|
1314
|
+
/**
|
|
1315
|
+
* The session's checkpoints, opened once and found again after a host restart (they are kept
|
|
1316
|
+
* under the session's refs). A failure to open is not kept: the next use tries again.
|
|
1317
|
+
*/
|
|
1318
|
+
checkpointsOf(record) {
|
|
1319
|
+
if (!record.checkpoints) {
|
|
1320
|
+
const opened = NativeCheckpoints.open(record.info.cwd, record.info.id, {
|
|
1321
|
+
indexDir: this.checkpointDirectory(record),
|
|
1322
|
+
});
|
|
1323
|
+
record.checkpoints = opened;
|
|
1324
|
+
opened.catch(() => {
|
|
1325
|
+
if (record.checkpoints === opened)
|
|
1326
|
+
record.checkpoints = undefined;
|
|
1327
|
+
});
|
|
1328
|
+
}
|
|
1329
|
+
return record.checkpoints;
|
|
1330
|
+
}
|
|
1331
|
+
checkpointDirectory(record) {
|
|
1332
|
+
return join(this.root, 'checkpoints', record.info.id);
|
|
1333
|
+
}
|
|
1334
|
+
/** Waits until `deadline` for the last turn's `turn.changes`; later, reports it unavailable. */
|
|
1335
|
+
async finishTurnChanges(record, deadline) {
|
|
1336
|
+
const end = record.turnEnd;
|
|
1337
|
+
if (!end)
|
|
1338
|
+
return;
|
|
1339
|
+
const left = Math.max(0, deadline - Date.now());
|
|
1340
|
+
if ((await withinMs(end.done.then(() => true), left)) === undefined)
|
|
1341
|
+
end.abandon(`The checkpoint after this turn took longer than ${NATIVE_CHECKPOINT_WAIT_MS / 1000} s`);
|
|
1342
|
+
}
|
|
1343
|
+
/**
|
|
1344
|
+
* The checkpoint a turn starts from, before the runner write. Delivery waits for it until
|
|
1345
|
+
* `deadline`; slower, the turn reports its changes unavailable and the late result is unused.
|
|
1346
|
+
*/
|
|
1347
|
+
async checkpointBefore(record, commandId, deadline) {
|
|
1348
|
+
record.turnStart = undefined;
|
|
1349
|
+
// A read-only checkout is never written, so its turns change nothing to checkpoint.
|
|
1350
|
+
if (record.readOnlyCheckout)
|
|
1351
|
+
return;
|
|
1352
|
+
const late = {
|
|
1353
|
+
commandId,
|
|
1354
|
+
unavailable: `The checkpoint before this turn took longer than ${NATIVE_CHECKPOINT_WAIT_MS / 1000} s`,
|
|
1355
|
+
};
|
|
1356
|
+
// The previous turn's checkpoint used the whole wait: none is started that would go unused.
|
|
1357
|
+
if (Date.now() >= deadline) {
|
|
1358
|
+
if (record.checkpoints)
|
|
1359
|
+
record.turnStart = late;
|
|
1360
|
+
return;
|
|
1361
|
+
}
|
|
1362
|
+
// `null`: the working directory is not in a Git working tree, so its turns report nothing.
|
|
1363
|
+
const taken = (async () => {
|
|
1364
|
+
const checkpoints = await this.checkpointsOf(record);
|
|
1365
|
+
return checkpoints ? { from: await checkpoints.take() } : null;
|
|
1366
|
+
})().catch((error) => ({
|
|
1367
|
+
unavailable: `The checkpoint before this turn failed: ${error.message}`,
|
|
1368
|
+
}));
|
|
1369
|
+
const start = await withinMs(taken, Math.max(0, deadline - Date.now()));
|
|
1370
|
+
if (start === undefined)
|
|
1371
|
+
record.turnStart = late;
|
|
1372
|
+
else if (start)
|
|
1373
|
+
record.turnStart = { commandId, ...start };
|
|
1374
|
+
}
|
|
1375
|
+
/** The turn's checkpoint after it, and `turn.changes` between the two, once. */
|
|
1376
|
+
checkpointAfter(record, start) {
|
|
1377
|
+
let reported = false;
|
|
1378
|
+
const report = (changes) => {
|
|
1379
|
+
if (reported || this.sessions.get(record.info.id) !== record)
|
|
1380
|
+
return;
|
|
1381
|
+
reported = true;
|
|
1382
|
+
if (record.turnEnd === end)
|
|
1383
|
+
record.turnEnd = undefined;
|
|
1384
|
+
this.append(record, { type: 'turn.changes', commandId: start.commandId, changes });
|
|
1385
|
+
};
|
|
1386
|
+
const end = {
|
|
1387
|
+
done: Promise.resolve(),
|
|
1388
|
+
abandon: (reason) => report({ files: [], unavailable: reason }),
|
|
1389
|
+
};
|
|
1390
|
+
record.turnEnd = end;
|
|
1391
|
+
end.done = (async () => {
|
|
1392
|
+
try {
|
|
1393
|
+
const checkpoints = start.from && (await record.checkpoints);
|
|
1394
|
+
report(start.from && checkpoints
|
|
1395
|
+
? await checkpoints.changes(start.from, await checkpoints.take())
|
|
1396
|
+
: { files: [], unavailable: start.unavailable ?? 'No checkpoint before this turn' });
|
|
1397
|
+
}
|
|
1398
|
+
catch (error) {
|
|
1399
|
+
report({
|
|
1400
|
+
files: [],
|
|
1401
|
+
unavailable: `The checkpoint after this turn failed: ${error.message}`,
|
|
1402
|
+
});
|
|
1403
|
+
}
|
|
1404
|
+
})();
|
|
1405
|
+
}
|
|
1406
|
+
/** Deletes the session's checkpoints; a failure is shown and the next close tries again. */
|
|
1407
|
+
async dropCheckpoints(record) {
|
|
1408
|
+
// A session that never took one (outside Git, read-only, no turn) has no index directory.
|
|
1409
|
+
if (!record.checkpoints && !existsSync(this.checkpointDirectory(record)))
|
|
1410
|
+
return;
|
|
1411
|
+
try {
|
|
1412
|
+
await (await this.checkpointsOf(record))?.remove();
|
|
1413
|
+
}
|
|
1414
|
+
catch (error) {
|
|
1415
|
+
this.append(record, {
|
|
1416
|
+
type: 'error',
|
|
1417
|
+
text: `This session's checkpoints were not deleted: ${error.message}. Close it again to retry.`,
|
|
1418
|
+
});
|
|
1419
|
+
}
|
|
1224
1420
|
}
|
|
1225
1421
|
}
|
|
1226
1422
|
//# sourceMappingURL=manager.js.map
|