@kaynooo/forgejo-tools 0.7.0 → 0.8.0

package/README.md

@@ -33,7 +33,7 @@ Needs [tea](https://gitea.com/gitea/tea) logged in to the Forgejo instance (`tea
 | `ft milestone <title\|id>` | shows a milestone's open issues as `ft board` does (available, taken, claimed by one gone); `ft milestone new <title> [-d text] [--due YYYY-MM-DD]` creates one through the API, sending no `due_on` unless `--due` is given, never a zero date; `ft milestone close <m>` refuses while issues are open in it, naming them, unless `--force` |
 | `ft remote [--fix]` | switches an origin using an ssh alias (`forgejo:owner/repo`) to `git@<host>:owner/repo.git`, which tea matches; the host comes from `--host` or `remoteHost` in `~/.config/ft/config.json` (`{"remoteHost": "git.example.com"}`), and with neither it checks nothing |
 
-`ft <command> --help` lists each command's options. Waiting commands exit 0 when the runs pass, 1 when one fails, 2 on a timeout, a stalled queue or bad usage; the other commands exit 0 when done, 1 when Forgejo refuses or a check fails, 2 on a usage error.
+`ft <command> --help` lists each command's options. Waiting commands show one line per run, redrawn in place on a terminal and left at its last status, and a line per status change in a log or a pipe; they exit 0 when the runs pass, 1 when one fails, 2 on a timeout, a stalled queue or bad usage; the other commands exit 0 when done, 1 when Forgejo refuses or a check fails, 2 on a usage error.
 
 ## CI
 

package/dist/cli.js

@@ -1222,8 +1222,77 @@ function capped(rows, limit) {
 var DAY_MS = 24 * 60 * 60 * 1000;
 // ../kit/src/secrets.ts
 var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "session", "jwt", "ssn", "iban", "card", "cvv", "otp"]);
+// ../kit/src/sessions.ts
+import { homedir } from "os";
+import { join } from "path";
+import process10 from "process";
+var {Glob } = globalThis.Bun;
+var SESSION_FILES = new Glob("*.json");
+var ACCOUNT_DIRS = new Glob("*/sessions");
+async function sessionDirs() {
+  const home = homedir();
+  const dirs = new Set([join(home, ".claude", "sessions")]);
+  if (process10.env.CLAUDE_CONFIG_DIR !== undefined)
+    dirs.add(join(process10.env.CLAUDE_CONFIG_DIR, "sessions"));
+  try {
+    for await (const dir of ACCOUNT_DIRS.scan({ cwd: join(home, ".claude-accounts"), onlyFiles: false, absolute: true }))
+      dirs.add(dir);
+  } catch {}
+  return [...dirs];
+}
+async function procStat(pid) {
+  try {
+    const stat = await Bun.file(`/proc/${pid}/stat`).text();
+    return stat.slice(stat.lastIndexOf(")") + 2).split(" ");
+  } catch {
+    return;
+  }
+}
+async function isAlive(pid, procStart) {
+  const stat = await procStat(pid);
+  if (stat === undefined)
+    return false;
+  return procStart === undefined || stat[19] === procStart;
+}
+async function liveSessions() {
+  const sessions = new Map;
+  for (const dir of await sessionDirs()) {
+    let files;
+    try {
+      files = await Array.fromAsync(SESSION_FILES.scan({ cwd: dir, absolute: true }));
+    } catch {
+      continue;
+    }
+    for (const file of files) {
+      let entry;
+      try {
+        entry = await Bun.file(file).json();
+      } catch {
+        continue;
+      }
+      if (entry.name === undefined || entry.pid === undefined || sessions.has(entry.pid) || !await isAlive(entry.pid, entry.procStart))
+        continue;
+      sessions.set(entry.pid, { name: entry.name, pid: entry.pid, status: entry.status ?? "unknown", cwd: entry.cwd ?? "" });
+    }
+  }
+  return [...sessions.values()];
+}
+async function currentSession(sessions) {
+  const byPid = new Map(sessions.map((session) => [session.pid, session]));
+  let pid = process10.ppid;
+  for (let depth = 0;depth < 32 && pid > 1; depth++) {
+    const session = byPid.get(pid);
+    if (session !== undefined)
+      return session;
+    const parent = Number((await procStat(pid))?.[1]);
+    if (!Number.isInteger(parent))
+      return;
+    pid = parent;
+  }
+  return;
+}
 // package.json
