@rse/ase 2.0.2 → 2.0.3

package/dst/ase-service.js

@@ -5,7 +5,6 @@
 */
 import path from "node:path";
 import fs from "node:fs";
-import net from "node:net";
 import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
 import Hapi from "@hapi/hapi";
@@ -13,7 +12,6 @@ import { ofetch } from "ofetch";
 import { isMap } from "yaml";
 import prettyMs from "pretty-ms";
 import * as v from "valibot";
-import { Tail } from "tail";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { ConfigMCP } from "./ase-config.js";
@@ -21,6 +19,7 @@ import { Config } from "./ase-config-core.js";
 import { configSchema } from "./ase-config-schema.js";
 import { ensureAseGitignore } from "./ase-config-scope.js";
 import { isLogLevel } from "./ase-lib-log.js";
+import { Daemon } from "./ase-lib-daemon-cli.js";
 import { CompatMCP } from "./ase-util-compat.js";
 import { DiagramMCP } from "./ase-util-diagram.js";
 import { Task, TaskMCP } from "./ase-task.js";
@@ -76,14 +75,7 @@ const PORT_ENV = "ASE_SERVICE_PORT";
 const LEVEL_ENV = "ASE_SERVICE_LOG_LEVEL";
 const IDLE_MS = 30 * 60 * 1000;
 const TICK_MS = 60 * 1000;
-const PORT_MIN = 42000;
-const PORT_MAX = 44000;
-const PORT_TRIES = 20;
-/*  bounds for the append-only ".ase/service.log" file:
-    maximum tolerated size, number of tail lines surviving a trim,
-    and maximum length of the MCP tool call arguments logged per request  */
-const LOG_MAX_SIZE = 1024 * 1024;
-const LOG_KEEP_LINES = 2000;
+/*  maximum length of the MCP tool call arguments logged per request  */
 const LOG_ARGS_MAX = 200;
 /*  load the optional "config.yaml" and "service.yaml" files and derive
     the service identity context (project id, port, preferred port, service config)  */
@@ -105,33 +97,8 @@ export const loadServiceContext = (log) => {
     /*  return context information  */
     return { projectId, port, portPref, svc, aseDir };
 };
-/*  reusable functionality: port allocation, persistence, and process spawning  */
+/*  reusable functionality: port persistence and process spawning  */
 export class Service {
-    /*  try binding a single candidate port to verify availability  */
-    static tryBind(port) {
-        return new Promise((resolve) => {
-            const s = net.createServer();
-            s.once("error", () => {
-                resolve(false);
-            });
-            s.once("listening", () => {
-                s.close(() => resolve(true));
-            });
-            s.listen(port, HOST);
-        });
-    }
-    /*  allocate the preferred port, if given and available,
-        else a fresh random port in PORT_MIN..PORT_MAX  */
-    static async allocatePort(pref = null) {
-        if (pref !== null && await Service.tryBind(pref))
-            return pref;
-        for (let i = 0; i < PORT_TRIES; i++) {
-            const p = PORT_MIN + Math.floor(Math.random() * (PORT_MAX - PORT_MIN + 1));
-            if (await Service.tryBind(p))
-                return p;
-        }
-        throw new Error(`failed to allocate a port in ${PORT_MIN}..${PORT_MAX} after ${PORT_TRIES} attempts`);
-    }
     /*  persist an allocated port into ".ase/service.yaml"  */
     static persistPort(svc, port) {
         ensureAseGitignore(path.dirname(svc.filename));
@@ -156,19 +123,6 @@ export class Service {
                 svc.write();
         });
     }
