wtsm 1.1.1 → 1.2.1

package/README.md

@@ -64,9 +64,10 @@ s ls
 s <name>
 # Example:
 s work
-```
 
-_Opens a new Windows Terminal window with all configured tabs._
+# Open in current Windows Terminal window: --current or -c
+s work -c
+```
 
 ### 4 Not implemented features
 

package/dist/index.mjs

@@ -282,7 +282,7 @@ function listCommand() {
 
 //#endregion
 //#region src/commands/restore.ts
-function restoreSession(sessionName) {
+function restoreSession(sessionName, options = {}) {
 	const sessions = loadSessions();
 	if (!sessions[sessionName]) {
 		console.log(chalk.red(`Session '${sessionName}' not found.`));
@@ -294,31 +294,60 @@ function restoreSession(sessionName) {
 		console.log(chalk.yellow(`Session '${sessionName}' is empty.`));
 		return;
 	}
-	const args = [];
+	const tabArgs = [];
 	tabs.forEach((tab, index) => {
 		if (index > 0) {
-			args.push(";");
-			args.push("new-tab");
+			tabArgs.push(";");
+			tabArgs.push("new-tab");
 		}
-		args.push("-p");
-		args.push("Windows PowerShell");
+		tabArgs.push("-p");
+		tabArgs.push("Windows PowerShell");
 		if (tab.path) {
-			args.push("-d");
-			args.push(tab.path);
+			tabArgs.push("-d");
+			tabArgs.push(tab.path);
 		}
 		if (tab.command) {
-			args.push("powershell");
-			args.push("-NoExit");
-			args.push("-Command");
-			args.push(tab.command);
+			tabArgs.push("powershell");
+			tabArgs.push("-NoExit");
+			tabArgs.push("-Command");
+			tabArgs.push(tab.command);
 		}
 	});
-	console.log(chalk.blue(`Launching session '${sessionName}'...`));
-	spawn("wt", args, {
-		detached: true,
-		stdio: "ignore",
-		shell: false
-	}).unref();
+	const isWindowsTerminal = !!process.env.WT_SESSION;
+	const launch = (inCurrentWindow) => {
+		const canUseCurrentWindow = inCurrentWindow && isWindowsTerminal;
+		const finalArgs = canUseCurrentWindow ? [
+			"-w",
+			"0",
+			...tabArgs
+		] : tabArgs;
+		if (!canUseCurrentWindow) {
+			if (inCurrentWindow && !isWindowsTerminal) console.log(chalk.yellow("Not running in Windows Terminal. Opening in new window..."));
+			else console.log(chalk.blue(`Launching session '${sessionName}' in new window...`));
+			spawn("wt", finalArgs, {
+				detached: true,
+				stdio: "ignore",
+				shell: false
+			}).unref();
+			return;
+		}
+		console.log(chalk.blue(`Attempting to launch session '${sessionName}' in current window...`));
+		const subprocess = spawn("wt", finalArgs, {
+			stdio: "inherit",
+			shell: false
+		});
+		subprocess.on("error", (err) => {
+			console.log(chalk.yellow(`Failed to launch in current window. Opening new window...`));
+			launch(false);
+		});
+		subprocess.on("exit", (code) => {
+			if (code !== 0) {
+				console.log(chalk.yellow(`Could not target current window (exit code ${code}). Opening new window...`));
+				launch(false);
+			}
+		});
+	};
+	launch(!!options.currentWindow);
 }
 
 //#endregion
@@ -332,7 +361,7 @@ function setupKeypressEvents() {
 setupKeypressEvents();
 function createCLI() {
 	const program = new Command();
-	program.name("s").description("Windows Terminal Session Manager").version("1.0.3");
+	program.name("s").description("Windows Terminal Session Manager").version("1.1.1");
 	program.addCommand(createCommand());
 	program.addCommand(addCommand());
 	program.addCommand(listCommand());
@@ -352,7 +381,7 @@ if (rawArgs.length > 0 && ![
 ].includes(rawArgs[0])) {
 	const sessionName = rawArgs[0];
 	if (rawArgs[1] === "add") addToSession(sessionName, process.cwd());
-	else restoreSession(sessionName);
+	else restoreSession(sessionName, { currentWindow: rawArgs.includes("--current") || rawArgs.includes("-c") });
 } else createCLI().parse(process.argv);
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wtsm",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Windows Terminal Session Manager",
   "type": "module",
   "main": "./dist/index.mjs",