@jungjaehoon/mama-os 0.77.0 → 0.79.0

package/dist/cli/runtime/update-progress.d.ts

@@ -0,0 +1,95 @@
+import { defaultTelegramCall } from './diagnostics.js';
+export type UpdateProgress = {
+    readonly kind: 'plan';
+    readonly from: string;
+    readonly to: string;
+} | {
+    readonly kind: 'current';
+    readonly version: string;
+} | {
+    readonly kind: 'step';
+    readonly from: string;
+    readonly to: string;
+    readonly step: number;
+}
+/** A step of the new version failed; the rollback reports next. */
+ | {
+    readonly kind: 'failed';
+    readonly from: string;
+    readonly to: string;
+    readonly step: number;
+    readonly code: string | null;
+}
+/** The stop or the snapshot failed; nothing was swapped. */
+ | {
+    readonly kind: 'not_updated';
+    readonly from: string;
+    readonly to: string;
+    readonly step: number;
+    readonly code: string;
+} | {
+    readonly kind: 'rolling_back';
+    readonly from: string;
+    readonly to: string;
+} | {
+    readonly kind: 'rolled_back';
+    readonly from: string;
+    readonly to: string;
+    readonly step: number;
+} | {
+    readonly kind: 'rollback_stopped';
+    readonly from: string;
+    readonly to: string;
+}
+/** `running`: the daemon answered the release; false when it is not running now. */
+ | {
+    readonly kind: 'updated';
+    readonly from: string;
+    readonly to: string;
+    readonly running: boolean;
+}
+/** The update ended on an error: a refusal before anything changed, or a step that threw. */
+ | {
+    readonly kind: 'error';
+    readonly code: string;
+};
+/** The step table's names (update.md, PR 3), for the chat. */
+export declare const UPDATE_STEP_NAMES: Readonly<Record<number, string>>;
+/** A code as the chat may see it: a token, never free text. */
+export declare function progressCode(value: unknown): string | null;
+export declare function progressText(event: UpdateProgress): string;
+export interface ProgressSink {
+    send(event: UpdateProgress): void;
+    /**
+     * Wait until every event sent so far has gone out (or failed and been logged). Past
+     * PROGRESS_FLUSH_DEADLINE_MS, step messages not yet sent are dropped and counted in the log;
+     * the outcomes (updated, failed, rolled back, …) are still sent, each within its own timeout.
+     */
+    flush(): Promise<void>;
+}
+/**
+ * One send's limit. The flushes before a child CLI and at the end run while MAMA is stopped, so
+ * a Bot API that does not answer must not hold the install down; Telegram answers in well under
+ * a second when it answers at all.
+ */
+export declare const PROGRESS_SEND_TIMEOUT_MS = 3000;
+/**
+ * How long a flush waits for step messages: past it, the steps still queued are dropped, so a
+ * slow Bot API holds the stopped install for this plus the few outcome sends at most.
+ */
+export declare const PROGRESS_FLUSH_DEADLINE_MS = 5000;
+export declare const NO_PROGRESS: ProgressSink;
+export type TelegramCall = typeof defaultTelegramCall;
+/**
+ * Progress to the /update's chat through the Bot API's sendMessage alone: the daemon may be
+ * stopped, and a getUpdates here would take its updates. The chat comes from
+ * runtime/update-request.json and the bot token alone from auth.env, as doctor reads it. A send
+ * that fails is logged (to update.log, the job's output) and the update goes on. Repeats of a step
+ * (the journal is saved more than once in a step) are sent once.
+ */
+export declare function telegramProgress(options: {
+    root: string;
+    log: (line: string) => void;
+    call?: TelegramCall;
+}): ProgressSink;
+//# sourceMappingURL=update-progress.d.ts.map

package/dist/cli/runtime/update-progress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-progress.d.ts","sourceRoot":"","sources":["../../../src/cli/runtime/update-progress.ts"],"names":[],"mappings":"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"}

package/dist/cli/runtime/update-progress.js

