pairit 0.1.2 → 0.1.4

package/README.md

@@ -38,6 +38,7 @@ This makes `pairit` available globally from the `bin` field in package.json.
 
 ```bash
 pairit login                                       # Authenticate (required first)
+# On a remote/headless server, open the printed URL locally and paste back the one-time code
 
 pairit config lint path/to/config.yaml
 pairit config compile path/to/config.yaml

package/dist/index.js

@@ -9955,73 +9955,74 @@ async function exchangeCodeForToken(code) {
 async function login() {
   console.log("Initiating login...");
   const loginUrl = `${BASE_URL}/login`;
-  try {
-    const { createServer } = await import("node:http");
-    const { default: open2 } = await Promise.resolve().then(() => (init_open(), exports_open));
-    const server = createServer();
-    const port = await new Promise((resolve, reject) => {
-      server.listen(0, "127.0.0.1", () => {
-        const address = server.address();
-        if (address && typeof address === "object") {
-          resolve(address.port);
-        } else {
-          reject(new Error("Could not determine port"));
-        }
-      });
-    });
-    const redirectUri = `http://127.0.0.1:${port}`;
-    const targetUrl = `${loginUrl}?cli_redirect_uri=${encodeURIComponent(redirectUri)}`;
-    console.log("Opening browser for authentication...");
-    await open2(targetUrl);
-    console.log(`Waiting for authentication at ${redirectUri}...`);
-    const authCode = await new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => {
-        server.close();
-        reject(new Error("Login timed out"));
-      }, 120000);
-      server.on("request", (req, res) => {
-        try {
-          const url = new URL(req.url || "/", `http://${req.headers.host}`);
-          const code = url.searchParams.get("code");
-          if (code) {
-            res.writeHead(200, { "Content-Type": "text/html" });
-            res.end(`<!DOCTYPE html><html><head><title>Login Successful</title></head><body style="font-family:system-ui;display:flex;align-items:center;justify-content:center;height:100vh;margin:0"><div style="text-align:center"><h1>Authenticated!</h1><p>You can close this window and return to your CLI.</p></div><script>setTimeout(()=>window.close(),3000)</script></body></html>`);
-            clearTimeout(timeout);
-            server.close();
-            resolve(code);
+  const manualLoginUrl = `${loginUrl}?manual=1`;
+  if (canAttemptBrowserLogin()) {
+    try {
+      const { createServer } = await import("node:http");
+      const { default: open2 } = await Promise.resolve().then(() => (init_open(), exports_open));
+      const server = createServer();
+      const port = await new Promise((resolve, reject) => {
+        server.listen(0, "127.0.0.1", () => {
+          const address = server.address();
+          if (address && typeof address === "object") {
+            resolve(address.port);
           } else {
-            res.writeHead(400);
-            res.end("Missing authorization code");
+            reject(new Error("Could not determine port"));
           }
-        } catch (_e) {
-          res.writeHead(500);
-          res.end("Error processing request");
-        }
+        });
       });
-    });
-    console.log("Exchanging authorization code for token...");
-    const token2 = await exchangeCodeForToken(authCode);
-    await saveCredentials({ token: token2 });
-    console.log("Successfully logged in!");
-    return;
-  } catch (error) {
-    console.warn("Automated login failed, falling back to manual entry:", error instanceof Error ? error.message : String(error));
+      const redirectUri = `http://127.0.0.1:${port}`;
+      const targetUrl = `${loginUrl}?cli_redirect_uri=${encodeURIComponent(redirectUri)}`;
+      console.log("Opening browser for authentication...");
+      await open2(targetUrl);
+      console.log(`Waiting for authentication at ${redirectUri}...`);
+      const authCode = await new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          server.close();
+          reject(new Error("Login timed out"));
+        }, 120000);
+        server.on("request", (req, res) => {
+          try {
+            const url = new URL(req.url || "/", `http://${req.headers.host}`);
+            const code2 = url.searchParams.get("code");
+            if (code2) {
+              res.writeHead(200, { "Content-Type": "text/html" });
+              res.end(`<!DOCTYPE html><html><head><title>Login Successful</title></head><body style="font-family:system-ui;display:flex;align-items:center;justify-content:center;height:100vh;margin:0"><div style="text-align:center"><h1>Authenticated!</h1><p>You can close this window and return to your CLI.</p></div><script>setTimeout(()=>window.close(),3000)</script></body></html>`);
+              clearTimeout(timeout);
+              server.close();
+              resolve(code2);
+            } else {
+              res.writeHead(400);
+              res.end("Missing authorization code");
+            }
+          } catch (_e) {
+            res.writeHead(500);
+            res.end("Error processing request");
+          }
+        });
+      });
+      console.log("Exchanging authorization code for token...");
+      const token2 = await exchangeCodeForToken(authCode);
+      await saveCredentials({ token: token2 });
+      console.log("Successfully logged in!");
+      return;
+    } catch (error) {
+      console.warn("Automated login failed, falling back to manual entry:", error instanceof Error ? error.message : String(error));
+    }
   }
   console.log(`
-Please visit: ${loginUrl}
+Open this URL in a browser on any machine:
+${manualLoginUrl}
 
-After logging in, you will see a success page. The CLI will handle authentication automatically.
-If automatic login fails, you may need to check your network connection or try again.
+After signing in, the page will show a one-time authorization code.
+Paste that code here to complete CLI login.
 `);
