@heyputer/shell 2.1.0 → 3.0.0

package/.github/workflows/npm-build.yml

@@ -14,8 +14,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 8
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4
       with:

package/.github/workflows/npm-publish.yml

@@ -15,8 +15,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 8
       - name: Use Node.js 20
         uses: actions/setup-node@v4
         with:
@@ -34,8 +32,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 8
       - name: Use Node.js 20
         uses: actions/setup-node@v4
         with:

package/bin/index.js

@@ -2,21 +2,29 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { login, logout } from '../src/commands/auth.js';
-import { init } from '../src/commands/init.js';
 import { startShell } from '../src/commands/shell.js';
 import { PROJECT_NAME, getLatestVersion } from '../src/commons.js';
-import { appInfo, createApp, listApps, deleteApp, updateApp } from '../src/commands/apps.js';
-import inquirer from 'inquirer';
-import { initProfileModule, getProfileModule } from '../src/modules/ProfileModule.js';
+import { initProfileModule } from '../src/modules/ProfileModule.js';
 import { initPuterModule } from '../src/modules/PuterModule.js';
-import { createSite, infoSite, listSites, deleteSite } from '../src/commands/sites.js';
+import { formatError, isAuthError, report } from '../src/modules/ErrorModule.js';
+
+// puter.js attaches an async 'load' listener to its XHRs, so a failed request
+// rejects twice: once on the promise we await, and once on a promise nothing
+// holds. Without this guard Node kills the CLI and prints the rejected plain
+// object as "#<Object>". Auth failures are already surfaced with a re-login
+// prompt by checkLogin(), so only report what is not handled elsewhere.
+process.on('unhandledRejection', (error) => {
+  report(error);
+  if (!isAuthError(error)) {
+    console.error(chalk.red(`Error: ${formatError(error)}`));
+    console.error(chalk.dim('Run "last-error" in the shell for the full details.'));
+  }
+});
 
 async function main() {
   initProfileModule();
   initPuterModule();
 
-  const profileModule = getProfileModule();
-
   const version = await getLatestVersion(PROJECT_NAME);
 
   const program = new Command();
@@ -45,206 +53,12 @@ async function main() {
       process.exit(0);
     });
 
-  program
-    .command('init')
-    .description('Initialize a new Puter app')
-    .action(init);
-
   program
     .command('shell')
     .description('Start interactive shell')
     .action(() => startShell());
 
 