@@ -0,0 +1,154 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NO_PROGRESS = exports.PROGRESS_FLUSH_DEADLINE_MS = exports.PROGRESS_SEND_TIMEOUT_MS = exports.UPDATE_STEP_NAMES = void 0;
+exports.progressCode = progressCode;
+exports.progressText = progressText;
+exports.telegramProgress = telegramProgress;
+const daemon_js_1 = require("../commands/daemon.js");
+const diagnostics_js_1 = require("./diagnostics.js");
+const update_request_js_1 = require("./update-request.js");
+/** The step table's names (update.md, PR 3), for the chat. */
+exports.UPDATE_STEP_NAMES = {
+    5: 'stage the new version',
+    6: 'drain and stop',
+    7: 'snapshot',
+    8: 'swap',
+    9: 'hand over to the new version',
+    10: 'service files',
+    11: 'doctor',
+    12: 'toolkit',
+    13: 'start held',
+    14: 'wait for the boot',
+};
+const VERSION = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
+const CODE = /^[A-Za-z0-9_.]{1,64}$/;
+function version(value) {
+    return VERSION.test(value) ? value : 'unknown';
+}
+/** A code as the chat may see it: a token, never free text. */
+function progressCode(value) {
+    return typeof value === 'string' && CODE.test(value) ? value : null;
+}
+function step(number) {
+    const name = exports.UPDATE_STEP_NAMES[number];
+    return name === undefined ? `step ${number}` : `step ${number} (${name})`;
+}
+function progressText(event) {
+    switch (event.kind) {
+        case 'plan':
+            return `update ${version(event.from)} → ${version(event.to)}: starting`;
+        case 'current':
+            return `already on ${version(event.version)}`;
+        case 'step':
+            return `update ${version(event.from)} → ${version(event.to)}: ${step(event.step)}`;
+        case 'failed':
+            return `update ${version(event.from)} → ${version(event.to)}: ${step(event.step)} failed${progressCode(event.code) === null ? '' : `: ${progressCode(event.code)}`}`;
+        case 'not_updated':
+            return `not updated: ${step(event.step)} failed: ${progressCode(event.code) ?? 'UNKNOWN'}; ${version(event.from)} stays installed`;
+        case 'rolling_back':
+            return `rolling back to ${version(event.from)}`;
+        case 'rolled_back':
+            return `rolled back: ${version(event.from)} runs again; ${step(event.step)} of the update to ${version(event.to)} failed`;
+        case 'rollback_stopped':
+            return `the rollback to ${version(event.from)} stopped; MAMA stays stopped until mama update --rollback runs on its machine`;
+        case 'updated':
+            return event.running
+                ? `updated: ${version(event.from)} → ${version(event.to)}; it runs`
+                : `updated: ${version(event.from)} → ${version(event.to)}; MAMA is not running now; start it on its machine`;
+        case 'error':
+            return `update ended: ${progressCode(event.code) ?? 'UNKNOWN'}; the update log on MAMA's machine has the details`;
+    }
+}
+/**
+ * One send's limit. The flushes before a child CLI and at the end run while MAMA is stopped, so
+ * a Bot API that does not answer must not hold the install down; Telegram answers in well under
+ * a second when it answers at all.
+ */
+exports.PROGRESS_SEND_TIMEOUT_MS = 3_000;
+/**
+ * How long a flush waits for step messages: past it, the steps still queued are dropped, so a
+ * slow Bot API holds the stopped install for this plus the few outcome sends at most.
+ */
+exports.PROGRESS_FLUSH_DEADLINE_MS = 5_000;
+exports.NO_PROGRESS = {
+    send: () => { },
+    flush: async () => { },
+};
+/**
+ * Progress to the /update's chat through the Bot API's sendMessage alone: the daemon may be
+ * stopped, and a getUpdates here would take its updates. The chat comes from
+ * runtime/update-request.json and the bot token alone from auth.env, as doctor reads it. A send
+ * that fails is logged (to update.log, the job's output) and the update goes on. Repeats of a step
+ * (the journal is saved more than once in a step) are sent once.
+ */
+function telegramProgress(options) {
+    const call = options.call ?? diagnostics_js_1.defaultTelegramCall;
+    let target = null;
+    let chain = Promise.resolve();
+    /** Step messages queued and not yet begun; a flush past its deadline drops them. */
+    let queuedSteps = 0;
+    let generation = 0;
+    let lastStep = null;
+    const deliver = async (text) => {
+        try {
+            if (target === null) {
+                const request = (0, update_request_js_1.readUpdateRequest)((0, update_request_js_1.updateRequestPath)(options.root));
+                if (request === null)
+                    throw new Error('no runtime/update-request.json');
+                const name = daemon_js_1.MESSENGER_SECRETS.telegram[0];
+                const token = (0, diagnostics_js_1.readAuthEnv)(options.root)[name];
+                if (!token?.trim())
+                    throw new Error(`auth.env has no ${name}`);
+                target = { token, chatId: request.chatId };
+            }
+            const reply = await call(target.token, 'sendMessage', { chat_id: target.chatId, text }, exports.PROGRESS_SEND_TIMEOUT_MS);
+            if (reply.ok !== true) {
+                options.log(`update progress not sent: Telegram answered ${String(reply.error_code ?? 'not ok')}`);
+            }
+        }
+        catch (error) {
+            const text = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+            // The request's URL holds the token; an error that quotes it does not reach the log.
+            const token = target?.token;
+            options.log(`update progress not sent: ${token ? text.split(token).join('<token>') : text}`);
+        }
+    };
+    return {
+        send: (event) => {
+            if (event.kind === 'step') {
+                if (event.step === lastStep)
+                    return;
+                lastStep = event.step;
+            }
+            const text = progressText(event);
+            const queuedIn = generation;
+            const isStep = event.kind === 'step';
+            if (isStep)
+                queuedSteps += 1;
+            chain = chain.then(async () => {
+                if (isStep) {
+                    queuedSteps -= 1;
+                    if (queuedIn !== generation)
+                        return;
+                }
+                await deliver(text);
+            });
+        },
+        flush: async () => {
+            let timer;
+            const late = new Promise((resolve) => {
+                timer = setTimeout(() => resolve('late'), exports.PROGRESS_FLUSH_DEADLINE_MS);
+            });
+            const outcome = await Promise.race([chain.then(() => 'sent'), late]);
+            clearTimeout(timer);
+            if (outcome === 'late') {
+                // Steps queued now are skipped; the one in flight and the outcomes still go, each
+                // within PROGRESS_SEND_TIMEOUT_MS.
+                options.log(`update progress: ${queuedSteps} step message(s) not sent within ${exports.PROGRESS_FLUSH_DEADLINE_MS} ms; dropped`);
+                generation += 1;
+                await chain;
+            }
+        },
+    };
+}
+//# sourceMappingURL=update-progress.js.map

