npm - sh3-server - Versions diffs - 0.15.0 → 0.15.2 - Mend

sh3-server 0.15.0 → 0.15.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/app/assets/index-CuexSuRN.css +1 -0
package/app/assets/index-dcWTOW90.js +21 -0
package/app/assets/index-dcWTOW90.js.map +1 -0
package/app/index.html +2 -2
package/dist/shell-shard/history-store.d.ts +6 -4
package/dist/shell-shard/history-store.js +31 -14
package/dist/shell-shard/index.js +2 -1
package/dist/shell-shard/session-manager.d.ts +11 -5
package/dist/shell-shard/session-manager.js +18 -10
package/dist/shell-shard/ws.js +2 -2
package/package.json +1 -1
package/app/assets/index-D37_vuLS.js +0 -24
package/app/assets/index-D37_vuLS.js.map +0 -1
package/app/assets/index-vrVBfm18.css +0 -1

package/app/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
   <title>SH3</title>
-  <script type="module" crossorigin src="/assets/index-D37_vuLS.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-vrVBfm18.css">
+  <script type="module" crossorigin src="/assets/index-dcWTOW90.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-CuexSuRN.css">
 </head>
 <body>
   <div id="app"></div>

package/dist/shell-shard/history-store.d.ts CHANGED Viewed

@@ -3,9 +3,11 @@ export declare class HistoryStore {
     private readonly max;
     private buffer;
     constructor(dataDir: string, userId: string, historyMaxLines: number);
-    /** Read the capped in-memory view — most recent `historyMaxLines` lines. */
-    read(): string[];
-    /** Append a new line to both the on-disk file and the in-memory buffer. */
-    append(line: string): void;
+    /** Read lines for a specific mode, in append order, up to the cap. */
+    read(mode: string): string[];
+    /** Read all-modes bundle for the history-bundle WS reply. */
+    readBundle(): Record<string, string[]>;
+    /** Append a line tagged with the active mode. */
+    append(line: string, mode: string): void;
     private loadBuffer;
 }

package/dist/shell-shard/history-store.js CHANGED Viewed

@@ -2,12 +2,17 @@
  * Per-user append-only history store for the shell-shard server.
  *
  * Storage format: JSONL at <dataDir>/history-<userId>.jsonl.
- * Each line: { "ts": <ms>, "line": "<command>" }.
+ * Each line: { "ts": <ms>, "line": "<command>", "mode": "<modeId>" }.
+ *
+ * Records carry a mode tag so different modes (sh3, bash, custom) maintain
+ * independent histories on read. Legacy untagged records (pre-tag rollout)
+ * load as 'bash' for back-compat with existing JSONL files.
  *
  * The store holds a capped in-memory view (most recent `historyMaxLines`)
- * that is served to clients on attach. The on-disk file is not rotated
- * in v1 — rotation is in the deferred list. If the file exceeds 2× the
- * cap, a warning is logged on load but the store still functions.
+ * served to clients on attach via the history-bundle WS message. The on-
+ * disk file is not rotated in v1 — rotation is in the deferred list. If the
+ * file exceeds 2× the cap, a warning is logged on load but the store still
+ * functions.
  *
  * A corrupt tail line (partial write from a crash mid-append) is skipped
  * on load with a warning.
@@ -23,15 +28,23 @@ export class HistoryStore {
         this.max = historyMaxLines;
         this.buffer = this.loadBuffer();
     }
