@lamalibre/portlama-agent 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lamalibre/portlama-agent",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Mac agent for Portlama — installs Chisel tunnel client and manages launchd agent",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/index.js

@@ -24,10 +24,6 @@ ${b('COMMANDS')}
   ${c('logs')}            Stream Chisel log output (tail -f)
   ${c('sites')}           List, create, or delete static sites
   ${c('deploy')}          Deploy a local directory to a static site
-  ${c('shell-server')}    Run the shell gateway (background service)
-  ${c('shell')}           Connect to a remote agent shell
-  ${c('cp')}              Copy files to/from a remote agent
-  ${c('shell-log')}       List or download shell session recordings
   ${c('plugin')}          Manage agent plugins (install, uninstall, update, status)
 
 ${b('EXAMPLES')}
@@ -50,18 +46,6 @@ ${b('EXAMPLES')}
   ${d('# Deploy local build to a site')}
   ${c('portlama-agent deploy blog ./dist')}
 
-  ${d('# Start the shell gateway (runs as background service)')}
-  ${c('portlama-agent shell-server')}
-
-  ${d('# Connect to a remote agent shell')}
-  ${c('portlama-agent shell myagent')}
-
-  ${d('# Copy a file from a remote agent')}
-  ${c('portlama-agent cp myagent:/var/log/app.log ./app.log')}
-
-  ${d('# List shell session recordings')}
-  ${c('portlama-agent shell-log myagent')}
-
   ${d('# Manage plugins')}
   ${c('portlama-agent plugin status')}
   ${c('portlama-agent plugin install @lamalibre/shell-agent')}
@@ -123,26 +107,6 @@ export async function main() {
       await runDeploy(args.slice(1));
       break;
     }
-    case 'shell-server': {
-      const { runShellServer } = await import('./commands/shell-server.js');
-      await runShellServer();
-      break;
-    }
-    case 'shell': {
-      const { runShell } = await import('./commands/shell.js');
-      await runShell(args.slice(1));
-      break;
-    }
-    case 'cp': {
-      const { runCp } = await import('./commands/cp.js');
-      await runCp(args.slice(1));
-      break;
-    }
-    case 'shell-log': {
-      const { runShellLog } = await import('./commands/shell-log.js');
-      await runShellLog(args.slice(1));
-      break;
-    }
     case 'plugin': {
       const { runPlugin } = await import('./commands/plugin.js');
       await runPlugin(args.slice(1));

package/src/lib/panel-api.js

@@ -406,211 +406,6 @@ export async function uploadSiteFiles(
   }
 }
 
