cli-setu 0.2.9 → 0.3.1

package/bin/setu.js

@@ -29,7 +29,27 @@ const args = process.argv.slice(2);
 const firstArg = args[0];
 const isSubcommand = firstArg && !firstArg.startsWith('-');
 
+// Real bug found by testing: a genuinely unrecognized flag like `-rfesfd`
+// or `-g` (a typo, not meant for supervisor.js at all) also starts with
+// "-", so it fell through the isSubcommand check above straight into the
+// bare-`cli-setu` session-watching path below - silently pairing/starting
+// a real session and generating a QR code instead of telling the user
+// their command doesn't exist. supervisor.js only ever actually reads
+// `--cli <name>` out of argv (confirmed by reading it directly - the
+// `[workingDir]` mentioned in its own old comment is dead, WORKING_DIR is
+// just process.cwd()) - every other `-`-prefixed flag is unrecognized by
+// definition, same as an unrecognized subcommand already is below.
+const KNOWN_FLAGS = new Set(['--version', '-v', '--help', '-h', '--update', '--cli']);
+const hasUnknownFlag = args.some((a) => a.startsWith('-') && !KNOWN_FLAGS.has(a));
+
 async function main() {
+  if (hasUnknownFlag) {
+    const bad = args.find((a) => a.startsWith('-') && !KNOWN_FLAGS.has(a));
+    console.error(`[cli-setu] Unknown option: ${bad}`);
+    console.error('[cli-setu] For more info, run: cli-setu --help');
+    process.exit(1);
+  }
+
   if (args.includes('--version') || args.includes('-v')) {
     console.log(require('../package.json').version);
     return;
@@ -49,8 +69,16 @@ async function main() {
   if (isSubcommand) {
     switch (firstArg) {
       case 'pair': {
+        // Real product ask (PM report): a first-time user had to run
+        // `cli-setu pair` then separately `cli-setu` to actually start a
+        // session - two commands where one would do, and the phone had
+        // nothing to show (no session yet) right after pairing. Matches
+        // bare `cli-setu`'s own already-correct behavior below: pair (if
+        // needed), then immediately start watching THIS folder as a
+        // session, same single-step flow either way now.
         const { pair } = require('../src/pair');
         await pair(AUTH_SERVER, AUTH_SERVER_PUBLIC);
+        require('../src/supervisor');
         return;
       }
       case 'status': {
@@ -91,7 +119,7 @@ async function main() {
   const config = readConfig();
   if (!config || !config.deviceToken) {
     const { pair } = require('../src/pair');
-    await pair(AUTH_SERVER, AUTH_SERVER_PUBLIC, { standalone: false });
+    await pair(AUTH_SERVER, AUTH_SERVER_PUBLIC);
   }
   require('../src/supervisor');
 }
@@ -104,7 +132,8 @@ Usage:
   cli-setu --cli <name>       Same, but run a specific CLI inside the bridged
                           session instead of the default plain shell
                           (e.g. --cli claude, --cli codex)
-  cli-setu pair               Pair this computer with your phone, nothing else
+  cli-setu pair               Pair this computer with your phone, then watch
+                          this folder as a session (same as bare cli-setu)
   cli-setu status             Show pairing status and any sessions running now
   cli-setu stop               Stop every session running on this computer
   cli-setu stop <sessionId>   Stop just one session (see \`cli-setu status\`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-setu",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "Bridge your terminal to your phone — run and approve Claude Code, Codex CLI and other AI coding agents from anywhere.",
   "type": "commonjs",
   "bin": {

package/src/pair.js

@@ -8,7 +8,7 @@ const qrcode = require('qrcode-terminal');
 const { loadOrCreateConfig, writeConfig, hasKeypair } = require('./config');
 const { generateKeypair, publicKeyToBase64, privateKeyToBase64 } = require('./crypto');
 
-async function pair(authServer, authServerPublic, { standalone = true } = {}) {
+async function pair(authServer, authServerPublic) {
   const config = loadOrCreateConfig();
 
   // Section 1 E2E: generate this device's own keypair up front, before
@@ -125,20 +125,6 @@ async function pair(authServer, authServerPublic, { standalone = true } = {}) {
     }
   }
 
-  // Real gap found by testing (PM report): a first-time user had no clear
-  // next step after pairing succeeded - pairing a device and starting a
-  // real terminal session are deliberately separate commands (one laptop
-  // can run several sessions, switch CLIs across restarts, etc.), but
-  // nothing here ever told a first-time user that distinction, or what
-  // to actually type next. Only shown for an explicit, standalone
-  // `cli-setu pair` - bin/setu.js's own bare-`cli-setu` flow calls this
-  // function too (auto-pairing an unpaired machine before immediately
-  // starting a session right after), where this message would be
-  // immediately followed by the session actually starting anyway.
-  if (standalone) {
-    console.log('[cli-setu] Run `cli-setu` in a project folder to start your first session.');
-  }
-
   return config;
 }