ftown 0.19.60 → 0.19.62
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/dist/bridge-update.d.ts +1 -0
- package/dist/bridge-update.js +7 -4
- package/dist/bridge-update.js.map +1 -1
- package/dist/command-rpc.js +25 -0
- package/dist/command-rpc.js.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/local-api-server.js +25 -1
- package/dist/local-api-server.js.map +1 -1
- package/dist/preview-protocol.d.ts +54 -0
- package/dist/preview-protocol.js +6 -0
- package/dist/preview-protocol.js.map +1 -0
- package/dist/security/bridge/permissions.js +8 -1
- package/dist/security/bridge/permissions.js.map +1 -1
- package/dist/session-controller.d.ts +19 -1
- package/dist/session-controller.js +128 -25
- package/dist/session-controller.js.map +1 -1
- package/dist/session-preview.d.ts +27 -0
- package/dist/session-preview.js +150 -0
- package/dist/session-preview.js.map +1 -0
- package/dist/session-resurrection.d.ts +1 -0
- package/dist/session-resurrection.js +27 -23
- package/dist/session-resurrection.js.map +1 -1
- package/dist/session-wire.js +1 -1
- package/dist/session-wire.js.map +1 -1
- package/dist/sessions-commands.js +18 -3
- package/dist/sessions-commands.js.map +1 -1
- package/dist/types.d.ts +5 -2
- package/dist/update-options.d.ts +2 -0
- package/dist/update-options.js +6 -0
- package/dist/update-options.js.map +1 -0
- package/dist/update-protocol.d.ts +4 -2
- package/dist/update-release.d.ts +1 -0
- package/dist/update-release.js +16 -7
- package/dist/update-release.js.map +1 -1
- package/package.json +2 -2
- package/skills/ftown/SKILL.md +9 -0
- package/skills/ftown/references/sessions.md +16 -0
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import { AUTOMATION_REMOVED_CODE, AUTOMATION_REMOVED_MESSAGE, isRetiredAutomationSession } from './retired-automation.js';
|
|
2
2
|
import { createFtownSession, relaunchFtownSession, } from './create-ftown-session.js';
|
|
3
3
|
import { normalizePullRequestUrl } from './pull-request-url.js';
|
|
4
|
+
import { currentPreview, preparePreview, PreviewError, previewChunk, previewStatus, SessionPreviewReader, validPreviewId, validRevision } from './session-preview.js';
|
|
5
|
+
import { PREVIEW_CHUNK_BYTES } from './preview-protocol.js';
|
|
4
6
|
export class SessionController {
|
|
5
7
|
deps;
|
|
6
8
|
metadataWrites = new Map();
|
|
9
|
+
previewReader;
|
|
7
10
|
constructor(deps) {
|
|
8
11
|
this.deps = deps;
|
|
12
|
+
this.previewReader = deps.previewReader ?? new SessionPreviewReader();
|
|
9
13
|
}
|
|
10
14
|
require(dep, name) {
|
|
11
15
|
if (dep === undefined) {
|
|
@@ -63,12 +67,16 @@ export class SessionController {
|
|
|
63
67
|
return { ok: true, usage: session.usage ?? null };
|
|
64
68
|
}
|
|
65
69
|
const usage = await collect(session);
|
|
66
|
-
if (usage && isTerminal)
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
70
|
+
if (usage && isTerminal)
|
|
71
|
+
await this.withSessionMutation(sessionId, async () => {
|
|
72
|
+
const fresh = await this.deps.store.loadSession(sessionId);
|
|
73
|
+
if (!fresh || (fresh.status !== 'completed' && fresh.status !== 'error'))
|
|
74
|
+
return;
|
|
75
|
+
fresh.usage = usage;
|
|
76
|
+
fresh.updatedAt = new Date().toISOString();
|
|
77
|
+
await this.deps.store.saveSession(fresh);
|
|
78
|
+
await this.deps.publishSessionUpdate(fresh);
|
|
79
|
+
});
|
|
72
80
|
return { ok: true, usage: usage ?? session.usage ?? null };
|
|
73
81
|
}
|
|
74
82
|
/** Collect several sessions behind one transport request. Missing sessions are omitted. */
|
|
@@ -81,22 +89,24 @@ export class SessionController {
|
|
|
81
89
|
}
|
|
82
90
|
/** Re-run a finished/dead session's stored command verbatim. */
|
|
83
91
|
async retry(sessionId) {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
92
|
+
return this.withSessionMutation(sessionId, async () => {
|
|
93
|
+
const existingSession = await this.deps.store.loadSession(sessionId);
|
|
94
|
+
if (!existingSession) {
|
|
95
|
+
return { ok: false, code: 'not_found', message: 'Session not found' };
|
|
96
|
+
}
|
|
97
|
+
if (isRetiredAutomationSession(existingSession)) {
|
|
98
|
+
return { ok: false, code: AUTOMATION_REMOVED_CODE, message: AUTOMATION_REMOVED_MESSAGE };
|
|
99
|
+
}
|
|
100
|
+
if (existingSession.status === 'running') {
|
|
101
|
+
return { ok: false, code: 'conflict', message: 'Session is already running' };
|
|
102
|
+
}
|
|
103
|
+
if (!existingSession.command) {
|
|
104
|
+
return { ok: false, code: 'invalid', message: 'Session has no command (created before v0.2.0)' };
|
|
105
|
+
}
|
|
106
|
+
const factory = this.require(this.deps.sessionFactory, 'sessionFactory');
|
|
107
|
+
await relaunchFtownSession(factory, existingSession, 'retry');
|
|
108
|
+
return { ok: true, session: existingSession };
|
|
109
|
+
});
|
|
100
110
|
}
|
|
101
111
|
/**
|
|
102
112
|
* Rename and/or reparent in ONE load-mutate-save-publish pass (the HTTP
|
|
@@ -105,7 +115,9 @@ export class SessionController {
|
|
|
105
115
|
* session trees stay one level deep.
|
|
106
116
|
*/
|
|
107
117
|
async update(sessionId, input) {
|
|
108
|
-
|
|
118
|
+
return this.withSessionMutation(sessionId, () => this.updateMetadata(sessionId, input));
|
|
119
|
+
}
|
|
120
|
+
async withSessionMutation(sessionId, update) {
|
|
109
121
|
if (this.deps.withSessionWrite) {
|
|
110
122
|
let result;
|
|
111
123
|
await this.deps.withSessionWrite(sessionId, async () => { result = await update(); });
|
|
@@ -202,8 +214,99 @@ export class SessionController {
|
|
|
202
214
|
/** Remove (archive + delete + publish removed). removed=false when nothing
|
|
203
215
|
* was removed — unknown id, or the onlyIfFinished guard rejected it. */
|
|
204
216
|
async remove(sessionId, options) {
|
|
205
|
-
|
|
206
|
-
|
|
217
|
+
return this.withSessionMutation(sessionId, async () => {
|
|
218
|
+
const removed = await this.deps.removeSession(sessionId, options);
|
|
219
|
+
return { removed: removed !== null };
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
async setPreview(sessionId, path) {
|
|
223
|
+
return this.withSessionMutation(sessionId, async () => {
|
|
224
|
+
const session = await this.deps.store.loadSession(sessionId);
|
|
225
|
+
if (!session)
|
|
226
|
+
return { ok: false, code: 'not_found', message: 'Session not found' };
|
|
227
|
+
try {
|
|
228
|
+
const prepared = await preparePreview(session, path);
|
|
229
|
+
session.preview = prepared.preview;
|
|
230
|
+
session.previewSource = prepared.previewSource;
|
|
231
|
+
session.updatedAt = new Date().toISOString();
|
|
232
|
+
await this.deps.store.saveSession(session);
|
|
233
|
+
await this.deps.publishSessionUpdate(session);
|
|
234
|
+
return { ok: true, session };
|
|
235
|
+
}
|
|
236
|
+
catch (error) {
|
|
237
|
+
if (error instanceof PreviewError)
|
|
238
|
+
return { ok: false, code: error.reason === 'too_large' ? 'too_large' : 'invalid', message: 'Invalid preview file' };
|
|
239
|
+
throw error;
|
|
240
|
+
}
|
|
241
|
+
});
|
|
242
|
+
}
|
|
243
|
+
async clearPreview(sessionId) {
|
|
244
|
+
return this.withSessionMutation(sessionId, async () => {
|
|
245
|
+
const session = await this.deps.store.loadSession(sessionId);
|
|
246
|
+
if (!session)
|
|
247
|
+
return { ok: false, code: 'not_found', message: 'Session not found' };
|
|
248
|
+
delete session.preview;
|
|
249
|
+
delete session.previewSource;
|
|
250
|
+
session.updatedAt = new Date().toISOString();
|
|
251
|
+
await this.deps.store.saveSession(session);
|
|
252
|
+
await this.deps.publishSessionUpdate(session);
|
|
253
|
+
return { ok: true, session };
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
async previewSnapshot(sessionId, previewId) {
|
|
257
|
+
return this.withSessionMutation(sessionId, async () => {
|
|
258
|
+
const session = await this.deps.store.loadSession(sessionId);
|
|
259
|
+
if (!session)
|
|
260
|
+
return null;
|
|
261
|
+
const source = currentPreview(session, previewId);
|
|
262
|
+
return { session, source };
|
|
263
|
+
});
|
|
264
|
+
}
|
|
265
|
+
async getPreviewStatus(sessionId, previewId, knownRevision) {
|
|
266
|
+
if (!validPreviewId(previewId) || (knownRevision !== undefined && !validRevision(knownRevision)))
|
|
267
|
+
return { ok: false, code: 'invalid', message: 'Invalid preview request' };
|
|
268
|
+
const selected = await this.previewSnapshot(sessionId, previewId);
|
|
269
|
+
if (!selected)
|
|
270
|
+
return { ok: false, code: 'not_found', message: 'Session not found' };
|
|
271
|
+
if (!selected.source)
|
|
272
|
+
return { ok: true, preview: { state: 'unregistered' } };
|
|
273
|
+
try {
|
|
274
|
+
const data = await this.previewReader.read(selected.session, selected.source);
|
|
275
|
+
const current = await this.previewSnapshot(sessionId, previewId);
|
|
276
|
+
if (!current?.source || current.session.workingDir !== selected.session.workingDir || JSON.stringify(current.source) !== JSON.stringify(selected.source))
|
|
277
|
+
return { ok: true, preview: { state: 'unregistered' } };
|
|
278
|
+
return { ok: true, preview: previewStatus(previewId, data, knownRevision) };
|
|
279
|
+
}
|
|
280
|
+
catch (error) {
|
|
281
|
+
const current = await this.previewSnapshot(sessionId, previewId);
|
|
282
|
+
if (!current?.source || current.session.workingDir !== selected.session.workingDir || JSON.stringify(current.source) !== JSON.stringify(selected.source))
|
|
283
|
+
return { ok: true, preview: { state: 'unregistered' } };
|
|
284
|
+
return { ok: true, preview: { state: 'unavailable', previewId, reason: error instanceof PreviewError ? error.reason : 'unavailable' } };
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
async getPreviewChunk(sessionId, previewId, revision, offset) {
|
|
288
|
+
if (!validPreviewId(previewId) || !validRevision(revision) || !Number.isSafeInteger(offset) || offset < 0 || offset % PREVIEW_CHUNK_BYTES !== 0)
|
|
289
|
+
return { ok: false, code: 'invalid', message: 'Invalid preview request' };
|
|
290
|
+
const selected = await this.previewSnapshot(sessionId, previewId);
|
|
291
|
+
if (!selected)
|
|
292
|
+
return { ok: false, code: 'not_found', message: 'Session not found' };
|
|
293
|
+
if (!selected.source)
|
|
294
|
+
return { ok: true, preview: { state: 'stale_revision' } };
|
|
295
|
+
try {
|
|
296
|
+
const data = await this.previewReader.read(selected.session, selected.source);
|
|
297
|
+
const current = await this.previewSnapshot(sessionId, previewId);
|
|
298
|
+
if (!current?.source || current.session.workingDir !== selected.session.workingDir || JSON.stringify(current.source) !== JSON.stringify(selected.source))
|
|
299
|
+
return { ok: true, preview: { state: 'stale_revision' } };
|
|
300
|
+
if (data.revision === revision && (data.bytes.length === 0 ? offset !== 0 : offset >= data.bytes.length))
|
|
301
|
+
return { ok: false, code: 'invalid', message: 'Invalid preview request' };
|
|
302
|
+
return { ok: true, preview: previewChunk(previewId, data, revision, offset) };
|
|
303
|
+
}
|
|
304
|
+
catch (error) {
|
|
305
|
+
const current = await this.previewSnapshot(sessionId, previewId);
|
|
306
|
+
if (!current?.source || current.session.workingDir !== selected.session.workingDir || JSON.stringify(current.source) !== JSON.stringify(selected.source))
|
|
307
|
+
return { ok: true, preview: { state: 'stale_revision' } };
|
|
308
|
+
return { ok: true, preview: { state: 'unavailable', previewId, reason: error instanceof PreviewError ? error.reason : 'unavailable' } };
|
|
309
|
+
}
|
|
207
310
|
}
|
|
208
311
|
/** Flush pending output, wipe the persisted log, drop the live buffer. */
|
|
209
312
|
async clearTerminal(sessionId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-controller.js","sourceRoot":"","sources":["../src/session-controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-controller.js","sourceRoot":"","sources":["../src/session-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { FileHandle } from 'node:fs/promises';
|
|
2
|
+
import type { PreviewUnavailableReason, SessionPreviewChunk, SessionPreviewDescriptor, SessionPreviewSource, SessionPreviewStatus } from './preview-protocol.js';
|
|
3
|
+
import type { Session } from './types.js';
|
|
4
|
+
export declare const validPreviewId: (s: unknown) => s is string;
|
|
5
|
+
export declare const validRevision: (s: unknown) => s is string;
|
|
6
|
+
export declare class PreviewError extends Error {
|
|
7
|
+
readonly reason: PreviewUnavailableReason;
|
|
8
|
+
constructor(reason: PreviewUnavailableReason);
|
|
9
|
+
}
|
|
10
|
+
export declare function preparePreview(session: Session, path: unknown): Promise<{
|
|
11
|
+
preview: SessionPreviewDescriptor;
|
|
12
|
+
previewSource: SessionPreviewSource;
|
|
13
|
+
}>;
|
|
14
|
+
type Snapshot = {
|
|
15
|
+
bytes: Buffer;
|
|
16
|
+
revision: string;
|
|
17
|
+
};
|
|
18
|
+
export declare class SessionPreviewReader {
|
|
19
|
+
private active;
|
|
20
|
+
protected openFile(path: string): Promise<FileHandle>;
|
|
21
|
+
protected initialStat(handle: FileHandle): Promise<import("fs").Stats>;
|
|
22
|
+
read(session: Session, source: SessionPreviewSource): Promise<Snapshot>;
|
|
23
|
+
}
|
|
24
|
+
export declare function previewStatus(id: string, snapshot: Snapshot, knownRevision?: string): SessionPreviewStatus;
|
|
25
|
+
export declare function previewChunk(id: string, snapshot: Snapshot, revision: string, offset: number): SessionPreviewChunk;
|
|
26
|
+
export declare function currentPreview(session: Session, id: string): SessionPreviewSource | null;
|
|
27
|
+
export {};
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
import { constants } from 'node:fs';
|
|
2
|
+
import { lstat, open, realpath } from 'node:fs/promises';
|
|
3
|
+
import { basename, extname, isAbsolute, relative, resolve, sep } from 'node:path';
|
|
4
|
+
import { createHash, randomUUID } from 'node:crypto';
|
|
5
|
+
import { PREVIEW_CHUNK_BYTES, PREVIEW_MAX_BYTES, PREVIEW_MAX_CONCURRENT_READS } from './preview-protocol.js';
|
|
6
|
+
const idPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
7
|
+
const revisionPattern = /^[0-9a-f]{64}$/;
|
|
8
|
+
const safePath = (s) => s.length > 0 && Buffer.byteLength(s, 'utf8') <= 4096 && !s.includes('\0');
|
|
9
|
+
export const validPreviewId = (s) => typeof s === 'string' && idPattern.test(s);
|
|
10
|
+
export const validRevision = (s) => typeof s === 'string' && revisionPattern.test(s);
|
|
11
|
+
export class PreviewError extends Error {
|
|
12
|
+
reason;
|
|
13
|
+
constructor(reason) {
|
|
14
|
+
super('Preview unavailable');
|
|
15
|
+
this.reason = reason;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
function invalid() { throw new PreviewError('invalid_file'); }
|
|
19
|
+
function contained(root, path) {
|
|
20
|
+
const rel = relative(root, path);
|
|
21
|
+
return rel !== '' && !isAbsolute(rel) && rel !== '..' && !rel.startsWith(`..${sep}`);
|
|
22
|
+
}
|
|
23
|
+
async function validatePaths(workingDir, source) {
|
|
24
|
+
if (!workingDir || !safePath(workingDir) || !safePath(source.root) || !safePath(source.filePath)
|
|
25
|
+
|| !isAbsolute(workingDir) || !isAbsolute(source.root) || !isAbsolute(source.filePath)
|
|
26
|
+
|| resolve(source.root) !== source.root || resolve(source.filePath) !== source.filePath
|
|
27
|
+
|| !contained(source.root, source.filePath))
|
|
28
|
+
invalid();
|
|
29
|
+
const rootInfo = await lstat(workingDir);
|
|
30
|
+
if (!rootInfo.isDirectory() || rootInfo.isSymbolicLink() || await realpath(workingDir) !== source.root)
|
|
31
|
+
invalid();
|
|
32
|
+
const rootCanonical = await lstat(source.root);
|
|
33
|
+
if (!rootCanonical.isDirectory() || rootCanonical.isSymbolicLink())
|
|
34
|
+
invalid();
|
|
35
|
+
const parts = relative(source.root, source.filePath).split(sep);
|
|
36
|
+
let current = source.root;
|
|
37
|
+
for (let i = 0; i < parts.length; i++) {
|
|
38
|
+
current = resolve(current, parts[i]);
|
|
39
|
+
const info = await lstat(current);
|
|
40
|
+
if (info.isSymbolicLink() || (i < parts.length - 1 ? !info.isDirectory() : !info.isFile()))
|
|
41
|
+
invalid();
|
|
42
|
+
}
|
|
43
|
+
if (await realpath(source.filePath) !== source.filePath)
|
|
44
|
+
invalid();
|
|
45
|
+
}
|
|
46
|
+
function reason(error) {
|
|
47
|
+
if (error instanceof PreviewError)
|
|
48
|
+
return error.reason;
|
|
49
|
+
if (error && typeof error === 'object' && 'code' in error && (error.code === 'ENOENT' || error.code === 'ENOTDIR'))
|
|
50
|
+
return 'missing';
|
|
51
|
+
return 'unavailable';
|
|
52
|
+
}
|
|
53
|
+
function registration(session, id) {
|
|
54
|
+
const source = session.previewSource;
|
|
55
|
+
if (!session.preview || !source || session.preview.id !== id || source.id !== id || source.version !== 1)
|
|
56
|
+
return null;
|
|
57
|
+
return source;
|
|
58
|
+
}
|
|
59
|
+
export async function preparePreview(session, path) {
|
|
60
|
+
if (typeof path !== 'string' || !safePath(path) || !isAbsolute(path) || resolve(path) !== path || !session.workingDir)
|
|
61
|
+
invalid();
|
|
62
|
+
const fileName = basename(path);
|
|
63
|
+
if (!fileName || Buffer.byteLength(fileName, 'utf8') > 255 || /[\u0000-\u001f\u007f-\u009f]/u.test(fileName) || !['.html', '.htm'].includes(extname(fileName).toLowerCase()))
|
|
64
|
+
invalid();
|
|
65
|
+
try {
|
|
66
|
+
const root = await realpath(session.workingDir);
|
|
67
|
+
const requestedRoot = resolve(session.workingDir);
|
|
68
|
+
if (!contained(requestedRoot, path))
|
|
69
|
+
invalid();
|
|
70
|
+
const filePath = resolve(root, relative(requestedRoot, path));
|
|
71
|
+
const preview = { id: randomUUID(), fileName };
|
|
72
|
+
const previewSource = { version: 1, id: preview.id, root, filePath };
|
|
73
|
+
await validatePaths(session.workingDir, previewSource);
|
|
74
|
+
const info = await lstat(filePath);
|
|
75
|
+
if (info.size > PREVIEW_MAX_BYTES)
|
|
76
|
+
throw new PreviewError('too_large');
|
|
77
|
+
return { preview, previewSource };
|
|
78
|
+
}
|
|
79
|
+
catch (error) {
|
|
80
|
+
throw new PreviewError(reason(error));
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
export class SessionPreviewReader {
|
|
84
|
+
active = 0;
|
|
85
|
+
openFile(path) { return open(path, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK); }
|
|
86
|
+
initialStat(handle) { return handle.stat(); }
|
|
87
|
+
async read(session, source) {
|
|
88
|
+
if (this.active >= PREVIEW_MAX_CONCURRENT_READS)
|
|
89
|
+
throw new PreviewError('unavailable');
|
|
90
|
+
this.active++;
|
|
91
|
+
try {
|
|
92
|
+
await validatePaths(session.workingDir, source);
|
|
93
|
+
const handle = await this.openFile(source.filePath);
|
|
94
|
+
try {
|
|
95
|
+
const before = await this.initialStat(handle);
|
|
96
|
+
if (!before.isFile())
|
|
97
|
+
invalid();
|
|
98
|
+
if (before.size > PREVIEW_MAX_BYTES)
|
|
99
|
+
throw new PreviewError('too_large');
|
|
100
|
+
const buffer = Buffer.alloc(PREVIEW_MAX_BYTES + 1);
|
|
101
|
+
let length = 0;
|
|
102
|
+
while (length < buffer.length) {
|
|
103
|
+
const { bytesRead } = await handle.read(buffer, length, buffer.length - length, length);
|
|
104
|
+
if (!bytesRead)
|
|
105
|
+
break;
|
|
106
|
+
length += bytesRead;
|
|
107
|
+
}
|
|
108
|
+
if (length > PREVIEW_MAX_BYTES)
|
|
109
|
+
throw new PreviewError('too_large');
|
|
110
|
+
const after = await handle.stat();
|
|
111
|
+
const current = await lstat(source.filePath);
|
|
112
|
+
if (before.dev !== after.dev || before.ino !== after.ino || before.size !== after.size || before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs || length !== after.size)
|
|
113
|
+
throw new PreviewError('unavailable');
|
|
114
|
+
if (current.isSymbolicLink() || !current.isFile() || current.dev !== after.dev || current.ino !== after.ino || current.size !== after.size || current.mtimeMs !== after.mtimeMs || current.ctimeMs !== after.ctimeMs)
|
|
115
|
+
throw new PreviewError('unavailable');
|
|
116
|
+
const bytes = buffer.subarray(0, length);
|
|
117
|
+
try {
|
|
118
|
+
new TextDecoder('utf-8', { fatal: true }).decode(bytes);
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
throw new PreviewError('invalid_utf8');
|
|
122
|
+
}
|
|
123
|
+
return { bytes, revision: createHash('sha256').update(bytes).digest('hex') };
|
|
124
|
+
}
|
|
125
|
+
finally {
|
|
126
|
+
await handle.close();
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
catch (error) {
|
|
130
|
+
throw new PreviewError(reason(error));
|
|
131
|
+
}
|
|
132
|
+
finally {
|
|
133
|
+
this.active--;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
export function previewStatus(id, snapshot, knownRevision) {
|
|
138
|
+
return { state: snapshot.revision === knownRevision ? 'unchanged' : 'ready', previewId: id, revision: snapshot.revision, totalBytes: snapshot.bytes.length };
|
|
139
|
+
}
|
|
140
|
+
export function previewChunk(id, snapshot, revision, offset) {
|
|
141
|
+
if (snapshot.revision !== revision)
|
|
142
|
+
return { state: 'stale_revision' };
|
|
143
|
+
const totalBytes = snapshot.bytes.length;
|
|
144
|
+
if (!Number.isSafeInteger(offset) || offset < 0 || offset % PREVIEW_CHUNK_BYTES !== 0 || (totalBytes === 0 ? offset !== 0 : offset >= totalBytes))
|
|
145
|
+
throw new PreviewError('invalid_file');
|
|
146
|
+
const chunk = snapshot.bytes.subarray(offset, offset + PREVIEW_CHUNK_BYTES);
|
|
147
|
+
return { state: 'chunk', previewId: id, revision, totalBytes, offset, dataBase64: chunk.toString('base64'), done: offset + chunk.length === totalBytes };
|
|
148
|
+
}
|
|
149
|
+
export function currentPreview(session, id) { return registration(session, id); }
|
|
150
|
+
//# sourceMappingURL=session-preview.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-preview.js","sourceRoot":"","sources":["../src/session-preview.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export interface SessionResurrectionDeps {
|
|
|
10
10
|
sessionFactoryDeps: CreateFtownSessionDeps;
|
|
11
11
|
publishSessionUpdate: (session: Session) => Promise<void>;
|
|
12
12
|
wireTerminalInput: (sessionId: string) => void;
|
|
13
|
+
withSessionWrite?: (sessionId: string, task: () => Promise<void>) => Promise<void>;
|
|
13
14
|
/** Exact dedicated-socket operations; injectable without touching a live tmux server. */
|
|
14
15
|
tmux?: {
|
|
15
16
|
available(): boolean;
|
|
@@ -86,27 +86,29 @@ export class SessionResurrection {
|
|
|
86
86
|
if (!retiredIds.has(snapshot.id))
|
|
87
87
|
continue;
|
|
88
88
|
try {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
89
|
+
await (this.deps.withSessionWrite ?? (async (_id, task) => task()))(snapshot.id, async () => {
|
|
90
|
+
const current = await store.loadSession(snapshot.id);
|
|
91
|
+
if (!current || !isRetiredAutomationSession(current))
|
|
92
|
+
return;
|
|
93
|
+
let cleanupFailed = false;
|
|
94
|
+
if (liveTmuxIds.has(current.id)) {
|
|
95
|
+
try {
|
|
96
|
+
cleanupFailed = !await tmux.kill(current.id);
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
cleanupFailed = true;
|
|
100
|
+
}
|
|
96
101
|
}
|
|
97
|
-
|
|
98
|
-
|
|
102
|
+
const reason = cleanupFailed
|
|
103
|
+
? `${AUTOMATION_REMOVED_MESSAGE}; failed to stop retired tmux session ${current.id}; cleanup will retry on bridge restart`
|
|
104
|
+
: AUTOMATION_REMOVED_MESSAGE;
|
|
105
|
+
if (cleanupFailed)
|
|
106
|
+
console.error(`[Bridge] ${reason}`);
|
|
107
|
+
if (current.status === 'running' || current.status === 'pending' || cleanupFailed
|
|
108
|
+
|| current.errorReason?.startsWith(`${AUTOMATION_REMOVED_MESSAGE}; failed to stop`)) {
|
|
109
|
+
await this.markSessionDead(current, reason);
|
|
99
110
|
}
|
|
100
|
-
}
|
|
101
|
-
const reason = cleanupFailed
|
|
102
|
-
? `${AUTOMATION_REMOVED_MESSAGE}; failed to stop retired tmux session ${current.id}; cleanup will retry on bridge restart`
|
|
103
|
-
: AUTOMATION_REMOVED_MESSAGE;
|
|
104
|
-
if (cleanupFailed)
|
|
105
|
-
console.error(`[Bridge] ${reason}`);
|
|
106
|
-
if (current.status === 'running' || current.status === 'pending' || cleanupFailed
|
|
107
|
-
|| current.errorReason?.startsWith(`${AUTOMATION_REMOVED_MESSAGE}; failed to stop`)) {
|
|
108
|
-
await this.markSessionDead(current, reason);
|
|
109
|
-
}
|
|
111
|
+
});
|
|
110
112
|
}
|
|
111
113
|
catch (error) {
|
|
112
114
|
console.error(`[Bridge] Failed to retire automation session ${snapshot.id}:`, error);
|
|
@@ -151,14 +153,16 @@ export class SessionResurrection {
|
|
|
151
153
|
if (!shouldResurrectStoredSession(session))
|
|
152
154
|
continue;
|
|
153
155
|
try {
|
|
154
|
-
await this.resurrectSession(session.id);
|
|
156
|
+
await (this.deps.withSessionWrite ?? (async (_id, task) => task()))(session.id, () => this.resurrectSession(session.id));
|
|
155
157
|
}
|
|
156
158
|
catch (err) {
|
|
157
159
|
console.error(`[Bridge] Failed to resurrect session ${session.id}:`, err);
|
|
158
160
|
try {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
161
|
+
await (this.deps.withSessionWrite ?? (async (_id, task) => task()))(session.id, async () => {
|
|
162
|
+
const current = await store.loadSession(session.id);
|
|
163
|
+
if (current)
|
|
164
|
+
await this.markSessionDead(current);
|
|
165
|
+
});
|
|
162
166
|
}
|
|
163
167
|
catch (markErr) {
|
|
164
168
|
console.error(`[Bridge] Failed to mark session ${session.id} as error:`, markErr);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-resurrection.js","sourceRoot":"","sources":["../src/session-resurrection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAIjG,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,GAErB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEpF,MAAM,UAAU,4BAA4B,CAAC,OAAgB;IAC3D,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC/E,OAAO,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;
|
|
1
|
+
{"version":3,"file":"session-resurrection.js","sourceRoot":"","sources":["../src/session-resurrection.ts"],"names":[],"mappings":"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"}
|
package/dist/session-wire.js
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* for egress. The input is never mutated.
|
|
9
9
|
*/
|
|
10
10
|
export function toWireSession(session) {
|
|
11
|
-
const { env: _env, ...rest } = session;
|
|
11
|
+
const { env: _env, previewSource: _previewSource, ...rest } = session;
|
|
12
12
|
return rest;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=session-wire.js.map
|
package/dist/session-wire.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-wire.js","sourceRoot":"","sources":["../src/session-wire.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,OAAgB;IAC5C,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"session-wire.js","sourceRoot":"","sources":["../src/session-wire.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,OAAgB;IAC5C,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IACtE,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import { Command, CommanderError } from 'commander';
|
|
7
7
|
import { normalizePullRequestUrl } from './pull-request-url.js';
|
|
8
8
|
import { sanitizeAttentionText } from './attention-events.js';
|
|
9
|
+
import { resolve } from 'node:path';
|
|
9
10
|
import { api as request, loadPointer, listSessions, fetchInbox, sendMail } from './cli-client.js';
|
|
10
11
|
import { MAIL_TYPES, AUTOMATION_REMOVED_MESSAGE, formatMailMessage, } from './wire-types.js';
|
|
11
12
|
async function api(method, path, body, headers) {
|
|
@@ -145,6 +146,10 @@ function sessionProgram() {
|
|
|
145
146
|
.option('--clear', 'Remove the current pull request association')
|
|
146
147
|
.option('--session-id <id>', 'Target session; defaults to FTOWN_SESSION_ID')
|
|
147
148
|
.action((url, _opts, cmd) => run('pr', url === undefined ? [] : [url], cmd));
|
|
149
|
+
command('preview [path]', 'Register a self-contained HTML preview for this session')
|
|
150
|
+
.option('--clear', 'Remove the preview registration')
|
|
151
|
+
.option('--session-id <id>', 'Target session; defaults to FTOWN_SESSION_ID')
|
|
152
|
+
.action((path, _opts, cmd) => run('preview', path === undefined ? [] : [path], cmd));
|
|
148
153
|
return program;
|
|
149
154
|
}
|
|
150
155
|
export async function runSessions(argv) {
|
|
@@ -170,7 +175,7 @@ export async function runSessions(argv) {
|
|
|
170
175
|
}
|
|
171
176
|
function selfSessionId(explicit) {
|
|
172
177
|
const id = (explicit ?? process.env.FTOWN_SESSION_ID)?.trim();
|
|
173
|
-
if (!id || !/^[A-Za-z0-9_-]
|
|
178
|
+
if (!id || !/^[A-Za-z0-9_-]{1,200}$/.test(id)) {
|
|
174
179
|
throw new Error('Supply a valid --session-id or set FTOWN_SESSION_ID');
|
|
175
180
|
}
|
|
176
181
|
return id;
|
|
@@ -189,13 +194,23 @@ async function requireSessionCapability(id, feature) {
|
|
|
189
194
|
const capabilities = data?.capabilities;
|
|
190
195
|
const supported = feature === 'attention'
|
|
191
196
|
? capabilities?.attention?.version === 1 && capabilities.attention.request === true
|
|
192
|
-
: capabilities?.sessionMetadata?.pullRequest === true;
|
|
197
|
+
: feature === 'preview' ? capabilities?.sessionMetadata?.preview === true : capabilities?.sessionMetadata?.pullRequest === true;
|
|
193
198
|
if (!supported)
|
|
194
|
-
throw new Error(`bridge_upgrade_required: Upgrade this bridge to support ${feature === 'attention' ? 'attention requests' : 'pull request metadata'}`);
|
|
199
|
+
throw new Error(`bridge_upgrade_required: Upgrade this bridge to support ${feature === 'attention' ? 'attention requests' : feature === 'preview' ? 'HTML previews' : 'pull request metadata'}`);
|
|
195
200
|
}
|
|
196
201
|
async function executeSessionCommand(cmd, rest, options) {
|
|
197
202
|
const jsonOut = !options.plain;
|
|
198
203
|
switch (cmd) {
|
|
204
|
+
case 'preview': {
|
|
205
|
+
const id = selfSessionId(options.sessionId);
|
|
206
|
+
const path = rest[0];
|
|
207
|
+
if ((path !== undefined && options.clear) || (path === undefined && !options.clear) || path === '')
|
|
208
|
+
throw new Error('Supply an HTML file path or --clear, but not both');
|
|
209
|
+
await requireSessionCapability(id, 'preview');
|
|
210
|
+
const { data } = await api(options.clear ? 'DELETE' : 'PUT', `/api/sessions/${id}/preview`, options.clear ? undefined : { path: resolve(path) });
|
|
211
|
+
console.log(jsonOut ? JSON.stringify(data, null, 2) : `preview ${options.clear ? 'cleared' : 'registered'} for ${id}`);
|
|
212
|
+
break;
|
|
213
|
+
}
|
|
199
214
|
case 'attention': {
|
|
200
215
|
const id = selfSessionId(options.sessionId);
|
|
201
216
|
const message = attentionText(options.message ?? '', '--message', 2000);
|