-var version = "0.7.0";
+var version = "0.8.0";
 
 // src/args.ts
 var repoOption = {
@@ -1625,76 +1694,6 @@ async function closeMilestone(id, repo) {
   await repoWrite("PATCH", `milestones/${id}`, { state: "closed" }, repo);
 }
 
-// src/sessions.ts
-import { homedir } from "os";
-import { join } from "path";
-import process11 from "process";
-var {Glob } = globalThis.Bun;
-var SESSION_FILES = new Glob("*.json");
-var ACCOUNT_DIRS = new Glob("*/sessions");
-async function sessionDirs() {
-  const home = homedir();
-  const dirs = new Set([join(home, ".claude", "sessions")]);
-  if (process11.env.CLAUDE_CONFIG_DIR !== undefined)
-    dirs.add(join(process11.env.CLAUDE_CONFIG_DIR, "sessions"));
-  try {
-    for await (const dir of ACCOUNT_DIRS.scan({ cwd: join(home, ".claude-accounts"), onlyFiles: false, absolute: true }))
-      dirs.add(dir);
-  } catch {}
-  return [...dirs];
-}
-async function procStat(pid) {
-  try {
-    const stat = await Bun.file(`/proc/${pid}/stat`).text();
-    return stat.slice(stat.lastIndexOf(")") + 2).split(" ");
-  } catch {
-    return;
-  }
-}
-async function isAlive(pid, procStart) {
-  const stat = await procStat(pid);
-  if (stat === undefined)
-    return false;
-  return procStart === undefined || stat[19] === procStart;
-}
-async function liveSessions() {
-  const sessions = new Map;
-  for (const dir of await sessionDirs()) {
-    let files;
-    try {
-      files = await Array.fromAsync(SESSION_FILES.scan({ cwd: dir, absolute: true }));
-    } catch {
-      continue;
-    }
-    for (const file of files) {
-      let entry;
-      try {
-        entry = await Bun.file(file).json();
-      } catch {
-        continue;
-      }
-      if (entry.name === undefined || entry.pid === undefined || sessions.has(entry.pid) || !await isAlive(entry.pid, entry.procStart))
-        continue;
-      sessions.set(entry.pid, { name: entry.name, pid: entry.pid, status: entry.status ?? "unknown", cwd: entry.cwd ?? "" });
-    }
-  }
-  return [...sessions.values()];
-}
-async function currentSession(sessions) {
-  const byPid = new Map(sessions.map((session) => [session.pid, session]));
-  let pid = process11.ppid;
-  for (let depth = 0;depth < 32 && pid > 1; depth++) {
-    const session = byPid.get(pid);
-    if (session !== undefined)
-      return session;
-    const parent = Number((await procStat(pid))?.[1]);
-    if (!Number.isInteger(parent))
-      return;
-    pid = parent;
-  }
-  return;
-}
-
 // src/commands/board.ts
 var LINE_START = /^/gm;
 var TITLE_WIDTH = 80;
@@ -3066,9 +3065,11 @@ var options5 = {
 var timing = { poll: 1e4 };
 var LIMIT = 20;
 var STALLED2 = 3 * 60000;
-async function watchRuns(pick, timeout, repo, idle) {
+async function watchRuns(pick, timeout, repo, idle, out = process.stdout) {
   const started = Date.now();
-  const reported = new Map;
+  const latest = new Map;
+  const line = (run) => `${run.workflow_id} run ${run.id} on ${run.prettyref}: ${badge(run.status, out)}`;
+  const region = takesControlCodes(out) ? liveRegion(() => [...latest.values()].map(line), out) : undefined;
   const followed = new Set;
   const failed = new Set;
   let moving = started;
@@ -3079,10 +3080,12 @@ async function watchRuns(pick, timeout, repo, idle) {
     for (const run of runs)
       followed.add(run.id);
     for (const run of runs) {
-      if (reported.get(run.id) !== run.status)
-        console.log(`${run.workflow_id} run ${run.id} on ${run.prettyref}: ${badge(run.status, process.stdout)}`);
-      reported.set(run.id, run.status);
+      if (region === undefined && latest.get(run.id)?.status !== run.status)
+        out.write(`${line(run)}
+`);
+      latest.set(run.id, run);
     }
+    region?.redraw();
     if (runs.length === 0) {
       if (idle !== undefined && Date.now() - started > idle) {
         console.log("no run started, so nothing was waited for");
@@ -3110,21 +3113,33 @@ ${run.html_url}`);
       fail(`queued runs are not moving: ${stall.reason}`);
     return;
   }
-  for (;; ) {
-    await Bun.sleep(timing.poll);
-    if (Date.now() - started > timeout)
-      fail(`the runs did not finish in ${formatDuration(timeout)}`);
-    try {
-      const code = await poll();
-      if (code !== undefined)
-        return code;
-    } catch (error) {
-      if (error instanceof Exit)
-        throw error;
-      const message = error instanceof Error ? error.message : String(error);
-      if (isPermanentFailure(error))
-        fail(message);
-      console.warn(`ft watch: ${message}, polling again`);
+  async function settle() {
+    for (;; ) {
+      await Bun.sleep(timing.poll);
+      if (Date.now() - started > timeout)
+        fail(`the runs did not finish in ${formatDuration(timeout)}`);
+      try {
+        const code = await poll();
+        if (code !== undefined)
+          return code;
+      } catch (error) {
+        if (error instanceof Exit)
+          throw error;
+        const message = error instanceof Error ? error.message : String(error);
+        if (isPermanentFailure(error))
+          fail(message);
+        console.warn(`ft watch: ${message}, polling again`);
+      }
+    }
+  }
+  try {
+    return await settle();
+  } finally {
+    if (region !== undefined) {
+      region.stop();
+      for (const run of latest.values())
+        out.write(`${line(run)}
+`);
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/forgejo-tools",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "ft: Forgejo CI runs, logs, releases and issue checklists from the terminal, through tea.",
   "author": "Kaynooo <contact@kaynooo.fr>",
   "license": "MIT",