package/dist/cli/runtime/update-progress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-progress.js","sourceRoot":"","sources":["../../../src/cli/runtime/update-progress.ts"],"names":[],"mappings":"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"}

package/dist/cli/runtime/update-request.d.ts

@@ -0,0 +1,58 @@
+import type { UpdateOrigin } from '../../gateways/telegram-commands.js';
+import type { ServiceRun } from './systemd-service.js';
+/** The systemd unit the update job runs as on Linux. */
+export declare const UPDATE_JOB_UNIT = "mama-update";
+/** The /update an update job reports to; kept after the run, so a repeat of it is refused. */
+export interface UpdateRequest {
+    readonly chatId: string;
+    readonly messageId: number;
+    readonly receivedAt: string;
+}
+/** Under runtime/, which the agents' native reads deny. */
+export declare function updateRequestPath(mamaRoot: string): string;
+export declare function readUpdateRequest(path: string): UpdateRequest | null;
+export type UpdateJobResult = {
+    readonly kind: 'started';
+    readonly from: string;
+    readonly to: string | null;
+}
+/**
+ * `lock`: an updater holds update.lock, a terminal's `mama update` or an /update's; `job`: the
+ * update job runs (it reports to its request's chat). `since`: when the lock was taken, or the
+ * request's time; null when unknown.
+ */
+ | {
+    readonly kind: 'busy';
+    readonly source: 'lock' | 'job';
+    readonly since: number | null;
+} | {
+    readonly kind: 'repeated';
+} | {
+    readonly kind: 'checkout';
+    readonly steps: readonly string[];
+} | {
+    readonly kind: 'not_updatable';
+    readonly reason: string;
+};
+export interface UpdateJobOptions {
+    readonly mamaRoot: string;
+    readonly home: string;
+    readonly origin: UpdateOrigin;
+    /** The running daemon's version. */
+    readonly version: string;
+    readonly platform: NodeJS.Platform;
+    /** launchctl and systemd-run go through it; tests record them. */
+    readonly run: ServiceRun;
+    readonly uid: number;
+    /** The daemon's log: what the reply leaves out is named there. */
+    readonly log: (line: string) => void;
+    readonly now?: () => Date;
+}
+/**
+ * Start `mama update` for an /update. In order: the install kind (a checkout gets its git
+ * steps); an updater holding update.lock, or the job still running, is left alone; a message
+ * already recorded is refused, since a daemon killed before it confirmed its offset receives it
+ * again; then the request is recorded, the job's files written, and the job started.
+ */
+export declare function requestUpdate(options: UpdateJobOptions): UpdateJobResult;
+//# sourceMappingURL=update-request.d.ts.map

