Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions packages/daemon/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ export const configSchema = z.object({
infraRetryMax: z.coerce.number().int().nonnegative().default(3),
infraRetryBaseMs: z.coerce.number().int().positive().default(15_000),
recoveryReport: z.boolean().default(true),
// Stuck-badge sweep: how often to re-verify every "processing" badge.
badgeSweepIntervalMs: z.coerce.number().int().positive().default(60_000),
// A processing badge older than this with no live signal is stale.
badgeTtlMs: z.coerce.number().int().positive().default(10 * 60_000),
// Signal ②: session output must have happened within this window.
badgeOutputTtlMs: z.coerce.number().int().positive().default(10 * 60_000),
// Signal ③: model traffic (token delta) within this window.
badgeModelTtlMs: z.coerce.number().int().positive().default(15 * 60_000),
}),
db: z.object({
driver: z.enum(["sqlite", "mysql"]).default("sqlite"),
Expand Down Expand Up @@ -129,6 +137,10 @@ function readWorkSection() {
: 3,
infraRetryBaseMs: process.env.WORK_INFRA_RETRY_BASE_MS ? Math.max(1, Number(process.env.WORK_INFRA_RETRY_BASE_MS)) : 15_000,
recoveryReport: !(process.env.WORK_RECOVERY_REPORT === "false" || process.env.WORK_RECOVERY_REPORT === "0"),
badgeSweepIntervalMs: process.env.WORK_BADGE_SWEEP_MS ? Math.max(1_000, Number(process.env.WORK_BADGE_SWEEP_MS)) : 60_000,
badgeTtlMs: process.env.WORK_BADGE_TTL_MIN ? Math.max(1, Number(process.env.WORK_BADGE_TTL_MIN)) * 60_000 : 10 * 60_000,
badgeOutputTtlMs: process.env.WORK_BADGE_OUTPUT_TTL_MIN ? Math.max(1, Number(process.env.WORK_BADGE_OUTPUT_TTL_MIN)) * 60_000 : 10 * 60_000,
badgeModelTtlMs: process.env.WORK_BADGE_MODEL_TTL_MIN ? Math.max(1, Number(process.env.WORK_BADGE_MODEL_TTL_MIN)) * 60_000 : 15 * 60_000,
};
}

Expand Down
8 changes: 8 additions & 0 deletions packages/daemon/src/db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,14 @@ async function runMigrations(db: AsyncDatabase): Promise<void> {
"generation",
sqlite ? "generation INTEGER NOT NULL DEFAULT 0" : "generation INT NOT NULL DEFAULT 0"
);
// Processing-badge heartbeat deadline (ms epoch). NULL = session not
// currently holding a processing badge; past due = badge must be treated
// as stale by the stuck-badge sweep regardless of other signals.
await ensureColumn(
tSessions,
"expected_heartbeat_at",
sqlite ? "expected_heartbeat_at INTEGER" : "expected_heartbeat_at BIGINT"
);

// messages.model — per-message model override from the webhook payload.
// Persisted so queued/nudged/recovered messages keep their model instead of
Expand Down
6 changes: 6 additions & 0 deletions packages/daemon/src/gitea.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ export class GiteaClient {
);
}

async listAiStatusBadges(status: string) {
return this.request<{ badges: Array<{ owner: string; repo: string; number: number; aiStatus: string; since: string | null }> }>(
"GET", `/ai-status?status=${encodeURIComponent(status)}`
);
}

async listComments(owner: string, repo: string, issueNumber: number) {
return this.request<
Array<{ id: number; body: string; created_at: string; user: { login: string } }>
Expand Down
7 changes: 7 additions & 0 deletions packages/daemon/src/op.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ interface SessionRow {
nudge_rounds: number;
stuck_nudge_rounds: number;
generation: number;
expected_heartbeat_at: number | null;
}

interface MessageRow {
Expand Down Expand Up @@ -90,6 +91,7 @@ function rowToSession(row: SessionRow): OpSession {
nudgeRounds: row.nudge_rounds ?? 0,
stuckNudgeRounds: row.stuck_nudge_rounds ?? 0,
generation: row.generation ?? 0,
expectedHeartbeatAt: row.expected_heartbeat_at ?? undefined,
};
}

Expand Down Expand Up @@ -548,6 +550,11 @@ export class Store {
await getDB().run("UPDATE {{op_sessions}} SET opencode_session_id = NULL WHERE issue_id = ?", [issueUid]);
}

/** Set or clear the processing-badge heartbeat deadline for a session. */
async setExpectedHeartbeat(sessionId: string, ms: number | null): Promise<void> {
await getDB().run("UPDATE {{op_sessions}} SET expected_heartbeat_at = ? WHERE uid = ?", [ms, sessionId]);
}

async markDaemonStatus(daemonId: number, status: "active" | "drained" | "dead"): Promise<void> {
await getDB().run(
"UPDATE {{daemons}} SET status = ? WHERE id = ?",
Expand Down
Loading
Loading