@songsid/agend 2.1.4-beta.2 → 2.1.4-beta.4

package/dist/update-marker.js

@@ -13,7 +13,7 @@
  * machine reboots) must not leave the fleet permanently unable to report a real
  * crash — a stale marker is ignored, and the next fleet startup deletes it.
  */
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 /**
  * How long a marker is believed. Long enough for a slow npm install plus a
@@ -25,16 +25,75 @@ const FILE = "update-in-progress.json";
 function markerPath(dataDir) {
     return join(dataDir, FILE);
 }
-/** Called by `agend update` before it touches anything. */
-export function markUpdateInProgress(dataDir, now = Date.now()) {
+function readMarker(dataDir) {
+    try {
+        const parsed = JSON.parse(readFileSync(markerPath(dataDir), "utf-8"));
+        if (typeof parsed.startedAt !== "number" || !Number.isFinite(parsed.startedAt))
+            return null;
+        if (typeof parsed.pid !== "number" || !Number.isFinite(parsed.pid))
+            return null;
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+function writeMarker(dataDir, marker) {
+    const path = markerPath(dataDir);
+    const temp = `${path}.${process.pid}.${Date.now()}.tmp`;
     try {
-        writeFileSync(markerPath(dataDir), JSON.stringify({ startedAt: now, pid: process.pid }));
+        writeFileSync(temp, JSON.stringify(marker), { mode: 0o600 });
+        renameSync(temp, path);
+        return true;
     }
     catch {
-        // Best effort: failing to write the marker costs a few spurious alerts,
-        // which is not a reason to abort someone's upgrade.
+        try {
+            unlinkSync(temp);
+        }
+        catch { /* best effort */ }
+        return false;
     }
 }
+/** Persist the channel message that `/update` will edit across process restart. */
+export function beginUpdateProgress(dataDir, target, now = Date.now()) {
+    writeMarker(dataDir, {
+        startedAt: now,
+        pid: process.pid,
+        progress: { stage: "preparing", target },
+    });
+}
+/** Read the live progress contract shared by the old CLI and the new fleet. */
+export function readUpdateProgress(dataDir) {
+    const marker = readMarker(dataDir);
+    if (!marker?.progress?.target?.messageId || !marker.progress.target.adapterId)
+        return null;
+    return marker;
+}
+/** Advance the cross-process progress state without losing its message target. */
+export function setUpdateProgressStage(dataDir, stage, details = {}) {
+    const marker = readMarker(dataDir);
+    if (!marker?.progress)
+        return false;
+    const previousStage = marker.progress.stage;
+    marker.pid = process.pid;
+    marker.progress = {
+        ...marker.progress,
+        stage,
+        ...(details.version !== undefined ? { version: details.version } : {}),
+        ...(details.error !== undefined ? { error: details.error.replace(/\s+/g, " ").trim().slice(0, 300) } : {}),
+        ...(stage === "failed" ? { failedStage: previousStage } : {}),
+    };
+    return writeMarker(dataDir, marker);
+}
+/** Called by `agend update` before it touches anything. */
+export function markUpdateInProgress(dataDir, now = Date.now()) {
+    const existing = readMarker(dataDir);
+    writeMarker(dataDir, {
+        startedAt: existing?.startedAt ?? now,
+        pid: process.pid,
+        ...(existing?.progress ? { progress: existing.progress } : {}),
+    });
+}
 /** Called when the update finishes or gives up, and by the new fleet on startup. */
 export function clearUpdateMarker(dataDir) {
     try {
@@ -47,23 +106,15 @@ export function clearUpdateMarker(dataDir) {
  * abandoned marker must not silence real incidents forever.
  */
 export function isUpdateInProgress(dataDir, now = Date.now()) {
-    const path = markerPath(dataDir);
-    if (!existsSync(path))
+    if (!existsSync(markerPath(dataDir)))
         return false;
-    let startedAt = null;
-    try {
-        const parsed = JSON.parse(readFileSync(path, "utf-8"));
-        if (typeof parsed.startedAt === "number" && Number.isFinite(parsed.startedAt)) {
-            startedAt = parsed.startedAt;
-        }
-    }
-    catch {
-        // Truncated or hand-edited: treat as unknown age rather than as fresh.
-    }
-    if (startedAt === null)
+    const marker = readMarker(dataDir);
+    if (!marker)
+        return false;
+    if (marker.progress?.stage === "failed" || marker.progress?.stage === "complete")
         return false;
     // A clock jump backwards would otherwise make a marker look infinitely fresh.
-    const age = now - startedAt;
+    const age = now - marker.startedAt;
     return age >= 0 && age < UPDATE_MARKER_MAX_AGE_MS;
 }
 //# sourceMappingURL=update-marker.js.map

package/dist/update-marker.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-marker.js","sourceRoot":"","sources":["../src/update-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,GAAG,MAAM,CAAC;AAEpD,MAAM,IAAI,GAAG,yBAAyB,CAAC;AAEvC,SAAS,UAAU,CAAC,OAAe;IACjC,OAAO,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACpE,IAAI,CAAC;QACH,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC3F,CAAC;IAAC,MAAM,CAAC;QACP,wEAAwE;QACxE,oDAAoD;IACtD,CAAC;AACH,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,IAAI,CAAC;QAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,wBAAwB,CAAC,CAAC;AAC7E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACpC,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAA4B,CAAC;QAClF,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9E,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAC/B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,uEAAuE;IACzE,CAAC;IACD,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACrC,8EAA8E;IAC9E,MAAM,GAAG,GAAG,GAAG,GAAG,SAAS,CAAC;IAC5B,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,wBAAwB,CAAC;AACpD,CAAC"}
+{"version":3,"file":"update-marker.js","sourceRoot":"","sources":["../src/update-marker.ts"],"names":[],"mappings":"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"}

package/dist/update-progress.d.ts

@@ -0,0 +1,6 @@
+import type { UpdateMarker } from "./update-marker.js";
+export declare function updateElapsedSeconds(startedAt: number, now?: number): number;
+/** Render the persisted CLI-side stage while the old fleet is still alive. */
+export declare function formatUpdateProgress(marker: UpdateMarker & {
+    progress: NonNullable<UpdateMarker["progress"]>;
+}, now?: number): string;

package/dist/update-progress.js

@@ -0,0 +1,29 @@
+import { t } from "./locale.js";
+export function updateElapsedSeconds(startedAt, now = Date.now()) {
+    return Math.max(0, Math.floor((now - startedAt) / 1000));
+}
+function stageLabel(stage) {
+    return t(`update.stage.${stage ?? "preparing"}`);
+}
+/** Render the persisted CLI-side stage while the old fleet is still alive. */
+export function formatUpdateProgress(marker, now = Date.now()) {
+    const elapsed = updateElapsedSeconds(marker.startedAt, now);
+    const progress = marker.progress;
+    switch (progress.stage) {
+        case "preparing":
+            return t("update.progress.preparing", elapsed);
+        case "downloading":
+            return t("update.progress.downloading", elapsed);
+        case "installed":
+            return t("update.progress.installed", progress.version ?? "?", elapsed);
+        case "stopping":
+            return t("update.progress.stopping", elapsed);
+        case "starting":
+            return t("update.progress.starting", elapsed);
+        case "complete":
+            return t("update.progress.already_current", progress.version ?? "?", elapsed);
+        case "failed":
+            return t("update.progress.failed", stageLabel(progress.failedStage), progress.error ?? "unknown error", elapsed);
+    }
+}
+//# sourceMappingURL=update-progress.js.map

package/dist/update-progress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-progress.js","sourceRoot":"","sources":["../src/update-progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AAGhC,MAAM,UAAU,oBAAoB,CAAC,SAAiB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACtE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,UAAU,CAAC,KAAsC;IACxD,OAAO,CAAC,CAAC,gBAAgB,KAAK,IAAI,WAAW,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,oBAAoB,CAAC,MAA0E,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAC/H,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,QAAQ,QAAQ,CAAC,KAAK,EAAE,CAAC;QACvB,KAAK,WAAW;YACd,OAAO,CAAC,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,aAAa;YAChB,OAAO,CAAC,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;QACnD,KAAK,WAAW;YACd,OAAO,CAAC,CAAC,2BAA2B,EAAE,QAAQ,CAAC,OAAO,IAAI,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1E,KAAK,UAAU;YACb,OAAO,CAAC,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;QAChD,KAAK,UAAU;YACb,OAAO,CAAC,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;QAChD,KAAK,UAAU;YACb,OAAO,CAAC,CAAC,iCAAiC,EAAE,QAAQ,CAAC,OAAO,IAAI,GAAG,EAAE,OAAO,CAAC,CAAC;QAChF,KAAK,QAAQ;YACX,OAAO,CAAC,CAAC,wBAAwB,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,KAAK,IAAI,eAAe,EAAE,OAAO,CAAC,CAAC;IACrH,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@songsid/agend",
-  "version": "2.1.4-beta.2",
+  "version": "2.1.4-beta.4",
   "description": "Multi-agent fleet daemon — run any coding CLI (Claude, Gemini, Codex, OpenCode) from Telegram",
   "type": "module",
   "bin": {