terminalhire 0.9.0 → 0.9.2

package/dist/bin/jpi-intro.js

@@ -774,6 +774,45 @@ var init_src = __esm({
   }
 });
 
+// src/web-session.ts
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  readFileSync as readFileSync2,
+  rmSync,
+  writeFileSync
+} from "fs";
+import { homedir } from "os";
+import { join as join2 } from "path";
+function terminalhireDir() {
+  return join2(homedir(), ".terminalhire");
+}
+function webSessionFilePath() {
+  return join2(terminalhireDir(), "web-session");
+}
+function readWebSessionFile() {
+  try {
+    const path = webSessionFilePath();
+    if (!existsSync(path)) return null;
+    const v = readFileSync2(path, "utf8").trim();
+    return v.length > 0 ? v : null;
+  } catch {
+    return null;
+  }
+}
+function readWebSessionCookie() {
+  const fromFile = readWebSessionFile();
+  if (fromFile) return fromFile;
+  const env = process.env["TERMINALHIRE_WEB_SESSION"];
+  return typeof env === "string" && env.length > 0 ? env : null;
+}
+var init_web_session = __esm({
+  "src/web-session.ts"() {
+    "use strict";
+  }
+});
+
 // src/profile.ts
 var profile_exports = {};
 __export(profile_exports, {
@@ -794,13 +833,13 @@ import {
   randomBytes as randomBytes2
 } from "crypto";
 import {
-  readFileSync as readFileSync2,
-  writeFileSync,
-  mkdirSync,
-  existsSync
+  readFileSync as readFileSync3,
+  writeFileSync as writeFileSync2,
+  mkdirSync as mkdirSync2,
+  existsSync as existsSync2
 } from "fs";
-import { join as join2 } from "path";
-import { homedir } from "os";
+import { join as join3 } from "path";
+import { homedir as homedir2 } from "os";
 async function loadKey() {
   try {
     const kt = await import("keytar");
@@ -813,12 +852,12 @@ async function loadKey() {
     return key2;
   } catch {
   }
-  mkdirSync(TERMINALHIRE_DIR, { recursive: true });
-  if (existsSync(KEY_FILE)) {
-    return Buffer.from(readFileSync2(KEY_FILE, "utf8").trim(), "hex");
+  mkdirSync2(TERMINALHIRE_DIR, { recursive: true });
+  if (existsSync2(KEY_FILE)) {
+    return Buffer.from(readFileSync3(KEY_FILE, "utf8").trim(), "hex");
   }
   const key = randomBytes2(KEY_BYTES);
-  writeFileSync(KEY_FILE, key.toString("hex"), { mode: 384, encoding: "utf8" });
+  writeFileSync2(KEY_FILE, key.toString("hex"), { mode: 384, encoding: "utf8" });
   return key;
 }
 function encrypt(plaintext, key) {
@@ -876,10 +915,10 @@ function migrateTagWeights(profile) {
   }
 }
 async function readProfile() {
-  if (!existsSync(PROFILE_FILE)) return blankProfile();
+  if (!existsSync2(PROFILE_FILE)) return blankProfile();
   try {
     const key = await loadKey();
-    const raw = readFileSync2(PROFILE_FILE, "utf8");
+    const raw = readFileSync3(PROFILE_FILE, "utf8");
     const blob = JSON.parse(raw);
     const plaintext = decrypt(blob, key);
     const parsed = JSON.parse(plaintext);
@@ -890,12 +929,12 @@ async function readProfile() {
   }
 }
 async function writeProfile(profile) {
-  mkdirSync(TERMINALHIRE_DIR, { recursive: true });
+  mkdirSync2(TERMINALHIRE_DIR, { recursive: true });
   const key = await loadKey();
   profile.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
   profile.skillTags = deriveSkillTags(profile.tagWeights);
   const blob = encrypt(JSON.stringify(profile), key);
-  writeFileSync(PROFILE_FILE, JSON.stringify(blob, null, 2), { encoding: "utf8" });
+  writeFileSync2(PROFILE_FILE, JSON.stringify(blob, null, 2), { encoding: "utf8" });
 }
 function accumulateSession(profile, tags, isEmployerContext, inferredSeniority, seniorityIsAuthoritative = false) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -956,13 +995,13 @@ async function removeSavedJob(id) {
   return true;
 }
 async function deleteProfile() {
-  const { rmSync } = await import("fs");
+  const { rmSync: rmSync2 } = await import("fs");
   try {
-    rmSync(PROFILE_FILE);
+    rmSync2(PROFILE_FILE);
   } catch {
   }
   try {
-    rmSync(KEY_FILE);
+    rmSync2(KEY_FILE);
   } catch {
   }
 }
@@ -984,9 +1023,9 @@ var init_profile = __esm({
   "src/profile.ts"() {
     "use strict";
     init_src();
-    TERMINALHIRE_DIR = join2(homedir(), ".terminalhire");
-    PROFILE_FILE = join2(TERMINALHIRE_DIR, "profile.enc");
-    KEY_FILE = join2(TERMINALHIRE_DIR, "key");
+    TERMINALHIRE_DIR = join3(homedir2(), ".terminalhire");
+    PROFILE_FILE = join3(TERMINALHIRE_DIR, "profile.enc");
+    KEY_FILE = join3(TERMINALHIRE_DIR, "key");
     ALGO = "aes-256-gcm";
     KEY_BYTES = 32;
     IV_BYTES = 12;
@@ -1089,10 +1128,9 @@ function defaultIntroDeps() {
       void Promise.resolve().then(() => (init_open_url(), open_url_exports)).then((m) => m.openInBrowser(url)).catch(() => {
       });
     },
-    sessionCookie: () => {
-      const v = process.env["TERMINALHIRE_WEB_SESSION"];
-      return typeof v === "string" && v.length > 0 ? v : null;
-    },
+    // Session source priority: persisted file (`terminalhire link`) FIRST, then the
+    // legacy TERMINALHIRE_WEB_SESSION env, then none.
+    sessionCookie: () => readWebSessionCookie(),
     log: (msg) => console.log(msg),
     errorLog: (msg) => console.error(msg),
     exit: (code) => process.exit(code)
@@ -1164,10 +1202,7 @@ async function runIntroRequest(args, overrides) {
   const cookie = deps.sessionCookie();
   if (!cookie) {
     deps.log("\n  No linked web session found on this machine.");
-    deps.log("  Sign in at your dashboard first, then re-run with a bridged session.");
-    deps.log(`  \u2192 ${LINK_BASE}/dashboard
-`);
-    deps.openBrowser(`${LINK_BASE}/dashboard`);
+    deps.log("  Run `terminalhire link` to connect this terminal to your account, then re-run.\n");
     deps.exit(0);
     return;
   }
@@ -1187,9 +1222,8 @@ async function runIntroRequest(args, overrides) {
     return;
   }
   if (res.status === 401) {
-    deps.log("\n  Your web session expired \u2014 sign in again at your dashboard, then re-run.");
-    deps.log(`  \u2192 ${LINK_BASE}/dashboard
-`);
+    deps.log("\n  Your linked web session expired.");
+    deps.log("  Run `terminalhire link` to reconnect this terminal, then re-run.\n");
     deps.exit(1);
     return;
   }
@@ -1220,10 +1254,7 @@ async function runIntroDecision(args, overrides) {
   const cookie = deps.sessionCookie();
   if (!cookie) {
     deps.log("\n  No linked web session found on this machine.");
-    deps.log("  Sign in at your dashboard first, then re-run.");
-    deps.log(`  \u2192 ${LINK_BASE}/dashboard
-`);
-    deps.openBrowser(`${LINK_BASE}/dashboard`);
+    deps.log("  Run `terminalhire link` to connect this terminal to your account, then re-run.\n");
     deps.exit(0);
     return;
   }
@@ -1266,9 +1297,8 @@ async function runIntroDecision(args, overrides) {
     return;
   }
   if (res.status === 401) {
-    deps.log("\n  Your web session expired \u2014 sign in again at your dashboard, then re-run.");
-    deps.log(`  \u2192 ${LINK_BASE}/dashboard
-`);
+    deps.log("\n  Your linked web session expired.");
+    deps.log("  Run `terminalhire link` to reconnect this terminal, then re-run.\n");
     deps.exit(1);
     return;
   }
@@ -1307,10 +1337,7 @@ async function runIntroList(overrides) {
   const cookie = deps.sessionCookie();
   if (!cookie) {
     deps.log("\n  No linked web session found on this machine.");
-    deps.log("  Sign in at your dashboard first, then re-run.");
-    deps.log(`  \u2192 ${LINK_BASE}/dashboard
-`);
-    deps.openBrowser(`${LINK_BASE}/dashboard`);
+    deps.log("  Run `terminalhire link` to connect this terminal to your account, then re-run.\n");
     deps.exit(0);
     return;
   }
@@ -1329,9 +1356,8 @@ async function runIntroList(overrides) {
     return;
   }
   if (res.status === 401) {
-    deps.log("\n  Your web session expired \u2014 sign in again at your dashboard, then re-run.");
-    deps.log(`  \u2192 ${LINK_BASE}/dashboard
-`);
+    deps.log("\n  Your linked web session expired.");
+    deps.log("  Run `terminalhire link` to reconnect this terminal, then re-run.\n");
     deps.exit(1);
     return;
   }
@@ -1369,6 +1395,7 @@ var init_intro2 = __esm({
   "src/intro.ts"() {
     "use strict";
     init_src();
+    init_web_session();
     LINK_BASE = process.env["TERMINALHIRE_API_URL"] || "https://www.terminalhire.com";
     GH_SESSION_COOKIE = "__jpi_gh_session";
   }

package/dist/bin/jpi-link.js

@@ -0,0 +1,285 @@
+#!/usr/bin/env node
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+// src/web-session.ts
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  rmSync,
+  writeFileSync
+} from "fs";
+import { homedir } from "os";
+import { join } from "path";
+function terminalhireDir() {
+  return join(homedir(), ".terminalhire");
+}
+function webSessionFilePath() {
+  return join(terminalhireDir(), "web-session");
+}
+function readWebSessionFile() {
+  try {
+    const path = webSessionFilePath();
+    if (!existsSync(path)) return null;
+    const v = readFileSync(path, "utf8").trim();
+    return v.length > 0 ? v : null;
+  } catch {
+    return null;
+  }
+}
+function writeWebSessionFile(token) {
+  mkdirSync(terminalhireDir(), { recursive: true });
+  const path = webSessionFilePath();
+  writeFileSync(path, token, { mode: 384, encoding: "utf8" });
+  try {
+    chmodSync(path, 384);
+  } catch {
+  }
+}
+function clearWebSessionFile() {
+  try {
+    rmSync(webSessionFilePath());
+  } catch {
+  }
+}
+var init_web_session = __esm({
+  "src/web-session.ts"() {
+    "use strict";
+  }
+});
+
+// src/open-url.js
+var open_url_exports = {};
+__export(open_url_exports, {
+  openInBrowser: () => openInBrowser
+});
+import { spawn } from "child_process";
+function openInBrowser(url) {
+  let cmd;
+  let args;
+  if (process.platform === "darwin") {
+    cmd = "open";
+    args = [url];
+  } else if (process.platform === "win32") {
+    cmd = "cmd";
+    args = ["/c", "start", "", url];
+  } else {
+    cmd = "xdg-open";
+    args = [url];
+  }
+  try {
+    const child = spawn(cmd, args, { stdio: "ignore", detached: true });
+    child.on("error", () => {
+    });
+    child.unref();
+  } catch {
+  }
+}
+var init_open_url = __esm({
+  "src/open-url.js"() {
+    "use strict";
+  }
+});
+
+// src/link.ts
+var link_exports = {};
+__export(link_exports, {
+  resolveLoopbackRequest: () => resolveLoopbackRequest,
+  runLink: () => runLink,
+  runLinkLogout: () => runLinkLogout
+});
+import { createServer } from "http";
+import { randomBytes } from "crypto";
+function resolveLoopbackRequest(rawUrl, expectedNonce) {
+  let u;
+  try {
+    u = new URL(rawUrl, "http://127.0.0.1");
+  } catch {
+    return { ok: false, reason: "bad_url" };
+  }
+  const nonce = u.searchParams.get("nonce");
+  if (!nonce || nonce !== expectedNonce) return { ok: false, reason: "nonce_mismatch" };
+  const token = u.searchParams.get("token");
+  if (!token) return { ok: false, reason: "missing_token" };
+  return { ok: true, token };
+}
+function defaultStartLoopback(expectedNonce, timeoutMs) {
+  return new Promise((resolveHandle) => {
+    let settle;
+    const result = new Promise((res) => {
+      settle = res;
+    });
+    let done = false;
+    const finish = (r) => {
+      if (done) return;
+      done = true;
+      clearTimeout(timer);
+      settle(r);
+      setImmediate(() => {
+        try {
+          server.close();
+        } catch {
+        }
+      });
+    };
+    const server = createServer((req, res) => {
+      const outcome = resolveLoopbackRequest(req.url ?? "", expectedNonce);
+      res.writeHead(outcome.ok ? 200 : 400, { "Content-Type": "text/html; charset=utf-8" });
+      res.end(outcome.ok ? LINKED_HTML : FAILED_HTML);
+      finish(outcome);
+    });
+    const timer = setTimeout(() => finish({ ok: false, reason: "timeout" }), timeoutMs);
+    if (typeof timer.unref === "function") timer.unref();
+    server.on("error", () => finish({ ok: false, reason: "listen_error" }));
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      const port = typeof addr === "object" && addr ? addr.port : 0;
+      resolveHandle({
+        port,
+        result,
+        close: () => {
+          try {
+            server.close();
+          } catch {
+          }
+        }
+      });
+    });
+  });
+}
+function defaultLinkDeps() {
+  return {
+    startLoopback: defaultStartLoopback,
+    openBrowser: (url) => {
+      void Promise.resolve().then(() => (init_open_url(), open_url_exports)).then((m) => m.openInBrowser(url)).catch(() => {
+      });
+    },
+    generateNonce: () => randomBytes(16).toString("hex"),
+    persistToken: (token) => writeWebSessionFile(token),
+    log: (msg) => console.log(msg),
+    errorLog: (msg) => console.error(msg),
+    exit: (code) => process.exit(code)
+  };
+}
+async function runLink(overrides) {
+  const deps = { ...defaultLinkDeps(), ...overrides };
+  const nonce = deps.generateNonce();
+  const handle = await deps.startLoopback(nonce, LINK_TIMEOUT_MS);
+  const url = `${LINK_BASE}/api/auth/link?port=${handle.port}&nonce=${encodeURIComponent(nonce)}`;
+  deps.log("");
+  deps.log("  terminalhire \u2014 link this terminal to your account");
+  deps.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  deps.log("  Opening your browser to approve. If it does not open, paste this URL:");
+  deps.log(`  \u2192 ${url}`);
+  deps.log("  Waiting for approval (this tab closes itself once you approve)\u2026");
+  deps.openBrowser(url);
+  let outcome;
+  try {
+    outcome = await handle.result;
+  } finally {
+    handle.close();
+  }
+  if (!outcome.ok || !outcome.token) {
+    if (outcome.reason === "timeout") {
+      deps.errorLog("\n  Link timed out \u2014 run `terminalhire link` again.\n");
+    } else if (outcome.reason === "nonce_mismatch") {
+      deps.errorLog("\n  Link rejected (nonce did not match) \u2014 run `terminalhire link` again.\n");
+    } else {
+      deps.errorLog("\n  Link failed \u2014 run `terminalhire link` again.\n");
+    }
+    deps.exit(1);
+    return;
+  }
+  deps.persistToken(outcome.token);
+  deps.log("\n  This terminal is now linked to your terminalhire account.");
+  deps.log("  Try `terminalhire intro <login>`, `terminalhire chat`, or `terminalhire trajectory --push`.");
+  deps.log("  Unlink any time with `terminalhire link --logout`.\n");
+  deps.exit(0);
+}
+function defaultLinkLogoutDeps() {
+  return {
+    fetchImpl: (...args) => globalThis.fetch(...args),
+    readSessionFile: () => readWebSessionFile(),
+    clearSessionFile: () => clearWebSessionFile(),
+    log: (msg) => console.log(msg),
+    errorLog: (msg) => console.error(msg),
+    exit: (code) => process.exit(code)
+  };
+}
+async function runLinkLogout(overrides) {
+  const deps = { ...defaultLinkLogoutDeps(), ...overrides };
+  const token = deps.readSessionFile();
+  if (!token) {
+    deps.log("\n  No linked web session on this machine \u2014 nothing to unlink.\n");
+    deps.exit(0);
+    return;
+  }
+  let revoked = false;
+  try {
+    const res = await deps.fetchImpl(`${LINK_BASE}/api/auth/session`, {
+      method: "DELETE",
+      headers: { Cookie: `${GH_SESSION_COOKIE}=${token}` },
+      signal: AbortSignal.timeout(1e4)
+    });
+    revoked = res.ok;
+  } catch {
+  }
+  deps.clearSessionFile();
+  if (revoked) {
+    deps.log("\n  Unlinked \u2014 the session was revoked server-side and removed from this machine.\n");
+  } else {
+    deps.log("\n  Removed the local session from this machine.");
+    deps.log("  (Could not reach the server to revoke it \u2014 it expires on its own.)\n");
+  }
+  deps.exit(0);
+}
+var LINK_BASE, GH_SESSION_COOKIE, LINK_TIMEOUT_MS, LINKED_HTML, FAILED_HTML;
+var init_link = __esm({
+  "src/link.ts"() {
+    "use strict";
+    init_web_session();
+    LINK_BASE = "https://www.terminalhire.com";
+    GH_SESSION_COOKIE = "__jpi_gh_session";
+    LINK_TIMEOUT_MS = 12e4;
+    LINKED_HTML = `<!doctype html><html><head><meta charset="utf-8"><title>terminalhire</title></head>
+<body style="font-family:system-ui;padding:2rem;background:#0b0d10;color:#e6e6e6">
+<script>history.replaceState({},'','/');</script>
+<p>CLI linked \u2014 you can close this tab.</p>
+<script>setTimeout(function(){window.close();},400);</script>
+</body></html>`;
+    FAILED_HTML = `<!doctype html><html><head><meta charset="utf-8"><title>terminalhire</title></head>
+<body style="font-family:system-ui;padding:2rem;background:#0b0d10;color:#e6e6e6">
+<script>history.replaceState({},'','/');</script>
+<p>Link failed \u2014 return to your terminal and run <code>terminalhire link</code> again.</p>
+</body></html>`;
+  }
+});
+
+// bin/jpi-link.js
+async function run() {
+  try {
+    const args = process.argv.slice(2);
+    if (args.includes("--logout")) {
+      const { runLinkLogout: runLinkLogout2 } = await Promise.resolve().then(() => (init_link(), link_exports));
+      await runLinkLogout2();
+      return;
+    }
+    const { runLink: runLink2 } = await Promise.resolve().then(() => (init_link(), link_exports));
+    await runLink2();
+  } catch (err) {
+    console.error("terminalhire link error:", err?.message ?? err);
+    process.exit(1);
+  }
+}
+export {
+  run
+};