-  // App commands
-  program
-    .command('apps')
-    .description('List all your apps')
-    .argument('[period]', 'period: today, yesterday, 7d, 30d, this_month, last_month')
-    .action(async (period) => {
-      await profileModule.checkLogin();
-      await listApps({
-        statsPeriod: period || 'all'
-      });
-      process.exit(0);
-    });
-
-  const app = program
-    .command('app')
-    .description('App management commands');
-
-  app
-    .command('info')
-    .description('Get application information')
-    .argument('<app_name>', 'Name of the application')
-    .action(async (app_name) => {
-      await profileModule.checkLogin();
-      await appInfo([app_name]);
-      process.exit(0);
-    });
-
-  app
-    .command('create')
-    .description('Create a new app')
-    .argument('<name>', 'Name of the application')
-    .argument('<remote_dir>', 'Remote directory URL')
-    .action(async (name, remote_dir) => {
-      try {
-        await profileModule.checkLogin();
-        await createApp({
-          name: name,
-          directory: remote_dir || '',
-          description: '',
-          url: 'https://dev-center.puter.com/coming-soon.html'
-        });
-      } catch (error) {
-        console.error(chalk.red(error.message));
-      }
-      process.exit(0);
-    });
-
-  app
-    .command('update')
-    .description('Update an app')
-    .argument('<name>', 'Name of the application')
-    .argument('[dir]', 'Directory path', '.')
-    .action(async (name, dir) => {
-      await profileModule.checkLogin();
-      await updateApp([name, dir]);
-      process.exit(0);
-    });
-
-  app
-    .command('delete')
-    .description('Delete an app')
-    .argument('<name>', 'Name of the application')
-    .option('-f, --force', 'Force deletion without confirmation')
-    .action(async (name, options) => {
-      await profileModule.checkLogin();
-      let shouldDelete = options.force;
-
-      if (!shouldDelete) {
-        const answer = await inquirer.prompt([
-          {
-            type: 'confirm',
-            name: 'confirm',
-            message: `Are you sure you want to delete the app "${name}"?`,
-            default: false
-          }
-        ]);
-        shouldDelete = answer.confirm;
-      }
-
-      if (shouldDelete) {
-        await deleteApp(name);
-      } else {
-        console.log(chalk.yellow('App deletion cancelled.'));
-      }
-      process.exit(0);
-    });
-
-  program
-    .command('sites')
-    .description('List sites and subdomains')
-    .action(async () => {
-      await profileModule.checkLogin();
-      await listSites();
-      process.exit(0);
-    });
-
-  const site = program
-    .command('site')
-    .description('Site management commands');
-
-  site
-    .command('info')
-    .description('Get site information by UID')
-    .argument('<site_uid>', 'Site UID')
-    .action(async (site_uid) => {
-      await profileModule.checkLogin();
-      await infoSite([site_uid]);
-      process.exit(0);
-    });
-
-  site
-    .command('create')
-    .description('Create a static website from directory')
-    .argument('<app_name>', 'Application name')
-    .argument('[dir]', 'Directory path')
-    .option('--subdomain <name>', 'Subdomain name')
-    .action(async (app_name, dir, options) => {
-      await profileModule.checkLogin();
-      const args = [app_name];
-      if (dir) args.push(dir);
-      if (options.subdomain) args.push(`--subdomain=${options.subdomain}`)
-
-      await createSite(args)
-      process.exit(0);
-    });
-
-  site
-    .command('deploy')
-    .description('Deploy a local web project to Puter')
-    .argument('[local_dir]', 'Local directory path')
-    .argument('[subdomain]', 'Deployment subdomain (<subdomain>.puter.site)')
-    .action(async (local_dir, subdomain) => {
-      await profileModule.checkLogin();
-      if (!local_dir) {
-        const answer = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'local_dir',
-            message: 'Local directory path:',
-            default: '.'
-          }
-        ]);
-        local_dir = answer.local_dir;
-      }
-
-      if (!subdomain) {
-        const answer = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'subdomain',
-            message: 'Deployment subdomain (leave empty for random):',
-          }
-        ]);
-        subdomain = answer.subdomain;
-      }
-
-      await startShell(`site:deploy ${local_dir}${subdomain ? ` --subdomain=${subdomain}` : ''}`)
-      process.exit(0);
-    });
-
-  site
-    .command('delete')
-    .description('Delete a site by UID')
-    .argument('<uid>', 'Site UID')
-    .option('-f, --force', 'Force deletion without confirmation')
-    .action(async (uid, options) => {
-      await profileModule.checkLogin();
-      let shouldDelete = options.force;
-
-      if (!shouldDelete) {
-        const answer = await inquirer.prompt([
-          {
-            type: 'confirm',
-            name: 'confirm',
-            message: `Are you sure you want to delete the site with UID "${uid}"?`,
-            default: false
-          }
-        ]);
-        shouldDelete = answer.confirm;
-      }
-
-      if (shouldDelete) {
-        await deleteSite([uid]);
-      } else {
-        console.log(chalk.yellow('Site deletion cancelled.'));
-      }
-      process.exit(0);
-    });
-
   if (process.argv.length === 2) {
     startShell();
   } else {
@@ -253,6 +67,12 @@ async function main() {
 }
 
 main().catch((err) => {
-  console.error(err);
+  report(err);
+  if (isAuthError(err)) {
+    console.error(chalk.red('Your session has expired or its token is no longer valid.'));
+    console.error(chalk.cyan('Run "puter login" to sign in again.'));
+  } else {
+    console.error(chalk.red(`Error: ${formatError(err)}`));
+  }
   process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heyputer/shell",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "description": "SSH-style shell access to your Puter files",
   "main": "index.js",
   "bin": {
@@ -19,6 +19,7 @@
   "engines": {
     "node": ">=20.0.0"
   },
+  "packageManager": "pnpm@9.9.0",
   "keywords": [
     "puter",
     "shell",
@@ -29,18 +30,15 @@
   "dependencies": {
     "@heyputer/puter.js": "^2.2.8",
     "chalk": "^5.3.0",
-    "cli-table3": "^0.6.5",
     "commander": "^13.0.0",
     "conf": "^12.0.0",
-    "cross-spawn": "^7.0.3",
     "dotenv": "^16.4.7",
     "glob": "^11.0.0",
     "inquirer": "^9.2.12",
     "minimatch": "^10.0.1",
     "node-fetch": "^3.3.2",
     "ora": "^8.0.1",
-    "uuid": "^11.0.5",
-    "yargs-parser": "^21.1.1"
+    "uuid": "^11.0.5"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "2.1.8",

package/src/commands/auth.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import Conf from 'conf';
 import ora from 'ora';
-import { PROJECT_NAME, } from '../commons.js'
+import { HOME, PROJECT_NAME, expandHome } from '../commons.js'
 import { getProfileModule } from '../modules/ProfileModule.js';
 import { getPuter } from '../modules/PuterModule.js';
 const config = new Conf({ projectName: PROJECT_NAME });
@@ -29,18 +29,10 @@ export async function logout() {
   let spinner;
   try {
     spinner = ora('Logging out from Puter...').start();
-    const token = config.get('auth_token');
     const selected_profile = config.get('selected_profile');
 
-    if (token) {
-      // legacy auth
-      config.clear();
-      spinner.succeed(chalk.green('Successfully logged out from Puter!'));
-    } else if (selected_profile) {
-      // multi profile auth
+    if (selected_profile) {
       config.delete('selected_profile');
-      config.delete('username');
-      config.delete('cwd');
 
       const profiles = config.get('profiles');
       config.set('profiles', profiles.filter(profile => profile.uuid != selected_profile));
@@ -86,7 +78,10 @@ export async function getUserInfo() {
   }
 }
 export function isAuthenticated() {
-  return !!config.get('auth_token');
+  const uuid = config.get('selected_profile');
+  if (!uuid) return false;
+  const profiles = config.get('profiles') ?? [];
+  return !!profiles.find(p => p.uuid === uuid)?.token;
 }
 
 export function getAuthToken() {
@@ -100,7 +95,7 @@ export function getCurrentUserName() {
 }
 
 export function getCurrentDirectory() {
-  return config.get('cwd');
+  return expandHome(getProfileModule().getCwd());
 }
 
 /**

package/src/commands/files.js

@@ -7,10 +7,10 @@ import { minimatch } from 'minimatch';
 import chalk from 'chalk';
 import Conf from 'conf';
 import fetch from 'node-fetch';
-import { API_BASE, BASE_URL, PROJECT_NAME, getHeaders, showDiskSpaceUsage, resolvePath, resolveRemotePath } from '../commons.js';
+import { API_BASE, BASE_URL, HOME, PROJECT_NAME, expandHome, getHeaders, isAbsolutePath, showDiskSpaceUsage, resolvePath, resolveRemotePath } from '../commons.js';
 import { formatDateTime, formatSize, getSystemEditor } from '../utils.js';
 import inquirer from 'inquirer';
-import { getAuthToken, getCurrentDirectory, getCurrentUserName } from './auth.js';
+import { getAuthToken, getCurrentDirectory } from './auth.js';
 import { updatePrompt } from './shell.js';
 import crypto from '../crypto.js';
 import { getPuter } from '../modules/PuterModule.js';
@@ -85,7 +85,7 @@ export async function makeDirectory(args = []) {
     const puter = getPuter();
 
     try {
-        const data = await puter.fs.mkdir(`${getCurrentDirectory()}/${directoryName}`, {
+        const data = await puter.fs.mkdir(resolvePath(getCurrentDirectory(), directoryName), {
             overwrite: false,
             dedupeName: true,
             createMissingParents: false
@@ -314,7 +314,7 @@ export async function removeFileOrDirectory(args = []) {
                 const uid = statData.uid;
 
                 // Step 4.2: Perform the move operation to Trash
-                const moveData = await puter.fs.move(uid, `/${getCurrentUserName()}/Trash`, {
+                const moveData = await puter.fs.move(uid, expandHome(`${HOME}/Trash`), {
                     overwrite: false,
                     newName: uid,
                     createMissingParents: false,
@@ -385,7 +385,7 @@ export async function deleteFolder(folderPath, skipConfirmation = false) {
  * @param {boolean} skipConfirmation - Whether to skip the confirmation prompt.
  */
 export async function emptyTrash(skipConfirmation = true) {
-    const trashPath = `/${getCurrentUserName()}/Trash`;
+    const trashPath = expandHome(`${HOME}/Trash`);
     await deleteFolder(trashPath, skipConfirmation);
 }
 
@@ -398,7 +398,7 @@ export async function getInfo(args = []) {
     const puter = getPuter();
     for (let name of names)
         try {
-            name = `${getCurrentDirectory()}/${name}`;
+            name = resolvePath(getCurrentDirectory(), name);
             console.log(chalk.green(`Getting stat info for: "${name}"...\n`));
             const data = await puter.fs.stat(name);
             if (data) {
@@ -425,7 +425,7 @@ export async function getInfo(args = []) {
  * Show the current working directory
  */
 export async function showCwd() {
-    console.log(chalk.green(`${config.get('cwd')}`));
+    console.log(chalk.green(`${getCurrentDirectory()}`));
 }
 
 /**
@@ -434,7 +434,7 @@ export async function showCwd() {
  * @returns void
  */
 export async function changeDirectory(args) {
-    let currentPath = config.get('cwd');
+    let currentPath = getCurrentDirectory();
     // If no arguments, print the current directory
     if (!args.length) {
         console.log(chalk.green(currentPath));
@@ -443,17 +443,15 @@ export async function changeDirectory(args) {
     const puter = getPuter();
 
     const path = args[0];
-    // Handle "/","~",".." and deeper navigation
-    const newPath = path.startsWith('/')? path: (path === '~'? `/${getCurrentUserName()}` :resolvePath(currentPath, path));
+    // resolvePath handles "/", "~", "~/...", "." and ".." in one place.
+    const newPath = resolvePath(currentPath, path);
     try {
         // Check if the new path is a valid directory
         const data = await puter.fs.stat(newPath);
         if (data && data.is_dir) {
-            // Update the newPath to use the correct name from the response
-            const arrayDirs = newPath.split('/');
-            arrayDirs.pop();
-            arrayDirs.push(data.name);
-            updatePrompt(arrayDirs.join('/')); // Update the shell prompt
+            // Adopt the server's canonical path, which is already rooted at the
+            // account's current home directory.
+            updatePrompt(data.path || newPath); // Update the shell prompt
         } else {
             console.log(chalk.red(`"${newPath}" is not a directory`));
         }
@@ -519,7 +517,7 @@ export async function createFile(args = []) {
     const filePath = args[0]; // File path (e.g., "app/index.html")
     const content = args.length > 1 ? args.slice(1).join(' ') : ''; // Optional content
     let fullPath = filePath;
-    if (!filePath.startsWith(`/${getCurrentUserName()}/`)){
+    if (!isAbsolutePath(filePath)) {
         fullPath = resolvePath(getCurrentDirectory(), filePath); // Resolve the full path
     }
     const dirName = path.dirname(fullPath); // Extract the directory name
@@ -763,8 +761,8 @@ export async function copyFile(args = []) {
         return;
     }
 
-    const sourcePath = args[0].startsWith(`/${getCurrentUserName()}`) ? args[0] : resolvePath(getCurrentDirectory(), args[0]); // Resolve the source path
-    const destinationPath = args[1].startsWith(`/${getCurrentUserName()}`) ? args[1] : resolvePath(getCurrentDirectory(), args[1]); // Resolve the destination path
+    const sourcePath = resolvePath(getCurrentDirectory(), args[0]); // Resolve the source path
+    const destinationPath = resolvePath(getCurrentDirectory(), args[1]); // Resolve the destination path
 
     console.log(chalk.green(`Copy: "${chalk.dim(sourcePath)}" to: "${chalk.dim(destinationPath)}"...\n`));
     const puter = getPuter();

package/src/commands/shell.js

@@ -4,6 +4,7 @@ import Conf from 'conf';
 import { execCommand, getPrompt } from '../executor.js';
 import { PROJECT_NAME } from '../commons.js';
 import { getProfileModule } from '../modules/ProfileModule.js';
+import { report, formatError } from '../modules/ErrorModule.js';
 
 const config = new Conf({ projectName: PROJECT_NAME });
 
@@ -13,7 +14,7 @@ export let rl;
  * Update the current shell prompt
  */
 export function updatePrompt(currentPath) {
-  config.set('cwd', currentPath);
+  getProfileModule().setCwd(currentPath);
   rl.setPrompt(getPrompt());
 }
 
@@ -37,7 +38,7 @@ export async function startShell(command) {
   })
 
   try {
-    console.log(chalk.green('Welcome to Puter-CLI! Type "help" for available commands.'));
+    console.log(chalk.green('Welcome to Puter Shell! Type "help" for available commands.'));
     rl.setPrompt(getPrompt());
     rl.prompt();
 
@@ -47,7 +48,8 @@ export async function startShell(command) {
         try {
           await execCommand(trimmedLine);
         } catch (error) {
-          console.error(chalk.red(error.message));
+          report(error);
+          console.error(chalk.red(formatError(error)));
         }
       }
       rl.prompt();