@gajae-code/coding-agent 0.11.0 → 0.11.2

package/src/sdk/bus/conversation-store.ts

@@ -1,8 +1,7 @@
-import { spawnSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { readFileSync } from "node:fs";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { isProcessIncarnation, processIncarnation } from "../broker/process-incarnation";
 
 export const CONVERSATION_STORE_VERSION = 1;
 export const MAX_DEDUPE_IDS = 128;
@@ -111,7 +110,7 @@ export class ConversationStore<T extends ConversationRecord> {
 		this.#fs = input.fs ?? nodeFs;
 		this.#clock = input.now ?? Date.now;
 		this.#pid = input.pid ?? process.pid;
-		this.#pidIncarnation = input.pidIncarnation ?? defaultPidIncarnation;
+		this.#pidIncarnation = input.pidIncarnation ?? processIncarnation;
 		this.#pidAlive = input.pidAlive ?? defaultPidAlive;
 		this.#sleep = input.sleep ?? (async ms => await Bun.sleep(ms));
 		this.#lockTimeoutMs = input.lockTimeoutMs ?? 1_000;
@@ -289,9 +288,9 @@ export class ConversationStore<T extends ConversationRecord> {
 		const currentIncarnation = this.#pidIncarnation(parsed.pid);
 		return (
 			!this.#pidAlive(parsed.pid) ||
-			(currentIncarnation !== undefined &&
-				parsed.incarnation !== "unavailable" &&
-				currentIncarnation !== parsed.incarnation)
+			(parsed.incarnation !== "unavailable" &&
+				(!isProcessIncarnation(parsed.incarnation) ||
+					(currentIncarnation !== undefined && currentIncarnation !== parsed.incarnation)))
 		);
 	}
 	async #isExpiredUnpublishedLock(lockFile: string): Promise<boolean> {
@@ -356,29 +355,6 @@ function defaultPidAlive(pid: number): boolean {
 	}
 }
 
-function defaultPidIncarnation(pid: number): string | undefined {
-	if (!Number.isSafeInteger(pid) || pid <= 0) return undefined;
-	if (process.platform === "linux") {
-		try {
-			const stat = readFileSync(`/proc/${pid}/stat`, "utf8");
-			return `linux:${
-				stat
-					.slice(stat.lastIndexOf(")") + 2)
-					.trim()
-					.split(/\s+/)[19]
-			}`;
-		} catch {
-			return undefined;
-		}
-	}
-	if (process.platform === "darwin") {
-		const result = spawnSync("ps", ["-o", "lstart=", "-p", String(pid)], { encoding: "utf8" });
-		const startedAt = result.status === 0 ? result.stdout.trim() : "";
-		return startedAt ? `darwin:${startedAt}` : undefined;
-	}
-	return undefined;
-}
-
 function isConversationStoreLock(value: unknown): value is ConversationStoreLock {
 	return (
 		isRecord(value) &&

package/src/sdk/bus/daemon-paths.ts

@@ -12,6 +12,7 @@ export interface DaemonPaths {
 	dir: string;
 	lock: string;
 	state: string;
+	ownership: string;
 	roots: string;
 	steal: string;
 	aliases: string;
@@ -24,6 +25,7 @@ export function daemonPaths(agentDir: string): DaemonPaths {
 		dir,
 		lock: path.join(dir, "telegram-daemon.lock"),
 		state: path.join(dir, "telegram-daemon.state.json"),
+		ownership: path.join(dir, "telegram-daemon.ownership"),
 		roots: path.join(dir, "telegram-daemon.roots.json"),
 		steal: path.join(dir, "telegram-daemon.steal"),
 		aliases: path.join(dir, "telegram-callback-aliases.json"),

package/src/sdk/bus/discord-daemon.ts

@@ -78,6 +78,11 @@ export interface DiscordEndpointBinding {
 	send(frame: Record<string, unknown>): void | Promise<void>;
 }
 
+export interface DiscordLeaseRecoveryScheduler {
+	setTimeout(callback: () => void | Promise<void>, delayMs: number): unknown;
+	clearTimeout(handle: unknown): void;
+}
+
 export interface DiscordNotificationDaemonOptions {
 	agentDir: string;
 	repo: string;
@@ -85,6 +90,7 @@ export interface DiscordNotificationDaemonOptions {
 	parentChannelId: string;
 	provider: DiscordProvider;
 	now?: () => number;
+	leaseRecoveryScheduler?: DiscordLeaseRecoveryScheduler;
 	resolveEndpoint: (sessionId: string, expectedGeneration?: number) => Promise<DiscordEndpointBinding | null>;
 	onCommand?: (
 		sessionId: string,
@@ -151,6 +157,7 @@ type DiscordInboundClaim = {
 export class DiscordNotificationDaemon {
 	readonly #store: ConversationStore<DiscordConversation>;
 	readonly #now: () => number;
+	readonly #leaseRecoveryScheduler: DiscordLeaseRecoveryScheduler;
 	readonly #creates = new Map<string, Promise<DiscordConversation>>();
 	readonly #resumes = new Map<string, Promise<DiscordConversation | undefined>>();
 	readonly #archives = new Map<string, Promise<void>>();
@@ -167,7 +174,7 @@ export class DiscordNotificationDaemon {
 	#stopTask: Promise<void> | undefined;
 	#providerStarting = false;
 
-	#leaseRecoveryTimer: ReturnType<typeof setTimeout> | undefined;
+	#leaseRecoveryTimer: unknown;
 	#leaseRecoveryAt: number | undefined;
 	#leaseRecoveryFailures = 0;
 
@@ -179,6 +186,10 @@ export class DiscordNotificationDaemon {
 		this.#store = new ConversationStore({ agentDir: options.agentDir, kind: "discord", now: options.now });
 		this.#effects = new ChatEffectJournal({ agentDir: options.agentDir, transport: "discord", now: options.now });
 		this.#now = options.now ?? Date.now;
+		this.#leaseRecoveryScheduler = options.leaseRecoveryScheduler ?? {
+			setTimeout: (callback, delayMs) => setTimeout(() => void callback(), delayMs),
+			clearTimeout: handle => clearTimeout(handle as ReturnType<typeof setTimeout>),
+		};
 		this.#resolveEndpoint = options.resolveEndpoint;
 	}
 
@@ -240,7 +251,8 @@ export class DiscordNotificationDaemon {
 		} catch (error) {
 			if (lifecycleGeneration === this.#lifecycleGeneration) {
 				this.#started = false;
-				if (this.#leaseRecoveryTimer) clearTimeout(this.#leaseRecoveryTimer);
+				if (this.#leaseRecoveryTimer !== undefined)
+					this.#leaseRecoveryScheduler.clearTimeout(this.#leaseRecoveryTimer);
 				this.#leaseRecoveryTimer = undefined;
 				this.#leaseRecoveryAt = undefined;
 			}
@@ -255,7 +267,7 @@ export class DiscordNotificationDaemon {
 		const stopProvider = this.#started || this.#providerStarting;
 		++this.#lifecycleGeneration;
 		this.#started = false;
-		if (this.#leaseRecoveryTimer) clearTimeout(this.#leaseRecoveryTimer);
+		if (this.#leaseRecoveryTimer !== undefined) this.#leaseRecoveryScheduler.clearTimeout(this.#leaseRecoveryTimer);
 		this.#leaseRecoveryTimer = undefined;
 		this.#leaseRecoveryAt = undefined;
 
@@ -2128,8 +2140,11 @@ export class DiscordNotificationDaemon {
 	}
 	async #scheduleLeaseRecovery(recoveryFailed = false): Promise<void> {
 		if (!this.#started) return;
+		const lifecycleGeneration = this.#lifecycleGeneration;
+		const effects = await this.#effects.list();
+		if (!this.#started || lifecycleGeneration !== this.#lifecycleGeneration) return;
 		const now = this.#now();
-		const recoveryAt = (await this.#effects.list())
+		const recoveryAt = effects
 			.filter(effect => effect.transport === "discord")
 			.reduce<number | undefined>(
 				(earliest, effect) => {
@@ -2146,23 +2161,25 @@ export class DiscordNotificationDaemon {
 				recoveryFailed ? now : undefined,
 			);
 		if (recoveryAt === undefined) {
-			if (this.#leaseRecoveryTimer) clearTimeout(this.#leaseRecoveryTimer);
+			if (this.#leaseRecoveryTimer !== undefined)
+				this.#leaseRecoveryScheduler.clearTimeout(this.#leaseRecoveryTimer);
 			this.#leaseRecoveryTimer = undefined;
 			this.#leaseRecoveryAt = undefined;
 			this.#leaseRecoveryFailures = 0;
 			return;
 		}
 		if (this.#leaseRecoveryAt !== undefined && this.#leaseRecoveryAt <= recoveryAt) return;
-		if (this.#leaseRecoveryTimer) clearTimeout(this.#leaseRecoveryTimer);
+		if (this.#leaseRecoveryTimer !== undefined) this.#leaseRecoveryScheduler.clearTimeout(this.#leaseRecoveryTimer);
 		this.#leaseRecoveryAt = recoveryAt;
 		const delay =
 			recoveryAt <= now
 				? Math.min(1_000, 25 * 2 ** Math.min(this.#leaseRecoveryFailures, 5))
 				: Math.min(recoveryAt - now, 2_147_483_647);
-		this.#leaseRecoveryTimer = setTimeout(() => {
+		this.#leaseRecoveryTimer = this.#leaseRecoveryScheduler.setTimeout(() => {
+			if (lifecycleGeneration !== this.#lifecycleGeneration) return;
 			this.#leaseRecoveryTimer = undefined;
 			this.#leaseRecoveryAt = undefined;
-			void this.#track(this.#recoverLeasedEffects());
+			return this.#track(this.#recoverLeasedEffects()).catch(() => {});
 		}, delay);
 	}
 	async #recoverLeasedEffects(): Promise<void> {

package/src/sdk/bus/html-format.ts

@@ -139,6 +139,21 @@ function renderTableText(header: string[], aligns: ColumnAlign[], body: string[]
 	const divider = widths.map(w => "-".repeat(w)).join("-|-");
 	return [renderRow(header), divider, ...body.map(renderRow)].join("\n");
 }
+/** Render compact tables as a grid and wide tables as readable Telegram-native records. */
+function renderTelegramTable(header: string[], aligns: ColumnAlign[], body: string[][]): string {
+	const grid = renderTableText(header, aligns, body);
+	if (body.length === 0 || grid.split("\n").every(line => Bun.stringWidth(line) <= 42)) return pre(grid);
+	return body
+		.map(row =>
+			header
+				.map(
+					(label, column) =>
+						`${tag("b", escapeHtml(label || `Column ${column + 1}`))}: ${escapeHtml(row[column] ?? "")}`,
+				)
+				.join("\n"),
+		)
+		.join("\n\n");
+}
 
 /**
  * Replace GFM tables with stashed monospace `<pre>` blocks. Telegram HTML has no
@@ -161,7 +176,7 @@ function convertMarkdownTables(text: string, stash: (html: string) => string): s
 				if (!looksLikeTableRow(row) || isTableSeparator(row)) break;
 				body.push(splitTableRow(row));
 			}
-			out.push(stash(pre(renderTableText(header, aligns, body))));
+			out.push(stash(renderTelegramTable(header, aligns, body)));
 			i = j - 1;
 			continue;
 		}
@@ -172,8 +187,9 @@ function convertMarkdownTables(text: string, stash: (html: string) => string): s
 
 /**
  * Convert a bounded markdown subset into Telegram HTML. Supported: fenced code,
- * inline code, `**bold**`, `*italic*`, `[text](url)` (safe schemes only),
- * `#` headers, `>` blockquotes, and GFM tables (rendered as a monospace block).
+ * inline code, `**bold**`, `*italic*`, `~~strikethrough~~`, `[text](url)`
+ * (safe schemes only), `#` headers, `>` blockquotes, and GFM tables (rendered
+ * as a monospace block).
  * Unsupported or malformed markdown is left as escaped literal text — never
  * emitted as unbalanced tags.
  */
@@ -234,6 +250,7 @@ export function markdownToTelegramHtml(markdown: string): string {
 	// 6. Inline emphasis (bold before italic; unbalanced markers stay literal).
 	text = text.replace(/\*\*([^*\n]+)\*\*/g, (_m, body: string) => tag("b", body));
 	text = text.replace(/\*([^*\n]+)\*/g, (_m, body: string) => tag("i", body));
+	text = text.replace(/~~([^~\n]+)~~/g, (_m, body: string) => tag("s", body));
 
 	// 7. Restore protected placeholders.
 	text = text.replace(