-/**
- * Fetch shell configuration for this agent.
- * @param {string|object} panelUrlOrConfig
- * @param {string} [p12Path]
- * @param {string} [p12Password]
- * @returns {Promise<{ enabled: boolean, label: string, blocklist?: string[], timeWindow?: object }>}
- */
-export async function fetchShellConfig(panelUrlOrConfig, p12Path, p12Password) {
-  const panelUrl = resolvePanelUrl(panelUrlOrConfig);
-  const url = `${panelUrl}/api/shell/config`;
-  try {
-    const { stdout } = typeof panelUrlOrConfig === 'object'
-      ? await curlAuthenticated(panelUrlOrConfig, [url])
-      : await curlWithConfig(p12Path, p12Password, [url]);
-    return JSON.parse(stdout);
-  } catch (err) {
-    throw new Error(
-      `Failed to fetch shell config from panel. ` + `Details: ${err.stderr || err.message}`,
-    );
-  }
-}
-
-/**
- * Fetch the agent's own status from the panel.
- * The server derives the agent label from the mTLS client certificate CN.
- * @param {string|object} panelUrlOrConfig
- * @param {string} [p12Path]
- * @param {string} [p12Password]
- * @returns {Promise<{ label: string }>}
- */
-export async function fetchAgentStatus(panelUrlOrConfig, p12Path, p12Password) {
-  const panelUrl = resolvePanelUrl(panelUrlOrConfig);
-  const url = `${panelUrl}/api/shell/agent-status`;
-  try {
-    const { stdout } = typeof panelUrlOrConfig === 'object'
-      ? await curlAuthenticated(panelUrlOrConfig, [url])
-      : await curlWithConfig(p12Path, p12Password, [url]);
-    return JSON.parse(stdout);
-  } catch (err) {
-    throw new Error(
-      `Failed to fetch agent status from panel. ` + `Details: ${err.stderr || err.message}`,
-    );
-  }
-}
-
-/**
- * Fetch shell session list from the panel.
- * @param {string|object} panelUrlOrConfig
- * @param {string} [p12Path]
- * @param {string} [p12Password]
- * @returns {Promise<{ sessions: Array }>}
- */
-export async function fetchShellSessions(panelUrlOrConfig, p12Path, p12Password) {
-  const panelUrl = resolvePanelUrl(panelUrlOrConfig);
-  const url = `${panelUrl}/api/shell/sessions`;
-  try {
-    const { stdout } = typeof panelUrlOrConfig === 'object'
-      ? await curlAuthenticated(panelUrlOrConfig, [url])
-      : await curlWithConfig(p12Path, p12Password, [url]);
-    return JSON.parse(stdout);
-  } catch (err) {
-    throw new Error(
-      `Failed to fetch shell sessions from panel. ` + `Details: ${err.stderr || err.message}`,
-    );
-  }
-}
-
-/**
- * Download a shell session recording from the panel.
- * @param {string|object} panelUrlOrConfig
- * @param {string} [p12Path]
- * @param {string} [p12Password]
- * @param {string} agentLabel - The agent label that owns the recording
- * @param {string} sessionId
- * @param {string} outputPath - Local path to write the recording to
- * @returns {Promise<void>}
- */
-export async function downloadShellRecording(
-  panelUrlOrConfig,
-  p12Path,
-  p12Password,
-  agentLabel,
-  sessionId,
-  outputPath,
-) {
-  const panelUrl = resolvePanelUrl(panelUrlOrConfig);
-  let actualAgentLabel, actualSessionId, actualOutputPath;
-  if (typeof panelUrlOrConfig === 'object') {
-    actualAgentLabel = p12Path;
-    actualSessionId = p12Password;
-    actualOutputPath = agentLabel;
-  } else {
-    actualAgentLabel = agentLabel;
-    actualSessionId = sessionId;
-    actualOutputPath = outputPath;
-  }
-  const url = `${panelUrl}/api/shell/recordings/${encodeURIComponent(actualAgentLabel)}/${encodeURIComponent(actualSessionId)}`;
-  const curlArgs = ['-o', actualOutputPath, url];
-  try {
-    if (typeof panelUrlOrConfig === 'object') {
-      await curlAuthenticated(panelUrlOrConfig, curlArgs);
-    } else {
-      await curlWithConfig(p12Path, p12Password, curlArgs);
-    }
-  } catch (err) {
-    throw new Error(
-      `Failed to download shell recording from panel. ` + `Details: ${err.stderr || err.message}`,
-    );
-  }
-}
-
-/**
- * Download a file from a remote agent via the panel relay.
- * @param {string|object} panelUrlOrConfig
- * @param {string} [p12Path]
- * @param {string} [p12Password]
- * @param {string} agentLabel
- * @param {string} remotePath - Absolute path on the remote agent
- * @param {string} outputPath - Local path to write the file to
- * @returns {Promise<void>}
- */
-export async function downloadRemoteFile(
-  panelUrlOrConfig,
-  p12Path,
-  p12Password,
-  agentLabel,
-  remotePath,
-  outputPath,
-) {
-  const panelUrl = resolvePanelUrl(panelUrlOrConfig);
-  let actualAgentLabel, actualRemotePath, actualOutputPath;
-  if (typeof panelUrlOrConfig === 'object') {
-    actualAgentLabel = p12Path;
-    actualRemotePath = p12Password;
-    actualOutputPath = agentLabel;
-  } else {
-    actualAgentLabel = agentLabel;
-    actualRemotePath = remotePath;
-    actualOutputPath = outputPath;
-  }
-  const url = `${panelUrl}/api/shell/file/${encodeURIComponent(actualAgentLabel)}?path=${encodeURIComponent(actualRemotePath)}`;
-  const curlArgs = ['-o', actualOutputPath, url];
-  try {
-    if (typeof panelUrlOrConfig === 'object') {
-      await curlAuthenticated(panelUrlOrConfig, curlArgs);
-    } else {
-      await curlWithConfig(p12Path, p12Password, curlArgs);
-    }
-  } catch (err) {
-    throw new Error(
-      `Failed to download file from agent ${actualAgentLabel}. ` +
-        `Details: ${err.stderr || err.message}`,
-    );
-  }
-}
-
-/**
- * Upload a local file to a remote agent via the panel relay.
- * @param {string|object} panelUrlOrConfig
- * @param {string} [p12Path]
- * @param {string} [p12Password]
- * @param {string} agentLabel
- * @param {string} remotePath - Absolute path on the remote agent
- * @param {string} localFilePath - Local file to upload
- * @returns {Promise<object>}
- */
-export async function uploadRemoteFile(
-  panelUrlOrConfig,
-  p12Path,
-  p12Password,
-  agentLabel,
-  remotePath,
-  localFilePath,
-) {
-  const panelUrl = resolvePanelUrl(panelUrlOrConfig);
-  let actualAgentLabel, actualRemotePath, actualLocalFilePath;
-  if (typeof panelUrlOrConfig === 'object') {
-    actualAgentLabel = p12Path;
-    actualRemotePath = p12Password;
-    actualLocalFilePath = agentLabel;
-  } else {
-    actualAgentLabel = agentLabel;
-    actualRemotePath = remotePath;
-    actualLocalFilePath = localFilePath;
-  }
-  const url = `${panelUrl}/api/shell/file/${encodeURIComponent(actualAgentLabel)}?path=${encodeURIComponent(actualRemotePath)}`;
-  const curlArgs = [
-    '-X',
-    'POST',
-    '-F',
-    `file=@${actualLocalFilePath}`,
-    url,
-  ];
-  try {
-    const { stdout } = typeof panelUrlOrConfig === 'object'
-      ? await curlAuthenticated(panelUrlOrConfig, curlArgs)
-      : await curlWithConfig(p12Path, p12Password, curlArgs);
-    return JSON.parse(stdout);
-  } catch (err) {
-    throw new Error(
-      `Failed to upload file to agent ${actualAgentLabel}. ` + `Details: ${err.stderr || err.message}`,
-    );
-  }
-}
-
 /**
  * Delete a file from a static site.
  * @param {string|object} panelUrlOrConfig

package/src/commands/cp.js

@@ -1,192 +0,0 @@
-import { existsSync } from 'node:fs';
-import { stat } from 'node:fs/promises';
-import path from 'node:path';
-import chalk from 'chalk';
-import { assertMacOS } from '../lib/platform.js';
-import { requireAgentConfig } from '../lib/config.js';
-import { downloadRemoteFile, uploadRemoteFile } from '../lib/panel-api.js';
-
-/**
- * Parse a cp argument to determine if it's a remote path (agent-label:/path)
- * or a local path.
- * @param {string} arg
- * @returns {{ isRemote: boolean, agentLabel?: string, path: string }}
- */
-function parseLocation(arg) {
-  // Match pattern: label:/path (label must be lowercase alphanumeric with hyphens, matching server validation)
-  const match = arg.match(/^([a-z0-9-]+):(.+)$/);
-  if (match) {
-    return { isRemote: true, agentLabel: match[1], path: match[2] };
-  }
-  return { isRemote: false, path: arg };
-}
-
-/**
- * Run the file copy command.
- * Supports download (remote → local) and upload (local → remote).
- * @param {string[]} args
- */
-export async function runCp(args) {
-  assertMacOS();
-  const config = await requireAgentConfig();
-
-  if (args.length < 2) {
-    printUsage();
-    process.exit(1);
-  }
-
-  const source = parseLocation(args[0]);
-  const dest = parseLocation(args[1]);
-
-  // Validate: exactly one side must be remote
-  if (source.isRemote && dest.isRemote) {
-    console.error(
-      chalk.red('\n  Cannot copy between two remote agents. One side must be a local path.\n'),
-    );
-    process.exit(1);
-  }
-
-  if (!source.isRemote && !dest.isRemote) {
-    console.error(
-      chalk.red(
-        '\n  Both paths are local. Use the system cp command for local copies.\n' +
-          '  For remote transfers, prefix with agent-label: (e.g. myagent:/path/to/file)\n',
-      ),
-    );
-    process.exit(1);
-  }
-
-  if (source.isRemote) {
-    await runDownload(config, source, dest);
-  } else {
-    await runUpload(config, source, dest);
-  }
-}
-
-/**
- * Download a file from a remote agent.
- * @param {object} config
- * @param {{ agentLabel: string, path: string }} source
- * @param {{ path: string }} dest
- */
-async function runDownload(config, source, dest) {
-  const agentLabel = source.agentLabel;
-  const remotePath = source.path;
-  let localPath = path.resolve(dest.path);
-
-  // If dest is a directory, use the remote filename
-  try {
-    const destStat = await stat(localPath);
-    if (destStat.isDirectory()) {
-      const remoteBasename = path.basename(remotePath);
-      localPath = path.join(localPath, remoteBasename);
-    }
-  } catch {
-    // Path doesn't exist yet — that's fine, we'll create the file
-    // Ensure the parent directory exists
-    const parentDir = path.dirname(localPath);
-    if (!existsSync(parentDir)) {
-      console.error(chalk.red(`\n  Parent directory does not exist: ${parentDir}\n`));
-      process.exit(1);
-    }
-  }
-
-  console.log('');
-  console.log(chalk.dim(`  Downloading ${chalk.bold(agentLabel)}:${remotePath} → ${localPath}`));
-
-  try {
-    await downloadRemoteFile(
-      config,
-      agentLabel,
-      remotePath,
-      localPath,
-    );
-  } catch (err) {
-    console.error(chalk.red(`\n  Download failed: ${err.message}\n`));
-    process.exit(1);
-  }
-
-  console.log(`  ${chalk.green('✓')} Downloaded to ${chalk.cyan(localPath)}`);
-  console.log('');
-}
-
-/**
- * Upload a local file to a remote agent.
- * @param {object} config
- * @param {{ path: string }} source
- * @param {{ agentLabel: string, path: string }} dest
- */
-async function runUpload(config, source, dest) {
-  const localPath = path.resolve(source.path);
-  const agentLabel = dest.agentLabel;
-  const remotePath = dest.path;
-
-  // Validate local file exists
-  if (!existsSync(localPath)) {
-    console.error(chalk.red(`\n  Local file not found: ${localPath}\n`));
-    process.exit(1);
-  }
-
-  let localStat;
-  try {
-    localStat = await stat(localPath);
-  } catch (err) {
-    console.error(chalk.red(`\n  Cannot read file: ${err.message}\n`));
-    process.exit(1);
-  }
-
-  if (!localStat.isFile()) {
-    console.error(
-      chalk.red('\n  Only single file transfers are currently supported.\n') +
-        chalk.dim(
-          '  To transfer a directory, archive it first (e.g. tar -czf archive.tar.gz dir/).\n',
-        ),
-    );
-    process.exit(1);
-  }
-
-  console.log('');
-  console.log(chalk.dim(`  Uploading ${localPath} → ${chalk.bold(agentLabel)}:${remotePath}`));
-
-  try {
-    await uploadRemoteFile(
-      config,
-      agentLabel,
-      remotePath,
-      localPath,
-    );
-  } catch (err) {
-    console.error(chalk.red(`\n  Upload failed: ${err.message}\n`));
-    process.exit(1);
-  }
-
-  console.log(`  ${chalk.green('✓')} Uploaded to ${chalk.cyan(`${agentLabel}:${remotePath}`)}`);
-  console.log('');
-}
-
-/**
- * Print usage information.
- */
-function printUsage() {
-  const c = chalk.cyan;
-  const d = chalk.dim;
-
-  console.error(`
-  ${chalk.bold('Usage:')}
-
-    ${c('portlama-agent cp')} ${d('<source> <destination>')}
-
-  ${chalk.bold('Download from agent:')}
-
-    ${c('portlama-agent cp myagent:/var/log/app.log ./app.log')}
-
-  ${chalk.bold('Upload to agent:')}
-
-    ${c('portlama-agent cp ./config.json myagent:/etc/app/config.json')}
-
-  ${chalk.bold('Notes:')}
-
-    Remote paths use the format: ${c('agent-label:/absolute/path')}
-    Only single file transfers are supported.
-`);
-}

