dirpush 0.1.3 → 0.1.5

package/package.json

@@ -37,7 +37,7 @@
     "url": "https://github.com/baronunread/dirpush.git"
   },
   "homepage": "https://dirpush.com",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "keywords": [
     "directories",
     "startup",

package/src/browser.ts

@@ -78,8 +78,22 @@ export async function stopBrowser() {
   return { stopped: true };
 }
 
+/**
+ * The CDP port of the agents' Chrome: the one `browser start` runs on BROWSER_PORT, else the one `dirpush ab` launched
+ * through agent-browser (its port is in the profile's DevToolsActivePort file). Only a live port counts.
+ */
+async function agentsChromePort() {
+  const live = async (port: number) => fetch(`http://127.0.0.1:${port}/json/version`, { signal: AbortSignal.timeout(1500) }).then((r) => r.ok, () => false);
+  if (await live(BROWSER_PORT)) return BROWSER_PORT;
+  const file = Bun.file(join(PROFILE, "DevToolsActivePort"));
+  const port = (await file.exists()) ? Number((await file.text()).split("\n")[0]) : NaN;
+  if (port && (await live(port))) return port;
+  throw new Error("the agents' browser is not open: open the page with 'dirpush ab open <url>' first");
+}
+let cdpPort = BROWSER_PORT;
+
 function ab(args: string[], stdin?: string) {
-  const p = Bun.spawnSync(["agent-browser", "--session", SECRETS_SESSION, "--cdp", String(BROWSER_PORT), ...args], { stdin: stdin === undefined ? "ignore" : Buffer.from(stdin), stdout: "pipe", stderr: "pipe", timeout: 60_000 });
+  const p = Bun.spawnSync(["agent-browser", "--session", SECRETS_SESSION, "--cdp", String(cdpPort), ...args], { stdin: stdin === undefined ? "ignore" : Buffer.from(stdin), stdout: "pipe", stderr: "pipe", timeout: 60_000 });
   const out = p.stdout.toString().trim();
   if (p.exitCode !== 0) throw new Error(`agent-browser ${args[0]} failed: ${(p.stderr.toString() || out).trim().slice(0, 300)}`);
   return out;
@@ -88,8 +102,9 @@ function ab(args: string[], stdin?: string) {
 /** The open tab on `site`'s host (the one the agent is working in); the most recently active one if several. */
 async function pageOn(site: string) {
   const host = new URL(site.includes("://") ? site : `https://${site}`).hostname.replace(/^www\./, "");
-  if (!(await browserStatus()).running) throw new Error("the browser is not running: launch browser start");
-  const page = (await json<Target[]>("/json/list")).find((t) => t.type === "page" && /^https?:/.test(t.url) && new URL(t.url).hostname.replace(/^www\./, "").endsWith(host));
+  cdpPort = await agentsChromePort();
+  const list = (await (await fetch(`http://127.0.0.1:${cdpPort}/json/list`, { signal: AbortSignal.timeout(1500) })).json()) as Target[];
+  const page = list.find((t) => t.type === "page" && /^https?:/.test(t.url) && new URL(t.url).hostname.replace(/^www\./, "").endsWith(host));
   if (!page) throw new Error(`no open tab on ${host}; open the login/sign-up page first`);
   ab(["tab", page.id]);
   return page;
@@ -97,6 +112,7 @@ async function pageOn(site: string) {
 
 /** Fills a saved login (agent-browser vault) into the open tab on that site. The password never leaves the vault. */
 export async function vaultLogin(name: string) {
+  cdpPort = await agentsChromePort();
   const meta = JSON.parse(ab(["auth", "show", name, "--json"])) as { data?: { profile?: { url?: string } } };
   const url = meta.data?.profile?.url;
   if (!url) throw new Error(`vault entry ${name} has no login URL`);
@@ -105,6 +121,17 @@ export async function vaultLogin(name: string) {
   return { vault: name, page: page.url.slice(0, 200), filled: true };
 }
 
+/** 24 random characters with every class sites ask for (upper, lower, digit, symbol), symbols that forms accept. */
+export function strongPassword() {
+  const sets = ["ABCDEFGHJKLMNPQRSTUVWXYZ", "abcdefghijkmnopqrstuvwxyz", "23456789", "!@#%^*-_=+?"];
+  const all = sets.join("");
+  const pick = (set: string, b: number) => set[b % set.length]!;
+  const bytes = randomBytes(32);
+  const chars = [...sets.map((set, i) => pick(set, bytes[i]!)), ...Array.from({ length: 20 }, (_, i) => pick(all, bytes[i + 4]!))];
+  for (let i = chars.length - 1; i > 0; i--) { const j = bytes[(i + 8) % 32]! % (i + 1); [chars[i], chars[j]] = [chars[j]!, chars[i]!]; }
+  return chars.join("");
+}
+
 /**
  * New account password: generated here, typed into every given field of the open tab on `url`'s site, checked,
  * then saved to the vault as `name`. Returns no secret.
@@ -112,7 +139,7 @@ export async function vaultLogin(name: string) {
 export async function newPassword(name: string, url: string, username: string, selectors: string[]) {
   if (!selectors.length) throw new Error("pass the password field selector(s), e.g. 'input[type=password]'");
   const page = await pageOn(url);
-  const pw = randomBytes(18).toString("base64");
+  const pw = strongPassword();
   for (const s of selectors) ab(["fill", s, pw]);
   // A fill can "succeed" on a selector that matched nothing; never save a password the site didn't get.
   const lengths = JSON.parse(ab(["eval", `JSON.stringify(${JSON.stringify(selectors)}.map((s) => document.querySelector(s)?.value.length ?? -1))`]));

package/src/checks.ts

@@ -9,6 +9,7 @@ import { and, eq, gt, inArray } from "drizzle-orm";
 import { HOME, PKG, type Db } from "./db";
 import { jobs } from "./db/schema";
 import * as J from "./jobs";
+import { loadCapabilities } from "./capabilities";
 import { loadDirectory } from "./registry";
 
 const color = process.stdout.isTTY && !process.env.NO_COLOR;
@@ -56,12 +57,12 @@ export async function checks(db: Db, opts: { product?: string; types: string[] }
   const handedBack: string[] = [], byYou: string[] = [], skipped: string[] = [];
   let signedIn = false;
 
-  const summary = () => {
+  const summary = async () => {
     console.log(`\n${bold("Done for now.")}`);
-    if (handedBack.length) console.log(`${green("✓")} Back to the agents: ${handedBack.join(", ")}`);
+    if (handedBack.length) console.log(`${green("✓")} Ready for the agents to finish: ${handedBack.join(", ")}`);
     if (byYou.length) console.log(`${green("✓")} Submitted by you: ${byYou.join(", ")}`);
     if (skipped.length) console.log(`${dim("·")} Skipped, still waiting: ${skipped.join(", ")}`);
-    if (handedBack.length) console.log(`\nNext: ask your agent to ${bold("“continue my launch”")}.`);
+    if (handedBack.length) await startAgent(handedBack.length);
   };
 
   const googleSignIn = async () => {
@@ -81,13 +82,13 @@ export async function checks(db: Db, opts: { product?: string; types: string[] }
 
   console.log(`${bold("dirpush checks")}  ${dim(`${google.length} need Google sign-in · ${queue.length} CAPTCHAs or bot checks`)}`);
   if (!google.length && !queue.length) return console.log("Nothing is waiting on you.");
-  console.log(dim("Agents never solve these; you do, and each job goes back to them."));
+  console.log(dim("Agents never solve these. You clear each one, then an agent finishes the submission (at the end I can start yours)."));
 
   if (google.length) {
     console.log(`\n${bold("1. Sign into Google")}  ${dim(google.map((j) => j.subject).join(", "))}`);
     console.log("These directories use “Sign in with Google”. Sign in once and the agents can use it from then on.");
     const k = await key(`${cyan("[enter]")} sign in now   ${cyan("[n]")} later   ${cyan("[q]")} quit `, "\rnq");
-    if (k === "q") return summary();
+    if (k === "q") return await summary();
     if (k === "\r" && (await googleSignIn())) {
       for (const j of google) { J.unblock(db, j.id, "human signed into Google in the agents' Chrome profile"); handedBack.push(j.subject); }
     } else skipped.push(...google.map((j) => j.subject));
@@ -109,10 +110,10 @@ export async function checks(db: Db, opts: { product?: string; types: string[] }
     console.log(dim("Check never passes there? Submit it from your own browser instead, then press s."));
     open();
     for (;;) {
-      const k = await key(`${cyan("enter")} done  ${cyan("s")} I submitted it  ${cyan("o")} reopen  ${cyan("g")} Google sign-in  ${cyan("n")} skip  ${cyan("q")} quit › `, "\rsognq");
+      const k = await key(`${cyan("enter")} cleared, agent finishes it  ${cyan("s")} I submitted it  ${cyan("o")} reopen  ${cyan("g")} Google sign-in  ${cyan("n")} skip  ${cyan("q")} quit › `, "\rsognq");
       if (k === "o") { open(); continue; }
       if (k === "g") { if (!signedIn) await googleSignIn(); open(); continue; }
-      if (k === "q") return summary();
+      if (k === "q") return await summary();
       if (k === "n") skipped.push(job.subject);
       else if (k === "\r") {
         J.unblock(db, job.id, "human cleared the check in the agents' Chrome; continue in the same browser session");
@@ -125,6 +126,28 @@ export async function checks(db: Db, opts: { product?: string; types: string[] }
       break;
     }
   }
-  summary();
+  await summary();
 }
 
+
+/** The agent CLIs we can open on "continue my launch", most likely first: the one that recorded capabilities, then any on PATH. */
+async function startAgent(n: number) {
+  const caps = await loadCapabilities().catch(() => null);
+  const known = [
+    { id: "claude-code", name: "Claude Code", bin: "claude" },
+    { id: "codex", name: "Codex", bin: "codex" },
+  ].filter((a) => Bun.which(a.bin));
+  const agent = known.find((a) => caps?.checked_by?.startsWith(a.id)) ?? known[0];
+  const prompt = "continue my launch";
+  if (!agent || process.platform !== "darwin") {
+    console.log(`\nNext: open your agent and say ${bold(`“${prompt}”`)}; it finishes the ${n} job(s) above.`);
+    return;
+  }
+  console.log(`\nThe ${n} job(s) above are waiting for an agent to finish them.`);
+  const k = await key(`${cyan("[enter]")} open ${agent.name} on “${prompt}” now   ${cyan("[n]")} I'll do it later `, "\rn");
+  if (k === "n") return console.log(dim(`Whenever you're ready: open your agent and say “${prompt}”.`));
+  // A new Terminal window, so the human watches it work and approves what it asks for. Nothing runs unattended.
+  const cmd = `cd ${JSON.stringify(process.cwd())} && ${agent.bin} ${JSON.stringify(prompt)}`;
+  const ok = Bun.spawnSync(["osascript", "-e", `tell application "Terminal" to do script ${JSON.stringify(cmd)}`, "-e", `tell application "Terminal" to activate`], { stdin: "ignore", stdout: "ignore", stderr: "ignore" }).exitCode === 0;
+  console.log(ok ? `${green("✓")} Opened ${agent.name} in a new Terminal window.` : `Couldn't open Terminal. Run this yourself: ${cmd}`);
+}