@fnndsc/chell 4.3.1 → 4.4.0

package/dist/remote/discovery.js

@@ -0,0 +1,55 @@
+/**
+ * @file Same-user daemon discovery.
+ *
+ * The daemon writes its URL and attach token to a user-only-readable file so a
+ * `chell --remote` client running as the same user can find it without the
+ * token crossing any other channel. This mirrors the local-daemon model: the
+ * perimeter is the loopback bind plus a token whose only distribution is a
+ * 0600 file on the same machine.
+ *
+ * @module
+ */
+import { writeFileSync, readFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { userInfo } from 'os';
+/**
+ * The per-user discovery file path.
+ *
+ * @returns The path the daemon writes and a client reads.
+ */
+export function discovery_path() {
+    return join(tmpdir(), `chell-calypso-${userInfo().username}.json`);
+}
+/**
+ * Writes the discovery file, readable only by the current user.
+ *
+ * @param discovery - The URL and token to record.
+ */
+export function discovery_write(discovery) {
+    writeFileSync(discovery_path(), JSON.stringify(discovery), { mode: 0o600 });
+}
+/**
+ * Reads the discovery file.
+ *
+ * @returns The recorded URL and token, or null when no daemon has advertised.
+ */
+export function discovery_read() {
+    const path = discovery_path();
+    if (!existsSync(path)) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(readFileSync(path, 'utf-8'));
+        if (typeof parsed === 'object' && parsed !== null &&
+            typeof parsed.url === 'string' &&
+            typeof parsed.token === 'string') {
+            return parsed;
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=discovery.js.map

package/dist/remote/discovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../src/remote/discovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAQ9B;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,iBAAiB,QAAQ,EAAE,CAAC,QAAQ,OAAO,CAAC,CAAC;AACrE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,SAAoB;IAClD,aAAa,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,MAAM,IAAI,GAAW,cAAc,EAAE,CAAC;IACtC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAChE,IACE,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;YAC7C,OAAQ,MAAoB,CAAC,GAAG,KAAK,QAAQ;YAC7C,OAAQ,MAAoB,CAAC,KAAK,KAAK,QAAQ,EAC/C,CAAC;YACD,OAAO,MAAmB,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/remote/remoteEngine.d.ts

@@ -0,0 +1,125 @@
+import type { CommandEnvelope } from '@fnndsc/cumin';
+import type { ChellEngine, CompletionResult } from '../core/engine.js';
+/** Options for connecting a remote engine. */
+export interface RemoteEngineOptions {
+    /** The daemon WebSocket URL, e.g. `ws://127.0.0.1:4300`. */
+    url: string;
+    /** The attach token. */
+    token: string;
+    /** Called with each session-bus broadcast from another surface. */
+    onSession?: (surface: string, envelope: CommandEnvelope) => void;
+    /** Answers a prompt the daemon raised during a command (password, confirmation). */
+    onPrompt?: (message: string, hidden: boolean) => Promise<string>;
+    /** Runs a pipeline segment on this machine and returns its output. */
+    onPipe?: (command: string, input: Buffer) => Promise<Buffer>;
+    /** Opens content in this machine's editor and returns the edited result. */
+    onEdit?: (content: string, extension: string | undefined) => Promise<{
+        content: string;
+        changed: boolean;
+    }>;
+    /** Called when the connection closes unexpectedly. */
+    onClose?: () => void;
+}
+/**
+ * A `ChellEngine` implementation that drives a remote daemon.
+ */
+export declare class RemoteEngine implements ChellEngine {
+    private readonly ws;
+    private readonly pending;
+    private readonly onSession;
+    private readonly onPrompt;
+    private readonly onPipe;
+    private readonly onEdit;
+    private latestPrompt;
+    private nextId;
+    private readonly liveEnvelopeChannels;
+    /**
+     * @param ws - An open, already-attached socket to the daemon.
+     * @param options - The callbacks for session broadcasts and prompts.
+     */
+    private constructor();
+    /**
+     * Connects to a daemon, performs the attach handshake, and returns a ready
+     * remote engine.
+     *
+     * @param options - The daemon URL, attach token, and callbacks.
+     * @returns The connected remote engine.
+     * @throws {Error} When the connection fails or the attach is refused.
+     */
+    static connect(options: RemoteEngineOptions): Promise<RemoteEngine>;
+    /** @inheritdoc */
+    line_execute(line: string): Promise<CommandEnvelope[]>;
+    /** @inheritdoc */
+    line_complete(linePrefix: string): Promise<CompletionResult>;
+    /**
+     * Sends a correlated request and returns a promise for its reply.
+     *
+     * @param type - The request message type.
+     * @param fields - The message fields besides `type` and `id`.
+     * @returns The reply payload.
+     */
+    private request;
+    /**
+     * Dispatches a message from the daemon: correlated replies resolve their
+     * pending request, session broadcasts reach the callback, and uncorrelated
+     * errors are surfaced.
+     *
+     * @param payload - The raw message bytes.
+     */
+    private message_handle;
+    /**
+     * Answers a prompt the daemon raised: asks the local surface and sends the
+     * answer back. With no prompt handler, answers empty so the command does not
+     * hang.
+     *
+     * @param promptId - The prompt correlation id.
+     * @param message - The prompt text.
+     * @param hidden - Whether the entry should be hidden (a password).
+     */
+    private prompt_answer;
+    /**
+     * Runs a pipeline segment the daemon asked for on this machine and returns
+     * its output. Data crosses the wire base64-encoded. With no pipe handler,
+     * returns the input unchanged so the pipeline does not hang.
+     *
+     * @param pipeId - The pipe correlation id.
+     * @param command - The segment command line.
+     * @param input - The base64-encoded input bytes.
+     */
+    private pipe_run;
+    /**
+     * Opens content in this machine's editor (the daemon asked for it) and
+     * returns the edited result. With no edit handler, returns the content
+     * unchanged so the command does not hang.
+     *
+     * @param editId - The edit correlation id.
+     * @param content - The content to edit.
+     * @param extension - An optional filename extension.
+     */
+    private edit_run;
+    /**
+     * Renders a streamed output chunk to the local sink on its channel.
+     *
+     * @param channel - The sink channel the chunk belongs to.
+     * @param chunk - The streamed text.
+     */
+    private output_render;
+    /**
+     * Applies a settlement to the pending request for an id, if one exists.
+     *
+     * @param id - The correlation id.
+     * @param settle - The settlement to apply.
+     */
+    private pending_settle;
+    /**
+     * The latest themed prompt string the daemon pushed, or empty before the
+     * first push.
+     *
+     * @returns The current prompt string.
+     */
+    promptLine(): string;
+    /**
+     * Closes the connection.
+     */
+    close(): void;
+}

package/dist/remote/remoteEngine.js

@@ -0,0 +1,283 @@
+/**
+ * @file The remote engine: a `ChellEngine` backed by a daemon over the wire.
+ *
+ * This is the transport swap that lets the same REPL drive either an in-process
+ * engine or a CALYPSO daemon. It implements the engine interface by sending
+ * `execute` / `complete` messages over a WebSocket and awaiting the correlated
+ * `result` / completion replies, validating every message against calypso's
+ * wire contract at the boundary. Session-bus broadcasts (another surface's
+ * activity) are delivered to an optional callback so the host can render them.
+ *
+ * @module
+ */
+import { WebSocket } from 'ws';
+import { serverMessage_parse, CONTRACT_VERSION } from '@fnndsc/calypso';
+import { envelope_deliver, sink_get } from '../core/sink.js';
+/**
+ * A `ChellEngine` implementation that drives a remote daemon.
+ */
+export class RemoteEngine {
+    ws;
+    pending = new Map();
+    onSession;
+    onPrompt;
+    onPipe;
+    onEdit;
+    latestPrompt = '';
+    nextId = 0;
+    liveEnvelopeChannels = new Map();
+    /**
+     * @param ws - An open, already-attached socket to the daemon.
+     * @param options - The callbacks for session broadcasts and prompts.
+     */
+    constructor(ws, options) {
+        this.ws = ws;
+        this.onSession = options.onSession;
+        this.onPrompt = options.onPrompt;
+        this.onPipe = options.onPipe;
+        this.onEdit = options.onEdit;
+    }
+    /**
+     * Connects to a daemon, performs the attach handshake, and returns a ready
+     * remote engine.
+     *
+     * @param options - The daemon URL, attach token, and callbacks.
+     * @returns The connected remote engine.
+     * @throws {Error} When the connection fails or the attach is refused.
+     */
+    static connect(options) {
+        return new Promise((resolve, reject) => {
+            const ws = new WebSocket(options.url);
+            ws.once('error', (err) => reject(err));
+            ws.once('open', () => {
+                ws.send(JSON.stringify({ type: 'attach', protocolVersion: CONTRACT_VERSION, token: options.token }));
+                ws.once('message', (data) => {
+                    const parsed = serverMessage_parse(safeJson_parse(data.toString()));
+                    if (!parsed.ok || parsed.value === undefined) {
+                        reject(new Error(`attach failed: ${parsed.error ?? 'invalid response'}`));
+                        ws.close();
+                        return;
+                    }
+                    const message = parsed.value;
+                    if (message.type === 'error') {
+                        reject(new Error(`attach refused: ${message.reason}`));
+                        ws.close();
+                        return;
+                    }
+                    if (message.type !== 'attached') {
+                        reject(new Error(`unexpected attach response: ${message.type}`));
+                        ws.close();
+                        return;
+                    }
+                    const engine = new RemoteEngine(ws, options);
+                    ws.on('message', (payload) => engine.message_handle(payload));
+                    if (options.onClose) {
+                        ws.on('close', () => options.onClose?.());
+                    }
+                    resolve(engine);
+                });
+            });
+        });
+    }
+    /** @inheritdoc */
+    async line_execute(line) {
+        const id = String(this.nextId++);
+        const envelopes = await this.request('execute', { line }, id);
+        const liveChannels = this.liveEnvelopeChannels.get(id);
+        this.liveEnvelopeChannels.delete(id);
+        // Deliver to the active sink exactly as the in-process engine delivers
+        // live, so the REPL host renders remote output without any change.
+        for (const envelope of envelopes) {
+            envelope_deliver(liveChannels ? {
+                ...envelope,
+                rendered: liveChannels.has('data') ? '' : envelope.rendered,
+                renderedErr: liveChannels.has('err') ? undefined : envelope.renderedErr,
+            } : envelope);
+        }
+        return envelopes;
+    }
+    /** @inheritdoc */
+    line_complete(linePrefix) {
+        return this.request('complete', { prefix: linePrefix });
+    }
+    /**
+     * Sends a correlated request and returns a promise for its reply.
+     *
+     * @param type - The request message type.
+     * @param fields - The message fields besides `type` and `id`.
+     * @returns The reply payload.
+     */
+    request(type, fields, requestId) {
+        const id = requestId ?? String(this.nextId++);
+        return new Promise((resolve, reject) => {
+            this.pending.set(id, { resolve, reject });
+            this.ws.send(JSON.stringify({ type, id, ...fields }));
+        });
+    }
+    /**
+     * Dispatches a message from the daemon: correlated replies resolve their
+     * pending request, session broadcasts reach the callback, and uncorrelated
+     * errors are surfaced.
+     *
+     * @param payload - The raw message bytes.
+     */
+    message_handle(payload) {
+        const parsed = serverMessage_parse(safeJson_parse(payload.toString()));
+        if (!parsed.ok || parsed.value === undefined) {
+            return;
+        }
+        const message = parsed.value;
+        switch (message.type) {
+            case 'result':
+                this.pending_settle(message.id, (p) => p.resolve(message.envelopes));
+                break;
+            case 'complete':
+                this.pending_settle(message.id, (p) => p.resolve({ candidates: message.candidates, prefix: message.prefix }));
+                break;
+            case 'session':
+                // The wire envelope is a CommandEnvelope; calypso's schema infers the
+                // model payload as optional-unknown, a zod nicety the runtime shape
+                // does not reflect. Narrow at this single boundary.
+                if (this.onSession)
+                    this.onSession(message.surface, message.envelope);
+                break;
+            case 'prompt':
+                void this.prompt_answer(message.promptId, message.message, message.hidden);
+                break;
+            case 'promptline':
+                this.latestPrompt = message.text;
+                break;
+            case 'progress':
+                {
+                    const { type: _type, id: _id, ...event } = message;
+                    sink_get().progress_write(event);
+                }
+                break;
+            case 'output':
+                if (message.channel === 'data' || message.channel === 'err') {
+                    const channels = this.liveEnvelopeChannels.get(message.id) ?? new Set();
+                    channels.add(message.channel);
+                    this.liveEnvelopeChannels.set(message.id, channels);
+                }
+                this.output_render(message.channel, message.chunk);
+                break;
+            case 'pipe':
+                void this.pipe_run(message.pipeId, message.command, message.input);
+                break;
+            case 'edit':
+                void this.edit_run(message.editId, message.content, message.extension);
+                break;
+            case 'error':
+                if (message.id !== undefined) {
+                    this.pending_settle(message.id, (p) => p.reject(new Error(message.reason)));
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    /**
+     * Answers a prompt the daemon raised: asks the local surface and sends the
+     * answer back. With no prompt handler, answers empty so the command does not
+     * hang.
+     *
+     * @param promptId - The prompt correlation id.
+     * @param message - The prompt text.
+     * @param hidden - Whether the entry should be hidden (a password).
+     */
+    async prompt_answer(promptId, message, hidden) {
+        const answer = this.onPrompt ? await this.onPrompt(message, hidden) : '';
+        this.ws.send(JSON.stringify({ type: 'promptAnswer', promptId, answer }));
+    }
+    /**
+     * Runs a pipeline segment the daemon asked for on this machine and returns
+     * its output. Data crosses the wire base64-encoded. With no pipe handler,
+     * returns the input unchanged so the pipeline does not hang.
+     *
+     * @param pipeId - The pipe correlation id.
+     * @param command - The segment command line.
+     * @param input - The base64-encoded input bytes.
+     */
+    async pipe_run(pipeId, command, input) {
+        const inputBytes = Buffer.from(input, 'base64');
+        const output = this.onPipe ? await this.onPipe(command, inputBytes) : inputBytes;
+        this.ws.send(JSON.stringify({ type: 'pipeResult', pipeId, output: output.toString('base64') }));
+    }
+    /**
+     * Opens content in this machine's editor (the daemon asked for it) and
+     * returns the edited result. With no edit handler, returns the content
+     * unchanged so the command does not hang.
+     *
+     * @param editId - The edit correlation id.
+     * @param content - The content to edit.
+     * @param extension - An optional filename extension.
+     */
+    async edit_run(editId, content, extension) {
+        const result = this.onEdit
+            ? await this.onEdit(content, extension)
+            : { content, changed: false };
+        this.ws.send(JSON.stringify({ type: 'editResult', editId, content: result.content, changed: result.changed }));
+    }
+    /**
+     * Renders a streamed output chunk to the local sink on its channel.
+     *
+     * @param channel - The sink channel the chunk belongs to.
+     * @param chunk - The streamed text.
+     */
+    output_render(channel, chunk) {
+        const sink = sink_get();
+        if (channel === 'data') {
+            sink.data_write(chunk);
+        }
+        else if (channel === 'err') {
+            sink.err_write(chunk);
+        }
+        else {
+            sink.status_write(chunk);
+        }
+    }
+    /**
+     * Applies a settlement to the pending request for an id, if one exists.
+     *
+     * @param id - The correlation id.
+     * @param settle - The settlement to apply.
+     */
+    pending_settle(id, settle) {
+        const pending = this.pending.get(id);
+        if (pending) {
+            this.pending.delete(id);
+            settle(pending);
+        }
+    }
+    /**
+     * The latest themed prompt string the daemon pushed, or empty before the
+     * first push.
+     *
+     * @returns The current prompt string.
+     */
+    promptLine() {
+        return this.latestPrompt;
+    }
+    /**
+     * Closes the connection.
+     */
+    close() {
+        this.ws.close();
+    }
+}
+/**
+ * Parses JSON, returning `undefined` on failure so callers can validate the
+ * result rather than catch.
+ *
+ * @param text - The JSON text.
+ * @returns The parsed value, or undefined when the text is not valid JSON.
+ */
+function safeJson_parse(text) {
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return undefined;
+    }
+}
+//# sourceMappingURL=remoteEngine.js.map

package/dist/remote/remoteEngine.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fnndsc/chell",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "description": "ChELL Executes Layered Logic - Interactive ChRIS REPL Shell",
   "repository": {
     "type": "git",
@@ -13,13 +13,14 @@
   "main": "dist/index.js",
   "type": "module",
   "bin": {
-    "chell": "./dist/index.js"
+    "chell": "./dist/index.js",
+    "calypso": "./dist/calypso.js"
   },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsc && chmod +x ./dist/index.js",
+    "build": "tsc && chmod +x ./dist/index.js ./dist/calypso.js",
     "exemplars:build": "tsc -p exemplars/ts",
     "start": "node dist/index.js",
     "test": "NODE_OPTIONS='--experimental-vm-modules --disable-warning=ExperimentalWarning' jest --forceExit --coverage",
@@ -38,8 +39,8 @@
   "license": "MIT",
   "dependencies": {
     "@fnndsc/chili": "^3.3.0",
-    "@fnndsc/cumin": "^3.4.0",
-    "@fnndsc/salsa": "^3.2.5",
+    "@fnndsc/cumin": "^3.5.0",
+    "@fnndsc/salsa": "^3.2.6",
     "chalk": "^4.1.2",
     "cli-progress": "^3.12.0",
     "commander": "^12.1.0",
@@ -48,7 +49,8 @@
     "marked": "^15.0.12",
     "marked-terminal": "^7.3.0",
     "minimatch": "^10.1.1",
-    "ws": "^8.21.0"
+    "ws": "^8.21.0",
+    "@fnndsc/calypso": "^0.2.0"
   },
   "devDependencies": {
     "@types/cli-progress": "^3.11.6",