-    /** Read the capped in-memory view — most recent `historyMaxLines` lines. */
-    read() {
-        return [...this.buffer];
+    /** Read lines for a specific mode, in append order, up to the cap. */
+    read(mode) {
+        return this.buffer.filter((r) => r.mode === mode).map((r) => r.line);
+    }
+    /** Read all-modes bundle for the history-bundle WS reply. */
+    readBundle() {
+        const out = {};
+        for (const r of this.buffer) {
+            (out[r.mode] ??= []).push(r.line);
+        }
+        return out;
     }
-    /** Append a new line to both the on-disk file and the in-memory buffer. */
-    append(line) {
-        const record = { ts: Date.now(), line };
+    /** Append a line tagged with the active mode. */
+    append(line, mode) {
+        const record = { ts: Date.now(), line, mode };
         appendFileSync(this.path, JSON.stringify(record) + '\n', 'utf-8');
-        this.buffer.push(line);
+        this.buffer.push(record);
         if (this.buffer.length > this.max) {
             this.buffer.splice(0, this.buffer.length - this.max);
         }
@@ -47,9 +60,13 @@ export class HistoryStore {
                 continue;
             try {
                 const record = JSON.parse(rawLine);
-                if (typeof record.line === 'string') {
-                    parsed.push(record.line);
-                }
+                if (typeof record.line !== 'string')
+                    continue;
+                parsed.push({
+                    ts: typeof record.ts === 'number' ? record.ts : 0,
+                    line: record.line,
+                    mode: typeof record.mode === 'string' ? record.mode : 'bash',
+                });
             }
             catch {
                 // Corrupt tail line — skip silently. Log at debug level only.

package/dist/shell-shard/index.js CHANGED Viewed

@@ -31,7 +31,8 @@ export default {
         app.get('/history', ctx.adminOnly, (c) => {
             const user = sessionUser(c);
             const session = manager.getOrCreate(user);
-            return c.json({ lines: session.readHistory() });
+            const mode = c.req.query('mode') ?? 'bash';
+            return c.json({ mode, lines: session.readHistory(mode) });
         });
         app.get('/session', ctx.adminOnly, ctx.wsRegister((ws, c) => {
             // Route this connection to the per-user ShellSession. sessionUser

package/dist/shell-shard/session-manager.d.ts CHANGED Viewed

@@ -24,6 +24,12 @@ export interface WsLike {
 }
 export declare class ShellSession {
     readonly userId: string;
+    /**
+     * Initial cwd at session construction — the per-user shell tenant root.
+     * Frozen for the session's lifetime so clients can render relative paths
+     * (e.g., `~/foo`) regardless of subsequent `cd` motion.
+     */
+    readonly tenantRoot: string;
     cwd: string;
     env: Record<string, string>;
     private readonly history;
@@ -40,14 +46,14 @@ export declare class ShellSession {
     broadcast(event: ServerEvent): void;
     /**
      * Submit a command line. Ignored if a process is already running.
-     * Appends the line to history and starts the runner. Stdout/stderr/
-     * exit are broadcast as events.
+     * Appends the line to history (tagged with the active mode) and starts
+     * the runner. Stdout/stderr/exit are broadcast as events.
      */
-    submit(line: string, _fromWs: WsLike): Promise<void>;
+    submit(line: string, mode: string, _fromWs: WsLike): Promise<void>;
     /** Record a line in history without running anything (for local SH3 verbs). */
-    historyLog(line: string): void;
+    historyLog(line: string, mode: string): void;
     /** Read the persisted history buffer — used by the JSON /history endpoint. */
-    readHistory(): string[];
+    readHistory(mode: string): string[];
     /** Forward a signal to the running process, if any. */
     signal(sig: 'SIGINT' | 'EOF'): void;
     /** Change cwd and broadcast a cwd update to every attached client. */

package/dist/shell-shard/session-manager.js CHANGED Viewed

@@ -16,6 +16,12 @@
 import { HistoryStore } from './history-store.js';
 export class ShellSession {
     userId;
+    /**
+     * Initial cwd at session construction — the per-user shell tenant root.
+     * Frozen for the session's lifetime so clients can render relative paths
+     * (e.g., `~/foo`) regardless of subsequent `cd` motion.
+     */
+    tenantRoot;
     cwd;
     env;
     history;
@@ -32,6 +38,7 @@ export class ShellSession {
         this.history = history;
         this.ringSize = cfg.ringSize;
         this.cwd = cfg.defaultCwd || process.cwd();
+        this.tenantRoot = this.cwd;
         this.env = { ...process.env, FORCE_COLOR: '1' };
     }
     attach(ws) {
@@ -40,14 +47,15 @@ export class ShellSession {
             t: 'welcome',
             userId: this.userId,
             cwd: this.cwd,
+            tenantRoot: this.tenantRoot,
             env: this.env,
             seq: this.nextSeq - 1,
         };
         ws.send(JSON.stringify(welcome));
         const replay = { t: 'replay', events: [...this.ring] };
         ws.send(JSON.stringify(replay));
-        const history = { t: 'history', lines: this.history.read() };
-        ws.send(JSON.stringify(history));
+        const bundle = { t: 'history-bundle', byMode: this.history.readBundle() };
+        ws.send(JSON.stringify(bundle));
     }
     detach(ws) {
         this.clients.delete(ws);
@@ -69,10 +77,10 @@ export class ShellSession {
     }
     /**
      * Submit a command line. Ignored if a process is already running.
-     * Appends the line to history and starts the runner. Stdout/stderr/
-     * exit are broadcast as events.
+     * Appends the line to history (tagged with the active mode) and starts
+     * the runner. Stdout/stderr/exit are broadcast as events.
      */
-    async submit(line, _fromWs) {
+    async submit(line, mode, _fromWs) {
         if (this.running || this.starting) {
             console.warn(`[shell-shard] submit while running — ignored (user=${this.userId})`);
             return;
@@ -88,7 +96,7 @@ export class ShellSession {
         // by the running-guard above. See runner.ts for the full race writeup.
         let exited = false;
         try {
-            this.history.append(line);
+            this.history.append(line, mode);
             // Emit a prompt event so every attached client echoes the line
             this.broadcast({
                 kind: 'prompt',
@@ -134,12 +142,12 @@ export class ShellSession {
         }
     }
     /** Record a line in history without running anything (for local SH3 verbs). */
-    historyLog(line) {
-        this.history.append(line);
+    historyLog(line, mode) {
+        this.history.append(line, mode);
     }
     /** Read the persisted history buffer — used by the JSON /history endpoint. */
-    readHistory() {
-        return this.history.read();
+    readHistory(mode) {
+        return this.history.read(mode);
     }
     /** Forward a signal to the running process, if any. */
     signal(sig) {

package/dist/shell-shard/ws.js CHANGED Viewed

@@ -27,14 +27,14 @@ export function handleClientMessage(session, ws, raw) {
                 applyCwdChange(session, target, 'cd');
                 return;
             }
-            void session.submit(msg.line, ws);
+            void session.submit(msg.line, msg.mode, ws);
             return;
         }
         case 'signal':
             session.signal(msg.sig);
             return;
         case 'history-log':
-            session.historyLog(msg.line);
+            session.historyLog(msg.line, msg.mode);
             return;
         case 'cwd-query':
             session.setCwd(session.cwd);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sh3-server",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "type": "module",
   "bin": {
     "sh3-server": "dist/cli.js"