@yu_robotics/remote-cli 1.6.215 → 1.6.217
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/README.md +1 -1
- package/dist/delegation/AgySessionDeletion.d.ts +50 -0
- package/dist/delegation/AgySessionDeletion.d.ts.map +1 -0
- package/dist/delegation/AgySessionDeletion.js +339 -0
- package/dist/delegation/AgySessionDeletion.js.map +1 -0
- package/dist/delegation/DelegatedWorkerSessionStore.js +1 -2
- package/dist/delegation/DelegatedWorkerSessionStore.js.map +1 -1
- package/dist/delegation/DelegationManager.d.ts.map +1 -1
- package/dist/delegation/DelegationManager.js +36 -5
- package/dist/delegation/DelegationManager.js.map +1 -1
- package/dist/delegation/DshManagedHistory.d.ts +14 -0
- package/dist/delegation/DshManagedHistory.d.ts.map +1 -0
- package/dist/delegation/DshManagedHistory.js +106 -0
- package/dist/delegation/DshManagedHistory.js.map +1 -0
- package/dist/delegation/DshSessionDeletion.d.ts +57 -0
- package/dist/delegation/DshSessionDeletion.d.ts.map +1 -0
- package/dist/delegation/DshSessionDeletion.js +313 -0
- package/dist/delegation/DshSessionDeletion.js.map +1 -0
- package/dist/delegation/NativeSessionDeletion.d.ts +10 -2
- package/dist/delegation/NativeSessionDeletion.d.ts.map +1 -1
- package/dist/delegation/NativeSessionDeletion.js +63 -10
- package/dist/delegation/NativeSessionDeletion.js.map +1 -1
- package/dist/delegation/OpenCodeSessionDeletion.d.ts +55 -0
- package/dist/delegation/OpenCodeSessionDeletion.d.ts.map +1 -0
- package/dist/delegation/OpenCodeSessionDeletion.js +287 -0
- package/dist/delegation/OpenCodeSessionDeletion.js.map +1 -0
- package/dist/delegation/ZCodeOwnedHistory.d.ts +53 -0
- package/dist/delegation/ZCodeOwnedHistory.d.ts.map +1 -0
- package/dist/delegation/ZCodeOwnedHistory.js +762 -0
- package/dist/delegation/ZCodeOwnedHistory.js.map +1 -0
- package/dist/delegation/ZCodeSessionDeletion.d.ts +70 -0
- package/dist/delegation/ZCodeSessionDeletion.d.ts.map +1 -0
- package/dist/delegation/ZCodeSessionDeletion.js +163 -0
- package/dist/delegation/ZCodeSessionDeletion.js.map +1 -0
- package/dist/executor/AcpExecutor.d.ts +11 -0
- package/dist/executor/AcpExecutor.d.ts.map +1 -1
- package/dist/executor/AcpExecutor.js +27 -13
- package/dist/executor/AcpExecutor.js.map +1 -1
- package/dist/executor/AgyExecutor.d.ts +15 -1
- package/dist/executor/AgyExecutor.d.ts.map +1 -1
- package/dist/executor/AgyExecutor.js +126 -7
- package/dist/executor/AgyExecutor.js.map +1 -1
- package/dist/executor/DshExecutor.d.ts +2 -0
- package/dist/executor/DshExecutor.d.ts.map +1 -1
- package/dist/executor/DshExecutor.js +9 -1
- package/dist/executor/DshExecutor.js.map +1 -1
- package/dist/executor/OpenCodeExecutor.d.ts.map +1 -1
- package/dist/executor/OpenCodeExecutor.js +7 -0
- package/dist/executor/OpenCodeExecutor.js.map +1 -1
- package/dist/executor/ZCodeExecutor.d.ts +9 -2
- package/dist/executor/ZCodeExecutor.d.ts.map +1 -1
- package/dist/executor/ZCodeExecutor.js +150 -7
- package/dist/executor/ZCodeExecutor.js.map +1 -1
- package/dist/executor/dsh/DshAcpClient.d.ts +1 -1
- package/dist/executor/dsh/DshAcpClient.d.ts.map +1 -1
- package/dist/executor/dsh/DshAcpClient.js +4 -2
- package/dist/executor/dsh/DshAcpClient.js.map +1 -1
- package/dist/executor/dsh/DshPrivacy.d.ts +1 -1
- package/dist/executor/dsh/DshPrivacy.d.ts.map +1 -1
- package/dist/executor/dsh/DshPrivacy.js +2 -2
- package/dist/executor/dsh/DshPrivacy.js.map +1 -1
- package/dist/executor/zcode/ZCodeClient.d.ts +4 -0
- package/dist/executor/zcode/ZCodeClient.d.ts.map +1 -1
- package/dist/executor/zcode/ZCodeClient.js +21 -2
- package/dist/executor/zcode/ZCodeClient.js.map +1 -1
- package/dist/executor/zcode/ZCodeStorageSelection.d.ts +13 -0
- package/dist/executor/zcode/ZCodeStorageSelection.d.ts.map +1 -0
- package/dist/executor/zcode/ZCodeStorageSelection.js +85 -0
- package/dist/executor/zcode/ZCodeStorageSelection.js.map +1 -0
- package/dist/maintenance/release-notes.json +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.DshManagedHistory = void 0;
|
|
7
|
+
const promises_1 = __importDefault(require("fs/promises"));
|
|
8
|
+
const fs_1 = require("fs");
|
|
9
|
+
const path_1 = __importDefault(require("path"));
|
|
10
|
+
const crypto_1 = require("crypto");
|
|
11
|
+
const AtomicFile_1 = require("./AtomicFile");
|
|
12
|
+
const OwnershipRuntime_1 = require("./OwnershipRuntime");
|
|
13
|
+
const NativeHistoryFiles_1 = require("./NativeHistoryFiles");
|
|
14
|
+
const DshSessionDeletion_1 = require("./DshSessionDeletion");
|
|
15
|
+
/** A separate binding avoids polluting native session-pointer inventories. */
|
|
16
|
+
class DshManagedHistory {
|
|
17
|
+
home;
|
|
18
|
+
executorThreadId;
|
|
19
|
+
pointer;
|
|
20
|
+
scope;
|
|
21
|
+
patch = '';
|
|
22
|
+
constructor(home, executorThreadId, pointer) {
|
|
23
|
+
this.home = home;
|
|
24
|
+
this.executorThreadId = executorThreadId;
|
|
25
|
+
this.pointer = pointer;
|
|
26
|
+
}
|
|
27
|
+
async read(file) {
|
|
28
|
+
let before;
|
|
29
|
+
try {
|
|
30
|
+
before = await (0, NativeHistoryFiles_1.historyIdentity)(file, 'file');
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
if (error.code === 'ENOENT')
|
|
34
|
+
return;
|
|
35
|
+
throw error;
|
|
36
|
+
}
|
|
37
|
+
if (BigInt(before.size) > 65536n)
|
|
38
|
+
throw new Error('DSH history binding exceeds limit');
|
|
39
|
+
const handle = await promises_1.default.open(file, fs_1.constants.O_RDONLY | (fs_1.constants.O_NOFOLLOW ?? 0));
|
|
40
|
+
try {
|
|
41
|
+
const opened = await handle.stat({ bigint: true });
|
|
42
|
+
if (String(opened.ino) !== before.ino || String(opened.dev) !== before.dev)
|
|
43
|
+
throw new Error('DSH history binding changed');
|
|
44
|
+
const bytes = await handle.readFile('utf8');
|
|
45
|
+
if (JSON.stringify(await (0, NativeHistoryFiles_1.historyIdentity)(file, 'file')) !== JSON.stringify(before))
|
|
46
|
+
throw new Error('DSH history binding changed');
|
|
47
|
+
return JSON.parse(bytes);
|
|
48
|
+
}
|
|
49
|
+
finally {
|
|
50
|
+
await handle.close();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
async prepare(cwd) {
|
|
54
|
+
if (!/^delegate-lane-[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/.test(this.executorThreadId)) {
|
|
55
|
+
throw new Error('DSH history requires a managed lane');
|
|
56
|
+
}
|
|
57
|
+
await (0, NativeHistoryFiles_1.historyDirectory)(this.home);
|
|
58
|
+
let directory = this.home;
|
|
59
|
+
for (const name of ['.remote-cli', 'dsh-history-bindings']) {
|
|
60
|
+
directory = path_1.default.join(directory, name);
|
|
61
|
+
await promises_1.default.mkdir(directory, { recursive: true, mode: 0o700 });
|
|
62
|
+
await (0, NativeHistoryFiles_1.historyDirectory)(directory);
|
|
63
|
+
}
|
|
64
|
+
const binding = path_1.default.join(directory, `${this.executorThreadId}.json`);
|
|
65
|
+
const saved = await this.read(binding);
|
|
66
|
+
const pointer = await this.read(this.pointer);
|
|
67
|
+
if (saved !== undefined && (!(0, DshSessionDeletion_1.validDshHistoryScope)(saved) || saved.executorThreadId !== this.executorThreadId
|
|
68
|
+
|| saved.home.path !== this.home))
|
|
69
|
+
throw new Error('DSH history binding is not owned');
|
|
70
|
+
if (saved && (0, DshSessionDeletion_1.validDshHistoryScope)(saved) && saved.cwd === cwd) {
|
|
71
|
+
this.scope = saved;
|
|
72
|
+
this.patch = await (0, DshSessionDeletion_1.dshHistoryPatch)(saved);
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
if (pointer !== undefined) {
|
|
76
|
+
// Never migrate a legacy/adopted session into a new private persistence root.
|
|
77
|
+
if (saved !== undefined || typeof pointer?.id !== 'string' || !pointer.id)
|
|
78
|
+
throw new Error('DSH legacy history binding is ambiguous');
|
|
79
|
+
this.scope = undefined;
|
|
80
|
+
this.patch = '';
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
const scope = await (0, DshSessionDeletion_1.createDshHistoryScope)(this.home, this.executorThreadId, cwd);
|
|
84
|
+
const patch = await (0, DshSessionDeletion_1.dshHistoryPatch)(scope);
|
|
85
|
+
const temporary = `${binding}.${(0, crypto_1.randomUUID)()}.tmp`;
|
|
86
|
+
const handle = await promises_1.default.open(temporary, 'wx', 0o600);
|
|
87
|
+
try {
|
|
88
|
+
await handle.writeFile(JSON.stringify(scope));
|
|
89
|
+
await handle.sync();
|
|
90
|
+
}
|
|
91
|
+
finally {
|
|
92
|
+
await handle.close();
|
|
93
|
+
}
|
|
94
|
+
await (0, AtomicFile_1.replaceAtomicFile)(temporary, binding);
|
|
95
|
+
await (0, OwnershipRuntime_1.syncDirectory)(directory);
|
|
96
|
+
this.scope = scope;
|
|
97
|
+
this.patch = patch;
|
|
98
|
+
}
|
|
99
|
+
async capture(sessionId) {
|
|
100
|
+
if (!this.scope)
|
|
101
|
+
throw new Error('DSH legacy session has no owned history scope');
|
|
102
|
+
return (0, DshSessionDeletion_1.captureDshDeletionTarget)(this.scope, sessionId);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
exports.DshManagedHistory = DshManagedHistory;
|
|
106
|
+
//# sourceMappingURL=DshManagedHistory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DshManagedHistory.js","sourceRoot":"","sources":["../../src/delegation/DshManagedHistory.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { type HistoryEntry } from './NativeHistoryFiles';
|
|
2
|
+
import type { NativeDirectoryIdentity, NativeDeletionResult } from './NativeSessionDeletion';
|
|
3
|
+
/** Audited DSH 0.2.1-rc.2/rc.5 and deepseek-ai/deepseek-harness@fcc0ad462172522aaf5c93a7b2e01f6b9f0b0159.
|
|
4
|
+
* ACP exposes close/list/resume, not permanent deletion. The explicit plugin root
|
|
5
|
+
* overrides are a storage capability contract, not an installed-version gate.
|
|
6
|
+
*/
|
|
7
|
+
export interface DshHistoryScope {
|
|
8
|
+
version: 1;
|
|
9
|
+
backend: 'dsh';
|
|
10
|
+
nativeVersion: 'dsh-owned-jsonl-v1';
|
|
11
|
+
executorThreadId: string;
|
|
12
|
+
cwd: string;
|
|
13
|
+
home: NativeDirectoryIdentity;
|
|
14
|
+
scope: NativeDirectoryIdentity;
|
|
15
|
+
history: NativeDirectoryIdentity;
|
|
16
|
+
}
|
|
17
|
+
export interface DshDeletionTarget extends DshHistoryScope {
|
|
18
|
+
provenance: 'created';
|
|
19
|
+
sessionId: string;
|
|
20
|
+
pointerRoot: NativeDirectoryIdentity;
|
|
21
|
+
pointer: string;
|
|
22
|
+
pointerHash: string;
|
|
23
|
+
}
|
|
24
|
+
export interface DshDeletionPreparation {
|
|
25
|
+
version: 1;
|
|
26
|
+
nativeVersion: 'dsh-owned-jsonl-v1';
|
|
27
|
+
targetHash: string;
|
|
28
|
+
sessionIds: string[];
|
|
29
|
+
files: HistoryEntry[];
|
|
30
|
+
}
|
|
31
|
+
/** The caller must first prove durable parent retirement, exclusive ownership and
|
|
32
|
+
* exit of every writer. No deletion is authorized by a pointer or scope alone.
|
|
33
|
+
*/
|
|
34
|
+
export interface DshDeletionRecovery {
|
|
35
|
+
/** Explicit creation receipts for every retired root sharing this private history scope. */
|
|
36
|
+
ownedTargets?: DshDeletionTarget[];
|
|
37
|
+
detachedPointer?: boolean;
|
|
38
|
+
prepared?: DshDeletionPreparation;
|
|
39
|
+
persistPrepared?: (value: DshDeletionPreparation) => Promise<void>;
|
|
40
|
+
}
|
|
41
|
+
export declare function validDshHistoryScope(value: any): value is DshHistoryScope;
|
|
42
|
+
export declare function validDshDeletionTarget(value: any): value is DshDeletionTarget;
|
|
43
|
+
/** Allocate once before a managed native session is created; persist this scope
|
|
44
|
+
* before launching. Reuse the same scope until that native context is retired.
|
|
45
|
+
* Never attach this scope to an adopted or pre-existing native session.
|
|
46
|
+
*/
|
|
47
|
+
export declare function createDshHistoryScope(home: string, executorThreadId: string, cwd: string): Promise<DshHistoryScope>;
|
|
48
|
+
/** Append to the privacy overlay. HOME, DSH_HOME, auth, profiles and tool HOME are
|
|
49
|
+
* untouched. Retained storage/attachments are NEVER part of the deletion manifest.
|
|
50
|
+
* The global file-upload index is not resumable history and is not erased.
|
|
51
|
+
*/
|
|
52
|
+
export declare function dshHistoryPatch(scope: DshHistoryScope): Promise<string>;
|
|
53
|
+
/** Call only after newSession, pointer persistence and native scope confirmation. */
|
|
54
|
+
export declare function captureDshDeletionTarget(scope: DshHistoryScope, sessionId: string): Promise<DshDeletionTarget>;
|
|
55
|
+
export declare function validDshDeletionPreparation(target: DshDeletionTarget, value: any): value is DshDeletionPreparation;
|
|
56
|
+
export declare function deleteOwnedDshSession(target: DshDeletionTarget, recovery: DshDeletionRecovery): Promise<NativeDeletionResult>;
|
|
57
|
+
//# sourceMappingURL=DshSessionDeletion.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DshSessionDeletion.d.ts","sourceRoot":"","sources":["../../src/delegation/DshSessionDeletion.ts"],"names":[],"mappings":"AAIA,OAAO,EACmB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE7F;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,KAAK,CAAC;IACf,aAAa,EAAE,oBAAoB,CAAC;IACpC,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,uBAAuB,CAAC;IAC9B,KAAK,EAAE,uBAAuB,CAAC;IAC/B,OAAO,EAAE,uBAAuB,CAAC;CAClC;AACD,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,UAAU,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,uBAAuB,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,CAAC,CAAC;IACX,aAAa,EAAE,oBAAoB,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AACD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,4FAA4F;IAC5F,YAAY,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAQD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,eAAe,CAOzE;AACD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,iBAAiB,CAO7E;AA6BD;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAiBzH;AACD;;;GAGG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAW7E;AACD,qFAAqF;AACrF,wBAAsB,wBAAwB,CAAC,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CASpH;AAyCD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,sBAAsB,CAQlH;AA2DD,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA+BnI"}
|
|
@@ -0,0 +1,313 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.validDshHistoryScope = validDshHistoryScope;
|
|
7
|
+
exports.validDshDeletionTarget = validDshDeletionTarget;
|
|
8
|
+
exports.createDshHistoryScope = createDshHistoryScope;
|
|
9
|
+
exports.dshHistoryPatch = dshHistoryPatch;
|
|
10
|
+
exports.captureDshDeletionTarget = captureDshDeletionTarget;
|
|
11
|
+
exports.validDshDeletionPreparation = validDshDeletionPreparation;
|
|
12
|
+
exports.deleteOwnedDshSession = deleteOwnedDshSession;
|
|
13
|
+
const promises_1 = __importDefault(require("fs/promises"));
|
|
14
|
+
const path_1 = __importDefault(require("path"));
|
|
15
|
+
const fs_1 = require("fs");
|
|
16
|
+
const crypto_1 = require("crypto");
|
|
17
|
+
const NativeHistoryFiles_1 = require("./NativeHistoryFiles");
|
|
18
|
+
const LinuxHistoryAnchor_1 = require("./LinuxHistoryAnchor");
|
|
19
|
+
const ID = /^[A-Za-z0-9_-]{1,128}$/;
|
|
20
|
+
const LANE = /^delegate-lane-[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/;
|
|
21
|
+
const canonical = (s) => typeof s === 'string' && path_1.default.isAbsolute(s)
|
|
22
|
+
&& path_1.default.normalize(s) === s && !s.includes('\0');
|
|
23
|
+
const hash = (bytes) => (0, crypto_1.createHash)('sha256').update(bytes).digest('hex');
|
|
24
|
+
const safeId = (value) => typeof value === 'string' && ID.test(value) && !/[^A-Za-z0-9_-]/.test(value);
|
|
25
|
+
const inside = (root, file) => file.startsWith(root + path_1.default.sep);
|
|
26
|
+
function validDshHistoryScope(value) {
|
|
27
|
+
return !!value && value.version === 1 && value.backend === 'dsh' && value.nativeVersion === 'dsh-owned-jsonl-v1'
|
|
28
|
+
&& safeId(value.executorThreadId) && LANE.test(value.executorThreadId)
|
|
29
|
+
&& canonical(value.cwd) && [value.home, value.scope, value.history].every(NativeHistoryFiles_1.validHistoryDirectory)
|
|
30
|
+
&& path_1.default.dirname(value.scope.path) === path_1.default.join(value.home.path, '.remote-cli', 'dsh-histories')
|
|
31
|
+
&& path_1.default.basename(value.scope.path).length === 36 && /^[0-9a-f-]{36}$/.test(path_1.default.basename(value.scope.path))
|
|
32
|
+
&& value.history.path === path_1.default.join(value.scope.path, 'history');
|
|
33
|
+
}
|
|
34
|
+
function validDshDeletionTarget(value) {
|
|
35
|
+
if (!validDshHistoryScope(value))
|
|
36
|
+
return false;
|
|
37
|
+
const target = value;
|
|
38
|
+
return target.provenance === 'created' && safeId(target.sessionId)
|
|
39
|
+
&& (0, NativeHistoryFiles_1.validHistoryDirectory)(target.pointerRoot) && target.pointerRoot.path === path_1.default.join(target.home.path, '.remote-cli', 'dsh-sessions')
|
|
40
|
+
&& target.pointer === path_1.default.join(target.pointerRoot.path, `${target.executorThreadId}.json`)
|
|
41
|
+
&& typeof target.pointerHash === 'string' && target.pointerHash.length === 64 && /^[a-f0-9]{64}$/.test(target.pointerHash);
|
|
42
|
+
}
|
|
43
|
+
function scopeRecord(value) {
|
|
44
|
+
return { version: 1, backend: 'dsh', nativeVersion: 'dsh-owned-jsonl-v1', executorThreadId: value.executorThreadId,
|
|
45
|
+
cwd: value.cwd, home: value.home, scope: value.scope, history: value.history };
|
|
46
|
+
}
|
|
47
|
+
async function readStable(file, limit = 65536) {
|
|
48
|
+
const before = await (0, NativeHistoryFiles_1.historyIdentity)(file, 'file');
|
|
49
|
+
if (BigInt(before.size) > BigInt(limit))
|
|
50
|
+
throw new Error('DSH metadata limit exceeded');
|
|
51
|
+
const handle = await promises_1.default.open(file, fs_1.constants.O_RDONLY | (fs_1.constants.O_NOFOLLOW ?? 0));
|
|
52
|
+
try {
|
|
53
|
+
const stat = await handle.stat({ bigint: true });
|
|
54
|
+
if (String(stat.dev) !== before.dev || String(stat.ino) !== before.ino)
|
|
55
|
+
throw new Error('DSH metadata changed');
|
|
56
|
+
const buffer = Buffer.alloc(limit + 1);
|
|
57
|
+
let size = 0;
|
|
58
|
+
while (size < buffer.length) {
|
|
59
|
+
const { bytesRead } = await handle.read(buffer, size, buffer.length - size, size);
|
|
60
|
+
if (!bytesRead)
|
|
61
|
+
break;
|
|
62
|
+
size += bytesRead;
|
|
63
|
+
}
|
|
64
|
+
if (size > limit || (0, NativeHistoryFiles_1.stableHistoryHash)(before) !== (0, NativeHistoryFiles_1.stableHistoryHash)(await (0, NativeHistoryFiles_1.historyIdentity)(file, 'file')))
|
|
65
|
+
throw new Error('DSH metadata changed');
|
|
66
|
+
return buffer.subarray(0, size);
|
|
67
|
+
}
|
|
68
|
+
finally {
|
|
69
|
+
await handle.close();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
async function verifyScope(value) {
|
|
73
|
+
if (!validDshHistoryScope(value))
|
|
74
|
+
throw new Error('Invalid DSH history scope');
|
|
75
|
+
for (const dir of [value.home, value.scope, value.history])
|
|
76
|
+
await (0, NativeHistoryFiles_1.verifyHistoryDirectory)(dir);
|
|
77
|
+
const marker = JSON.parse((await readStable(path_1.default.join(value.scope.path, 'owner.json'))).toString());
|
|
78
|
+
if ((0, NativeHistoryFiles_1.stableHistoryHash)(marker) !== (0, NativeHistoryFiles_1.stableHistoryHash)(scopeRecord(value)))
|
|
79
|
+
throw new Error('DSH scope ownership changed');
|
|
80
|
+
}
|
|
81
|
+
/** Allocate once before a managed native session is created; persist this scope
|
|
82
|
+
* before launching. Reuse the same scope until that native context is retired.
|
|
83
|
+
* Never attach this scope to an adopted or pre-existing native session.
|
|
84
|
+
*/
|
|
85
|
+
async function createDshHistoryScope(home, executorThreadId, cwd) {
|
|
86
|
+
if (!canonical(home) || !canonical(cwd) || !safeId(executorThreadId) || !LANE.test(executorThreadId))
|
|
87
|
+
throw new Error('Invalid DSH scope allocation');
|
|
88
|
+
const homeIdentity = await (0, NativeHistoryFiles_1.historyDirectory)(home);
|
|
89
|
+
let parent = home;
|
|
90
|
+
for (const part of ['.remote-cli', 'dsh-histories']) {
|
|
91
|
+
parent = path_1.default.join(parent, part);
|
|
92
|
+
await promises_1.default.mkdir(parent, { recursive: true, mode: 0o700 });
|
|
93
|
+
await (0, NativeHistoryFiles_1.historyDirectory)(parent);
|
|
94
|
+
}
|
|
95
|
+
const root = path_1.default.join(parent, (0, crypto_1.randomUUID)());
|
|
96
|
+
await promises_1.default.mkdir(root, { mode: 0o700 });
|
|
97
|
+
for (const part of ['history', 'retained'])
|
|
98
|
+
await promises_1.default.mkdir(path_1.default.join(root, part), { mode: 0o700 });
|
|
99
|
+
for (const part of ['sessions', 'query'])
|
|
100
|
+
await promises_1.default.mkdir(path_1.default.join(root, 'history', part), { mode: 0o700 });
|
|
101
|
+
const scope = { version: 1, backend: 'dsh', nativeVersion: 'dsh-owned-jsonl-v1', executorThreadId, cwd,
|
|
102
|
+
home: homeIdentity, scope: await (0, NativeHistoryFiles_1.historyDirectory)(root), history: await (0, NativeHistoryFiles_1.historyDirectory)(path_1.default.join(root, 'history')) };
|
|
103
|
+
await promises_1.default.writeFile(path_1.default.join(root, 'owner.json'), JSON.stringify(scope), { flag: 'wx', mode: 0o600 });
|
|
104
|
+
return scope;
|
|
105
|
+
}
|
|
106
|
+
/** Append to the privacy overlay. HOME, DSH_HOME, auth, profiles and tool HOME are
|
|
107
|
+
* untouched. Retained storage/attachments are NEVER part of the deletion manifest.
|
|
108
|
+
* The global file-upload index is not resumable history and is not erased.
|
|
109
|
+
*/
|
|
110
|
+
async function dshHistoryPatch(scope) {
|
|
111
|
+
await verifyScope(scope);
|
|
112
|
+
const rows = [
|
|
113
|
+
{ id: 'session-persistence-jsonl', config: { root: path_1.default.join(scope.history.path, 'sessions'), compression: 'none' } },
|
|
114
|
+
{ id: 'session-query-sqlite', config: { path: path_1.default.join(scope.history.path, 'query', 'index.sqlite') } },
|
|
115
|
+
{ id: 'storage-json', config: { root: path_1.default.join(scope.scope.path, 'retained', 'storage') } },
|
|
116
|
+
{ id: 'attachment-local', config: { dshHome: path_1.default.join(scope.scope.path, 'retained') } },
|
|
117
|
+
];
|
|
118
|
+
// JSON scalars are valid YAML scalars, including quoted Windows paths.
|
|
119
|
+
return rows.map(row => `- id: ${row.id}\n config:\n${Object.entries(row.config)
|
|
120
|
+
.map(([key, value]) => ` ${key}: ${JSON.stringify(value)}`).join('\n')}\n`).join('');
|
|
121
|
+
}
|
|
122
|
+
/** Call only after newSession, pointer persistence and native scope confirmation. */
|
|
123
|
+
async function captureDshDeletionTarget(scope, sessionId) {
|
|
124
|
+
await verifyScope(scope);
|
|
125
|
+
if (!safeId(sessionId))
|
|
126
|
+
throw new Error('Invalid DSH session identity');
|
|
127
|
+
const pointerRoot = await (0, NativeHistoryFiles_1.historyDirectory)(path_1.default.join(scope.home.path, '.remote-cli', 'dsh-sessions'));
|
|
128
|
+
const pointer = path_1.default.join(pointerRoot.path, `${scope.executorThreadId}.json`);
|
|
129
|
+
const bytes = await readStable(pointer);
|
|
130
|
+
const value = JSON.parse(bytes.toString());
|
|
131
|
+
if (value.id !== sessionId || value.cwd !== scope.cwd)
|
|
132
|
+
throw new Error('DSH creation pointer mismatch');
|
|
133
|
+
return { ...scopeRecord(scope), provenance: 'created', sessionId, pointerRoot, pointer, pointerHash: hash(bytes) };
|
|
134
|
+
}
|
|
135
|
+
async function verifyTarget(target, detached, ids, ownedTargets = [target]) {
|
|
136
|
+
if (!validDshDeletionTarget(target))
|
|
137
|
+
throw new Error('Invalid DSH target');
|
|
138
|
+
await verifyScope(target);
|
|
139
|
+
await (0, NativeHistoryFiles_1.verifyHistoryDirectory)(target.pointerRoot);
|
|
140
|
+
const before = await promises_1.default.stat(target.pointerRoot.path, { bigint: true });
|
|
141
|
+
let own = false, count = 0;
|
|
142
|
+
for await (const entry of await promises_1.default.opendir(target.pointerRoot.path)) {
|
|
143
|
+
if (++count > 4096)
|
|
144
|
+
throw new Error('DSH pointer inventory limit');
|
|
145
|
+
// DshExecutor's handoff files are not continuation pointers.
|
|
146
|
+
if (!entry.name.endsWith('.json') || entry.name.endsWith('.handoff.json'))
|
|
147
|
+
continue;
|
|
148
|
+
const file = path_1.default.join(target.pointerRoot.path, entry.name);
|
|
149
|
+
const bytes = await readStable(file);
|
|
150
|
+
const value = JSON.parse(bytes.toString());
|
|
151
|
+
// DSH SessionId is an opaque branded string, not a UUID or filename. Its
|
|
152
|
+
// persistence backend encodes it without normalization. A foreign valid
|
|
153
|
+
// string must not block this scope merely because it is not our safe ID form.
|
|
154
|
+
if (!value || typeof value !== 'object' || typeof value.id !== 'string' || !value.id.length)
|
|
155
|
+
throw new Error('Ambiguous DSH pointer');
|
|
156
|
+
if (file === target.pointer) {
|
|
157
|
+
own = true;
|
|
158
|
+
if (value.id === target.sessionId) {
|
|
159
|
+
if (hash(bytes) !== target.pointerHash)
|
|
160
|
+
throw new Error('DSH target pointer changed');
|
|
161
|
+
}
|
|
162
|
+
else if (!detached || ids.includes(value.id) && !ownedTargets.some(owned => owned.sessionId === value.id
|
|
163
|
+
&& owned.pointer === file && owned.pointerHash === hash(bytes) && value.adopted !== true))
|
|
164
|
+
throw new Error('DSH target pointer changed');
|
|
165
|
+
}
|
|
166
|
+
else if (ids.includes(value.id))
|
|
167
|
+
throw new Error('DSH native identity is shared');
|
|
168
|
+
}
|
|
169
|
+
const after = await promises_1.default.stat(target.pointerRoot.path, { bigint: true });
|
|
170
|
+
if ((!own && !detached) || before.ino !== after.ino || before.dev !== after.dev || before.mtimeNs !== after.mtimeNs)
|
|
171
|
+
throw new Error('DSH pointer inventory changed');
|
|
172
|
+
await (0, NativeHistoryFiles_1.verifyHistoryDirectory)(target.pointerRoot);
|
|
173
|
+
}
|
|
174
|
+
async function collect(file, files, depth = 0) {
|
|
175
|
+
if (files.length >= 1024 || depth > 16)
|
|
176
|
+
throw new Error('DSH history inventory limit');
|
|
177
|
+
const stat = await promises_1.default.lstat(file);
|
|
178
|
+
const entry = await (0, NativeHistoryFiles_1.historyIdentity)(file, stat.isDirectory() ? 'directory' : 'file');
|
|
179
|
+
files.push(entry);
|
|
180
|
+
if (entry.kind === 'directory') {
|
|
181
|
+
for (const name of await promises_1.default.readdir(file))
|
|
182
|
+
await collect(path_1.default.join(file, name), files, depth + 1);
|
|
183
|
+
const after = await (0, NativeHistoryFiles_1.historyIdentity)(file, 'directory');
|
|
184
|
+
if ((0, NativeHistoryFiles_1.stableHistoryHash)(entry) !== (0, NativeHistoryFiles_1.stableHistoryHash)(after))
|
|
185
|
+
throw new Error('DSH directory changed');
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
function validDshDeletionPreparation(target, value) {
|
|
189
|
+
return validDshDeletionTarget(target) && !!value && value.version === 1 && value.nativeVersion === target.nativeVersion
|
|
190
|
+
&& value.targetHash === (0, NativeHistoryFiles_1.stableHistoryHash)(target) && Array.isArray(value.sessionIds) && value.sessionIds.length > 0
|
|
191
|
+
&& value.sessionIds.length <= 1024 && value.sessionIds.includes(target.sessionId) && value.sessionIds.every(safeId)
|
|
192
|
+
&& new Set(value.sessionIds).size === value.sessionIds.length && Array.isArray(value.files) && value.files.length <= 1024
|
|
193
|
+
&& value.files.length > 0 && new Set(value.files.map((f) => f.path)).size === value.files.length
|
|
194
|
+
&& value.files.every((f) => (0, NativeHistoryFiles_1.validHistoryEntry)(f) && inside(target.history.path, f.path)
|
|
195
|
+
&& ['sessions', 'query'].includes(path_1.default.relative(target.history.path, f.path).split(path_1.default.sep)[0]));
|
|
196
|
+
}
|
|
197
|
+
async function prepare(target, ownedTargets) {
|
|
198
|
+
const roots = new Set(ownedTargets.map(value => value.sessionId));
|
|
199
|
+
const files = [];
|
|
200
|
+
for (const name of await promises_1.default.readdir(target.history.path)) {
|
|
201
|
+
if (!['sessions', 'query'].includes(name))
|
|
202
|
+
throw new Error('Unknown DSH history layout');
|
|
203
|
+
await collect(path_1.default.join(target.history.path, name), files);
|
|
204
|
+
}
|
|
205
|
+
const parents = new Map();
|
|
206
|
+
const transcriptDirectories = new Set();
|
|
207
|
+
const lockDirectories = new Set();
|
|
208
|
+
for (const file of files.filter(f => f.kind === 'file')) {
|
|
209
|
+
const rel = path_1.default.relative(target.history.path, file.path).split(path_1.default.sep);
|
|
210
|
+
if (/[\r\n]/.test(path_1.default.basename(file.path)))
|
|
211
|
+
throw new Error('Unknown DSH history filename');
|
|
212
|
+
if (rel[0] === 'query') {
|
|
213
|
+
if (rel.length !== 2 || !/^index\.sqlite(?:-wal|-shm|-journal)?$/.test(rel[1]))
|
|
214
|
+
throw new Error('Unknown DSH search layout');
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
217
|
+
if (rel.length !== 4)
|
|
218
|
+
throw new Error('Unknown DSH session layout');
|
|
219
|
+
// DSH's POSIX kernel-lock inode survives handle.close(). It is NOT exit
|
|
220
|
+
// evidence; the caller must already hold managed process-group exit proof.
|
|
221
|
+
if (path_1.default.basename(file.path) === 'session.lock' && file.size === '0') {
|
|
222
|
+
lockDirectories.add(path_1.default.dirname(file.path));
|
|
223
|
+
continue;
|
|
224
|
+
}
|
|
225
|
+
if (!/^session(?:\.v[1-9][0-9]*)?\.jsonl$/.test(path_1.default.basename(file.path)))
|
|
226
|
+
throw new Error('Unknown DSH session artifact');
|
|
227
|
+
const handle = await promises_1.default.open(file.path, fs_1.constants.O_RDONLY | (fs_1.constants.O_NOFOLLOW ?? 0));
|
|
228
|
+
let header;
|
|
229
|
+
try {
|
|
230
|
+
const stat = await handle.stat({ bigint: true });
|
|
231
|
+
if (String(stat.ino) !== file.ino || String(stat.dev) !== file.dev)
|
|
232
|
+
throw new Error('DSH transcript changed');
|
|
233
|
+
const buffer = Buffer.alloc(65536);
|
|
234
|
+
const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
|
|
235
|
+
const first = buffer.subarray(0, bytesRead).toString().split('\n')[0];
|
|
236
|
+
if (Buffer.byteLength(first) >= buffer.length)
|
|
237
|
+
throw new Error('DSH header limit');
|
|
238
|
+
header = JSON.parse(first);
|
|
239
|
+
}
|
|
240
|
+
finally {
|
|
241
|
+
await handle.close();
|
|
242
|
+
}
|
|
243
|
+
if (!header || header.type !== 'session' || !Number.isSafeInteger(header.version) || header.version < 1
|
|
244
|
+
|| !safeId(header.id) || path_1.default.basename(path_1.default.dirname(file.path)) !== header.id
|
|
245
|
+
|| typeof header.isSeeded !== 'boolean' || !Number.isSafeInteger(header.createdAt)
|
|
246
|
+
|| header.createdAt < 0 || !Number.isSafeInteger(header.delegationDepth) || header.delegationDepth < 0
|
|
247
|
+
|| (roots.has(header.id) ? header.isSeeded || header.cwd !== target.cwd || header.parentSession !== undefined || header.origin !== undefined
|
|
248
|
+
: header.origin !== 'subagent' || !safeId(header.parentSession)))
|
|
249
|
+
throw new Error('DSH session ownership is ambiguous');
|
|
250
|
+
if (parents.has(header.id) && parents.get(header.id) !== header.parentSession)
|
|
251
|
+
throw new Error('DSH conflicting session generations');
|
|
252
|
+
parents.set(header.id, header.parentSession);
|
|
253
|
+
transcriptDirectories.add(path_1.default.dirname(file.path));
|
|
254
|
+
}
|
|
255
|
+
if ([...lockDirectories].some(dir => !transcriptDirectories.has(dir)))
|
|
256
|
+
throw new Error('DSH lock has no confirmed history');
|
|
257
|
+
if (!parents.has(target.sessionId))
|
|
258
|
+
throw new Error('DSH root transcript is missing');
|
|
259
|
+
for (const id of parents.keys()) {
|
|
260
|
+
let current = id;
|
|
261
|
+
const seen = new Set();
|
|
262
|
+
while (!roots.has(current)) {
|
|
263
|
+
if (!current || seen.has(current) || !parents.has(current))
|
|
264
|
+
throw new Error('DSH foreign or cyclic history');
|
|
265
|
+
seen.add(current);
|
|
266
|
+
current = parents.get(current);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
return { version: 1, nativeVersion: target.nativeVersion, targetHash: (0, NativeHistoryFiles_1.stableHistoryHash)(target), sessionIds: [...parents.keys()].sort(), files };
|
|
270
|
+
}
|
|
271
|
+
async function deleteOwnedDshSession(target, recovery) {
|
|
272
|
+
let deleting = false;
|
|
273
|
+
try {
|
|
274
|
+
if (process.platform !== 'linux')
|
|
275
|
+
return { state: 'unsupported', reason: 'DSH anchored deletion requires Linux writer proof' };
|
|
276
|
+
const ownedTargets = recovery.ownedTargets ?? [target];
|
|
277
|
+
if (!ownedTargets.length || ownedTargets.length > 64 || !ownedTargets.some(value => (0, NativeHistoryFiles_1.stableHistoryHash)(value) === (0, NativeHistoryFiles_1.stableHistoryHash)(target))
|
|
278
|
+
|| ownedTargets.some(value => !validDshDeletionTarget(value) || (0, NativeHistoryFiles_1.stableHistoryHash)(scopeRecord(value)) !== (0, NativeHistoryFiles_1.stableHistoryHash)(scopeRecord(target)))) {
|
|
279
|
+
throw new Error('DSH root ownership scope changed');
|
|
280
|
+
}
|
|
281
|
+
await verifyTarget(target, recovery.detachedPointer === true, recovery.prepared?.sessionIds ?? ownedTargets.map(value => value.sessionId), ownedTargets);
|
|
282
|
+
let prepared = recovery.prepared;
|
|
283
|
+
if (prepared && !validDshDeletionPreparation(target, prepared))
|
|
284
|
+
throw new Error('DSH preparation changed');
|
|
285
|
+
if (!prepared) {
|
|
286
|
+
if (!recovery.persistPrepared)
|
|
287
|
+
throw new Error('Durable DSH preparation is required');
|
|
288
|
+
prepared = await prepare(target, ownedTargets);
|
|
289
|
+
await verifyTarget(target, recovery.detachedPointer === true, prepared.sessionIds, ownedTargets);
|
|
290
|
+
await recovery.persistPrepared(prepared);
|
|
291
|
+
}
|
|
292
|
+
if (!validDshDeletionPreparation(target, prepared))
|
|
293
|
+
throw new Error('DSH preparation changed');
|
|
294
|
+
await verifyTarget(target, recovery.detachedPointer === true, prepared.sessionIds, ownedTargets);
|
|
295
|
+
const anchor = await LinuxHistoryAnchor_1.LinuxHistoryAnchor.open(target.history, prepared.files);
|
|
296
|
+
try {
|
|
297
|
+
deleting = true;
|
|
298
|
+
for (const entry of [...prepared.files].sort((a, b) => b.path.length - a.path.length))
|
|
299
|
+
await anchor.remove(entry);
|
|
300
|
+
await verifyTarget(target, recovery.detachedPointer === true, prepared.sessionIds, ownedTargets);
|
|
301
|
+
if ((await promises_1.default.readdir(target.history.path)).length)
|
|
302
|
+
throw new Error('DSH history remains');
|
|
303
|
+
return { state: 'deleted', reason: 'Owned DSH resumable history and private search index were removed; retained artifacts were preserved' };
|
|
304
|
+
}
|
|
305
|
+
finally {
|
|
306
|
+
await anchor.close();
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
catch {
|
|
310
|
+
return { state: deleting ? 'uncertain' : 'held', reason: 'DSH scope, pointer, layout or immutable preparation could not be verified' };
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
//# sourceMappingURL=DshSessionDeletion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DshSessionDeletion.js","sourceRoot":"","sources":["../../src/delegation/DshSessionDeletion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { type CodexAppServerClientOptions } from '../executor/CodexAppServerClient';
|
|
2
|
+
import { type OpenCodeDeletionTarget } from './OpenCodeSessionDeletion';
|
|
3
|
+
import { type DshDeletionTarget } from './DshSessionDeletion';
|
|
4
|
+
import { type AgyDeletionTarget } from './AgySessionDeletion';
|
|
5
|
+
import { type ZCodeArtifactReceipt } from './ZCodeSessionDeletion';
|
|
6
|
+
import { type ZCodeOwnedTarget } from './ZCodeOwnedHistory';
|
|
2
7
|
import { type OwnedHistoryTarget, type HistoryEntry } from './NativeHistoryFiles';
|
|
3
8
|
export interface NativeDirectoryIdentity {
|
|
4
9
|
path: string;
|
|
@@ -17,7 +22,7 @@ export interface CodexDeletionTarget {
|
|
|
17
22
|
cwd: string;
|
|
18
23
|
command: string;
|
|
19
24
|
}
|
|
20
|
-
export type NativeSessionDeletionTarget = CodexDeletionTarget | OwnedHistoryTarget;
|
|
25
|
+
export type NativeSessionDeletionTarget = CodexDeletionTarget | OwnedHistoryTarget | OpenCodeDeletionTarget | DshDeletionTarget | AgyDeletionTarget | ZCodeOwnedTarget;
|
|
21
26
|
export type NativeDeletionState = 'pending' | 'waiting-exit' | 'held' | 'unsupported' | 'uncertain' | 'deleted';
|
|
22
27
|
export interface NativeDeletionResult {
|
|
23
28
|
state: NativeDeletionState;
|
|
@@ -43,10 +48,12 @@ export declare function verifyNativeTarget(target: NativeSessionDeletionTarget,
|
|
|
43
48
|
export interface NativeDeletionPreparation {
|
|
44
49
|
version: 1;
|
|
45
50
|
/** Adapter protocol/layout contract; old package strings remain immutable legacy receipt markers. */
|
|
46
|
-
nativeVersion: 'codex-thread-delete-v1' | '0.166.0' | OwnedHistoryTarget['nativeVersion'];
|
|
51
|
+
nativeVersion: 'codex-thread-delete-v1' | '0.166.0' | OwnedHistoryTarget['nativeVersion'] | 'opencode-session-delete-v1' | 'dsh-owned-jsonl-v1' | 'agy-owned-sqlite-v1' | 'zcode-session-data-v4';
|
|
47
52
|
targetHash: string;
|
|
48
53
|
/** Exact immutable pre-delete manifest for file-backed adapters. */
|
|
49
54
|
files?: HistoryEntry[];
|
|
55
|
+
sessionIds?: string[];
|
|
56
|
+
artifacts?: ZCodeArtifactReceipt;
|
|
50
57
|
}
|
|
51
58
|
/** Recovery never replaces the caller's parent-reset authorization and current exit proof. */
|
|
52
59
|
export interface NativeDeletionRecovery {
|
|
@@ -66,6 +73,7 @@ export interface NativeDeletionTransport {
|
|
|
66
73
|
getServerVersion(): string | null;
|
|
67
74
|
request(method: string, params: unknown): Promise<any>;
|
|
68
75
|
stop(): Promise<void>;
|
|
76
|
+
waitForManagedProcessGroupExit(): Promise<void>;
|
|
69
77
|
}
|
|
70
78
|
export type NativeDeletionClientFactory = (options: CodexAppServerClientOptions) => NativeDeletionTransport;
|
|
71
79
|
/** No archive, resume, new session, model turn, or direct database writes. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativeSessionDeletion.d.ts","sourceRoot":"","sources":["../../src/delegation/NativeSessionDeletion.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,KAAK,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAG1G,OAAO,EACL,KAAK,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAI3E,MAAM,WAAW,uBAAuB;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AACnF,kFAAkF;AAClF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,uBAAuB,CAAC;IAC9B,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"NativeSessionDeletion.d.ts","sourceRoot":"","sources":["../../src/delegation/NativeSessionDeletion.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,KAAK,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAG1G,OAAO,EAA4D,KAAK,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAClI,OAAO,EAAuD,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAuD,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAiC,KAAK,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,EACL,KAAK,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAI3E,MAAM,WAAW,uBAAuB;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AACnF,kFAAkF;AAClF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,uBAAuB,CAAC;IAC9B,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG,kBAAkB,GAAG,sBAAsB,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,gBAAgB,CAAC;AACvK,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,cAAc,GAAG,MAAM,GAAG,aAAa,GAAG,WAAW,GAAG,SAAS,CAAC;AAChH,MAAM,WAAW,oBAAoB;IAAG,KAAK,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE;AACpF,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,uBAAuB,CAAC;CACxF;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,2BAA2B,CAalF;AACD,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAKjG;AAoCD,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,SAAS,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;CAC7G,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAS/B;AACD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,2BAA2B,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBpH;AAwID,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,CAAC,CAAC;IACX,qGAAqG;IACrG,aAAa,EAAE,wBAAwB,GAAG,SAAS,GAAG,kBAAkB,CAAC,eAAe,CAAC,GACrF,4BAA4B,GAAG,oBAAoB,GAAG,qBAAqB,GAAG,uBAAuB,CAAC;IAC1G,UAAU,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,oBAAoB,CAAC;CAClC;AACD,8FAA8F;AAC9F,MAAM,WAAW,sBAAsB;IACrC,iFAAiF;IACjF,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IACrC,6EAA6E;IAC7E,eAAe,CAAC,EAAE,CAAC,WAAW,EAAE,yBAAyB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,mFAAmF;IACnF,uBAAuB,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,2BAA2B,GAAG,yBAAyB,CAQlG;AACD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,2BAA2B,EAAE,QAAQ,EAAE,yBAAyB,GAAG,OAAO,CAU1H;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAAC;IAClC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACvD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,8BAA8B,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD;AACD,MAAM,MAAM,2BAA2B,GAAG,CAAC,OAAO,EAAE,2BAA2B,KAAK,uBAAuB,CAAC;AAC5G,8EAA8E;AAC9E,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,2BAA2B,EAC/E,OAAO,GAAE,2BAA0E,EACnF,QAAQ,GAAE,sBAA2B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAqFtE;AAED,iGAAiG;AACjG,qBAAa,0BAA0B;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM;gBAAjB,SAAS,EAAE,MAAM;YACxB,OAAO;IAQf,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBnE,QAAQ,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAgBnD"}
|