package/dist/cli/runtime/update-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-request.d.ts","sourceRoot":"","sources":["../../../src/cli/runtime/update-request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAExE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAWvD,wDAAwD;AACxD,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,8FAA8F;AAC9F,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,2DAA2D;AAC3D,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAapE;AASD,MAAM,MAAM,eAAe,GACvB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AACjF;;;;GAIG;GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACzF;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GAChE;IAAE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,oCAAoC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IACnC,kEAAkE;IAClE,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAmDD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CA4DxE"}

package/dist/cli/runtime/update-request.js

@@ -0,0 +1,172 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UPDATE_JOB_UNIT = void 0;
+exports.updateRequestPath = updateRequestPath;
+exports.readUpdateRequest = readUpdateRequest;
+exports.requestUpdate = requestUpdate;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const launch_files_js_1 = require("../launch-files.js");
+const daemon_control_js_1 = require("./daemon-control.js");
+const install_kind_js_1 = require("./install-kind.js");
+const release_check_js_1 = require("./release-check.js");
+const update_journal_js_1 = require("./update-journal.js");
+/*
+ * /update, the daemon's side (docs/development/work/update.md, PR 4): it starts `mama update` as
+ * a job of its own, which outlives the daemon's stop, and records where its progress goes.
+ */
+/** The systemd unit the update job runs as on Linux. */
+exports.UPDATE_JOB_UNIT = 'mama-update';
+/** Under runtime/, which the agents' native reads deny. */
+function updateRequestPath(mamaRoot) {
+    return (0, node_path_1.join)(mamaRoot, 'runtime', 'update-request.json');
+}
+function readUpdateRequest(path) {
+    if (!(0, node_fs_1.existsSync)(path))
+        return null;
+    const value = JSON.parse((0, node_fs_1.readFileSync)(path, 'utf8'));
+    if (value === null ||
+        typeof value !== 'object' ||
+        typeof value.chatId !== 'string' ||
+        typeof value.messageId !== 'number' ||
+        typeof value.receivedAt !== 'string') {
+        throw new Error(`${path} is not an update request MAMA wrote`);
+    }
+    return value;
+}
+function writeStaged(path, content, mode) {
+    const staged = `${path}.${process.pid}.tmp`;
+    (0, node_fs_1.writeFileSync)(staged, content, { mode });
+    (0, node_fs_1.chmodSync)(staged, mode);
+    (0, node_fs_1.renameSync)(staged, path);
+}
+/**
+ * The update job as `launchctl print` shows it: not loaded; finished (the top-level `state = not
+ * running` with a real `last exit code`, or a `last terminating signal` for a job killed by one),
+ * which a new /update boots out; or anything else loaded, which runs or is starting. Two /update messages are answered concurrently, and right after a bootstrap the job
+ * can be loaded with no pid yet; booting that out would kill the update the first one started.
+ */
+function launchdJob(run, uid) {
+    const result = run('launchctl', ['print', `gui/${uid}/${launch_files_js_1.UPDATE_JOB_LABEL}`]);
+    if (result.error)
+        throw result.error;
+    if (result.status === 113)
+        return 'none';
+    if (result.status !== 0) {
+        throw new Error(`launchctl print ${launch_files_js_1.UPDATE_JOB_LABEL} failed: exit ${String(result.status)}`);
+    }
+    // Top-level lines carry one tab; the nested sections' own `state = active` lines carry two.
+    const state = /^\tstate = (.+?)\s*$/m.exec(result.stdout)?.[1];
+    const exited = /^\tlast exit code = (?!\(never exited\))\S/m.test(result.stdout) ||
+        /^\tlast terminating signal = \S/m.test(result.stdout);
+    return state === 'not running' && exited ? 'finished' : 'running';
+}
+/** Run launchctl or systemd-run; a failure throws with the command and its own words. */
+function check(run, command, args) {
+    const result = run(command, args);
+    if (result.error)
+        throw new Error(`${command} ${args[0]} could not run: ${result.error.message}`);
+    if (result.status !== 0) {
+        const detail = `${result.stderr ?? ''}`.trim() || `exit ${String(result.status)}`;
+        throw new Error(`${command} ${args.join(' ')} failed: ${detail}`);
+    }
+}
+/** systemd states in which the update unit still runs. */
+const SYSTEMD_RUNNING = new Set(['active', 'activating', 'deactivating', 'reloading']);
+/** Whether the update job still runs: the request file must not change under it. */
+function jobRuns(options) {
+    if (options.platform === 'darwin') {
+        const job = launchdJob(options.run, options.uid);
+        return { loaded: job !== 'none', running: job === 'running' };
+    }
+    if (options.platform === 'linux') {
+        // `is-active` exits non-zero for a unit that does not run; its word says which state.
+        const result = options.run('systemctl', ['--user', 'is-active', `${exports.UPDATE_JOB_UNIT}.service`]);
+        if (result.error)
+            throw result.error;
+        return { loaded: false, running: SYSTEMD_RUNNING.has(`${result.stdout ?? ''}`.trim()) };
+    }
+    throw new Error('/update runs the updater as a launchd or systemd job: macOS and Linux only');
+}
+/**
+ * Start `mama update` for an /update. In order: the install kind (a checkout gets its git
+ * steps); an updater holding update.lock, or the job still running, is left alone; a message
+ * already recorded is refused, since a daemon killed before it confirmed its offset receives it
+ * again; then the request is recorded, the job's files written, and the job started.
+ */
+function requestUpdate(options) {
+    const { mamaRoot, home } = options;
+    const install = (0, install_kind_js_1.installKind)(mamaRoot, home);
+    if (install.kind === 'checkout')
+        return { kind: 'checkout', steps: (0, install_kind_js_1.updateSteps)(install) };
+    if (install.kind === 'other')
+        return { kind: 'not_updatable', reason: install.reason };
+    const holder = (0, daemon_control_js_1.lockHolder)((0, update_journal_js_1.updatePaths)(mamaRoot).lock);
+    if (holder !== null)
+        return { kind: 'busy', source: 'lock', since: holder.startedAt || null };
+    const requestPath = updateRequestPath(mamaRoot);
+    const previous = readUpdateRequest(requestPath);
+    const job = jobRuns(options);
+    if (job.running) {
+        return {
+            kind: 'busy',
+            source: 'job',
+            since: previous === null ? null : Date.parse(previous.receivedAt),
+        };
+    }
+    if (previous?.chatId === options.origin.chatId && previous.messageId === options.origin.messageId)
+        return { kind: 'repeated' };
+    const now = options.now?.() ?? new Date();
+    const request = {
+        chatId: options.origin.chatId,
+        messageId: options.origin.messageId,
+        receivedAt: now.toISOString(),
+    };
+    writeStaged(requestPath, `${JSON.stringify(request)}\n`, 0o600);
+    const script = (0, node_path_1.join)(mamaRoot, 'runtime', 'update.sh');
+    writeStaged(script, (0, launch_files_js_1.updateScript)({
+        home,
+        start: (0, node_fs_1.readFileSync)((0, node_path_1.join)(mamaRoot, 'start.sh'), 'utf8'),
+        nodePath: install.nodePath,
+        cliPath: install.cliPath,
+    }), 0o700);
+    // Before the job starts: nothing that can throw runs after it.
+    const to = cachedNewer(mamaRoot, options.version, options.log);
+    const log = (0, node_path_1.join)(mamaRoot, 'logs', 'update.log');
+    if (options.platform === 'darwin') {
+        const plist = (0, node_path_1.join)(mamaRoot, 'runtime', 'update.plist');
+        writeStaged(plist, (0, launch_files_js_1.updateAgent)(home), 0o600);
+        const domain = `gui/${options.uid}`;
+        // A finished job stays loaded without a pid; its label bootstraps again once booted out.
+        if (job.loaded)
+            check(options.run, 'launchctl', ['bootout', `${domain}/${launch_files_js_1.UPDATE_JOB_LABEL}`]);
+        check(options.run, 'launchctl', ['bootstrap', domain, plist]);
+    }
+    else {
+        check(options.run, 'systemd-run', [
+            '--user',
+            `--unit=${exports.UPDATE_JOB_UNIT}`,
+            '--collect',
+            `--property=StandardOutput=append:${log}`,
+            `--property=StandardError=append:${log}`,
+            script,
+        ]);
+    }
+    return { kind: 'started', from: options.version, to };
+}
+/**
+ * The cached release check's newer version, for the reply only: the updater asks npm itself
+ * (step 2), so a cache that is a day old, failed or unreadable leaves the reply without one.
+ */
+function cachedNewer(mamaRoot, running, log) {
+    try {
+        const latest = (0, release_check_js_1.readReleaseCheck)((0, release_check_js_1.releaseCheckPath)(mamaRoot))?.latest ?? null;
+        return latest !== null && (0, release_check_js_1.compareReleases)(latest, running) > 0 ? latest : null;
+    }
+    catch (error) {
+        // /update repairs installs (R7): a release check it cannot read leaves only the reply short.
+        log(`update request: the cached release check cannot be read (${error instanceof Error ? error.message : String(error)}); the reply names no target`);
+        return null;
+    }
+}
+//# sourceMappingURL=update-request.js.map

