@autoscanlab/connect 0.4.1 → 0.4.2

package/connect.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawn, spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { appendFileSync, chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { appendFileSync, chmodSync, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { homedir, hostname, platform } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -10,6 +10,7 @@ import manifest from "./package.json" with { type: "json" };
 
 const IDLE_EXIT_MS = 30 * 60_000;
 const RETRY_MS = 5_000;
+const OUTPUT_TAIL = 1_000;
 const AGENT_LABELS = { claude: "Claude Code", codex: "Codex" };
 const SCHEME = "autoscan";
 const KEYCHAIN_SERVICE = "autoscan-connect";
@@ -210,6 +211,7 @@ async function install(value, code) {
   const check = await reach(`${helperUrl(base, agents)}&wait=0`, { headers: { Authorization: `Bearer ${key}` } });
   if (!check.ok) fail((await check.text()) || "That key doesn't work for this course.");
   mkdirSync(APP_DIR, { recursive: true });
+  stopRunning(base);
   for (const file of ["connect.mjs", "package.json"]) copyFileSync(join(HERE, file), join(APP_DIR, file));
   saveKey(base, key);
   registerLink(join(APP_DIR, "connect.mjs"));
@@ -232,9 +234,34 @@ function uninstall() {
   console.log("Removed autOScan from this computer.");
 }
 
+const lockOf = (base) => join(APP_DIR, `running-${createHash("sha256").update(base).digest("hex").slice(0, 12)}.pid`);
+
+function stopRunning(base) {
+  const lock = lockOf(base);
+  if (!existsSync(lock)) return;
+  try {
+    process.kill(Number(readFileSync(lock, "utf8")), "SIGTERM");
+  } catch {}
+  rmSync(lock, { force: true });
+}
+
+function updateItself(base) {
+  console.log("Updating the helper…");
+  rmSync(lockOf(base), { force: true });
+  const npx = OS === "win32" ? "npx.cmd" : "npx";
+  const updated = spawnSync(npx, ["--prefer-online", "-y", `${manifest.name}@latest`, "install", base], { stdio: "inherit", shell: OS === "win32" });
+  if (updated.status !== 0) fail("Couldn't update the helper. Run the install command from autOScan's Agents page.");
+  // Restarting the same version would be told to update again, round and round.
+  if (JSON.parse(readFileSync(join(APP_DIR, "package.json"), "utf8")).version === manifest.version) fail("No newer helper is published yet; try again later.");
+  const log = openSync(join(APP_DIR, "helper.log"), "a");
+  const link = `${SCHEME}://connect?base=${encodeURIComponent(base)}`;
+  spawn(process.execPath, [join(APP_DIR, "connect.mjs"), "open", link], { detached: true, stdio: ["ignore", log, log] }).unref();
+  process.exit(0);
+}
+
 // One helper per course: a second autoscan:// link while one runs leaves it be.
 function holdLock(base) {
-  const lock = join(APP_DIR, `running-${createHash("sha256").update(base).digest("hex").slice(0, 12)}.pid`);
+  const lock = lockOf(base);
   if (existsSync(lock)) {
     try {
       process.kill(Number(readFileSync(lock, "utf8")), 0);
@@ -249,14 +276,15 @@ function holdLock(base) {
 async function run(base, key) {
   const agents = agentsOrFail();
   const headers = { Authorization: `Bearer ${key}` };
-  const report = (running) =>
+  const report = (running, exit = null) =>
     fetch(`${base}/agent/helper`, {
       method: "POST",
       headers: { ...headers, "Content-Type": "application/json" },
-      body: JSON.stringify({ running }),
+      body: JSON.stringify({ running, exit }),
     }).catch(() => {});
 
   let child = null;
+  let stopping = false;
   let idleSince = Date.now();
   let reachable = null;
   const announce = (now) => {
@@ -267,14 +295,29 @@ async function run(base, key) {
   const start = async ({ agent, workspace }) => {
     const { command, args, env } = agentCommand(agent, { mcpUrl: `${base}/mcp/grading`, key, workspace });
     console.log(`Grading ${workspace} with ${AGENT_LABELS[agent]}…`);
-    child = spawn(command, args, { stdio: "inherit", env: { ...process.env, ...env } });
-    await report({ workspace, agent });
-    child.on("exit", () => {
+    const running = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, ...env } });
+    child = running;
+    let tail = "";
+    for (const [stream, log] of [[running.stdout, process.stdout], [running.stderr, process.stderr]]) {
+      stream.on("data", (chunk) => {
+        log.write(chunk);
+        tail = (tail + chunk).slice(-OUTPUT_TAIL);
+      });
+    }
+    let ended = false;
+    const end = (code, error) => {
+      if (ended) return;
+      ended = true;
       child = null;
       idleSince = Date.now();
-      console.log("Agent stopped.");
-      void report(null);
-    });
+      const failed = !stopping && (error !== null || code !== 0);
+      stopping = false;
+      console.log(failed ? `Agent stopped unexpectedly (${error?.message ?? `exit code ${code}`}).` : "Agent stopped.");
+      void report(null, failed ? { agent, code, message: error?.message ?? (tail.trim() || `${AGENT_LABELS[agent]} exited with code ${code}.`) } : null);
+    };
+    running.on("error", (error) => end(null, error));
+    running.on("close", (code) => end(code, null));
+    await report({ workspace, agent });
   };
 
   while (child || Date.now() - idleSince < IDLE_EXIT_MS) {
@@ -288,8 +331,14 @@ async function run(base, key) {
     announce(true);
     if (response.status !== 200) continue;
     const command = await response.json();
-    if (command.kind === "stop") child?.kill("SIGTERM");
-    else if (!child && agents.includes(command.agent)) await start(command);
+    if (command.kind === "update" && !child) {
+      updateItself(base);
+    } else if (command.kind === "stop" && child) {
+      stopping = true;
+      child.kill("SIGTERM");
+    } else if (command.kind === "start" && !child && agents.includes(command.agent)) {
+      await start(command);
+    }
   }
   console.log("Idle for 30 minutes; disconnected.");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autoscanlab/connect",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Lets autOScan start your own Claude Code or Codex to grade alongside you.",
   "type": "module",
   "bin": {