-    /*  trim the log file down to its tail if it grew beyond the size limit  */
-    static trimLog(logFile) {
-        try {
-            if (!fs.existsSync(logFile) || fs.statSync(logFile).size <= LOG_MAX_SIZE)
-                return;
-            const tail = Service.readLogTail(logFile, LOG_KEEP_LINES);
-            fs.writeFileSync(logFile, tail.length > 0 ? `${tail}\n` : "");
-        }
-        catch {
-            /*  intentionally ignore all trimming errors, as a
-                non-trimmable log file must never block the service  */
-        }
-    }
     /*  spawn the current executable detached as a background service  */
     static spawnDetached(aseDir, port, logLevel) {
         fs.mkdirSync(aseDir, { recursive: true });
@@ -177,7 +131,7 @@ export class Service {
         /*  trim the log before handing it to the service, as the detached
             service inherits the file descriptor for its entire lifetime and
             hence cannot rotate the file itself while it is running  */
-        Service.trimLog(logFile);
+        Daemon.trimLog(logFile);
         const fd = fs.openSync(logFile, "a");
         const entry = fileURLToPath(new URL("./ase.js", import.meta.url));
         const child = spawn(process.execPath, [entry, "service", "start"], {
@@ -188,68 +142,6 @@ export class Service {
         fs.closeSync(fd);
         return { child, logFile };
     }
-    /*  read the last N non-empty lines of a log file for diagnostics  */
-    static readLogTail(logFile, lines) {
-        let fd = null;
-        try {
-            fd = fs.openSync(logFile, "r");
-            const size = fs.fstatSync(fd).size;
-            const CHUNK = 8192;
-            const chunks = [];
-            let pos = size;
-            let count = 0;
-            while (pos > 0 && count <= lines) {
-                const n = Math.min(CHUNK, pos);
-                const buf = Buffer.alloc(n);
-                pos -= n;
-                fs.readSync(fd, buf, 0, n, pos);
-                chunks.unshift(buf);
-                for (let i = 0; i < n; i++)
-                    if (buf[i] === 10)
-                        count++;
-            }
-            /*  decode once after re-assembly to avoid splitting
-                multi-byte UTF-8 sequences at chunk boundaries  */
-            const all = Buffer.concat(chunks).toString("utf8")
-                .split("\n").filter((l) => l.length > 0);
-            return all.slice(-lines).join("\n");
-        }
-        catch {
-            return "";
-        }
-        finally {
-            if (fd !== null)
-                fs.closeSync(fd);
-        }
-    }
-    /*  show a log file on stdout, either completely or its last <lines> lines only, and
-        optionally follow it for newly appended lines (default: the last 10 lines first),
-        where each line is passed through <transform> (e.g. to colorize parts of it)  */
-    static async showLog(logFile, opts, transform = (line) => line) {
-        const lines = opts.lines !== undefined ? Number(opts.lines) : null;
-        if (lines !== null && (!Number.isInteger(lines) || lines < 1))
-            throw new Error(`invalid number of lines: ${opts.lines}`);
-        if (!fs.existsSync(logFile))
-            return 0;
-        if (opts.follow) {
-            /*  follow until interrupted (on log trimming,
-                "tail" continues at the new end of the file)  */
-            const tail = new Tail(logFile, { nLines: lines ?? 10 });
-            tail.on("line", (line) => {
-                process.stdout.write(`${transform(line)}\n`);
-            });
-            return await new Promise((_resolve, reject) => {
-                tail.on("error", (err) => {
-                    reject(err instanceof Error ? err : new Error(String(err)));
-                });
-            });
-        }
-        const text = lines !== null ?
-            Service.readLogTail(logFile, lines) :
-            fs.readFileSync(logFile, "utf8").replace(/\n$/, "");
-        process.stdout.write(text.length > 0 ? `${text.split("\n").map(transform).join("\n")}\n` : "");
-        return 0;
-    }
 }
 /*  MCP registration entry point for service-identity tools  */
 export class ServiceMCP {
@@ -332,6 +224,68 @@ export default class ServiceCommand {
         }
         return { method: bMethod, info };
     }
+    /*  register the endpoints of the AI usage accounting: the usage records forwarded
+        by the OTLP ingress, the session end, the task assignment on behalf of a session,
+        and the task rename  */
+    static registerUsageRoutes(server, usage) {
+        server.route({
+            method: "POST",
+            path: "/usage/records",
+            options: { payload: { parse: true, allow: "application/json", maxBytes: 32 * 1024 * 1024 } },
+            handler: (request, h) => {
+                const payload = request.payload;
+                if (!Array.isArray(payload?.records))
+                    return h.response({ error: "missing or invalid 'records' field" }).code(400);
+                usage.ingest(payload.records);
+                return h.response({ ok: true }).code(200);
+            }
+        });
+        server.route({
+            method: "POST",
+            path: "/usage/detach",
+            options: { payload: { parse: true, allow: "application/json" } },
+            handler: (request, h) => {
+                const payload = request.payload;
+                if (typeof payload?.session !== "string")
+                    return h.response({ error: "missing or invalid 'session' field" }).code(400);
+                usage.detach(payload.session);
+                return h.response({ ok: true }).code(200);
+            }
+        });
+        server.route({
+            method: "POST",
+            path: "/usage/rename",
+            options: { payload: { parse: true, allow: "application/json" } },
+            handler: (request, h) => {
+                const payload = request.payload;
+                if (typeof payload?.old !== "string" || typeof payload.new !== "string")
+                    return h.response({ error: "missing or invalid 'old' or 'new' field" }).code(400);
+                try {
+                    usage.rename(payload.old, payload.new);
+                }
+                catch (err) {
+                    return h.response({ error: err instanceof Error ? err.message : String(err) }).code(422);
+                }
+                return h.response({ ok: true }).code(200);
+            }
+        });
+        server.route({
+            method: "POST",
+            path: "/usage/assign",
+            options: { payload: { parse: true, allow: "application/json" } },
+            handler: async (request, h) => {
+                const payload = request.payload;
+                if (typeof payload?.id !== "string" || typeof payload.assignee !== "string" || typeof payload.session !== "string")
+                    return h.response({ error: "missing or invalid 'id', 'assignee', or 'session' field" }).code(400);
+                try {
+                    return h.response(await usage.assign(payload.id, payload.assignee, payload.session)).code(200);
+                }
+                catch (err) {
+                    return h.response({ error: err instanceof Error ? err.message : String(err) }).code(422);
+                }
+            }
+        });
+    }
     /*  service-side: bind HAPI server until "/stop" command is received or idle timeout happens
         (or, in the foreground, until "/stop" command is received or a termination signal arrives)  */
     async runService(ctx, foreground = false) {
@@ -361,6 +315,18 @@ export default class ServiceCommand {
         const usage = new UsageTracker(this.log, Task.projectRoot(), ctx.projectId, ctx.aseDir, () => {
             lastActivity = Date.now();
         });
+        /*  stop the HTTP server and the usage tracker, clear the persisted port, and exit  */
+        const stopService = async () => {
+            try {
+                await server.stop({ timeout: 1000 });
+            }
+            catch (err) {
+                this.log.write("error", `service: stop failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+            await usage.stop();
+            Service.clearPort(ctx.svc);
+            process.exit(0);
+        };
         /*  listen to HTTP/REST endpoints  */
         server.route({
             method: "OPTIONS",
@@ -379,17 +345,7 @@ export default class ServiceCommand {
                 if (!ct.startsWith("application/json"))
                     return h.response({ error: "unsupported media type" }).code(415);
                 this.log.write("info", "service: stop requested");
-                setImmediate(async () => {
-                    try {
-                        await server.stop({ timeout: 1000 });
-                    }
-                    catch (err) {
-                        const e = err;
-                        this.log.write("error", `service: stop failed: ${e.message}`);
-                    }
-                    await usage.stop();
-                    process.exit(0);
-                });
+                setImmediate(stopService);
                 return h.response({ ok: true }).code(200);
             }
         });
@@ -456,66 +412,8 @@ export default class ServiceCommand {
                 return h.response({ error: "unknown command", command: cmd }).code(400);
             }
         });
-        /*  listen to the endpoints of the AI usage accounting: the usage records forwarded
-            by the OTLP ingress, the session end, the task assignment on behalf of a session,
-            and the task rename  */
-        server.route({
-            method: "POST",
-            path: "/usage/records",
-            options: { payload: { parse: true, allow: "application/json", maxBytes: 32 * 1024 * 1024 } },
-            handler: (request, h) => {
-                const payload = request.payload;
-                if (!Array.isArray(payload?.records))
-                    return h.response({ error: "missing or invalid 'records' field" }).code(400);
-                usage.ingest(payload.records);
-                return h.response({ ok: true }).code(200);
-            }
-        });
-        server.route({
-            method: "POST",
-            path: "/usage/detach",
-            options: { payload: { parse: true, allow: "application/json" } },
-            handler: (request, h) => {
-                const payload = request.payload;
-                if (typeof payload?.session !== "string")
-                    return h.response({ error: "missing or invalid 'session' field" }).code(400);
-                usage.detach(payload.session);
-                return h.response({ ok: true }).code(200);
-            }
-        });
-        server.route({
-            method: "POST",
-            path: "/usage/rename",
-            options: { payload: { parse: true, allow: "application/json" } },
-            handler: (request, h) => {
-                const payload = request.payload;
-                if (typeof payload?.old !== "string" || typeof payload.new !== "string")
-                    return h.response({ error: "missing or invalid 'old' or 'new' field" }).code(400);
-                try {
-                    usage.rename(payload.old, payload.new);
-                }
-                catch (err) {
-                    return h.response({ error: err instanceof Error ? err.message : String(err) }).code(422);
-                }
-                return h.response({ ok: true }).code(200);
-            }
-        });
-        server.route({
-            method: "POST",
-            path: "/usage/assign",
-            options: { payload: { parse: true, allow: "application/json" } },
-            handler: async (request, h) => {
-                const payload = request.payload;
-                if (typeof payload?.id !== "string" || typeof payload.assignee !== "string" || typeof payload.session !== "string")
-                    return h.response({ error: "missing or invalid 'id', 'assignee', or 'session' field" }).code(400);
-                try {
-                    return h.response(await usage.assign(payload.id, payload.assignee, payload.session)).code(200);
-                }
-                catch (err) {
-                    return h.response({ error: err instanceof Error ? err.message : String(err) }).code(422);
-                }
-            }
-        });
+        /*  listen to the endpoints of the AI usage accounting  */
+        ServiceCommand.registerUsageRoutes(server, usage);
         /*  serve the web board of the project (imported dynamically to keep it out of all
             other CLI commands; its rendering dependencies marked, MRCS, and ELK load on
             first request only, its board core dependencies at service startup)  */
@@ -549,16 +447,7 @@ export default class ServiceCommand {
                     return;
                 stopping = true;
                 this.log.write("info", `service: received ${signal}, stopping`);
-                try {
-                    await server.stop({ timeout: 1000 });
-                }
-                catch (err) {
-                    const e = err;
-                    this.log.write("error", `service: stop failed: ${e.message}`);
-                }
-                await usage.stop();
-                Service.clearPort(ctx.svc);
-                process.exit(0);
+                await stopService();
             };
             process.on("SIGTERM", () => shutdown("SIGTERM"));
             process.on("SIGINT", () => shutdown("SIGINT"));
@@ -578,25 +467,13 @@ export default class ServiceCommand {
             if (Date.now() - lastActivity > IDLE_MS) {
                 stopping = true;
                 this.log.write("info", "service: idle timeout reached, stopping");
-                try {
-                    await server.stop({ timeout: 1000 });
-                    await usage.stop();
-                    Service.clearPort(ctx.svc);
-                    process.exit(0);
-                }
-                catch (err) {
-                    const e = err;
-                    this.log.write("error", `service: stop failed: ${e.message}`);
-                    await usage.stop();
-                    Service.clearPort(ctx.svc);
-                    process.exit(1);
-                }
+                await stopService();
             }
         }, TICK_MS).unref();
     }
     /*  allocate the service port, preferring the configured one, else falling back to a random one  */
     async allocatePort(ctx) {
-        const port = await Service.allocatePort(ctx.portPref);
+        const port = await Daemon.allocatePort(ctx.portPref);
         if (ctx.portPref !== null && port !== ctx.portPref)
             this.log.write("warning", `service: preferred port ${ctx.portPref} unavailable, falling back to port ${port}`);
         return port;
@@ -612,7 +489,7 @@ export default class ServiceCommand {
             if (level !== undefined && isLogLevel(level))
                 this.log.logLevel(level);
             const raw = process.env[PORT_ENV];
-            port = raw !== undefined ? Number(raw) : await Service.allocatePort();
+            port = raw !== undefined ? Number(raw) : await Daemon.allocatePort();
             await this.runService({ ...ctx, port });
             return await new Promise(() => { });
         }
@@ -668,7 +545,7 @@ export default class ServiceCommand {
                         break;
                     }
                 }
-                const tail = Service.readLogTail(logFile, 20);
+                const tail = Daemon.readLogTail(logFile, 20);
                 const reason = exited ?
                     `service exited during startup (code ${exitCode})` :
                     foreign ?
@@ -755,7 +632,7 @@ export default class ServiceCommand {
     /*  log flow: show the (tail of the) log file and optionally follow it  */
     async doLog(opts) {
         const ctx = this.loadContext();
-        return Service.showLog(path.join(ctx.aseDir, "service.log"), opts);
+        return Daemon.showLog(path.join(ctx.aseDir, "service.log"), opts);
     }
     /*  stop flow: no-op if no port configured or connection refused  */
     async doStop() {

package/dst/ase-setup-common.js

@@ -51,8 +51,7 @@ export class SetupRunner {
         if (process.platform === "win32")
             return false;
         /*  already running as root  */
-        const getuid = process.getuid;
-        if (typeof getuid === "function" && getuid.call(process) === 0)
+        if (process.getuid?.() === 0)
             return false;
         /*  determine the npm global prefix and probe writability of the
             directories that "npm -g" actually mutates  */

package/dst/ase-setup-settings.js

@@ -252,7 +252,6 @@ export class SetupSettings {
         /*  the OpenAI Codex CLI has no scriptable statusline mechanism at all  */
         if (tool === "codex")
             return [];
-        const home = os.homedir();
         const scopes = tool === "claude" ? ["user", "project", "local"] : ["user"];
         const entries = [];
         for (const scope of scopes) {
@@ -269,7 +268,7 @@ export class SetupSettings {
             if (member === undefined)
                 continue;
             entries.push({
-                file: file.startsWith(home + path.sep) ? `~${file.slice(home.length)}` : file,
+                file: this.fileDisplay(file),
                 scope: tool === "claude" ? scope : "(n/a)",
                 status: this.statuslineIsOwned(member) ? "activated" : "foreign"
             });
@@ -336,7 +335,6 @@ export class SetupSettings {
     async outputStyleStatus(tool) {
         if (tool !== "claude")
             return [];
-        const home = os.homedir();
         const scopes = ["user", "project", "local"];
         const entries = [];
         for (const scope of scopes) {
@@ -353,7 +351,7 @@ export class SetupSettings {
             if (member === undefined)
                 continue;
             entries.push({
-                file: file.startsWith(home + path.sep) ? `~${file.slice(home.length)}` : file,
+                file: this.fileDisplay(file),
                 scope,
                 status: this.outputStyleIsOwned(member) ? "selected" : "foreign"
             });
@@ -389,8 +387,7 @@ export class SetupSettings {
             /*  a match is the presence of the "ase@ase" key under
                 "enabledPlugins", regardless of its true/false value  */
             const plugins = settings?.enabledPlugins;
-            if (plugins !== undefined && plugins !== null
-                && Object.prototype.hasOwnProperty.call(plugins, "ase@ase")) {
+            if (plugins !== undefined && plugins !== null && Object.hasOwn(plugins, "ase@ase")) {
                 if (scope !== "user")
                     this.log.write("info", `setup: detected ASE plugin installation in scope "${scope}"`);
                 return scope;
@@ -488,7 +485,7 @@ export class SetupSettings {
         return files;
     }
     /*  abbreviate the home directory of a file path as "~"  */
-    telemetryFileDisplay(file) {
+    fileDisplay(file) {
         const home = os.homedir();
         return file.startsWith(home + path.sep) ? `~${file.slice(home.length)}` : file;
     }
@@ -796,7 +793,7 @@ export class SetupSettings {
             const present = env !== undefined && env.type() === "object" ? this.telemetryClaudePresent(env) : [];
             if (env !== undefined && present.length > 0)
                 entries.push({
-                    file: this.telemetryFileDisplay(file),
+                    file: this.fileDisplay(file),
                     scope: "user",
                     status: this.telemetryClaudeIsOwned(env) ? "activated" : "foreign"
                 });
@@ -822,7 +819,7 @@ export class SetupSettings {
                 else if ([...block.head, ...block.tail].some((line) => foreign.test(line)))
                     status = "foreign";
                 if (status !== "")
-                    entries.push({ file: this.telemetryFileDisplay(file), scope: "(n/a)", status });
+                    entries.push({ file: this.fileDisplay(file), scope: "(n/a)", status });
             }
             if (tool === "copilot" && this.telemetryCopilotForeignEnv() !== undefined)
                 entries.push({ file: "$OTEL_EXPORTER_OTLP_ENDPOINT", scope: "(n/a)", status: "foreign" });

package/dst/ase-setup.js

@@ -347,10 +347,9 @@ export default class SetupCommand {
         });
         /*  parser for the non-negative integer "ase setup statusline" options  */
         const parseNonNeg = (name) => (value) => {
-            const n = Number.parseInt(value, 10);
-            if (!Number.isFinite(n) || n < 0)
+            if (!/^\d+$/.test(value))
                 throw new Error(`invalid --${name} value: "${value}" (expected a non-negative integer)`);
-            return n;
+            return Number.parseInt(value, 10);
         };
         /*  register CLI sub-command "ase setup statusline"  */
         const statuslineCmd = setupCmd