@pablovitasso/szkrabok 1.0.16 → 1.0.18

package/README.md

@@ -80,20 +80,19 @@ session_manage { "action": "open", "sessionName": "my-session" }
 browser.run_test { "sessionName": "my-session", "files": ["automation/example.spec.js"] }
 ```
 
-### Bebok (CLI)
+### CLI
 
-`bebok` is the human/shell interface — calls the same handlers as MCP tools:
+`szkrabok` is both the MCP server and the CLI. With no arguments it starts the MCP server; with a subcommand it runs the CLI:
 
 ```bash
-bebok open <profile>              # Launch browser, print CDP endpoint, stay alive
-bebok session list                # Show all sessions (active + stored)
-bebok session inspect <id>        # Dump cookie/localStorage counts
-bebok session delete <id>         # Delete a session
-bebok session cleanup --days 30   # Delete sessions unused for N days
-bebok endpoint <sessionName>      # Print CDP + WS endpoints
-
-szkrabok detect-browser           # List usable Chrome/Chromium installations
-szkrabok install-browser          # Install Playwright's Chromium
+szkrabok open <profile>              # Launch browser, print CDP endpoint, stay alive
+szkrabok session list                # Show all sessions (active + stored)
+szkrabok session inspect <id>        # Dump cookie/localStorage counts
+szkrabok session delete <id>         # Delete a session
+szkrabok session cleanup --days 30   # Delete sessions unused for N days
+szkrabok endpoint <sessionName>      # Print CDP + WS endpoints
+szkrabok detect-browser              # List usable Chrome/Chromium installations
+szkrabok install-browser             # Install Playwright's Chromium
 ```
 
 ---
@@ -102,7 +101,7 @@ szkrabok install-browser          # Install Playwright's Chromium
 
 * **`@pablovitasso/szkrabok/runtime`** (`packages/runtime/`): Browser bootstrap, stealth, session pool, MCP client (`mcpConnect`, `spawnClient`, codegen).
 * **Config**: `szkrabok.config.toml` (defaults) deep-merged with `szkrabok.config.local.toml` (machine-specific, gitignored).
-* **Release**: `npm run release:patch` bumps version, then `npm publish --access public`.
+* **Release**: `npm run deps:update` updates dependencies, `npm run release:patch` bumps version + tags, then `npm run release:publish`.
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pablovitasso/szkrabok",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Production-grade MCP browser automation layer with persistent sessions and stealth capabilities",
   "type": "module",
   "main": "src/index.js",
@@ -18,8 +18,7 @@
     "README.md"
   ],
   "bin": {
-    "szkrabok": "src/index.js",
-    "bebok": "src/cli.js"
+    "szkrabok": "src/index.js"
   },
   "engines": {
     "node": ">=20.0.0"
@@ -37,8 +36,9 @@
     "format:check": "prettier --check \"{src,tests}/**/*.{js,json,md}\" \"*.{js,json,md}\"",
     "codegen:mcp": "node packages/runtime/mcp-client/codegen/generate-mcp-tools.mjs",
     "prepack": "git describe --exact-match --tags HEAD 2>/dev/null || (echo 'ERROR: HEAD is not tagged. Run npm run release:patch or release:minor first.' && exit 1)",
-    "release:patch": "npm version patch --workspaces --include-workspace-root --ignore-scripts && node scripts/release-commit.js && node scripts/release-reminder.js",
-    "release:minor": "npm version minor --workspaces --include-workspace-root --ignore-scripts && node scripts/release-commit.js && node scripts/release-reminder.js",
+    "release:patch": "npm version patch --workspaces --include-workspace-root --ignore-scripts --no-git-tag-version && node scripts/release-commit.js",
+    "release:minor": "npm version minor --workspaces --include-workspace-root --ignore-scripts --no-git-tag-version && node scripts/release-commit.js",
+    "deps:update": "npx npm-check-updates -u --workspaces && npm install",
     "release:publish": "node scripts/release-publish.js",
     "test": "npm run test:self && npm run test:auto",
     "test:node": "node --test tests/node/*.test.js",
@@ -68,26 +68,26 @@
     "url": "git+https://github.com/PabloVitasso/szkrabok.git"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.0.4",
+    "@modelcontextprotocol/sdk": "^1.27.1",
     "dotenv": "^17.3.1",
-    "playwright": "^1.49.1",
+    "playwright": "^1.58.2",
     "playwright-core": "^1.58.2",
     "playwright-extra": "^4.3.6",
-    "puppeteer": "^24.34.0",
+    "puppeteer": "^24.39.0",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "smol-toml": "^1.6.0",
-    "zod": "^3.24.1"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@eslint/js": "^9.17.0",
-    "@types/puppeteer": "^5.4.7",
-    "ajv": "^8.17.1",
+    "@eslint/js": "^10.0.1",
+    "@types/puppeteer": "^7.0.4",
+    "ajv": "^8.18.0",
     "ajv-formats": "^3.0.1",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^10.0.3",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-node": "^11.1.0",
-    "globals": "^15.13.0",
-    "prettier": "^3.4.2",
+    "globals": "^17.4.0",
+    "prettier": "^3.8.1",
     "puppeteer-extra": "^3.3.6"
   },
   "puppeteer": {

package/packages/runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@szkrabok/runtime",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "szkrabok — browser bootstrap, stealth, session pool, MCP client.",
   "type": "module",
   "main": "index.js",
@@ -18,7 +18,7 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": ">=1.0.0",
+    "@modelcontextprotocol/sdk": ">=1.27.1",
     "chrome-launcher": "*",
     "playwright": "*",
     "playwright-core": "*",

package/scripts/release-commit.js

@@ -3,9 +3,23 @@ import { readFileSync } from 'node:fs';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-const pkg = JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf8'));
+const root = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+const pkg = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf8'));
+const v = pkg.version;
 
-execSync(
-  `git add package.json package-lock.json packages/runtime/package.json && git commit -m "chore: release ${pkg.version}"`,
-  { stdio: 'inherit' }
-);
+const run = cmd => execSync(cmd, { cwd: root, stdio: 'inherit' });
+
+// Stage all version-bumped files
+run('git add package.json package-lock.json packages/runtime/package.json');
+
+// Single release commit
+run(`git commit -m "chore: release ${v}"`);
+
+// Tag on this commit (not the npm version bump commit)
+run(`git tag v${v}`);
+
+// Push commit and tag together
+run('git push');
+run(`git push origin v${v}`);
+
+console.log(`\nReleased v${v}. Run: npm run release:publish`);

package/scripts/release-publish.js

@@ -3,9 +3,12 @@ import { readFileSync } from 'node:fs';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-const pkg = JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf8'));
+const root = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+const pkg = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf8'));
 const v = pkg.version;
 
+const run = cmd => execSync(cmd, { cwd: root, stdio: 'inherit' });
+
 try {
   execSync('npm whoami', { stdio: 'pipe' });
 } catch {
@@ -14,5 +17,5 @@ try {
 }
 
 console.log(`Publishing @pablovitasso/szkrabok@${v} to npm...`);
-execSync('npm publish --access public', { stdio: 'inherit' });
+run('npm publish --access public');
 console.log(`\nDone. https://www.npmjs.com/package/@pablovitasso/szkrabok`);