-  try {
-    const { default: open2 } = await Promise.resolve().then(() => (init_open(), exports_open));
-    await open2(loginUrl);
-  } catch (_e) {}
-  const token = await prompt("Enter session token (from browser): ");
-  if (!token) {
-    console.error("No token provided");
+  const code = await prompt("Enter authorization code: ");
+  if (!code) {
+    console.error("No authorization code provided");
     process.exit(1);
   }
+  const token = await exchangeCodeForToken(code);
   await saveCredentials({ token });
   console.log("Successfully logged in!");
 }
@@ -10086,6 +10087,15 @@ async function prompt(question) {
     });
   });
 }
+function canAttemptBrowserLogin() {
+  if (!process.stdout.isTTY || !process.stdin.isTTY) {
+    return false;
+  }
+  if (process.env.SSH_CONNECTION || process.env.SSH_CLIENT || process.env.SSH_TTY) {
+    return false;
+  }
+  return process.platform === "darwin" || process.platform === "win32" || Boolean(process.env.DISPLAY || process.env.WAYLAND_DISPLAY);
+}
 async function loadKeytar() {
   try {
     const runtimeImport = new Function("s", "return import(s)");
@@ -10101,7 +10111,7 @@ async function loadKeytar() {
 
 // src/index.ts
 var program2 = new Command;
-program2.name("pairit").description("CLI for Pairit experiment configs").version("0.1.0");
+program2.name("pairit").description("CLI for Pairit experiment configs").version("0.1.3");
 program2.command("login").description("Login to Pairit Manager").action(async () => {
   try {
     await login();
@@ -10560,11 +10570,11 @@ async function exportData(configId, options) {
 Files written to: ${outDir}`);
 }
 function flattenSession(session) {
-  const { user_state, prolific, ...rest } = session;
+  const { session_state, prolific, ...rest } = session;
   const flattened = { ...rest };
-  if (user_state && typeof user_state === "object") {
-    for (const [key, value] of Object.entries(user_state)) {
-      flattened[`user_state.${key}`] = serializeValue(value);
+  if (session_state && typeof session_state === "object") {
+    for (const [key, value] of Object.entries(session_state)) {
+      flattened[`session_state.${key}`] = serializeValue(value);
     }
   }
   if (prolific) {

package/package.json

@@ -1,43 +1,43 @@
 {
-	"name": "pairit",
-	"version": "0.1.2",
-	"description": "CLI for the Pairit behavioral science experiment platform",
-	"type": "module",
-	"bin": {
-		"pairit": "dist/index.js"
-	},
-	"files": [
-		"dist"
-	],
-	"scripts": {
-		"build": "bun build src/index.ts --outdir dist --target node",
-		"lint": "tsc --noEmit",
-		"prepublishOnly": "bun run build"
-	},
-	"keywords": [
-		"experiment",
-		"behavioral-science",
-		"research",
-		"cli"
-	],
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/pairium/pairit.git",
-		"directory": "apps/manager/cli"
-	},
-	"homepage": "https://pairium.github.io/pairit/",
-	"license": "MIT",
-	"optionalDependencies": {
-		"keytar": "^7.9.0"
-	},
-	"devDependencies": {
-		"@types/bun": "^1.1.13",
-		"@types/open": "^6.2.1",
-		"better-auth": "^1.4.7",
-		"commander": "^12.1.0",
-		"dotenv": "^17.2.3",
-		"open": "^11.0.0",
-		"typescript": "^5.9.3",
-		"yaml": "^2.6.0"
-	}
+  "name": "pairit",
+  "version": "0.1.4",
+  "description": "CLI for the Pairit behavioral science experiment platform",
+  "type": "module",
+  "bin": {
+    "pairit": "dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "bun build src/index.ts --outdir dist --target node",
+    "lint": "tsc --noEmit",
+    "prepublishOnly": "bun run build"
+  },
+  "keywords": [
+    "experiment",
+    "behavioral-science",
+    "research",
+    "cli"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pairium/pairit.git",
+    "directory": "apps/manager/cli"
+  },
+  "homepage": "https://pairium.github.io/pairit/",
+  "license": "MIT",
+  "optionalDependencies": {
+    "keytar": "^7.9.0"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.1.13",
+    "@types/open": "^6.2.1",
+    "better-auth": "^1.4.7",
+    "commander": "^12.1.0",
+    "dotenv": "^17.2.3",
+    "open": "^11.0.0",
+    "typescript": "^5.9.3",
+    "yaml": "^2.6.0"
+  }
 }