@struktoai/mirage-node 0.0.7 → 0.0.8

package/dist/runtime/sandbox/ssh/runtime.js

@@ -16,21 +16,24 @@ import { Readable } from 'node:stream';
 import { once } from 'node:events';
 import { connectOptions } from "../../../utils/ssh.js";
 import { RemoteSandbox } from '@struktoai/mirage-core/runtime/sandbox/base';
+import { currentCaller } from '@struktoai/mirage-core/context/session_context';
+import { PIPE_TRANSPORT } from '@struktoai/mirage-core/runtime/sandbox/mixin';
 import { requireId } from '@struktoai/mirage-core/runtime/sandbox/config';
 import { registerRuntime } from '@struktoai/mirage-core/runtime/table';
 import { loadSdk } from "./sdk.js";
 import { SSH_RUNTIME_CONFIG_KEYS } from "./config.js";
-import { wrapLine } from "./constants.js";
+import { EXEC_ID, stopSignal, wrapLine } from '@struktoai/mirage-core/runtime/sandbox/constants';
 import { makeAbortError } from '@struktoai/mirage-core/utils/abort';
+import { feed } from '@struktoai/mirage-core/io/stream';
 /**
  * A machine reached over SSH as a whole-line runtime.
  *
  * You run the machine and its sshd yourself; mirage only connects
  * (keys or an agent, never a password) and execs lines. One connection opens on
  * the first captured line and is reused; each line is one exec
- * channel with real byte stdin and separated stderr, the merged
- * environment and session cwd dressed onto the command by wrapLine,
- * because SSH exec has no docker-style `-w`/`-e`.
+ * channel with real byte stdin and separated stderr, streamed both
+ * ways, the merged environment and session cwd dressed onto the command
+ * by wrapLine, because SSH exec has no docker-style `-w`/`-e`.
  *
  * This is the one provider whose machine usually IS the fileserver:
  * mount the same host's directory over the ssh VFS at a prefix
@@ -40,6 +43,7 @@ import { makeAbortError } from '@struktoai/mirage-core/utils/abort';
  * the network path as trusted.
  */
 export class SSHRuntime extends RemoteSandbox {
+    [PIPE_TRANSPORT] = true;
     name = 'ssh';
     client = null;
     constructor(options = {}) {
@@ -56,6 +60,9 @@ export class SSHRuntime extends RemoteSandbox {
         const opts = await connectOptions(this.config.host, this.config.hostname, this.config.port, this.config.username, this.config.identityFile, this.config.timeout ?? 30);
         await new Promise((resolveFn, rejectFn) => {
             client.on('ready', () => {
+                // A mount_type's SFTP rides this connection, which stalls on
+                // Nagle as the SSH accessor's did (accessor/ssh.ts).
+                client.setNoDelay(true);
                 resolveFn();
             });
             client.on('error', rejectFn);
@@ -69,30 +76,51 @@ export class SSHRuntime extends RemoteSandbox {
         });
         this.client = client;
     }
-    async execLine(line, stdin, env, cwd, signal) {
-        const result = await this.ssh(wrapLine(line, env, cwd), stdin, signal);
-        return { stdout: result.stdout, stderr: result.stderr, exitCode: result.code };
+    execArgv(argv, stdin, env, cwd, output, errors, signal) {
+        return this.ssh(wrapLine(argv, env, cwd), stdin, output, signal, env[EXEC_ID] !== undefined, errors);
     }
     /**
-     * One exec channel on the shared connection; the seam tests override. An
-     * abort signals the command and closes its channel, so a line abandoned
-     * to a timeout neither waits for the remote side nor leaves the channel
-     * open, which sshd counts against its sessions per connection.
+     * One exec channel on the shared connection; the seam tests override.
+     * Input is written as it is read, waiting out the channel's window, and
+     * ended at its end, or at once when nothing is piped: a finite command
+     * waits for that EOF. Output goes to `output` as it arrives when one is
+     * given, the channel paused until each chunk is taken. An abort signals
+     * the command and closes its channel, so a line abandoned to a timeout
+     * neither waits for the remote side nor leaves the channel open, which
+     * sshd counts against its sessions per connection; any other failure
+     * closes the channel.
+     *
+     * @param tagged whether the command carries its run's `EXEC_ID`, so a
+     *   cancelled run's reap stops it.
+     * @param errors receives stderr as it arrives, as `output` does stdout.
      */
-    ssh(command, stdin, signal) {
+    ssh(command, stdin, output = null, signal, tagged = false, errors = null) {
         const client = this.client;
         if (client === null)
             return Promise.reject(new Error('ssh runtime not connected'));
+        // Read now: an abort's listener runs as the caller that aborted.
+        const runner = currentCaller().process;
         return new Promise((resolveFn, rejectFn) => {
             client.exec(command, (err, stream) => {
                 if (err !== undefined) {
                     rejectFn(err);
                     return;
                 }
-                const abort = () => {
-                    stream.signal('KILL');
+                const state = { done: false, closed: false };
+                const fail = (error) => {
+                    if (state.done)
+                        return;
+                    state.done = true;
+                    signal?.removeEventListener('abort', abort);
                     stream.close();
-                    rejectFn(makeAbortError(signal));
+                    rejectFn(error instanceof Error ? error : new Error(String(error)));
+                };
+                const abort = () => {
+                    // A tagged command a kill stopped with a gentler signal is left
+                    // to the reap, which sends it that signal first.
+                    if (!state.done && (!tagged || stopSignal(runner) === null))
+                        stream.signal('KILL');
+                    fail(makeAbortError(signal));
                 };
                 if (signal?.aborted === true) {
                     abort();
@@ -102,8 +130,24 @@ export class SSHRuntime extends RemoteSandbox {
                 const out = [];
                 const errs = [];
                 let code = null;
-                stream.on('data', (chunk) => out.push(chunk));
-                stream.stderr.on('data', (chunk) => errs.push(chunk));
+                const pending = [Promise.resolve(), Promise.resolve()];
+                // A channel's chunks go to its sink as they arrive, the channel
+                // paused until each is taken, or are kept for the result.
+                const deliver = (source, sink, kept, at) => {
+                    source.on('data', (chunk) => {
+                        if (sink === null) {
+                            kept.push(chunk);
+                            return;
+                        }
+                        source.pause();
+                        pending[at] = sink(chunk).then(() => {
+                            if (!state.done)
+                                source.resume();
+                        }, fail);
+                    });
+                };
+                deliver(stream, output, out, 0);
+                deliver(stream.stderr, errors, errs, 1);
                 stream.on('exit', (c, signalName) => {
                     code =
                         c ??
@@ -112,22 +156,36 @@ export class SSHRuntime extends RemoteSandbox {
                                 : 1);
                 });
                 stream.on('close', () => {
-                    signal?.removeEventListener('abort', abort);
-                    resolveFn({
-                        stdout: new Uint8Array(Buffer.concat(out)),
-                        stderr: new Uint8Array(Buffer.concat(errs)),
-                        code: code ?? 1,
+                    state.closed = true;
+                    void Promise.all(pending).then(() => {
+                        if (state.done)
+                            return;
+                        state.done = true;
+                        signal?.removeEventListener('abort', abort);
+                        const stderr = Buffer.concat(errs);
+                        resolveFn({
+                            stdout: new Uint8Array(Buffer.concat(out)),
+                            stderr: stderr.length > 0 ? new Uint8Array(stderr) : null,
+                            exitCode: code ?? 1,
+                        });
                     });
                 });
-                stream.on('error', (streamErr) => {
-                    signal?.removeEventListener('abort', abort);
-                    stream.close();
-                    rejectFn(streamErr);
+                stream.on('error', fail);
+                const drained = () => new Promise((resolve) => {
+                    const go = () => {
+                        stream.off('drain', go);
+                        stream.off('close', go);
+                        resolve();
+                    };
+                    stream.on('drain', go);
+                    stream.on('close', go);
                 });
-                // No pipe still closes stdin, so a reader sees EOF immediately.
-                if (stdin !== null)
-                    stream.write(stdin);
-                stream.end();
+                const write = (chunk) => stream.write(chunk) ? Promise.resolve() : drained();
+                const end = () => {
+                    stream.end();
+                    return Promise.resolve();
+                };
+                feed(stdin, write, end, () => state.done || state.closed).catch(fail);
             });
         });
     }

package/dist/runtime/sandbox/ssh/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/runtime/sandbox/ssh/runtime.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,uEAAuE;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAA;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAA;AAGtE,OAAO,EAAE,OAAO,EAAgB,MAAM,UAAU,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAyB,MAAM,aAAa,CAAA;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAA;AAGnE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,UAAW,SAAQ,aAA+B;IACpD,IAAI,GAAG,KAAK,CAAA;IACb,MAAM,GAAkB,IAAI,CAAA;IAEpC,YAAY,UAA4C,EAAE;QACxD,KAAK,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAA;QACvC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;IAED,iEAAiE;IACvD,OAAO;QACf,OAAO,OAAO,EAAE,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAChC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAA;QAC/B,MAAM,IAAI,GAAG,MAAM,cAAc,CAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,IAAI,CAAC,MAAM,CAAC,QAAQ,EACpB,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,IAAI,CAAC,MAAM,CAAC,QAAQ,EACpB,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAC1B,CAAA;QACD,MAAM,IAAI,OAAO,CAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YAC9C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,SAAS,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAC5B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBAC3B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;oBAClB,IAAI,CAAC,YAAY,EAAE,CAAA;gBACrB,CAAC;YACH,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEQ,KAAK,CAAC,QAAQ,CACrB,IAAY,EACZ,KAAwB,EACxB,GAA2B,EAC3B,GAAW,EACX,MAAoB;QAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;QACtE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;IAChF,CAAC;IAED;;;;;OAKG;IACO,GAAG,CACX,OAAe,EACf,KAAwB,EACxB,MAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC1B,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAA;QAClF,OAAO,IAAI,OAAO,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YACzC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAsB,EAAE,MAAqB,EAAE,EAAE;gBACrE,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;oBACtB,QAAQ,CAAC,GAAG,CAAC,CAAA;oBACb,OAAM;gBACR,CAAC;gBACD,MAAM,KAAK,GAAG,GAAS,EAAE;oBACvB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;oBACrB,MAAM,CAAC,KAAK,EAAE,CAAA;oBACd,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAA;gBAClC,CAAC,CAAA;gBACD,IAAI,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;oBAC7B,KAAK,EAAE,CAAA;oBACP,OAAM;gBACR,CAAC;gBACD,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;gBACxD,MAAM,GAAG,GAAa,EAAE,CAAA;gBACxB,MAAM,IAAI,GAAa,EAAE,CAAA;gBACzB,IAAI,IAAI,GAAkB,IAAI,CAAA;gBAC9B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;gBAC7D,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAgB,EAAE,UAAmB,EAAE,EAAE;oBAC1D,IAAI;wBACF,CAAC;4BACD,CAAC,UAAU;gCACT,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAoB,CAAC;gCACnF,CAAC,CAAC,CAAC,CAAC,CAAA;gBACV,CAAC,CAAC,CAAA;gBACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBACtB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;oBAC3C,SAAS,CAAC;wBACR,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBAC1C,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBAC3C,IAAI,EAAE,IAAI,IAAI,CAAC;qBAChB,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAA;gBACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,SAAgB,EAAE,EAAE;oBACtC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;oBAC3C,MAAM,CAAC,KAAK,EAAE,CAAA;oBACd,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACrB,CAAC,CAAC,CAAA;gBACF,gEAAgE;gBAChE,IAAI,KAAK,KAAK,IAAI;oBAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBACvC,MAAM,CAAC,GAAG,EAAE,CAAA;YACd,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,QAAQ,CAAC,OAAe;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC1B,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAA;QAClF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAwB,EAAE,MAAqB,EAAE,EAAE;gBACvE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,MAAM,CAAC,KAAK,CAAC,CAAA;oBACb,OAAM;gBACR,CAAC;gBACD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;gBACtB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;oBAC1D,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAA;gBACzC,CAAC,CAAC,CAAA;gBACF,OAAO,CAAC;oBACN,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAA+B;oBAC5D,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,KAAK,IAAI,EAAE;wBACf,MAAM,CAAC,KAAK,EAAE,CAAA;wBACd,MAAM,MAAM,CAAA;oBACd,CAAC;iBACF,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,KAAK,CAAC,KAAK;QAClB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,YAAY,EAAE,CAAA;QACnB,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QACpB,CAAC;IACH,CAAC;CACF;AAED,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/runtime/sandbox/ssh/runtime.ts"],"names":[],"mappings":"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"}

package/dist/secrets/config.d.ts

@@ -1,11 +1,11 @@
 import { z } from '@struktoai/mirage-core/vfs/secrets';
-export declare const AWSSMConfig: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+export declare const AWSSMConfig: z.ZodPreprocess<z.ZodObject<{
     region: z.ZodOptional<z.ZodString>;
     awsAccessKeyId: z.ZodOptional<z.ZodString>;
     awsSecretAccessKey: z.ZodOptional<z.ZodString>;
     awsSessionToken: z.ZodOptional<z.ZodString>;
     awsProfile: z.ZodOptional<z.ZodString>;
-}, z.core.$strict>>;
+}, z.core.$strict>, unknown>;
 export type AWSSMConfig = z.infer<typeof AWSSMConfig>;
 /**
  * Dotenv source config: `path` is the default file when a managed

package/dist/secrets/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/secrets/config.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,CAAC,EAAE,MAAM,oCAAoC,CAAA;AA4CtD,eAAO,MAAM,WAAW;;;;;;mBASvB,CAAA;AACD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAA;AAErD;;;;GAIG;AACH,eAAO,MAAM,YAAY;;kBAEvB,CAAA;AACF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAEvD;;;;GAIG;AACH,eAAO,MAAM,SAAS,iCAAqB,CAAA;AAC3C,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAA;AAEjD;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB;;kBAE5B,CAAA;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/secrets/config.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,CAAC,EAAE,MAAM,oCAAoC,CAAA;AA4CtD,eAAO,MAAM,WAAW;;;;;;4BASvB,CAAA;AACD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAA;AAErD;;;;GAIG;AACH,eAAO,MAAM,YAAY;;kBAEvB,CAAA;AACF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAEvD;;;;GAIG;AACH,eAAO,MAAM,SAAS,iCAAqB,CAAA;AAC3C,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAA;AAEjD;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB;;kBAE5B,CAAA;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA"}

package/dist/secrets/onepassword.d.ts

@@ -5,13 +5,6 @@ export declare const OP_SCHEME = "op://";
 export declare const TOKEN_VAR = "OP_SERVICE_ACCOUNT_TOKEN";
 export declare const INTEGRATION_NAME = "mirage";
 export declare const NOTES_KEY = "notesPlain";
-/** A 1Password reference split into its parts. */
-export interface OpRef {
-    readonly vault: string;
-    readonly item: string;
-    /** The field label; empty for an item reference. */
-    readonly field: string;
-}
 /**
  * Split a 1Password secret reference into vault, item and field.
  *
@@ -24,7 +17,11 @@ export interface OpRef {
  * Throws SecretsError on an empty ref, one that is not an `op://` url,
  * or one naming less than a vault and an item.
  */
-export declare function parseOpRef(ref: string): OpRef;
+export declare function parseOpRef(ref: string): {
+    vault: string;
+    item: string;
+    field: string;
+};
 /**
  * Authenticate a 1Password SDK client.
  *

package/dist/secrets/onepassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onepassword.d.ts","sourceRoot":"","sources":["../../src/secrets/onepassword.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAGlD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAE1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGpD,eAAO,MAAM,SAAS,UAAU,CAAA;AAChC,eAAO,MAAM,SAAS,6BAA6B,CAAA;AACnD,eAAO,MAAM,gBAAgB,WAAW,CAAA;AAKxC,eAAO,MAAM,SAAS,eAAe,CAAA;AAErC,kDAAkD;AAClD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,oDAAoD;IACpD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAa7C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAclF;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK/E;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK/F;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUjE;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,iBAAiB,EACzB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,cAAc,CAAC,CAOzB"}
+{"version":3,"file":"onepassword.d.ts","sourceRoot":"","sources":["../../src/secrets/onepassword.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAE1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAEpD,eAAO,MAAM,SAAS,UAAU,CAAA;AAChC,eAAO,MAAM,SAAS,6BAA6B,CAAA;AACnD,eAAO,MAAM,gBAAgB,WAAW,CAAA;AAKxC,eAAO,MAAM,SAAS,eAAe,CAAA;AAErC;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM;;;;EAarC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAclF;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK/E;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK/F;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUjE;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,iBAAiB,EACzB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,cAAc,CAAC,CAOzB"}

package/dist/secrets/onepassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"onepassword.js","sourceRoot":"","sources":["../../src/secrets/onepassword.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onepassword.js","sourceRoot":"","sources":["../../src/secrets/onepassword.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,uEAAuE;AAGvE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AAEpE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAGvC,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAA;AAChC,MAAM,CAAC,MAAM,SAAS,GAAG,0BAA0B,CAAA;AACnD,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAA;AAExC,qEAAqE;AACrE,oEAAoE;AACpE,mDAAmD;AACnD,MAAM,CAAC,MAAM,SAAS,GAAG,YAAY,CAAA;AAErC;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;QACf,MAAM,IAAI,YAAY,CAAC,yDAAyD,CAAC,CAAA;IACnF,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,YAAY,CAAC,2CAA2C,GAAG,GAAG,CAAC,CAAA;IAC3E,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACpD,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,KAAK,CAAA;IAC3B,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,YAAY,CAAC,qDAAqD,GAAG,GAAG,CAAC,CAAA;IACrF,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;AACxF,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAyB;IAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;IAC1D,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,YAAY,CACpB,4DAA4D;YAC1D,GAAG,SAAS,gCAAgC,CAC/C,CAAA;IACH,CAAC;IACD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACvD,OAAO,MAAM,YAAY,CAAC;QACxB,IAAI,EAAE,KAAK;QACX,eAAe,EAAE,gBAAgB;QACjC,kBAAkB,EAAE,OAAO;KAC5B,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAc,EAAE,IAAY;IAC5D,KAAK,MAAM,KAAK,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QAC/C,IAAI,IAAI,KAAK,KAAK,CAAC,EAAE,IAAI,IAAI,KAAK,KAAK,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC,EAAE,CAAA;IAChE,CAAC;IACD,MAAM,IAAI,YAAY,CAAC,oBAAoB,IAAI,aAAa,CAAC,CAAA;AAC/D,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,MAAc,EAAE,OAAe,EAAE,IAAY;IAC5E,KAAK,MAAM,IAAI,IAAI,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,IAAI,IAAI,KAAK,IAAI,CAAC,EAAE,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC,EAAE,CAAA;IAC7D,CAAC;IACD,MAAM,IAAI,YAAY,CAAC,mBAAmB,IAAI,aAAa,CAAC,CAAA;AAC9D,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,cAAc,CAAC,IAAU;IACvC,6DAA6D;IAC7D,kEAAkE;IAClE,kEAAkE;IAClE,uCAAuC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAC/B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CACnE,CAAA;IAC3B,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;QAAE,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAA;IAC1F,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAyB,EACzB,GAAW;IAEX,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;IAC9C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,CAAA;IACnF,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAChD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IACtD,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAA;AAC5E,CAAC"}

package/dist/shell/console/redis/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const APPEND_LUA: string;
 export declare const POLL_MS = 100;
+export declare const ENDED_POLL_MS = 1000;
 //# sourceMappingURL=constants.d.ts.map

package/dist/shell/console/redis/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/shell/console/redis/constants.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,UAAU,QAAiE,CAAA;AAExF,eAAO,MAAM,OAAO,MAAM,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/shell/console/redis/constants.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,UAAU,QAAiE,CAAA;AAExF,eAAO,MAAM,OAAO,MAAM,CAAA;AAI1B,eAAO,MAAM,aAAa,OAAO,CAAA"}

package/dist/shell/console/redis/constants.js

@@ -19,4 +19,7 @@ import { readFileSync } from 'node:fs';
 // dist (tsup onSuccess); byte-identical to the Python append.lua.
 export const APPEND_LUA = readFileSync(new URL('./append.lua', import.meta.url), 'utf8');
 export const POLL_MS = 100;
+// How often `waitEnded` checks for the ending: it is how a job's owner
+// notices a kill another process wrote, which needs no chunk's latency.
+export const ENDED_POLL_MS = 1000;
 //# sourceMappingURL=constants.js.map

package/dist/shell/console/redis/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/shell/console/redis/constants.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,uEAAuE;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEtC,mEAAmE;AACnE,qEAAqE;AACrE,qEAAqE;AACrE,qEAAqE;AACrE,kEAAkE;AAClE,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;AAExF,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/shell/console/redis/constants.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,uEAAuE;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEtC,mEAAmE;AACnE,qEAAqE;AACrE,qEAAqE;AACrE,qEAAqE;AACrE,kEAAkE;AAClE,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;AAExF,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAA;AAE1B,uEAAuE;AACvE,wEAAwE;AACxE,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAA"}

package/dist/shell/console/redis/store.d.ts

@@ -1,10 +1,17 @@
 import { Channel } from '@struktoai/mirage-core/shell/console/index';
 import type { ConsoleChunk, ConsoleStore, ReadResult } from '@struktoai/mirage-core/shell/console/index';
+import { RedisConnection } from '../../../optional_peer.ts';
 export interface RedisConsoleStoreOptions {
     url?: string;
     keyPrefix?: string;
-    /** Expire the keys this long after the last append; absent keeps them. */
+    /** Expire the keys this long after the last append or expire(); absent keeps them. */
     ttlSeconds?: number;
+    /**
+     * A connection the caller owns and shares between consoles (a job
+     * store's); absent connects to `url` and closes that connection on
+     * close().
+     */
+    connection?: RedisConnection;
 }
 /**
  * Console storage on a Redis stream, for readers in other processes.
@@ -17,11 +24,9 @@ export interface RedisConsoleStoreOptions {
  * RedisConsoleStore byte for byte, so the reader does not have to be
  * the writer's language.
  *
- * The job owns its keys: a factory must hand every job a prefix nothing
+ * The job owns its keys: its job store hands every job a prefix nothing
  * else has written, because a reused stream replays the previous job's
- * chunks, ending chunk included. `keyPrefix` stays public because it is
- * the console's address: an embedder reads it off a job's store and
- * hands it to the process that should attach.
+ * chunks, ending chunk included.
  *
  * The ending chunk is terminal in the store itself, not only in this
  * process: the append script refuses any append once a CONTROL chunk
@@ -32,10 +37,14 @@ export interface RedisConsoleStoreOptions {
  * Python's XREAD BLOCK does: node-redis serializes commands on one
  * connection, so a blocking read would wedge the job's own appends
  * behind it, and a second connection costs more than a short poll.
+ * `waitEnded` polls the ending flag instead, so a watcher costs nothing
+ * per chunk.
  * There is no retention trim, so readFrom never reports a truncated
- * cursor; retention is bounded by `ttlSeconds` instead, refreshed on
- * every append, so a console expires that long after its job's last
- * write.
+ * cursor; retention is bounded by `ttlSeconds` instead, refreshed on every
+ * append and by `expire()`, which a job's owner calls while the job runs,
+ * so a console expires that long after its job ended or its owner went,
+ * and never under a quiet job still running: a reader parked on it would
+ * not see a restarted sequence.
  */
 export declare class RedisConsoleStore implements ConsoleStore {
     readonly url: string;
@@ -45,6 +54,7 @@ export declare class RedisConsoleStore implements ConsoleStore {
     private readonly endedKey;
     private readonly ttlSeconds;
     private readonly redis;
+    private readonly ownsConnection;
     private isClosed;
     constructor(options?: RedisConsoleStoreOptions);
     get closed(): boolean;
@@ -58,7 +68,12 @@ export declare class RedisConsoleStore implements ConsoleStore {
      */
     append(channel: Channel, data: Uint8Array): Promise<ConsoleChunk>;
     readFrom(seq: number, limit?: number): Promise<ReadResult>;
-    wait(seq: number): Promise<void>;
+    wait(seq: number, signal?: AbortSignal): Promise<void>;
+    waitEnded(signal?: AbortSignal): Promise<void>;
+    /** The console's keys: its stream, its counter and its ending flag. */
+    get keys(): readonly string[];
+    /** Push the keys' expiry out again, as an append does. */
+    expire(): Promise<void>;
     close(): Promise<void>;
     /** Delete the console's keys (test and integ teardown only). */
     clear(): Promise<void>;

package/dist/shell/console/redis/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/shell/console/redis/store.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,4CAA4C,CAAA;AACpE,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,UAAU,EACX,MAAM,4CAA4C,CAAA;AASnD,MAAM,WAAW,wBAAwB;IACvC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,iBAAkB,YAAW,YAAY;IACpD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAQ;gBAEZ,OAAO,GAAE,wBAA6B;IAUlD,IAAI,MAAM,IAAI,OAAO,CAEpB;YAEa,MAAM;IAOpB;;;;;;OAMG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAiBjE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAqC1D,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBhC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5B,gEAAgE;IAC1D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,OAAO,CAAC,KAAK;CAQd"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/shell/console/redis/store.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,4CAA4C,CAAA;AACpE,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,UAAU,EACX,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAQ3D,MAAM,WAAW,wBAAwB;IACvC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,sFAAsF;IACtF,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,UAAU,CAAC,EAAE,eAAe,CAAA;CAC7B;AAcD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,iBAAkB,YAAW,YAAY;IACpD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAQ;gBAEZ,OAAO,GAAE,wBAA6B;IAWlD,IAAI,MAAM,IAAI,OAAO,CAEpB;YAEa,MAAM;IAOpB;;;;;;OAMG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAiBjE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAqC1D,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtD,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD,uEAAuE;IACvE,IAAI,IAAI,IAAI,SAAS,MAAM,EAAE,CAE5B;IAED,0DAA0D;IACpD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5B,gEAAgE;IAC1D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,OAAO,CAAC,KAAK;CAQd"}

package/dist/shell/console/redis/store.js

@@ -13,9 +13,17 @@
 // ========= Copyright 2026 @ Strukto.AI All Rights Reserved. =========
 import { Channel } from '@struktoai/mirage-core/shell/console/index';
 import { RedisConnection } from "../../../optional_peer.js";
-import { APPEND_LUA, POLL_MS } from "./constants.js";
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+import { APPEND_LUA, ENDED_POLL_MS, POLL_MS } from "./constants.js";
+function sleep(ms, signal) {
+    return new Promise((resolve) => {
+        const done = () => {
+            clearTimeout(timer);
+            signal?.removeEventListener('abort', done);
+            resolve();
+        };
+        const timer = setTimeout(done, ms);
+        signal?.addEventListener('abort', done, { once: true });
+    });
 }
 /**
  * Console storage on a Redis stream, for readers in other processes.
@@ -28,11 +36,9 @@ function sleep(ms) {
  * RedisConsoleStore byte for byte, so the reader does not have to be
  * the writer's language.
  *
- * The job owns its keys: a factory must hand every job a prefix nothing
+ * The job owns its keys: its job store hands every job a prefix nothing
  * else has written, because a reused stream replays the previous job's
- * chunks, ending chunk included. `keyPrefix` stays public because it is
- * the console's address: an embedder reads it off a job's store and
- * hands it to the process that should attach.
+ * chunks, ending chunk included.
  *
  * The ending chunk is terminal in the store itself, not only in this
  * process: the append script refuses any append once a CONTROL chunk
@@ -43,10 +49,14 @@ function sleep(ms) {
  * Python's XREAD BLOCK does: node-redis serializes commands on one
  * connection, so a blocking read would wedge the job's own appends
  * behind it, and a second connection costs more than a short poll.
+ * `waitEnded` polls the ending flag instead, so a watcher costs nothing
+ * per chunk.
  * There is no retention trim, so readFrom never reports a truncated
- * cursor; retention is bounded by `ttlSeconds` instead, refreshed on
- * every append, so a console expires that long after its job's last
- * write.
+ * cursor; retention is bounded by `ttlSeconds` instead, refreshed on every
+ * append and by `expire()`, which a job's owner calls while the job runs,
+ * so a console expires that long after its job ended or its owner went,
+ * and never under a quiet job still running: a reader parked on it would
+ * not see a restarted sequence.
  */
 export class RedisConsoleStore {
     url;
@@ -56,6 +66,7 @@ export class RedisConsoleStore {
     endedKey;
     ttlSeconds;
     redis;
+    ownsConnection;
     isClosed = false;
     constructor(options = {}) {
         this.url = options.url ?? 'redis://localhost:6379/0';
@@ -64,7 +75,8 @@ export class RedisConsoleStore {
         this.counterKey = `${this.keyPrefix}seq`;
         this.endedKey = `${this.keyPrefix}ended`;
         this.ttlSeconds = options.ttlSeconds ?? 0;
-        this.redis = new RedisConnection(this.url, 'RedisConsoleStore');
+        this.ownsConnection = options.connection === undefined;
+        this.redis = options.connection ?? new RedisConnection(this.url, 'RedisConsoleStore');
     }
     get closed() {
         return this.isClosed;
@@ -119,14 +131,14 @@ export class RedisConsoleStore {
         const total = raw === null ? 0 : Number(raw);
         return [[], Math.min(seq, total), false];
     }
-    async wait(seq) {
+    async wait(seq, signal) {
         // Checked before touching the client: close() nulls the promise,
         // and a wait arriving later must not reconnect a discarded store.
         if (this.isClosed)
             return;
         const c = await this.client();
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- close() flips it across awaits
-        while (!this.isClosed) {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- close() and the signal flip across awaits
+        while (!this.isClosed && signal?.aborted !== true) {
             let raw;
             try {
                 raw = await c.get(this.counterKey);
@@ -141,14 +153,34 @@ export class RedisConsoleStore {
             }
             if (raw !== null && Number(raw) > seq)
                 return;
-            await sleep(POLL_MS);
+            await sleep(POLL_MS, signal);
+        }
+    }
+    async waitEnded(signal) {
+        while (!this.isClosed && signal?.aborted !== true) {
+            const c = await this.client();
+            if ((await c.exists(this.endedKey)) > 0)
+                return;
+            await sleep(ENDED_POLL_MS, signal);
         }
     }
+    /** The console's keys: its stream, its counter and its ending flag. */
+    get keys() {
+        return [this.streamKey, this.counterKey, this.endedKey];
+    }
+    /** Push the keys' expiry out again, as an append does. */
+    async expire() {
+        if (this.isClosed || this.ttlSeconds <= 0)
+            return;
+        const c = await this.client();
+        await Promise.all(this.keys.map((key) => c.expire(key, this.ttlSeconds)));
+    }
     async close() {
         // Idempotent, and the flag flips before the quit so a parked wait
         // that wakes mid-teardown returns instead of re-polling.
         this.isClosed = true;
-        await this.redis.close();
+        if (this.ownsConnection)
+            await this.redis.close();
     }
     /** Delete the console's keys (test and integ teardown only). */
     async clear() {

package/dist/shell/console/redis/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/shell/console/redis/store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/shell/console/redis/store.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,uEAAuE;AAGvE,OAAO,EAAE,OAAO,EAAE,MAAM,4CAA4C,CAAA;AAMpE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAoBnE,SAAS,KAAK,CAAC,EAAU,EAAE,MAAoB;IAC7C,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,GAAS,EAAE;YACtB,YAAY,CAAC,KAAK,CAAC,CAAA;YACnB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;YAC1C,OAAO,EAAE,CAAA;QACX,CAAC,CAAA;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QAClC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,OAAO,iBAAiB;IACnB,GAAG,CAAQ;IACX,SAAS,CAAQ;IACT,SAAS,CAAQ;IACjB,UAAU,CAAQ;IAClB,QAAQ,CAAQ;IAChB,UAAU,CAAQ;IAClB,KAAK,CAAiB;IACtB,cAAc,CAAS;IAChC,QAAQ,GAAG,KAAK,CAAA;IAExB,YAAY,UAAoC,EAAE;QAChD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,0BAA0B,CAAA;QACpD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAA;QACvD,IAAI,CAAC,SAAS,GAAG,GAAG,IAAI,CAAC,SAAS,QAAQ,CAAA;QAC1C,IAAI,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,SAAS,KAAK,CAAA;QACxC,IAAI,CAAC,QAAQ,GAAG,GAAG,IAAI,CAAC,SAAS,OAAO,CAAA;QACxC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,CAAA;QACzC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,CAAA;QACtD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,UAAU,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;IACvF,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,kEAAkE;QAClE,qEAAqE;QACrE,IAAI,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QACjE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;IAC5B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,IAAgB;QAC7C,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QACtE,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE;YACtC,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC;YACtD,SAAS,EAAE;gBACT,OAAO;gBACP,GAAG;gBACH,MAAM,CAAC,EAAE,CAAC;gBACV,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;gBACvC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;aACxB;SACF,CAAC,CAAW,CAAA;QACb,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,KAAc;QACxC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAC7B,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAEjC,CAAA;QACD,MAAM,OAAO,GAA4B,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;QACjF,MAAM,KAAK,GAAG,CASb,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,KAAK;aACxB,eAAe,CAAC,OAAO,CAAC;aACxB,MAAM,CACL,IAAI,CAAC,SAAS,EACd,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,EAC3B,GAAG,EACH,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CACnD,CAAA;QACH,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;QACxD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACtC,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9C,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA;QAChD,CAAC;QACD,iEAAiE;QACjE,0DAA0D;QAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACxC,MAAM,KAAK,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC5C,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,MAAoB;QAC1C,iEAAiE;QACjE,kEAAkE;QAClE,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAM;QACzB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAC7B,oHAAoH;QACpH,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAClD,IAAI,GAAkB,CAAA;YACtB,IAAI,CAAC;gBACH,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACpC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,8DAA8D;gBAC9D,wCAAwC;gBACxC,yGAAyG;gBACzG,IAAI,IAAI,CAAC,QAAQ;oBAAE,OAAM;gBACzB,MAAM,GAAG,CAAA;YACX,CAAC;YACD,IAAI,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG;gBAAE,OAAM;YAC7C,MAAM,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC9B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAoB;QAClC,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAClD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;YAC7B,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC;gBAAE,OAAM;YAC/C,MAAM,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,IAAI,IAAI;QACN,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IACzD,CAAC;IAED,0DAA0D;IAC1D,KAAK,CAAC,MAAM;QACV,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC;YAAE,OAAM;QACjD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAC7B,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED,KAAK,CAAC,KAAK;QACT,kEAAkE;QAClE,yDAAyD;QACzD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,IAAI,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACnD,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,KAAK;QACT,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAC7B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/D,CAAC;IAEO,KAAK,CAAC,KAAkB;QAC9B,OAAO;YACL,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAClD,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC;YAC9C,OAAO,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,QAAQ,CAAY;YAC7D,IAAI,EAAE,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACzD,CAAA;IACH,CAAC;CACF"}

package/dist/shell/job_table/redis.d.ts

@@ -0,0 +1,52 @@
+import { JobStore } from '@struktoai/mirage-core/shell/job_table/store';
+import type { RecordFields } from '@struktoai/mirage-core/workspace/record/types';
+import { RedisConsoleStore } from '../console/redis/index.ts';
+export interface RedisJobStoreOptions {
+    url?: string;
+    keyPrefix?: string;
+    /** See `JobStore`; null means owners never lapse. */
+    leaseSeconds?: number | null;
+}
+/**
+ * JobStore on one Redis server, shared by every process on it.
+ *
+ * Key layout under one prefix:
+ *
+ * - `{prefix}lists`: a hash of session id to job list JSON, written with
+ *   the session table's compare-and-set script
+ * - `{prefix}console:{name}:*`: one console stream per job
+ *   (`RedisConsoleStore`), expiring a day after its last write or its
+ *   owner's last renewal
+ * - `{prefix}owner:{id}`: an owner's lease, a key that expires
+ * - `{prefix}processes:{id}`: the processes an owner runs, as JSON, kept a
+ *   day after its last publish so a lapsed owner's runs can still be found
+ * - `{prefix}stops:{id}`: a list of the stops asked of an owner
+ *
+ * One connection serves the lists, the leases and every console, so a
+ * workspace holds one client however many jobs it follows. Mirrors
+ * Python's `RedisJobStore`.
+ */
+export declare class RedisJobStore extends JobStore {
+    readonly url: string;
+    private readonly prefix;
+    private readonly listsKey;
+    private readonly redis;
+    constructor(options?: RedisJobStoreOptions);
+    load(sessionId: string): Promise<RecordFields | null>;
+    casSet(sessionId: string, fields: RecordFields, expectedGeneration: number): Promise<boolean>;
+    delete(sessionId: string, expectedGeneration: number): Promise<boolean>;
+    console(name: string): RedisConsoleStore;
+    /**
+     * One round trip however many jobs the owner runs, so the lease is never
+     * late behind its consoles.
+     */
+    renew(owner: string, consoles?: readonly string[]): Promise<void>;
+    alive(owner: string): Promise<boolean>;
+    publish(owner: string, processes: Readonly<Record<string, RecordFields>>): Promise<void>;
+    processes(): Promise<Record<string, Record<string, RecordFields>>>;
+    requestStop(owner: string, pid: number, signal: number): Promise<void>;
+    takeStops(owner: string): Promise<[number, number][]>;
+    clear(): Promise<void>;
+    close(): Promise<void>;
+}
+//# sourceMappingURL=redis.d.ts.map

package/dist/shell/job_table/redis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../src/shell/job_table/redis.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAEjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAG7D,MAAM,WAAW,oBAAoB;IACnC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,aAAc,SAAQ,QAAQ;IACzC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;gBAE3B,OAAO,GAAE,oBAAyB;IAQxC,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAMrD,MAAM,CACV,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,EACpB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,OAAO,CAAC;IASb,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7E,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;IASxC;;;OAGG;IACG,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,SAAS,MAAM,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMtC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUxF,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAkBlE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtE,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAOrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}