package/src/cli.js

@@ -1,16 +1,18 @@
-#!/usr/bin/env node
-
 import { program } from 'commander';
 import path from 'node:path';
 import fs from 'node:fs/promises';
+
 import { list, deleteSession, endpoint } from './tools/szkrabok_session.js';
 
 const SESSIONS_DIR = path.join(process.cwd(), 'sessions');
 
-program
-  .name('bebok')
-  .description('szkrabok CLI')
-  .version('2.0.0');
+/* ---------- lazy runtime ---------- */
+
+let runtime;
+const getRuntime = async () => {
+  if (!runtime) runtime = await import('#runtime');
+  return runtime;
+};
 
 /* ---------- helpers ---------- */
 
@@ -22,175 +24,254 @@ const readJson = async file => {
   }
 };
 
-const shutdownHandler = handle => async () => {
+const safe = fn => async (...args) => {
   try {
-    await handle.close();
-  } finally {
-    process.exit(0);
+    await fn(...args);
+  } catch (err) {
+    console.error(err?.message ?? err);
+    process.exit(1);
   }
 };
 
-/* ---------- session command ---------- */
+const attachShutdown = handle => {
+  let closing = false;
+
+  const shutdown = async () => {
+    if (closing) return;
+    closing = true;
+
+    try {
+      await handle.close();
+    } finally {
+      process.exit(0);
+    }
+  };
+
+  process.once('SIGINT', shutdown);
+  process.once('SIGTERM', shutdown);
+};
+
+/* ---------- program ---------- */
 
 program
-  .command('session')
-  .description('Session management')
-  .argument('<action>', 'list | inspect | delete | cleanup')
-  .argument('[id]', 'Session ID')
-  .option('--days <days>', 'For cleanup: delete sessions older than N days', '30')
-  .action(async (action, id, options) => {
-    const actions = {
-      list: async () => {
-        const { sessions } = await list();
-        console.table(
-          sessions.map(s => ({
-            ID: s.id,
-            Active: s.active ? 'yes' : 'no',
-            Preset: s.preset ?? 'N/A',
-            Label: s.label ?? 'N/A',
-          }))
-        );
-      },
-
-      inspect: async () => {
-        if (!id) throw new Error('Session ID required');
-
-        const dir = path.join(SESSIONS_DIR, id);
-        const [meta, state] = await Promise.all([
-          readJson(path.join(dir, 'meta.json')),
-          readJson(path.join(dir, 'state.json')),
-        ]);
-
-        if (!meta || !state) throw new Error(`Session ${id} not found or incomplete`);
-
-        console.log('=== METADATA ===');
-        console.log(JSON.stringify(meta, null, 2));
-        console.log('\n=== COOKIES ===');
-        console.log(state.cookies?.length ?? 0, 'cookies');
-        console.log('\n=== LOCALSTORAGE ===');
-        for (const origin of state.origins ?? []) {
-          console.log(origin.origin, ':', origin.localStorage?.length ?? 0, 'items');
-        }
-      },
-
-      delete: async () => {
-        if (!id) throw new Error('Session ID required');
-        await deleteSession({ sessionName: id });
-        console.log(`Session ${id} deleted`);
-      },
-
-      cleanup: async () => {
-        const days = Number(options.days) || 30;
-        const cutoff = Date.now() - days * 86400000;
-
-        let entries;
-        try {
-          entries = await fs.readdir(SESSIONS_DIR, { withFileTypes: true });
-        } catch {
-          console.log('No sessions directory found');
-          return;
-        }
-
-        await Promise.all(
-          entries
-            .filter(e => e.isDirectory())
-            .map(async e => {
-              const meta = await readJson(path.join(SESSIONS_DIR, e.name, 'meta.json'));
-              if (meta?.lastUsed && meta.lastUsed < cutoff) {
-                await deleteSession({ sessionName: e.name });
-                console.log(`Deleted old session: ${e.name}`);
-              }
-            })
+  .name('szkrabok')
+  .description('szkrabok CLI')
+  .version('1.0.16');
+
+/* ---------- init ---------- */
+
+program
+  .command('init')
+  .description('Scaffold minimal config')
+  .action(
+    safe(async () => {
+      const { init } = await import('./tools/scaffold.js');
+
+      const result = await init({
+        dir: process.cwd(),
+        preset: 'minimal',
+        install: false,
+      });
+
+      if (result.created.length)
+        console.error(`Created: ${result.created.join(', ')}`);
+
+      if (result.merged.length)
+        console.error(`Merged: ${result.merged.join(', ')}`);
+
+      if (result.skipped.length)
+        console.error(`Skipped: ${result.skipped.join(', ')}`);
+
+      for (const w of result.warnings)
+        console.error(`Warning: ${w}`);
+
+      console.error(
+        'Done. Run "szkrabok install-browser" if Chromium is not installed.'
+      );
+    })
+  );
+
+/* ---------- session ---------- */
+
+const session = program.command('session').description('Session management');
+
+session
+  .command('list')
+  .action(
+    safe(async () => {
+      const { sessions } = await list();
+
+      console.table(
+        sessions.map(s => ({
+          ID: s.id,
+          Active: s.active ? 'yes' : 'no',
+          Preset: s.preset ?? 'N/A',
+          Label: s.label ?? 'N/A',
+        }))
+      );
+    })
+  );
+
+session
+  .command('inspect <id>')
+  .action(
+    safe(async id => {
+      const dir = path.join(SESSIONS_DIR, id);
+
+      const [meta, state] = await Promise.all([
+        readJson(path.join(dir, 'meta.json')),
+        readJson(path.join(dir, 'state.json')),
+      ]);
+
+      if (!meta || !state)
+        throw new Error(`Session ${id} not found`);
+
+      console.log('=== METADATA ===');
+      console.log(JSON.stringify(meta, null, 2));
+
+      console.log('\n=== COOKIES ===');
+      console.log(state.cookies?.length ?? 0, 'cookies');
+
+      console.log('\n=== LOCALSTORAGE ===');
+
+      for (const origin of state.origins ?? []) {
+        console.log(
+          origin.origin,
+          ':',
+          origin.localStorage?.length ?? 0,
+          'items'
         );
-      },
-    };
+      }
+    })
+  );
 
-    const fn = actions[action];
-    if (!fn) {
-      console.error(`Unknown action: ${action}. Use: list | inspect | delete | cleanup`);
-      process.exit(1);
-    }
+session
+  .command('delete <id>')
+  .action(
+    safe(async id => {
+      await deleteSession({ sessionName: id });
+      console.log(`Session ${id} deleted`);
+    })
+  );
 
-    try {
-      await fn();
-    } catch (err) {
-      console.error(err.message);
-      process.exit(1);
-    }
-  });
+session
+  .command('cleanup')
+  .option('--days <days>', 'delete sessions older than N days', '30')
+  .action(
+    safe(async options => {
+      const days = Number(options.days) || 30;
+      const cutoff = Date.now() - days * 86400000;
+
+      let entries;
+
+      try {
+        entries = await fs.readdir(SESSIONS_DIR, { withFileTypes: true });
+      } catch {
+        console.log('No sessions directory');
+        return;
+      }
+
+      await Promise.all(
+        entries
+          .filter(e => e.isDirectory())
+          .map(async e => {
+            const meta = await readJson(
+              path.join(SESSIONS_DIR, e.name, 'meta.json')
+            );
 
-/* ---------- open command ---------- */
+            if (meta?.lastUsed && meta.lastUsed < cutoff) {
+              await deleteSession({ sessionName: e.name });
+              console.log(`Deleted: ${e.name}`);
+            }
+          })
+      );
+    })
+  );
+
+/* ---------- open ---------- */
 
 program
   .command('open <profile>')
-  .description(
-    'Launch a browser session with stealth + persistence. Prints CDP endpoint. Runs until Ctrl-C.'
-  )
-  .option('--preset <preset>', 'TOML preset name')
-  .option('--headless', 'Run headless')
-  .action(async (profile, options) => {
-    const { launch } = await import('#runtime');
-
-    const handle = await launch({
-      profile,
-      preset: options.preset,
-      headless: options.headless ?? undefined,
-      reuse: false,
-    });
+  .description('Launch persistent browser and print CDP endpoint')
+  .option('--preset <preset>')
+  .option('--headless')
+  .action(
+    safe(async (profile, options) => {
+      const { launch } = await getRuntime();
 
-    console.log(handle.cdpEndpoint);
+      const handle = await launch({
+        profile,
+        preset: options.preset,
+        headless: options.headless ?? undefined,
+        reuse: false,
+      });
 
-    const shutdown = shutdownHandler(handle);
-    process.on('SIGINT', shutdown);
-    process.on('SIGTERM', shutdown);
+      console.log(handle.cdpEndpoint);
 
-    await new Promise(() => {});
-  });
+      attachShutdown(handle);
 
-/* ---------- endpoint command ---------- */
+      await new Promise(() => {});
+    })
+  );
+
+/* ---------- endpoint ---------- */
 
 program
   .command('endpoint <sessionName>')
-  .description('Print CDP and WS endpoints for a running session')
-  .action(async sessionName => {
-    try {
+  .description('Print CDP and WS endpoints')
+  .action(
+    safe(async sessionName => {
       const result = await endpoint({ sessionName });
+
       console.log(`CDP: ${result.cdpEndpoint}`);
-      if (result.wsEndpoint) console.log(`WS:  ${result.wsEndpoint}`);
-    } catch (err) {
-      console.error(err.message);
-      process.exit(1);
-    }
-  });
 
-/* ---------- detect-browser command ---------- */
+      if (result.wsEndpoint)
+        console.log(`WS:  ${result.wsEndpoint}`);
+    })
+  );
+
+/* ---------- detect browser ---------- */
 
 program
   .command('detect-browser')
-  .description('Detect usable Chrome/Chromium browsers')
-  .action(async () => {
-    const { findChromiumPath } = await import('#runtime');
-    const path = await findChromiumPath();
-    if (!path) {
-      console.log('No usable Chrome/Chromium browser found.\n');
-      console.log('  szkrabok install-browser');
-      console.log('  https://www.google.com/chrome/\n');
-      process.exit(1);
-    }
-    console.log(path);
-    console.log('\nRecommended configuration:\n\n[default]');
-    console.log(`executablePath = "${path}"`);
-  });
+  .description('Detect Chrome/Chromium')
+  .action(
+    safe(async () => {
+      const { findChromiumPath } = await getRuntime();
 
-/* ---------- install-browser command ---------- */
+      const chromiumPath = await findChromiumPath();
+
+      if (!chromiumPath) {
+        console.log('No Chromium detected\n');
+        console.log('  szkrabok install-browser');
+        process.exit(1);
+      }
+
+      console.log(chromiumPath);
+
+      console.log('\nRecommended config:\n');
+      console.log('[default]');
+      console.log(`executablePath = "${chromiumPath}"`);
+    })
+  );
+
+/* ---------- install browser ---------- */
 
 program
   .command('install-browser')
-  .description('Install Chromium browser via Playwright')
-  .action(async () => {
-    const { spawn } = await import('node:child_process');
-    const proc = spawn('npx', ['playwright', 'install', 'chromium'], { stdio: 'inherit' });
-    proc.on('close', code => process.exit(code ?? 0));
+  .description('Install Chromium via Playwright')
+  .action(() => {
+    import('node:child_process').then(({ spawn }) => {
+      const proc = spawn('npx', ['playwright', 'install', 'chromium'], {
+        stdio: 'inherit',
+      });
+
+      proc.on('close', code => process.exit(code ?? 0));
+    });
   });
 
-program.parse();
+/* ---------- export ---------- */
+
+export async function runCli() {
+  await program.parseAsync(process.argv);
+}

package/src/index.js

@@ -1,39 +1,25 @@
 #!/usr/bin/env node
 import 'dotenv/config';
-import { createServer } from './server.js';
-import { log, logError } from './utils/logger.js';
 
-// Parse CLI args
+const CLI_COMMANDS = new Set(['session', 'open', 'endpoint', 'detect-browser', 'install-browser', 'init']);
 const args = process.argv.slice(2);
+const firstArg = args[0];
 
-if (args.includes('init')) {
-  const { init } = await import('./tools/scaffold.js');
-  const result = await init({ dir: process.cwd(), preset: 'minimal', install: false });
-  if (result.created.length) console.error(`Created: ${result.created.join(', ')}`);
-  if (result.merged.length) console.error(`Merged: ${result.merged.join(', ')}`);
-  if (result.skipped.length) console.error(`Skipped (already exists): ${result.skipped.join(', ')}`);
-  if (result.warnings.length) result.warnings.forEach(w => console.error(`Warning: ${w}`));
-  console.error('Done. Run "szkrabok --setup" if Chromium is not yet installed.');
-  process.exit(0);
-}
-
-if (args.includes('--setup')) {
-  const { execSync } = await import('node:child_process');
-  console.log('Installing Playwright Chromium browser...');
-  try {
-    execSync('npx playwright install chromium', { stdio: 'inherit' });
-    console.log('Browser installed successfully.');
-  } catch {
-    console.error('Browser install failed. Run manually: npx playwright install chromium');
-    process.exit(1);
-  }
+// --- CLI mode ---
+if (firstArg && (CLI_COMMANDS.has(firstArg) || firstArg === '--setup' || firstArg === '--help' || firstArg === '-h' || firstArg === '--version' || firstArg === '-V')) {
+  const { runCli } = await import('./cli.js');
+  await runCli();
   process.exit(0);
 }
 
+// --- MCP server mode ---
 if (args.includes('--no-headless') || args.includes('--headful')) {
   process.env.HEADLESS = 'false';
 }
 
+const { createServer } = await import('./server.js');
+const { log, logError } = await import('./utils/logger.js');
+
 const server = createServer();
 
 process.on('SIGINT', async () => {

package/scripts/release-reminder.js

@@ -1,13 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { resolve, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const pkg = JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf8'));
-const v = pkg.version;
-
-console.log(`
-Version bumped to ${v}.
-
-Next steps:
-  npm run release:publish
-`);