package/src/commands/shell-log.js

@@ -1,183 +0,0 @@
-import path from 'node:path';
-import chalk from 'chalk';
-import { assertMacOS } from '../lib/platform.js';
-import { requireAgentConfig } from '../lib/config.js';
-import { fetchShellSessions, downloadShellRecording } from '../lib/panel-api.js';
-
-/**
- * Parse simple CLI flags from an array of arguments.
- * @param {string[]} args
- * @returns {{ positional: string[], flags: Record<string, string|boolean> }}
- */
-function parseFlags(args) {
-  const positional = [];
-  const flags = {};
-  for (let i = 0; i < args.length; i++) {
-    if (args[i].startsWith('--')) {
-      const key = args[i].slice(2);
-      const next = args[i + 1];
-      if (next && !next.startsWith('--')) {
-        flags[key] = next;
-        i++;
-      } else {
-        flags[key] = true;
-      }
-    } else {
-      positional.push(args[i]);
-    }
-  }
-  return { positional, flags };
-}
-
-/**
- * Format a date string for display.
- * @param {string} isoDate
- * @returns {string}
- */
-function formatDate(isoDate) {
-  try {
-    const d = new Date(isoDate);
-    return d.toLocaleString();
-  } catch {
-    return isoDate || 'unknown';
-  }
-}
-
-/**
- * Format duration in seconds to human-readable.
- * @param {number} seconds
- * @returns {string}
- */
-function formatDuration(seconds) {
-  if (seconds == null) return 'unknown';
-  if (seconds < 60) return `${seconds}s`;
-  const mins = Math.floor(seconds / 60);
-  const secs = seconds % 60;
-  if (mins < 60) return `${mins}m ${secs}s`;
-  const hours = Math.floor(mins / 60);
-  const remainMins = mins % 60;
-  return `${hours}h ${remainMins}m`;
-}
-
-/**
- * List shell sessions, optionally filtered by agent label.
- * @param {object} config
- * @param {string} [agentLabel]
- */
-async function runList(config, agentLabel) {
-  const b = chalk.bold;
-  const c = chalk.cyan;
-  const d = chalk.dim;
-  const y = chalk.yellow;
-
-  console.log('');
-  console.log(b('  Shell Sessions'));
-  console.log(d('  ─'.repeat(28)));
-
-  let sessions;
-  try {
-    const data = await fetchShellSessions(config);
-    sessions = data.sessions || [];
-  } catch (err) {
-    console.log(`  ${y(`Could not fetch sessions: ${err.message}`)}`);
-    console.log('');
-    return;
-  }
-
-  // Filter by agent label if specified
-  if (agentLabel) {
-    sessions = sessions.filter((s) => s.agentLabel === agentLabel);
-  }
-
-  if (sessions.length === 0) {
-    const suffix = agentLabel ? ` for agent ${chalk.bold(agentLabel)}` : '';
-    console.log(`  ${d(`No sessions found${suffix}.`)}`);
-    console.log('');
-    return;
-  }
-
-  // Sort by start time, newest first
-  sessions.sort((a, b2) => {
-    const da = new Date(a.startedAt || 0);
-    const db = new Date(b2.startedAt || 0);
-    return db - da;
-  });
-
-  for (const session of sessions) {
-    const statusLabel =
-      session.status === 'active'
-        ? chalk.green('Active')
-        : session.status === 'ended'
-          ? d('Ended')
-          : d(session.status || 'unknown');
-
-    console.log(`  ${c('•')} ${b(session.id)}`);
-    console.log(`    Agent:    ${session.agentLabel || d('unknown')}`);
-    console.log(`    Status:   ${statusLabel}`);
-    console.log(`    Started:  ${formatDate(session.startedAt)}`);
-    if (session.endedAt) {
-      console.log(`    Ended:    ${formatDate(session.endedAt)}`);
-    }
-    if (session.duration != null) {
-      console.log(`    Duration: ${formatDuration(session.duration)}`);
-    }
-    if (session.commandCount != null) {
-      console.log(`    Commands: ${session.commandCount}`);
-    }
-    console.log('');
-  }
-}
-
-/**
- * Download a session recording.
- * @param {object} config
- * @param {string} agentLabel
- * @param {string} sessionId
- */
-async function runDownload(config, agentLabel, sessionId) {
-  const outputPath = path.resolve(`${sessionId}.log`);
-
-  console.log('');
-  console.log(chalk.dim(`  Downloading recording for session ${chalk.bold(sessionId)}...`));
-
-  try {
-    await downloadShellRecording(
-      config,
-      agentLabel,
-      sessionId,
-      outputPath,
-    );
-  } catch (err) {
-    console.error(chalk.red(`\n  Download failed: ${err.message}\n`));
-    process.exit(1);
-  }
-
-  console.log(`  ${chalk.green('✓')} Recording saved to ${chalk.cyan(outputPath)}`);
-  console.log('');
-}
-
-/**
- * Shell log command: list or download session recordings.
- * @param {string[]} args
- */
-export async function runShellLog(args) {
-  assertMacOS();
-  const config = await requireAgentConfig();
-
-  const { positional, flags } = parseFlags(args);
-  const agentLabel = positional[0];
-
-  if (flags.download) {
-    const sessionId = typeof flags.download === 'string' ? flags.download : null;
-    if (!sessionId || !agentLabel) {
-      console.error(
-        `\n  Usage: ${chalk.cyan('portlama-agent shell-log <agent-label> --download <session-id>')}\n`,
-      );
-      process.exit(1);
-    }
-    return runDownload(config, agentLabel, sessionId);
-  }
-
-  // Default to --list behavior
-  return runList(config, agentLabel);
-}