typescript-virtual-container 1.3.4 → 1.4.1

package/dist/commands/uname.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Print system information (kernel name, version, machine type).
+ * @category system
+ * @params ["[-a] [-s] [-r] [-m]"]
+ */
 export declare const unameCommand: ShellModule;
 //# sourceMappingURL=uname.d.ts.map

package/dist/commands/uname.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uname.d.ts","sourceRoot":"","sources":["../../src/commands/uname.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,eAAO,MAAM,YAAY,EAAE,WAoB1B,CAAC"}
+{"version":3,"file":"uname.d.ts","sourceRoot":"","sources":["../../src/commands/uname.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,WAoB1B,CAAC"}

package/dist/commands/uname.js

@@ -1,4 +1,9 @@
 import { ifFlag } from "./command-helpers";
+/**
+ * Print system information (kernel name, version, machine type).
+ * @category system
+ * @params ["[-a] [-s] [-r] [-m]"]
+ */
 export const unameCommand = {
     name: "uname",
     description: "Print system information",

package/dist/commands/uniq.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Report or filter out repeated consecutive lines.
+ * @category text
+ * @params ["[-c] [-d] [-u] [file]"]
+ */
 export declare const uniqCommand: ShellModule;
 //# sourceMappingURL=uniq.d.ts.map

package/dist/commands/uniq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uniq.d.ts","sourceRoot":"","sources":["../../src/commands/uniq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,eAAO,MAAM,WAAW,EAAE,WA8BzB,CAAC"}
+{"version":3,"file":"uniq.d.ts","sourceRoot":"","sources":["../../src/commands/uniq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD;;;;GAIG;AACH,eAAO,MAAM,WAAW,EAAE,WA8BzB,CAAC"}

package/dist/commands/uniq.js

@@ -1,4 +1,9 @@
 import { ifFlag } from "./command-helpers";
+/**
+ * Report or filter out repeated consecutive lines.
+ * @category text
+ * @params ["[-c] [-d] [-u] [file]"]
+ */
 export const uniqCommand = {
     name: "uniq",
     description: "Report or filter out repeated lines",

package/dist/commands/unset.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Remove shell variable from the environment.
+ * @category shell
+ * @params ["<VAR>"]
+ */
 export declare const unsetCommand: ShellModule;
 //# sourceMappingURL=unset.d.ts.map

package/dist/commands/unset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unset.d.ts","sourceRoot":"","sources":["../../src/commands/unset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,YAAY,EAAE,WAS1B,CAAC"}
+{"version":3,"file":"unset.d.ts","sourceRoot":"","sources":["../../src/commands/unset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,WAS1B,CAAC"}

package/dist/commands/unset.js

@@ -1,3 +1,8 @@
+/**
+ * Remove shell variable from the environment.
+ * @category shell
+ * @params ["<VAR>"]
+ */
 export const unsetCommand = {
     name: "unset",
     description: "Remove shell variable",

package/dist/commands/uptime.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Tell how long the system has been running.
+ * @category system
+ * @params ["[-p] [-s]"]
+ */
 export declare const uptimeCommand: ShellModule;
 //# sourceMappingURL=uptime.d.ts.map

package/dist/commands/uptime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uptime.d.ts","sourceRoot":"","sources":["../../src/commands/uptime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,eAAO,MAAM,aAAa,EAAE,WA6C3B,CAAC"}
+{"version":3,"file":"uptime.d.ts","sourceRoot":"","sources":["../../src/commands/uptime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,WA6C3B,CAAC"}

package/dist/commands/uptime.js

@@ -1,4 +1,9 @@
 import { ifFlag } from "./command-helpers";
+/**
+ * Tell how long the system has been running.
+ * @category system
+ * @params ["[-p] [-s]"]
+ */
 export const uptimeCommand = {
     name: "uptime",
     description: "Tell how long the system has been running",

package/dist/commands/wc.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Count words, lines, and/or bytes in files or stdin.
+ * @category text
+ * @params ["[-l] [-w] [-c] [file...]"]
+ */
 export declare const wcCommand: ShellModule;
 //# sourceMappingURL=wc.d.ts.map

package/dist/commands/wc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wc.d.ts","sourceRoot":"","sources":["../../src/commands/wc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,eAAO,MAAM,SAAS,EAAE,WA6CvB,CAAC"}
+{"version":3,"file":"wc.d.ts","sourceRoot":"","sources":["../../src/commands/wc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,WA6CvB,CAAC"}

package/dist/commands/wc.js

@@ -1,5 +1,10 @@
 import { ifFlag } from "./command-helpers";
 import { assertPathAccess, resolvePath } from "./helpers";
+/**
+ * Count words, lines, and/or bytes in files or stdin.
+ * @category text
+ * @params ["[-l] [-w] [-c] [file...]"]
+ */
 export const wcCommand = {
     name: "wc",
     description: "Count words/lines/bytes",

package/dist/commands/wget.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Download files from the web (fetch-based implementation).
+ * @category network
+ * @params ["[options] <url>"]
+ */
 export declare const wgetCommand: ShellModule;
 //# sourceMappingURL=wget.d.ts.map

package/dist/commands/wget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wget.d.ts","sourceRoot":"","sources":["../../src/commands/wget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,eAAO,MAAM,WAAW,EAAE,WA+HzB,CAAC"}
+{"version":3,"file":"wget.d.ts","sourceRoot":"","sources":["../../src/commands/wget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD;;;;GAIG;AACH,eAAO,MAAM,WAAW,EAAE,WA0IzB,CAAC"}

package/dist/commands/wget.js

@@ -1,5 +1,10 @@
 import { ifFlag, parseArgs } from "./command-helpers";
 import { assertPathAccess, resolvePath, stripUrlFilename } from "./helpers";
+/**
+ * Download files from the web (fetch-based implementation).
+ * @category network
+ * @params ["[options] <url>"]
+ */
 export const wgetCommand = {
     name: "wget",
     description: "File downloader (pure fetch)",
@@ -39,7 +44,17 @@ export const wgetCommand = {
                 exitCode: 0,
             };
         }
-        const url = positionals[0];
+        const urlWithoutProtocol = positionals[0];
+        if (!urlWithoutProtocol) {
+            return {
+                stderr: "wget: missing URL\nUsage: wget [OPTION]... [URL]...",
+                exitCode: 1,
+            };
+        }
+        const url = urlWithoutProtocol.startsWith("http://") ||
+            urlWithoutProtocol.startsWith("https://")
+            ? urlWithoutProtocol
+            : `http://${urlWithoutProtocol}`;
         if (!url)
             return {
                 stderr: "wget: missing URL\nUsage: wget [OPTION]... [URL]...",

package/dist/commands/who.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Show active user sessions.
+ * @category system
+ * @params []
+ */
 export declare const whoCommand: ShellModule;
 //# sourceMappingURL=who.d.ts.map

package/dist/commands/who.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"who.d.ts","sourceRoot":"","sources":["../../src/commands/who.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,UAAU,EAAE,WAgBxB,CAAC"}
+{"version":3,"file":"who.d.ts","sourceRoot":"","sources":["../../src/commands/who.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;GAIG;AACH,eAAO,MAAM,UAAU,EAAE,WAgBxB,CAAC"}

package/dist/commands/who.js

@@ -1,4 +1,9 @@
 import { formatLoginDate } from "../SSHMimic/loginFormat";
+/**
+ * Show active user sessions.
+ * @category system
+ * @params []
+ */
 export const whoCommand = {
     name: "who",
     description: "Show active sessions",

package/dist/commands/whoami.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Print the current user name.
+ * @category system
+ * @params []
+ */
 export declare const whoamiCommand: ShellModule;
 //# sourceMappingURL=whoami.d.ts.map

package/dist/commands/whoami.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,aAAa,EAAE,WAM3B,CAAC"}
+{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,WAM3B,CAAC"}

package/dist/commands/whoami.js

@@ -1,3 +1,8 @@
+/**
+ * Print the current user name.
+ * @category system
+ * @params []
+ */
 export const whoamiCommand = {
     name: "whoami",
     description: "Print current user",

package/dist/commands/xargs.d.ts

@@ -1,3 +1,8 @@
 import type { ShellModule } from "../types/commands";
+/**
+ * Build and execute commands from stdin arguments.
+ * @category text
+ * @params ["[command] [args...]"]
+ */
 export declare const xargsCommand: ShellModule;
 //# sourceMappingURL=xargs.d.ts.map

package/dist/commands/xargs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xargs.d.ts","sourceRoot":"","sources":["../../src/commands/xargs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,eAAO,MAAM,YAAY,EAAE,WAsB1B,CAAC"}
+{"version":3,"file":"xargs.d.ts","sourceRoot":"","sources":["../../src/commands/xargs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,WAsB1B,CAAC"}

package/dist/commands/xargs.js

@@ -1,4 +1,9 @@
 import { runCommand } from "./runtime";
+/**
+ * Build and execute commands from stdin arguments.
+ * @category text
+ * @params ["[command] [args...]"]
+ */
 export const xargsCommand = {
     name: "xargs",
     description: "Build and execute command lines from stdin",

package/dist/self-standalone.js

@@ -1,7 +1,9 @@
+import { readFile, unlink, writeFile } from "node:fs/promises";
 import { basename } from "node:path";
 import { stdin, stdout } from "node:process";
 import { createInterface } from "node:readline";
 import { makeDefaultEnv, runCommand } from "./commands/runtime";
+import { spawnNanoEditorProcess } from "./modules/shellInteractive";
 import { buildLoginBanner } from "./SSHMimic/loginBanner";
 import { buildPrompt } from "./SSHMimic/prompt";
 import { VirtualShell } from "./VirtualShell";
@@ -40,9 +42,50 @@ function readLastLogin(username) {
         return null;
     }
 }
-function askQuestion(rl, promptText) {
+function askHiddenQuestion(rl, promptText) {
     return new Promise((resolve) => {
-        rl.question(promptText, resolve);
+        if (!stdin.isTTY || !stdout.isTTY) {
+            rl.question(promptText, resolve);
+            return;
+        }
+        const wasRawMode = Boolean(stdin.isRaw);
+        let buffer = "";
+        const cleanup = () => {
+            stdin.off("data", onData);
+            if (!wasRawMode) {
+                stdin.setRawMode(false);
+            }
+            rl.resume();
+        };
+        const finish = (value) => {
+            cleanup();
+            stdout.write("\n");
+            resolve(value);
+        };
+        const onData = (chunk) => {
+            const input = chunk.toString("utf8");
+            for (let index = 0; index < input.length; index += 1) {
+                const ch = input[index];
+                if (ch === "\r" || ch === "\n") {
+                    finish(buffer);
+                    return;
+                }
+                if (ch === "\u007f" || ch === "\b") {
+                    buffer = buffer.slice(0, -1);
+                    continue;
+                }
+                if (ch >= " ") {
+                    buffer += ch;
+                }
+            }
+        };
+        rl.pause();
+        stdout.write(promptText);
+        if (!wasRawMode) {
+            stdin.setRawMode(true);
+        }
+        stdin.resume();
+        stdin.on("data", onData);
     });
 }
 function writeLastLogin(username, from) {
@@ -52,6 +95,42 @@ function writeLastLogin(username, from) {
     }
     virtualShell.vfs.writeFile(`/virtual-env-js/.lastlog/${username}.json`, JSON.stringify({ at: new Date().toISOString(), from }));
 }
+async function flushVfs() {
+    await virtualShell.vfs.flushMirror();
+}
+function loadHistory() {
+    const historyPath = "/virtual-env-js/.bash_history";
+    if (!virtualShell.vfs.exists(historyPath)) {
+        virtualShell.vfs.writeFile(historyPath, "");
+        return [];
+    }
+    return virtualShell.vfs
+        .readFile(historyPath)
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
+}
+function saveHistory(history) {
+    const data = history.length > 0 ? `${history.join("\n")}\n` : "";
+    virtualShell.vfs.writeFile("/virtual-env-js/.bash_history", data);
+}
+function applySessionState(authUserState, cwdState, result, shellEnvState) {
+    let authUser = authUserState;
+    let cwd = cwdState;
+    if (result.switchUser) {
+        authUser = result.switchUser;
+        cwd = result.nextCwd ?? `/home/${authUser}`;
+        shellEnvState.vars.USER = authUser;
+        shellEnvState.vars.LOGNAME = authUser;
+        shellEnvState.vars.HOME = `/home/${authUser}`;
+        shellEnvState.vars.PWD = cwd;
+    }
+    else if (result.nextCwd) {
+        cwd = result.nextCwd;
+        shellEnvState.vars.PWD = cwd;
+    }
+    return { authUser, cwd };
+}
 virtualShell.addCommand("demo", [], () => {
     return {
         stdout: "This is a demo command. It does nothing useful.",
@@ -61,6 +140,9 @@ virtualShell.addCommand("demo", [], () => {
 async function runReadlineShell() {
     const rl = createInterface({ input: stdin, output: stdout, terminal: true });
     await virtualShell.ensureInitialized();
+    let history = loadHistory();
+    const rlWithHistory = rl;
+    rlWithHistory.history = [...history].reverse();
     const selectedUser = initialUser.trim() || "root";
     const userExists = virtualShell.users.getPasswordHash(selectedUser) !== null;
     if (!userExists) {
@@ -72,8 +154,161 @@ async function runReadlineShell() {
     let cwd = `/home/${authUser}`;
     shellEnv.vars.PWD = cwd;
     const remoteAddress = "localhost";
+    const terminalSize = {
+        cols: stdout.columns ?? 80,
+        rows: stdout.rows ?? 24,
+    };
+    async function startNanoEditor(targetPath, initialContent, tempPath) {
+        if (virtualShell.vfs.exists(targetPath)) {
+            await writeFile(tempPath, initialContent, "utf8");
+        }
+        rl.pause();
+        const editor = spawnNanoEditorProcess(tempPath, terminalSize, {
+            write: stdout.write.bind(stdout),
+            exit: () => undefined,
+            end: () => undefined,
+        });
+        const wasRawMode = Boolean(stdin.isRaw);
+        const forwardInput = (chunk) => {
+            editor.stdin.write(chunk);
+        };
+        stdin.resume();
+        if (!wasRawMode) {
+            stdin.setRawMode(true);
+        }
+        stdin.on("data", forwardInput);
+        await new Promise((resolve) => {
+            const cleanup = () => {
+                stdin.off("data", forwardInput);
+                if (!wasRawMode) {
+                    stdin.setRawMode(false);
+                }
+                rl.resume();
+            };
+            editor.on("error", (error) => {
+                cleanup();
+                stdout.write(`nano: ${error.message}\r\n`);
+                resolve();
+            });
+            editor.on("close", async () => {
+                cleanup();
+                rl.write("", { ctrl: true, name: "u" });
+                try {
+                    const updatedContent = await readFile(tempPath, "utf8");
+                    virtualShell.writeFileAsUser(authUser, targetPath, updatedContent);
+                    await flushVfs();
+                }
+                catch {
+                    // Save skipped or temp file missing.
+                }
+                await unlink(tempPath).catch(() => undefined);
+                stdout.write("\r\n");
+                resolve();
+            });
+        });
+    }
+    async function handleSudoChallenge(challenge) {
+        if (challenge.onPassword) {
+            let promptText = challenge.prompt;
+            while (true) {
+                const typed = await askHiddenQuestion(rl, promptText);
+                const step = await challenge.onPassword(typed, virtualShell);
+                if (step.result === null) {
+                    promptText = step.nextPrompt ?? promptText;
+                    continue;
+                }
+                await handleCommandResult(step.result);
+                return;
+            }
+        }
+        const password = await askHiddenQuestion(rl, challenge.prompt);
+        if (!virtualShell.users.verifyPassword(challenge.username, password)) {
+            process.stderr.write("Sorry, try again.\n");
+            return;
+        }
+        if (!challenge.commandLine) {
+            authUser = challenge.targetUser;
+            cwd = `/home/${authUser}`;
+            shellEnv.vars.USER = authUser;
+            shellEnv.vars.LOGNAME = authUser;
+            shellEnv.vars.HOME = `/home/${authUser}`;
+            shellEnv.vars.PWD = cwd;
+            return;
+        }
+        const runCwd = challenge.loginShell ? `/home/${challenge.targetUser}` : cwd;
+        const nestedResult = await runCommand(challenge.commandLine, challenge.targetUser, hostname, "shell", runCwd, virtualShell, undefined, shellEnv);
+        await handleCommandResult(nestedResult);
+    }
+    async function handlePasswordChallenge(challenge) {
+        const first = await askHiddenQuestion(rl, challenge.prompt);
+        if (challenge.confirmPrompt) {
+            const second = await askHiddenQuestion(rl, challenge.confirmPrompt);
+            if (second !== first) {
+                process.stderr.write("passwords do not match\n");
+                return;
+            }
+        }
+        switch (challenge.action) {
+            case "passwd":
+                await virtualShell.users.setPassword(challenge.targetUsername, first);
+                stdout.write("passwd: password updated successfully\n");
+                break;
+            case "adduser":
+                if (!challenge.newUsername) {
+                    process.stderr.write("adduser: missing username\n");
+                    return;
+                }
+                await virtualShell.users.addUser(challenge.newUsername, first);
+                stdout.write(`adduser: user '${challenge.newUsername}' created\n`);
+                break;
+            case "deluser":
+                await virtualShell.users.deleteUser(challenge.targetUsername);
+                stdout.write(`Removing user '${challenge.targetUsername}' ...\ndeluser: done.\n`);
+                break;
+            case "su":
+                authUser = challenge.targetUsername;
+                cwd = `/home/${authUser}`;
+                shellEnv.vars.USER = authUser;
+                shellEnv.vars.LOGNAME = authUser;
+                shellEnv.vars.HOME = `/home/${authUser}`;
+                shellEnv.vars.PWD = cwd;
+                break;
+        }
+    }
+    async function handleCommandResult(result) {
+        if (result.openEditor) {
+            await startNanoEditor(result.openEditor.targetPath, result.openEditor.initialContent, result.openEditor.tempPath);
+            return;
+        }
+        if (result.sudoChallenge) {
+            await handleSudoChallenge(result.sudoChallenge);
+            return;
+        }
+        if (result.passwordChallenge) {
+            await handlePasswordChallenge(result.passwordChallenge);
+            return;
+        }
+        if (result.stdout) {
+            stdout.write(result.stdout.endsWith("\n") ? result.stdout : `${result.stdout}\n`);
+        }
+        if (result.stderr) {
+            process.stderr.write(result.stderr.endsWith("\n") ? result.stderr : `${result.stderr}\n`);
+        }
+        if (result.clearScreen) {
+            stdout.write("\u001b[2J\u001b[H");
+            console.clear();
+        }
+        const updatedState = applySessionState(authUser, cwd, result, shellEnv);
+        authUser = updatedState.authUser;
+        cwd = updatedState.cwd;
+        if (result.closeSession) {
+            await flushVfs();
+            rl.close();
+            process.exit(result.exitCode ?? 0);
+        }
+    }
     if (process.env.USER !== "root" && virtualShell.users.hasPassword(authUser)) {
-        const password = await askQuestion(rl, `Password for ${authUser}: `);
+        const password = await askHiddenQuestion(rl, `Password for ${authUser}: `);
         if (!virtualShell.users.verifyPassword(authUser, password)) {
             process.stderr.write("self-standalone: authentication failed\n");
             process.exit(1);
@@ -93,43 +328,32 @@ async function runReadlineShell() {
         prompt();
     });
     rl.on("close", () => {
-        console.log("");
-        process.exit(0);
+        void (async () => {
+            await flushVfs();
+            console.log("");
+            process.exit(0);
+        })();
     });
     stdout.write(buildLoginBanner(hostname, virtualShell.properties, readLastLogin(authUser)));
     writeLastLogin(authUser, remoteAddress);
+    await flushVfs();
     prompt();
     while (true) {
         const inputLine = await new Promise((resolve) => {
             rl.once("line", (line) => resolve(line));
         });
         rl.pause();
-        const result = await runCommand(inputLine, authUser, hostname, "shell", cwd, virtualShell, undefined, shellEnv);
-        if (result.stdout) {
-            stdout.write(result.stdout.endsWith("\n") ? result.stdout : `${result.stdout}\n`);
-        }
-        if (result.stderr) {
-            process.stderr.write(result.stderr.endsWith("\n") ? result.stderr : `${result.stderr}\n`);
-        }
-        if (result.clearScreen) {
-            stdout.write("\u001b[2J\u001b[H");
-        }
-        if (result.switchUser) {
-            authUser = result.switchUser;
-            cwd = result.nextCwd ?? `/home/${authUser}`;
-            shellEnv.vars.USER = authUser;
-            shellEnv.vars.LOGNAME = authUser;
-            shellEnv.vars.HOME = `/home/${authUser}`;
-            shellEnv.vars.PWD = cwd;
-        }
-        else if (result.nextCwd) {
-            cwd = result.nextCwd;
-            shellEnv.vars.PWD = cwd;
-        }
-        if (result.closeSession) {
-            rl.close();
-            process.exit(result.exitCode ?? 0);
+        if (inputLine.trim().length > 0) {
+            history.push(inputLine);
+            if (history.length > 500) {
+                history = history.slice(history.length - 500);
+            }
+            saveHistory(history);
+            rlWithHistory.history = [...history].reverse();
         }
+        const result = await runCommand(inputLine, authUser, hostname, "shell", cwd, virtualShell, undefined, shellEnv);
+        await handleCommandResult(result);
+        await flushVfs();
         prompt();
         rl.resume();
     }

package/dist/types/commands.d.ts

@@ -29,6 +29,8 @@ export interface CommandResult {
     openHtop?: boolean;
     /** Request sudo password challenge flow. */
     sudoChallenge?: SudoChallenge;
+    /** Request a generic password challenge (adduser, passwd). */
+    passwordChallenge?: PasswordChallenge;
 }
 /** Deferred sudo challenge metadata returned by sudo command. */
 export interface SudoChallenge {
@@ -42,6 +44,40 @@ export interface SudoChallenge {
     loginShell: boolean;
     /** Prompt text shown before password input. */
     prompt: string;
+    /**
+     * Challenge mode.
+     * - `"sudo"` (default): verify `username`'s password, then run `commandLine`.
+     * - `"passwd"`: multi-step new-password flow; `onPassword` handles each step.
+     * - `"confirm"`: text confirmation flow (e.g. deluser); `onPassword` receives typed text.
+     */
+    mode?: "sudo" | "passwd" | "confirm";
+    /**
+     * Optional async handler called when the user submits input.
+     * Receives the typed text and the shell instance.
+     * Returns a `CommandResult` written to the terminal, or `null` to show
+     * another prompt (pass `nextPrompt` to change the prompt text).
+     */
+    onPassword?: (input: string, shell: import("../VirtualShell").VirtualShell) => Promise<{
+        result: CommandResult | null;
+        nextPrompt?: string;
+    }>;
+}
+/** Generic password challenge — used by adduser, passwd, deluser. */
+export interface PasswordChallenge {
+    /** Lines to print before the first prompt. */
+    preamble?: string;
+    /** Primary prompt text (e.g. "New password: "). */
+    prompt: string;
+    /** If set, a second prompt is shown for confirmation. */
+    confirmPrompt?: string;
+    /** Prompt shown for a destructive confirmation (y/N). */
+    confirmText?: string;
+    /** Tag identifying what to do with the entered value. */
+    action: "adduser" | "passwd" | "deluser" | "su";
+    /** Username targeted by the action. */
+    targetUsername: string;
+    /** For adduser: the new user's username (already validated). */
+    newUsername?: string;
 }
 /** State payload used by nano command interactive editor flow. */
 export interface NanoEditorSession {

package/dist/types/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/types/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/types/commands.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC7B,qDAAqD;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gDAAgD;IAChD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,+DAA+D;IAC/D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,iDAAiD;IACjD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,8DAA8D;IAC9D,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACtC;AAED,iEAAiE;AACjE,MAAM,WAAW,aAAa;IAC7B,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,2DAA2D;IAC3D,UAAU,EAAE,OAAO,CAAC;IACpB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;IACrC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,iBAAiB,EAAE,YAAY,KAAK,OAAO,CAAC;QACtF,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;QAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACH;AAED,qEAAqE;AACrE,MAAM,WAAW,iBAAiB;IACjC,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yDAAyD;IACzD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC;IAChD,uCAAuC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IACjC,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,cAAc,EAAE,MAAM,CAAC;CACvB;AAED,iEAAiE;AACjE,MAAM,WAAW,QAAQ;IACxB,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,gDAAgD;IAChD,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,4DAA4D;AAC5D,MAAM,WAAW,cAAc;IAC9B,oDAAoD;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,cAAc,EAAE,oBAAoB,EAAE,CAAC;IACvC,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,0DAA0D;IAC1D,IAAI,EAAE,WAAW,CAAC;IAClB,kDAAkD;IAClD,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,8BAA8B;IAC9B,KAAK,EAAE,YAAY,CAAC;IACpB,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uDAAuD;IACvD,GAAG,EAAE,MAAM,CAAC;IACZ,4DAA4D;IAC5D,GAAG,EAAE,QAAQ,CAAC;CACd;AAED,yDAAyD;AACzD,MAAM,WAAW,WAAW;IAC3B,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,sCAAsC;IACtC,GAAG,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,4DAA4D;AAC5D,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC"}