@myagentroam/node 0.1.2 → 0.1.4

package/dist/service/workspace-upload-service.js

@@ -0,0 +1,241 @@
+import { randomUUID } from 'node:crypto';
+import { lstat, mkdir, open, readFile, rename, rm } from 'node:fs/promises';
+import { dirname, join, resolve } from 'node:path';
+import { parseComposerAttachmentUpload, validComposerAttachmentName } from '../util/node-operation-parsers.js';
+import { preflightWorkspaceUpload, workspaceUploadTemporaryName } from '../workspace.js';
+const CHUNK_BYTES = 512 * 1024;
+const TTL_MS = 60 * 60_000;
+const MAX_ATTACHMENT_BYTES = 5 * 1024 * 1024;
+export class WorkspaceUploadService {
+    state;
+    onCompleted;
+    constructor(state, onCompleted) {
+        this.state = state;
+        this.onCompleted = onCompleted;
+    }
+    async preflight(workspace, input) {
+        if ((input.directory !== undefined && typeof input.directory !== 'string') ||
+            !Array.isArray(input.files) ||
+            input.files.length === 0 ||
+            input.files.some((file) => !plain(file) || typeof file.name !== 'string'))
+            throw new Error('UPLOAD_INVALID');
+        const seen = new Set();
+        return Promise.all(input.files.map(async (file) => {
+            const name = file.name;
+            if (seen.has(name))
+                return { name, status: 'INVALID_NAME', path: null };
+            seen.add(name);
+            const target = await preflightWorkspaceUpload(workspace.path, typeof input.directory === 'string' ? input.directory : '.', name);
+            return { name, status: target.status, path: target.path || null };
+        }));
+    }
+    async create(workspace, input) {
+        const attachment = parseComposerAttachmentUpload(input);
+        if ((input.directory !== undefined && typeof input.directory !== 'string') ||
+            typeof input.name !== 'string' ||
+            !Number.isSafeInteger(input.size) ||
+            input.size < 0 ||
+            typeof input.overwrite !== 'boolean' ||
+            (attachment !== undefined && input.directory !== undefined))
+            throw new Error('UPLOAD_INVALID');
+        if (attachment !== undefined &&
+            (!validComposerAttachmentName(input.name) ||
+                input.size > MAX_ATTACHMENT_BYTES ||
+                this.state.composerAttachments.has(attachment.id) ||
+                [...this.state.uploads.values()].some((upload) => upload.composerAttachment?.id === attachment.id)))
+            throw new Error('COMPOSER_ATTACHMENT_INVALID');
+        const target = attachment === undefined
+            ? await preflightWorkspaceUpload(workspace.path, typeof input.directory === 'string' ? input.directory : '.', input.name)
+            : await this.attachmentTarget(workspace.path, attachment.id, input.name);
+        if (target.status === 'INVALID_NAME')
+            throw new Error('UPLOAD_NAME_INVALID');
+        if (target.status === 'EXISTS_DIRECTORY')
+            throw new Error('UPLOAD_TARGET_DIRECTORY');
+        if (target.status === 'EXISTS_FILE' && !input.overwrite)
+            throw new Error('UPLOAD_TARGET_EXISTS');
+        if ([...this.state.uploads.values()].some((upload) => upload.workspaceId === workspace.id && upload.targetPath === target.absolutePath))
+            throw new Error('UPLOAD_TARGET_BUSY');
+        const id = randomUUID();
+        const temporaryPath = resolve(dirname(target.absolutePath), workspaceUploadTemporaryName(id));
+        const handle = await open(temporaryPath, 'wx');
+        const timer = setTimeout(() => {
+            const upload = this.state.uploads.get(id);
+            if (upload !== undefined)
+                void this.remove(upload);
+        }, TTL_MS);
+        const upload = {
+            id,
+            workspaceId: workspace.id,
+            path: target.path,
+            targetPath: target.absolutePath,
+            temporaryPath,
+            size: input.size,
+            overwrite: input.overwrite,
+            ...(attachment === undefined ? {} : { composerAttachment: attachment }),
+            handle,
+            receivedBytes: 0,
+            timer
+        };
+        this.state.uploads.set(id, upload);
+        return this.status(id);
+    }
+    async write(input) {
+        if (typeof input.uploadId !== 'string' ||
+            !Number.isSafeInteger(input.offset) ||
+            input.offset < 0 ||
+            typeof input.dataBase64 !== 'string')
+            throw new Error('UPLOAD_CHUNK_INVALID');
+        const upload = this.require(input.uploadId);
+        if (input.offset !== upload.receivedBytes)
+            throw new Error('UPLOAD_OFFSET_INVALID');
+        const bytes = Buffer.from(input.dataBase64, 'base64');
+        if (bytes.length === 0 || bytes.length > CHUNK_BYTES)
+            throw new Error('UPLOAD_CHUNK_INVALID');
+        if (upload.receivedBytes + bytes.length > upload.size)
+            throw new Error('UPLOAD_SIZE_INVALID');
+        const result = await upload.handle.write(bytes, 0, bytes.length, upload.receivedBytes);
+        if (result.bytesWritten !== bytes.length)
+            throw new Error('UPLOAD_WRITE_FAILED');
+        upload.receivedBytes += bytes.length;
+        return this.status(upload.id);
+    }
+    status(uploadId) {
+        const upload = this.require(uploadId);
+        return {
+            uploadId: upload.id,
+            path: upload.path,
+            receivedBytes: upload.receivedBytes,
+            size: upload.size
+        };
+    }
+    async complete(uploadId) {
+        const upload = this.require(uploadId);
+        if (upload.receivedBytes !== upload.size)
+            throw new Error('UPLOAD_INCOMPLETE');
+        await upload.handle.sync();
+        await upload.handle.close();
+        const existing = await lstat(upload.targetPath).catch((error) => error.code === 'ENOENT' ? undefined : Promise.reject(error));
+        if (existing?.isSymbolicLink())
+            throw new Error('FILE_PATH_ESCAPE');
+        if (existing !== undefined && (!existing.isFile() || !upload.overwrite))
+            throw new Error('UPLOAD_TARGET_EXISTS');
+        try {
+            await rename(upload.temporaryPath, upload.targetPath);
+        }
+        catch (error) {
+            if (error.code !== 'EEXIST')
+                throw error;
+            if (!upload.overwrite)
+                throw new Error('UPLOAD_TARGET_EXISTS');
+            await rm(upload.targetPath, { force: false });
+            await rename(upload.temporaryPath, upload.targetPath);
+        }
+        clearTimeout(upload.timer);
+        this.state.uploads.delete(upload.id);
+        this.onCompleted(upload.workspaceId);
+        if (upload.composerAttachment !== undefined)
+            this.state.composerAttachments.set(upload.composerAttachment.id, {
+                id: upload.composerAttachment.id,
+                workspaceId: upload.workspaceId,
+                path: upload.path,
+                targetPath: upload.targetPath,
+                name: upload.composerAttachment.name,
+                mime: upload.composerAttachment.mime,
+                size: upload.size
+            });
+        return {
+            uploadId: upload.id,
+            path: upload.path,
+            receivedBytes: upload.receivedBytes,
+            size: upload.size
+        };
+    }
+    async cancel(uploadId) {
+        if (typeof uploadId !== 'string')
+            throw new Error('UPLOAD_NOT_FOUND');
+        const active = this.state.uploads.get(uploadId);
+        if (active !== undefined)
+            return this.remove(active);
+        const attachment = this.state.composerAttachments.get(uploadId);
+        if (attachment === undefined)
+            throw new Error('UPLOAD_NOT_FOUND');
+        this.state.composerAttachments.delete(uploadId);
+        await rm(dirname(attachment.targetPath), { recursive: true, force: true });
+    }
+    async resolve(workspaceId, ids) {
+        return Promise.all(ids.map(async (id) => {
+            const stored = this.state.composerAttachments.get(id);
+            if (stored === undefined || stored.workspaceId !== workspaceId)
+                throw new Error('COMPOSER_ATTACHMENT_UNAVAILABLE');
+            const metadata = await lstat(stored.targetPath).catch(() => undefined);
+            if (metadata === undefined ||
+                metadata.isSymbolicLink() ||
+                !metadata.isFile() ||
+                metadata.size !== stored.size)
+                throw new Error('COMPOSER_ATTACHMENT_UNAVAILABLE');
+            const bytes = await readFile(stored.targetPath);
+            return {
+                attachment: {
+                    name: stored.name,
+                    mime: stored.mime,
+                    dataBase64: bytes.toString('base64')
+                },
+                path: stored.path
+            };
+        }));
+    }
+    async shutdown() {
+        await Promise.allSettled([...this.state.uploads.values()].map((upload) => this.remove(upload)));
+        for (const attachment of this.state.composerAttachments.values())
+            await rm(dirname(attachment.targetPath), { recursive: true, force: true });
+        this.state.composerAttachments.clear();
+    }
+    require(id) {
+        if (typeof id !== 'string')
+            throw new Error('UPLOAD_NOT_FOUND');
+        const upload = this.state.uploads.get(id);
+        if (upload === undefined)
+            throw new Error('UPLOAD_NOT_FOUND');
+        return upload;
+    }
+    async remove(upload) {
+        this.state.uploads.delete(upload.id);
+        clearTimeout(upload.timer);
+        await upload.handle.close().catch(() => undefined);
+        await rm(upload.temporaryPath, { force: true }).catch(() => undefined);
+        if (upload.composerAttachment !== undefined)
+            await rm(dirname(upload.targetPath), { recursive: true, force: true }).catch(() => undefined);
+    }
+    async attachmentTarget(workspacePath, id, name) {
+        const mar = resolve(workspacePath, '.mar');
+        await mkdir(mar, { recursive: true, mode: 0o700 });
+        await safeDirectory(mar);
+        const temp = join(mar, 'temp-files');
+        await mkdir(temp, { recursive: true, mode: 0o700 });
+        await safeDirectory(temp);
+        const directory = join(temp, id);
+        try {
+            await mkdir(directory, { mode: 0o700 });
+        }
+        catch (error) {
+            if (error.code === 'EEXIST')
+                throw new Error('COMPOSER_ATTACHMENT_INVALID');
+            throw error;
+        }
+        await safeDirectory(directory);
+        return {
+            path: `.mar/temp-files/${id}/${name}`,
+            absolutePath: join(directory, name),
+            status: 'READY'
+        };
+    }
+}
+async function safeDirectory(path) {
+    const value = await lstat(path);
+    if (!value.isDirectory() || value.isSymbolicLink())
+        throw new Error('COMPOSER_ATTACHMENT_DIRECTORY_INVALID');
+}
+function plain(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+//# sourceMappingURL=workspace-upload-service.js.map

package/dist/service/workspace-upload-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-upload-service.js","sourceRoot":"","sources":["../../src/service/workspace-upload-service.ts"],"names":[],"mappings":"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"}

package/dist/service/workspace-watch-service.d.ts

@@ -0,0 +1,18 @@
+import { WorkspaceDomainState, type WorkspaceWatch } from './workspace-domain-state.js';
+export declare class WorkspaceWatchService {
+    private readonly state;
+    private readonly onSessionWatchRequired;
+    private readonly onSessionWatchUnused;
+    constructor(state: WorkspaceDomainState, onSessionWatchRequired: (workspaceId: string) => void, onSessionWatchUnused: (workspaceId: string) => void);
+    parseTopics(input: Record<string, unknown>): WorkspaceWatch['topics'];
+    key(input: Record<string, unknown>): string;
+    sessionHash(input: Record<string, unknown>): string;
+    create(workspaceId: string, watchId: string, sessionHash: string, topics: WorkspaceWatch['topics']): WorkspaceWatch;
+    renew(workspaceId: string, key: string): WorkspaceWatch | undefined;
+    remove(workspaceId: string, key: string): void;
+    clear(workspaceId: string): void;
+    clearAll(): void;
+    nextRevision(workspaceId: string): number;
+    topicActive(workspaceId: string, topic: 'files' | 'changes' | 'sessions'): boolean;
+    private expiryTimer;
+}

package/dist/service/workspace-watch-service.js

@@ -0,0 +1,121 @@
+const WATCH_TTL_MS = 45_000;
+export class WorkspaceWatchService {
+    state;
+    onSessionWatchRequired;
+    onSessionWatchUnused;
+    constructor(state, onSessionWatchRequired, onSessionWatchUnused) {
+        this.state = state;
+        this.onSessionWatchRequired = onSessionWatchRequired;
+        this.onSessionWatchUnused = onSessionWatchUnused;
+    }
+    parseTopics(input) {
+        if (!plain(input.topics))
+            throw new Error('WORKSPACE_WATCH_INVALID');
+        const sessions = input.topics.sessions === true;
+        const changes = input.topics.changes === true;
+        const rawFiles = input.topics.files;
+        let files;
+        if (rawFiles !== undefined) {
+            if (!plain(rawFiles) || typeof rawFiles.path !== 'string')
+                throw new Error('WORKSPACE_WATCH_INVALID');
+            if ((rawFiles.cursor !== undefined && typeof rawFiles.cursor !== 'string') ||
+                (rawFiles.limit !== undefined &&
+                    (typeof rawFiles.limit !== 'number' ||
+                        !Number.isInteger(rawFiles.limit) ||
+                        rawFiles.limit < 1 ||
+                        rawFiles.limit > 200)))
+                throw new Error('WORKSPACE_WATCH_INVALID');
+            files = {
+                path: rawFiles.path,
+                ...(typeof rawFiles.cursor === 'string' ? { cursor: rawFiles.cursor } : {}),
+                ...(typeof rawFiles.limit === 'number' ? { limit: rawFiles.limit } : {})
+            };
+        }
+        if (!sessions && !changes && files === undefined)
+            throw new Error('WORKSPACE_WATCH_INVALID');
+        return { sessions, changes, files };
+    }
+    key(input) {
+        return `${this.sessionHash(input)}:${input.watchId}`;
+    }
+    sessionHash(input) {
+        return typeof input.__workspaceWatchSessionHash === 'string'
+            ? input.__workspaceWatchSessionHash
+            : 'local-test';
+    }
+    create(workspaceId, watchId, sessionHash, topics) {
+        const key = `${sessionHash}:${watchId}`;
+        this.remove(workspaceId, key);
+        const watch = {
+            workspaceId,
+            watchId,
+            sessionHash,
+            expiresAt: Date.now() + WATCH_TTL_MS,
+            topics,
+            timer: undefined
+        };
+        watch.timer = this.expiryTimer(workspaceId, key);
+        const watches = this.state.watches.get(workspaceId) ?? new Map();
+        watches.set(key, watch);
+        this.state.watches.set(workspaceId, watches);
+        if (topics.sessions)
+            this.onSessionWatchRequired(workspaceId);
+        return watch;
+    }
+    renew(workspaceId, key) {
+        const watch = this.state.watches.get(workspaceId)?.get(key);
+        if (watch === undefined || watch.expiresAt <= Date.now()) {
+            this.remove(workspaceId, key);
+            return undefined;
+        }
+        clearTimeout(watch.timer);
+        watch.expiresAt = Date.now() + WATCH_TTL_MS;
+        watch.timer = this.expiryTimer(workspaceId, key);
+        return watch;
+    }
+    remove(workspaceId, key) {
+        const watches = this.state.watches.get(workspaceId);
+        const watch = watches?.get(key);
+        if (watch === undefined)
+            return;
+        clearTimeout(watch.timer);
+        watches?.delete(key);
+        if (watches?.size === 0)
+            this.state.watches.delete(workspaceId);
+        if (!this.topicActive(workspaceId, 'sessions'))
+            this.onSessionWatchUnused(workspaceId);
+    }
+    clear(workspaceId) {
+        const watches = this.state.watches.get(workspaceId);
+        if (watches !== undefined)
+            for (const watch of watches.values())
+                clearTimeout(watch.timer);
+        this.state.watches.delete(workspaceId);
+        this.state.watchRevisions.delete(workspaceId);
+        this.onSessionWatchUnused(workspaceId);
+    }
+    clearAll() {
+        for (const watches of this.state.watches.values())
+            for (const watch of watches.values())
+                clearTimeout(watch.timer);
+        this.state.watches.clear();
+        this.state.watchRevisions.clear();
+    }
+    nextRevision(workspaceId) {
+        const revision = (this.state.watchRevisions.get(workspaceId) ?? 0) + 1;
+        this.state.watchRevisions.set(workspaceId, revision);
+        return revision;
+    }
+    topicActive(workspaceId, topic) {
+        return [...(this.state.watches.get(workspaceId)?.values() ?? [])].some((watch) => topic === 'files' ? watch.topics.files !== undefined : watch.topics[topic]);
+    }
+    expiryTimer(workspaceId, key) {
+        const timer = setTimeout(() => this.remove(workspaceId, key), WATCH_TTL_MS);
+        timer.unref();
+        return timer;
+    }
+}
+function plain(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+//# sourceMappingURL=workspace-watch-service.js.map

package/dist/service/workspace-watch-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-watch-service.js","sourceRoot":"","sources":["../../src/service/workspace-watch-service.ts"],"names":[],"mappings":"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"}

package/dist/service/workspace-workbench-service.d.ts

@@ -0,0 +1,38 @@
+import type { NodeOperationHandler } from '../connector/node-operation-router.js';
+import type { NodeWorkspace } from '../database.js';
+import { NodeRuntimeState } from '../runtime-state.js';
+import { WorkspaceChangeService } from './workspace-change-service.js';
+import { WorkspaceFileService } from './workspace-file-service.js';
+import { WorkspaceUploadService } from './workspace-upload-service.js';
+import { WorkspaceWatchService } from './workspace-watch-service.js';
+export interface WorkspaceWorkbenchServiceOptions {
+    readonly requireWorkspace: (workspaceId: unknown) => NodeWorkspace;
+    readonly runtime: NodeRuntimeState;
+    readonly watch: WorkspaceWatchService;
+    readonly files: WorkspaceFileService;
+    readonly uploads: WorkspaceUploadService;
+    readonly changes: WorkspaceChangeService;
+    readonly listSessions: (workspaceId: string) => Promise<unknown>;
+    readonly invalidate: (workspaceId: string) => void;
+}
+export declare class WorkspaceWorkbenchService {
+    private readonly options;
+    constructor(options: WorkspaceWorkbenchServiceOptions);
+    operations(): Readonly<Record<string, NodeOperationHandler>>;
+    private activity;
+    private watch;
+    private unwatch;
+    private listFiles;
+    private readFile;
+    private searchFiles;
+    private preflight;
+    private createUpload;
+    private writeUpload;
+    private completeUpload;
+    private cancelUpload;
+    private currentChanges;
+    private changeDiff;
+    private restoreChange;
+    private diff;
+    private gitWorkspace;
+}

package/dist/service/workspace-workbench-service.js

@@ -0,0 +1,156 @@
+import { readCurrentChangeDiff, readRestrictedDiff, resolveGitRepository, restoreCurrentChange } from '../workspace.js';
+export class WorkspaceWorkbenchService {
+    options;
+    constructor(options) {
+        this.options = options;
+    }
+    operations() {
+        return {
+            'workspace.activity.read': (data) => this.activity(record(data)),
+            'workspace.watch': (data) => this.watch(record(data)),
+            'workspace.unwatch': (data) => this.unwatch(record(data)),
+            'workspace.files.list': (data) => this.listFiles(record(data)),
+            'workspace.file.read': (data) => this.readFile(record(data)),
+            'workspace.files.search': (data) => this.searchFiles(record(data)),
+            'workspace.files.upload.preflight': (data) => this.preflight(record(data)),
+            'workspace.files.upload.create': (data) => this.createUpload(record(data)),
+            'workspace.files.upload.chunk': (data) => this.writeUpload(record(data)),
+            'workspace.files.upload.status': (data) => ({
+                upload: this.options.uploads.status(record(data).uploadId)
+            }),
+            'workspace.files.upload.complete': (data) => this.completeUpload(record(data)),
+            'workspace.files.upload.cancel': (data) => this.cancelUpload(record(data)),
+            'workspace.changes.current': (data) => this.currentChanges(record(data)),
+            'workspace.change.diff': (data) => this.changeDiff(record(data)),
+            'workspace.change.restore': (data) => this.restoreChange(record(data)),
+            'workspace.diff': (data) => this.diff(record(data))
+        };
+    }
+    activity(input) {
+        if (typeof input.workspaceId !== 'string' ||
+            (input.cursor !== undefined && typeof input.cursor !== 'string') ||
+            (input.limit !== undefined &&
+                (!Number.isInteger(input.limit) ||
+                    input.limit < 1 ||
+                    input.limit > 500)))
+            throw new Error('EVENT_CURSOR_INVALID');
+        return this.options.runtime.listWorkspaceActivity({
+            workspaceId: input.workspaceId,
+            ...(typeof input.cursor === 'string' ? { cursor: input.cursor } : {}),
+            ...(typeof input.limit === 'number' ? { limit: input.limit } : {})
+        });
+    }
+    async watch(input) {
+        if (typeof input.workspaceId !== 'string' ||
+            typeof input.watchId !== 'string' ||
+            !/^[A-Za-z0-9_-]{8,128}$/.test(input.watchId) ||
+            (input.mode !== 'initial' && input.mode !== 'renew'))
+            throw new Error('WORKSPACE_WATCH_INVALID');
+        const workspace = this.options.requireWorkspace(input.workspaceId);
+        if (input.mode === 'renew') {
+            const watch = this.options.watch.renew(workspace.id, this.options.watch.key(input));
+            if (watch === undefined)
+                throw new Error('WORKSPACE_WATCH_NOT_FOUND');
+            return { renewed: true };
+        }
+        const topics = this.options.watch.parseTopics(input);
+        const snapshot = {};
+        if (topics.sessions)
+            snapshot.sessions = await this.options.listSessions(workspace.id);
+        if (topics.files !== undefined)
+            snapshot.files = { files: await this.options.files.list(workspace, topics.files) };
+        if (topics.changes)
+            snapshot.changes =
+                workspace.kind === 'GIT_WORKSPACE' ? await this.options.changes.current(workspace) : null;
+        if (topics.files !== undefined || topics.changes)
+            await this.options.files.index(workspace).observe();
+        const watch = this.options.watch.create(workspace.id, input.watchId, this.options.watch.sessionHash(input), topics);
+        return { watch: { expiresAt: watch.expiresAt }, snapshot };
+    }
+    unwatch(input) {
+        if (typeof input.workspaceId !== 'string' ||
+            typeof input.watchId !== 'string' ||
+            !/^[A-Za-z0-9_-]{8,128}$/.test(input.watchId))
+            throw new Error('WORKSPACE_WATCH_INVALID');
+        this.options.watch.remove(input.workspaceId, this.options.watch.key(input));
+        return { stopped: true };
+    }
+    async listFiles(input) {
+        const workspace = this.options.requireWorkspace(input.workspaceId);
+        return { files: await this.options.files.list(workspace, input) };
+    }
+    async readFile(input) {
+        const workspace = this.options.requireWorkspace(input.workspaceId);
+        return { file: await this.options.files.read(workspace, input) };
+    }
+    async searchFiles(input) {
+        const workspace = this.options.requireWorkspace(input.workspaceId);
+        return { files: await this.options.files.search(workspace, input) };
+    }
+    async preflight(input) {
+        return {
+            uploads: await this.options.uploads.preflight(this.options.requireWorkspace(input.workspaceId), input)
+        };
+    }
+    async createUpload(input) {
+        return {
+            upload: await this.options.uploads.create(this.options.requireWorkspace(input.workspaceId), input)
+        };
+    }
+    async writeUpload(input) {
+        return { upload: await this.options.uploads.write(input) };
+    }
+    async completeUpload(input) {
+        return { upload: await this.options.uploads.complete(input.uploadId) };
+    }
+    async cancelUpload(input) {
+        await this.options.uploads.cancel(input.uploadId);
+        return { cancelled: true };
+    }
+    async currentChanges(input) {
+        return this.options.changes.current(this.options.requireWorkspace(input.workspaceId));
+    }
+    async changeDiff(input) {
+        if (typeof input.workspaceId !== 'string' ||
+            typeof input.path !== 'string' ||
+            (input.repositoryPath !== undefined && typeof input.repositoryPath !== 'string'))
+            throw new Error('GIT_DIFF_INVALID');
+        const workspace = this.gitWorkspace(input.workspaceId);
+        const repository = await resolveGitRepository(workspace.path, input.repositoryPath ?? '');
+        return { diff: await readCurrentChangeDiff(repository, input.path) };
+    }
+    async restoreChange(input) {
+        if (typeof input.workspaceId !== 'string' ||
+            typeof input.path !== 'string' ||
+            (input.repositoryPath !== undefined && typeof input.repositoryPath !== 'string') ||
+            (input.state !== 'STAGED' && input.state !== 'UNSTAGED' && input.state !== 'UNTRACKED'))
+            throw new Error('GIT_CHANGE_RESTORE_UNAVAILABLE');
+        const workspace = this.gitWorkspace(input.workspaceId);
+        if (this.options.runtime.hasActiveWorkspaceLease(workspace.id))
+            throw new Error('WORKSPACE_BUSY');
+        const repository = await resolveGitRepository(workspace.path, input.repositoryPath ?? '');
+        await restoreCurrentChange(repository, input.path, input.state);
+        this.options.invalidate(workspace.id);
+        return { restored: true };
+    }
+    async diff(input) {
+        if (typeof input.workspaceId !== 'string' ||
+            typeof input.fromRef !== 'string' ||
+            typeof input.toRef !== 'string')
+            throw new Error('GIT_DIFF_INVALID');
+        const workspace = this.gitWorkspace(input.workspaceId);
+        return { diff: await readRestrictedDiff(workspace.path, input.fromRef, input.toRef) };
+    }
+    gitWorkspace(workspaceId) {
+        const workspace = this.options.requireWorkspace(workspaceId);
+        if (workspace.kind !== 'GIT_WORKSPACE')
+            throw new Error('WORKSPACE_NOT_GIT');
+        return workspace;
+    }
+}
+function record(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value)
+        ? value
+        : {};
+}
+//# sourceMappingURL=workspace-workbench-service.js.map

package/dist/service/workspace-workbench-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-workbench-service.js","sourceRoot":"","sources":["../../src/service/workspace-workbench-service.ts"],"names":[],"mappings":"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"}

package/dist/terminal.d.ts

@@ -98,6 +98,7 @@ export declare class TerminalManager {
         readonly cwd?: unknown;
         /** Resolved by NodeConnector; never trusted from a browser directly. */
         readonly workspaceId?: string | null;
+        readonly environment?: Readonly<Record<string, string>>;
     }): TerminalSummary;
     list(): readonly TerminalSummary[];
     get(terminalId: string): TerminalSummary;

package/dist/terminal.js

@@ -93,7 +93,7 @@ export class TerminalManager {
             cols,
             rows,
             cwd: typeof input.cwd === 'string' ? input.cwd : this.cwd,
-            env: process.env
+            env: { ...process.env, ...input.environment }
         });
         const createdAt = this.now();
         const terminal = {