cortad 0.1.4 → 0.1.6

package/local.mjs

@@ -149,8 +149,13 @@ function envOrigins(envFiles) {
 const THROUGHPUT = /(RATE_?LIMIT|DAILY_LIMIT|HOURLY_LIMIT|MINUTE_LIMIT|REQUESTS_PER|TOKEN_BUDGET|MAX_SSE|MAX_CONCURRENT|THROTTLE|_RPM$|_RPS$|_QPS$)/;
 const GUARDED = /(AUTH|LOGIN|PASSWORD|BREAKER|LOCKOUT|ATTEMPT|FAIL|BAN|BLOCK)/;
 const SWITCH = /_(?:ENABLED|DISABLED|ENABLE|DISABLE)$|^(?:ENABLE|DISABLE)_/;
-function liftedLimits(envFiles) {
-  const lifted = {};
+// Limit-shaped names the code itself reads (process.env.GUEST_DAILY_LIMIT, os.environ.get("RATE_LIMIT_RPM"))
+// count too: a limit with a default in code and no line in .env is the one that closes on a run.
+const ENV_READ = /(?:process\.env(?:\.|\[\s*['"])|os\.(?:environ\.get|getenv)\(\s*['"]|os\.environ\[\s*['"]|\benv\(\s*['"]|Deno\.env\.get\(\s*['"])([A-Z][A-Z0-9_]*)/g;
+const lifted = (name) => (/(TOKEN_BUDGET|TOKENS)/.test(name) ? "1000000000" : "1000000");
+const liftable = (name) => THROUGHPUT.test(name) && !GUARDED.test(name) && !SWITCH.test(name);
+function liftedLimits(envFiles, sources = []) {
+  const out = {};
   for (const file of envFiles) {
     let text = "";
     try { text = readFileSync(file, "utf8"); } catch { continue; }
@@ -159,10 +164,16 @@ function liftedLimits(envFiles) {
       if (!m) continue;
       const [, name, raw] = m;
       const value = raw.trim().replace(/^(['"])(.*)\1$/, "$2");
-      if (THROUGHPUT.test(name) && !GUARDED.test(name) && !SWITCH.test(name) && /^\d+$/.test(value)) lifted[name] = /(TOKEN_BUDGET|TOKENS)/.test(name) ? "1000000000" : "1000000";
+      if (liftable(name) && /^\d+$/.test(value)) out[name] = lifted(name);
     }
   }
-  return lifted;
+  for (const file of sources) {
+    if (!/\.(?:[cm]?[jt]sx?|py|go|rb|php|rs)$/.test(file)) continue;
+    let text = "";
+    try { if (statSync(file).size > 512_000) continue; text = readFileSync(file, "utf8"); } catch { continue; }
+    for (const m of text.matchAll(ENV_READ)) if (liftable(m[1]) && !(m[1] in out)) out[m[1]] = lifted(m[1]);
+  }
+  return out;
 }
 let secrets = [];
 let identities = null;
@@ -335,6 +346,9 @@ async function startApp() {
   const wanted = Number(flag("--port"));
   if (wanted) {
     if (!(await answers(wanted))) fail(`nothing is answering on port ${wanted}. Start your app first, then run this again.`);
+    const took = await takeOver(wanted);
+    if (took) return took;
+    say("your app was already running, so its request limits stay as they are; if it answers 429, stop it and run this without --port and they are raised for the session");
     return { port: wanted, cmd: null };
   }
   const plan = startPlan({ root, typed: flag("--start"), onPath });
@@ -343,7 +357,7 @@ async function startApp() {
   appDir = plan?.cwd ?? root;
   pinned = pinnedNode();
   if (plan?.within) say(`your app is in ${plan.within}, started there with: ${cmd}`);
-  const lifted = liftedLimits(envFiles);
+  const lifted = liftedLimits(envFiles, files.map((f) => join(root, f)));
   if (Object.keys(lifted).length) say(`higher request limits for this session: ${Object.keys(lifted).join(", ")}`);
   launched = { cmd, lifted };
   step(`starting your app: ${cmd}`);
@@ -354,7 +368,13 @@ async function startApp() {
   if (up.exited !== null && /EADDRINUSE|address already in use|port.{0,40}(?:in use|already used|is taken|unavailable)/i.test(up.tail)) {
     const ports = [...up.tail.matchAll(/(?::|port\s*[:=]?\s*)(\d{4,5})\b/gi)].map((m) => Number(m[1]));
     for (const port of new Set(ports)) {
-      if (await answers(port)) { launched = null; child = null; say(`your app is already running on port ${port}, so that one is used`); return { port, cmd: null }; }
+      if (await answers(port)) {
+        launched = null; child = null;
+        const took = await takeOver(port);
+        if (took) return took;
+        say(`your app is already running on port ${port}, so that one is used; its request limits stay as they are`);
+        return { port, cmd: null };
+      }
     }
   }
   if (up.tail) console.error(up.tail);
@@ -362,6 +382,55 @@ async function startApp() {
   return { port: null, said: up.tail, why: `${up.exited !== null ? "your app stopped before it answered" : "your app did not answer within three minutes"}; what it said is above.${wrongNode}` };
 }
 
+// An app the person started keeps the limits it started with, and a run needs more than a person
+// uses in a month. With their yes, the command stops that app and starts it the way it would have,
+// limits raised for the session. Only in a terminal, only when the code reads a limit, and only
+// when the command knows how to start the app.
+async function takeOver(port) {
+  const lifted = liftedLimits(envFiles, files.map((f) => join(root, f)));
+  const names = Object.keys(lifted);
+  if (!names.length || !process.stdin.isTTY) return null;
+  const plan = startPlan({ root, typed: flag("--start"), onPath });
+  if (!plan?.cmd) return null;
+  const pid = await listenerOn(port);
+  if (!pid) return null;
+  const answer = await ask(`your app is running with its own request limits (${names.join(", ")}). Restart it with them raised for this session? [Y/n] `);
+  if (answer && !/^y(?:es)?$/i.test(answer)) return null;
+  const top = await supervisorOf(pid);
+  step(`stopping your app (pid ${top}) to start it with higher limits`);
+  await stopApp(top);
+  for (let i = 0; i < 50 && (await answers(port)); i++) await new Promise((r) => setTimeout(r, 200));
+  if (await answers(port)) { say("your app did not stop, so it is used as it is"); return null; }
+  appDir = plan.cwd ?? root;
+  pinned = pinnedNode();
+  if (plan.within) say(`your app is in ${plan.within}, started there with: ${plan.cmd}`);
+  say(`higher request limits for this session: ${names.join(", ")}`);
+  launched = { cmd: plan.cmd, lifted };
+  step(`starting your app: ${plan.cmd}`);
+  const up = await launch(180_000);
+  if (up.port) return { port: up.port, cmd: plan.cmd, lifted: names };
+  if (up.tail) console.error(up.tail);
+  fail("your app did not come back after the restart. Start it yourself, then run this again with --port.");
+}
+// The process listening on a port.
+async function listenerOn(port) {
+  try { return Number((await exec("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"])).stdout.trim().split("\n")[0]) || null; } catch { return null; }
+}
+// The top of the chain that runs the app: nodemon, npm, the sh -c under it. Climbs from the listener
+// while the parent is a runner, never into the person's own shell or terminal.
+const RUNNER = /^(?:\S*\/)?(?:node|npm|npx|pnpm|yarn|bun|deno|python[\d.]*|uvicorn|gunicorn|flask|tsx|ts-node|nodemon|concurrently|pm2)(?:\s|$)|^(?:\/bin\/)?sh -c\b/;
+async function supervisorOf(pid) {
+  const rows = (await exec("ps", ["-axo", "pid=,ppid=,args="])).stdout.trim().split("\n").map((l) => l.trim());
+  const table = new Map(rows.map((l) => { const m = /^(\d+)\s+(\d+)\s+(.*)$/.exec(l); return m ? [Number(m[1]), { ppid: Number(m[2]), args: m[3] }] : [0, null]; }));
+  let top = pid;
+  for (let i = 0; i < 8; i++) {
+    const parent = table.get(table.get(top)?.ppid ?? 0);
+    if (!parent || !RUNNER.test(parent.args)) break;
+    top = table.get(top).ppid;
+  }
+  return top;
+}
+
 // Your app, started the way you start it, and watched until one of its own ports answers.
 let launched = null;
 // The Node this project pins, when the shell that ran this command has another. Strapi refuses
@@ -480,6 +549,7 @@ if (explain) {
     `not sent        anything git ignores, env files (${envFiles.length} here: ${envFiles.slice(0, 6).map(rel).join(", ") || "none"}), key files, data files, node_modules, .git`,
     `env files       read here only: to hide their values in replies, and to sign in a test account`,
     `would start     ${flag("--port") ? `nothing: uses your app on port ${flag("--port")}` : plan ? `${plan.cmd}   (in ${rel(plan.cwd)})` : "asks you how your app starts"}`,
+    `would raise     ${flag("--port") ? "nothing: your app's own request limits stay as they are" : `${Object.keys(liftedLimits(envFiles, files.map((f) => join(root, f)))).join(", ") || "no request limits found"}   (for this session only)`}`,
     `loads into app  lib/trace.cjs (Node) or lib/pyhook/sitecustomize.py (Python): records the one request during which your app calls a model`,
     `agent edits     in your files, each with an undo kept in ~/.cortad/checkpoints; git is never touched`,
     `agent shell     confined by the OS: your project and toolchains only, writes to temp and build folders, localhost only`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortad",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Connects the AI app on your machine to Cortad for test conversations. No dependencies.",
   "bin": {
     "cortad": "local.mjs"