package/dist/cli/runtime/update-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-request.js","sourceRoot":"","sources":["../../../src/cli/runtime/update-request.ts"],"names":[],"mappings":"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"}

package/dist/connectors/calendar/index.d.ts

@@ -13,7 +13,11 @@ export declare class CalendarConnector implements IConnector {
     constructor(config: ConnectorConfig, statePath: string);
     commitPoll(): void;
     abortPollHandoff(): void;
-    private verifyAccess;
+    /**
+     * Starting needs only gws, as for the other Google sources. The sign-in is the read check in
+     * authenticate(): a sign-in that has ended (a testing-mode client's, after 7 days) fails each
+     * poll and doctor's check, and does not stop MAMA from starting.
+     */
     init(): Promise<void>;
     dispose(): Promise<void>;
     healthCheck(): Promise<ConnectorHealth>;

package/dist/connectors/calendar/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/calendar/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAqC/B,qBAAa,iBAAkB,YAAW,UAAU;IAgBhD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAf5B,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAC/B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAqB;IAItC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoD;IAC9E,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,aAAa,CAA4B;gBAG/C,MAAM,EAAE,eAAe,EACN,SAAS,EAAE,MAAM;IAwBpC,UAAU,IAAI,IAAI;IAOlB,gBAAgB,IAAI,IAAI;YAIV,YAAY;IAWpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAarB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAExB,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IAYlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAShC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAiHjF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/calendar/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AA6C/B,qBAAa,iBAAkB,YAAW,UAAU;IAgBhD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAf5B,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAC/B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAqB;IAItC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoD;IAC9E,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,aAAa,CAA4B;gBAG/C,MAAM,EAAE,eAAe,EACN,SAAS,EAAE,MAAM;IAwBpC,UAAU,IAAI,IAAI;IAOlB,gBAAgB,IAAI,IAAI;IAIxB;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAExB,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IAUlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAWhC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAiHjF"}

package/dist/connectors/calendar/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalendarConnector = void 0;
 /** Google Calendar snapshots through the authorised gws CLI on the daemon's PATH. */
 const node_crypto_1 = require("node:crypto");
+const types_js_1 = require("../framework/types.js");
 const gws_utils_js_1 = require("../framework/gws-utils.js");
 const connector_state_js_1 = require("../framework/connector-state.js");
 const MAX_EVENT_LIST_PAGES = 20;
@@ -61,27 +62,17 @@ class CalendarConnector {
     abortPollHandoff() {
         this.pendingSynced = null;
     }
-    async verifyAccess() {
-        // auth status can succeed without Calendar scope. Exercise the read permission itself.
-        await (0, gws_utils_js_1.execGwsAsync)([
-            'calendar',
-            'events',
-            'list',
-            '--params',
-            JSON.stringify({ calendarId: this.calendars[0]?.id ?? 'primary', maxResults: 1 }),
-        ]);
-    }
+    /**
+     * Starting needs only gws, as for the other Google sources. The sign-in is the read check in
+     * authenticate(): a sign-in that has ended (a testing-mode client's, after 7 days) fails each
+     * poll and doctor's check, and does not stop MAMA from starting.
+     */
     async init() {
         try {
-            await this.verifyAccess();
-            this.lastError = undefined;
+            await (0, gws_utils_js_1.execGwsTextAsync)(['--version']);
         }
         catch (error) {
-            this.lastError =
-                error.code === 'ENOENT'
-                    ? 'Calendar: install gws and add its bin directory to the daemon PATH in ~/.mama/start.sh; then run: gws auth login'
-                    : 'Calendar: gws cannot read the primary calendar. Run: gws auth login with Google Calendar read access, then retry.';
-            throw new Error(this.lastError, { cause: error });
+            throw new Error(`Calendar: ${(0, gws_utils_js_1.gwsUnavailable)(error)}`, { cause: error });
         }
     }
     async dispose() { }
@@ -96,21 +87,21 @@ class CalendarConnector {
     getAuthRequirements() {
         return [
             {
-                type: 'cli',
-                cli: 'gws',
-                cliAuthCommand: 'gws auth login',
-                description: 'Google Calendar read access through Google Workspace CLI. Run: gws auth login',
+                ...(0, types_js_1.cliAuth)(gws_utils_js_1.gwsTool),
+                scope: 'calendar',
+                description: `Google Workspace CLI sign-in with ${gws_utils_js_1.gwsTool.loginScope('calendar')}; ${gws_utils_js_1.gwsLogin}`,
             },
         ];
     }
     async authenticate() {
-        try {
-            await this.verifyAccess();
-            return true;
-        }
-        catch {
-            return false;
-        }
+        this.lastError = await (0, gws_utils_js_1.gwsReadRefusal)('Calendar', 'the calendar', [
+            'calendar',
+            'events',
+            'list',
+            '--params',
+            JSON.stringify({ calendarId: this.calendars[0]?.id ?? 'primary', maxResults: 1 }),
+        ]);
+        return this.lastError === undefined;
     }
     async poll(since, cursor) {
         const items = [];