@buihongduc132/pi-acp-agents 0.3.1 → 0.4.0

package/src/acp-widget.ts

@@ -8,9 +8,39 @@
 import type { Theme, ThemeColor } from "@mariozechner/pi-coding-agent";
 import type { Component } from "@mariozechner/pi-tui";
 import { truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
+import type { DagIndexEntry } from "./config/types.js";
 
 // ── Types ──────────────────────────────────────────────────────────
 
+/** DAG lifecycle status. Mirrors `DagStore` / `DagIndexEntry` status values. */
+export type DagStatus =
+	| "pending"
+	| "running"
+	| "completed"
+	| "failed"
+	| "cancelled"
+	| "stale";
+
+/**
+ * DAG summary row for the ACP widget.
+ *
+ * Mapped from `DagIndexEntry` (see `index.ts` wiring): `totalSteps` → `total`,
+ * `completedSteps` → `completed`, `failedSteps` → `failed`. Wave info is
+ * optional since the index entry doesn't always carry it.
+ */
+export interface AcpWidgetDag {
+	dagId: string;
+	status: DagStatus;
+	total: number;
+	completed: number;
+	failed: number;
+	cancelled: number;
+	currentWave?: number;
+	totalWaves?: number;
+	createdAt: Date;
+	updatedAt: Date;
+}
+
 export type AcpSessionStatus = "active" | "idle" | "stale" | "error";
 
 export interface AcpWidgetSession {
@@ -70,6 +100,8 @@ export interface AcpWidgetState {
 	defaultAgent?: string;
 	activity: AcpWidgetActivity;
 	workers?: AcpWidgetWorker[];
+	/** DAG progress rows, populated from `DagStore.listAll()` in `getWidgetState()`. Optional for backwards-compat with fixtures that predate DAGs. */
+	dags?: AcpWidgetDag[];
 }
 
 // ── Status styling ──────────────────────────────────────────────────
@@ -101,6 +133,19 @@ const WORKER_STATUS_ICON: Record<string, { icon: string; color: ThemeColor }> =
 	offline: { icon: "✕", color: "dim" },
 };
 
+/**
+ * DAG status → `{ icon, color }` styling. Reuses the existing widget palette
+ * (`success`/`warning`/`error`/`muted`/`dim`/`accent`) — no new colors introduced.
+ */
+export const DAG_STATUS_ICON: Record<DagStatus, { icon: string; color: ThemeColor }> = {
+	running: { icon: "●", color: "accent" },
+	completed: { icon: "✓", color: "success" },
+	failed: { icon: "✕", color: "error" },
+	cancelled: { icon: "◻", color: "dim" },
+	pending: { icon: "·", color: "muted" },
+	stale: { icon: "◻", color: "warning" },
+};
+
 // ── Helpers ─────────────────────────────────────────────────────────
 
 /** Pad a string to a visible width, accounting for ANSI escape codes. */
@@ -122,6 +167,146 @@ function shortId(id: string): string {
 	return id.length <= 8 ? id : id.slice(0, 8) + "…";
 }
 
+/**
+ * Format a DAG progress bar.
+ *
+ * Filled blocks (`█`) = `completed + failed`; empty blocks (`░`) = the
+ * remainder up to the bar width (`min(total, 8)`). When `total === 0` returns
+ * an empty string (no progress to show).
+ *
+ * Example: `formatProgress(2, 0, 5)` → `[██░░░] 2/5`.
+ */
+/**
+ * Map a persisted `DagIndexEntry` (summary row from `dag-index.json`) into an
+ * `AcpWidgetDag` row for the TUI widget.
+ *
+ * This is the single authoritative place where the two shapes are bridged.
+ * Field-name remapping (task 3.4 verification):
+ *
+ *   DagIndexEntry      → AcpWidgetDag
+ *   ────────────────────────────────────────────
+ *   dagId              → dagId            (identity)
+ *   status             → status           (identity)
+ *   totalSteps         → total            (RENAMED)
+ *   completedSteps     → completed        (RENAMED)
+ *   failedSteps        → failed           (RENAMED)
+ *   (absent)           → cancelled = 0    (index carries no cancelled count)
+ *   (absent)           → currentWave?     (index carries no wave info → undefined)
+ *   (absent)           → totalWaves?      (index carries no wave info → undefined)
+ *   createdAt: string  → createdAt: Date  (ISO → Date)
+ *   updatedAt: string  → updatedAt: Date  (ISO → Date)
+ *
+ * Wave info (`currentWave`, `totalWaves`) is intentionally NOT pulled from the
+ * index — `DagIndexEntry` does not carry it. The widget renders wave info only
+ * when richer sources populate it; for the `DagStore.listAll()` path they
+ * remain undefined and the row omits the wave segment.
+ */
+export function dagIndexEntryToWidgetDag(entry: DagIndexEntry): AcpWidgetDag {
+	return {
+		dagId: entry.dagId,
+		status: entry.status,
+		total: entry.totalSteps,
+		completed: entry.completedSteps,
+		failed: entry.failedSteps,
+		cancelled: 0,
+		currentWave: undefined,
+		totalWaves: undefined,
+		createdAt: new Date(entry.createdAt),
+		updatedAt: new Date(entry.updatedAt),
+	};
+}
+
+export function formatProgress(
+	completed: number,
+	failed: number,
+	total: number,
+): string {
+	if (total <= 0) return "";
+	const width = Math.min(total, 8);
+	const filled = Math.max(0, Math.min(completed + failed, width));
+	const empty = width - filled;
+	const bar = "█".repeat(filled) + "░".repeat(empty);
+	return `[${bar}] ${completed}/${total}`;
+}
+
+/**
+ * Render a single DAG summary row (plain text — no theme coloring).
+ *
+ * Format: `<icon> <dagId> <progress> wave <w>/<totalW> <age> [fail:<failed>]`
+ *  - the `wave <w>/<totalW>` segment is omitted when `totalWaves` is absent
+ *  - the `[fail:<failed>]` segment is omitted when `failed === 0`
+ *
+ * The `<icon>` comes from `DAG_STATUS_ICON[dag.status]`. `<progress>` comes
+ * from `formatProgress`. `<age>` comes from `timeAgo(dag.updatedAt)`.
+ */
+export function renderDagRow(dag: AcpWidgetDag): string {
+	const icon = DAG_STATUS_ICON[dag.status]?.icon ?? "○";
+	const parts: string[] = [icon, dag.dagId];
+
+	const progress = formatProgress(dag.completed, dag.failed, dag.total);
+	if (progress) parts.push(progress);
+
+	if (dag.totalWaves !== undefined) {
+		parts.push(`wave ${dag.currentWave ?? 0}/${dag.totalWaves}`);
+	}
+
+	parts.push(timeAgo(dag.updatedAt));
+
+	if (dag.failed > 0) {
+		parts.push(`[fail:${dag.failed}]`);
+	}
+
+	return parts.join(" ");
+}
+
+/**
+ * Render a collapsed one-line summary of recent DAGs (D2).
+ *
+ * Each entry renders as `<dagId>:<icon>` joined by single spaces. The list is
+ * capped at 5 entries (preserving input order) to keep the widget bounded.
+ *
+ * Example: `renderDagSummary([completed, failed])` → `a1b2c3:✓ d4e5f6:✕`.
+ */
+export function renderDagSummary(dags: AcpWidgetDag[]): string {
+	return dags
+		.slice(0, 5)
+		.map((dag) => `${dag.dagId}:${DAG_STATUS_ICON[dag.status]?.icon ?? "○"}`)
+		.join(" ");
+}
+
+/**
+ * Render the full DAG section for the widget state (task 2.3).
+ *
+ * Decision rules (see `design.md` D2/D3/D4):
+ *  - When `dags` is absent or empty → return `""` (no DAG section rendered).
+ *  - When any DAG has `status === "running"` → return one `renderDagRow` line per
+ *    entry (joined by `\n`), so users get live per-DAG progress.
+ *  - Otherwise (no running DAGs but some completed/failed/cancelled) → return a
+ *    collapsed `renderDagSummary` of the recent DAGs, capped at 5 entries.
+ *
+ * `pending` DAGs never contribute a row (they carry no progress worth surfacing).
+ */
+export function renderDagSection(state: AcpWidgetState): string {
+	const dags = state.dags;
+	if (!dags || dags.length === 0) return "";
+
+	const visible = dags.filter((d) => d.status !== "pending");
+	if (visible.length === 0) return "";
+
+	// D2 — cap the render list at 5 entries, ordered by `updatedAt` descending
+	// (most-recent first). Prevents pathological render cases when many DAGs
+	// exist, and matches the widget's bounded-list pattern.
+	const recent = [...visible]
+		.sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime())
+		.slice(0, 5);
+
+	if (recent.some((d) => d.status === "running")) {
+		return recent.map(renderDagRow).join("\n");
+	}
+
+	return renderDagSummary(recent);
+}
+
 /** Time ago string. */
 function timeAgo(date: Date): string {
 	const ms = Date.now() - date.getTime();
@@ -287,6 +472,18 @@ export function createAcpWidget(deps: AcpWidgetDeps): AcpWidgetFactory {
 					lines.push(truncateToWidth(row, width));
 				}
 
+				// ── DAG progress rows (between sessions and workers — D4) ──
+				const dagSection = renderDagSection(state);
+				if (dagSection !== "") {
+					// Header line only when DAG rows are rendered (task 2.5)
+					lines.push(
+						truncateToWidth(" " + theme.fg("dim", "─ DAGs ─"), width),
+					);
+					for (const dagLine of dagSection.split("\n")) {
+						lines.push(truncateToWidth(` ${dagLine}`, width));
+					}
+				}
+
 				// ── Worker rows (persistent workers) ──
 				if (state.workers && state.workers.length > 0) {
 					lines.push(

package/src/config/config.ts

@@ -28,6 +28,8 @@ export const DEFAULT_CONFIG: AcpConfig = {
 	workerShutdownTimeoutMs: 30_000,
 	workerOnlineMs: 60_000,
 	workerStaleMs: 60_000,
+	dagStaleTimeoutMs: 3_600_000, // 1 hour default DAG stale timeout
+	dagOutputTruncateChars: 8_000, // default truncation limit for injected step outputs
 	modelPolicy: {
 		allowedModels: [],
 		blockedModels: [],
@@ -132,6 +134,11 @@ export function validateConfig(partial: Partial<AcpConfig>): AcpConfig {
 			DEFAULT_CONFIG.circuitBreakerMaxFailures,
 		circuitBreakerResetMs:
 			partial.circuitBreakerResetMs ?? DEFAULT_CONFIG.circuitBreakerResetMs,
+		dagStaleTimeoutMs:
+			partial.dagStaleTimeoutMs ?? DEFAULT_CONFIG.dagStaleTimeoutMs,
+		dagOutputTruncateChars:
+			partial.dagOutputTruncateChars ??
+			DEFAULT_CONFIG.dagOutputTruncateChars,
 		modelPolicy: {
 			...DEFAULT_CONFIG.modelPolicy,
 			...partial.modelPolicy,
@@ -159,6 +166,8 @@ function validateNumericFields(resolved: AcpConfig): void {
 		["staleTimeoutMs", resolved.staleTimeoutMs],
 		["healthCheckIntervalMs", resolved.healthCheckIntervalMs],
 		["circuitBreakerResetMs", resolved.circuitBreakerResetMs],
+		["dagStaleTimeoutMs", resolved.dagStaleTimeoutMs],
+		["dagOutputTruncateChars", resolved.dagOutputTruncateChars],
 	];
 	for (const [field, val] of numericFields) {
 		if (val !== undefined && val < 0) {

package/src/config/types.ts

@@ -62,6 +62,10 @@ export interface AcpConfig {
 	agent_aliases?: Record<string, AcpAliasConfig>;
 	/** Timeout for race strategy in ms (default: 30_000 = 30s) */
 	raceTimeoutMs?: number;
+	/** DAG stale timeout in ms — a DAG with no step transitions for this long is marked `stale` (default: 3_600_000 = 1 hour). */
+	dagStaleTimeoutMs?: number;
+	/** Maximum chars of a step output injected into downstream prompts before truncation (default: 8000). */
+	dagOutputTruncateChars?: number;
 	runtimeDir?: string;
 	modelPolicy?: {
 		allowedModels?: string[];
@@ -201,3 +205,95 @@ export interface Logger {
 	error(msg: string, data?: unknown): void;
 	debug(msg: string, data?: unknown): void;
 }
+
+// --- DAG delegation types (acp-dag-delegation) ---
+
+/**
+ * A single declarative task within a submitted DAG.
+ *
+ * Mirrors the `acp_dag_submit` task shape from design.md (D8).
+ */
+export interface DagTaskDefinition {
+	/** Unique step identifier (must not be a reserved word: dag, step, agent). */
+	id: string;
+	/** Agent name; must exist in `agent_servers` config. */
+	agent: string;
+	/** Prompt text; may contain `{<id>.output}`, `{<id>.status}`, `{dag.args.<key>}` template vars. */
+	prompt: string;
+	/** Step IDs this step depends on. Default: []. */
+	dependsOn?: string[];
+	/** Gate type applied to ALL dependencies. Default: "needs". */
+	gate?: "needs" | "after";
+}
+
+/** Lifecycle status for a DAG step. */
+export type DagStepStatus =
+	| "pending"
+	| "running"
+	| "completed"
+	| "failed"
+	| "skipped"
+	| "cancelled";
+
+/** Lifecycle status for a DAG as a whole. */
+export type DagStatus =
+	| "pending"
+	| "running"
+	| "completed"
+	| "failed"
+	| "cancelled"
+	| "stale";
+
+/** Runtime execution state for a single DAG step. */
+export interface DagStepRecord {
+	id: string;
+	agent: string;
+	prompt: string;
+	dependsOn: string[];
+	gate: "needs" | "after";
+	status: DagStepStatus;
+	/** Text result on success; null/undefined otherwise. */
+	output?: string | null;
+	/** Error message on failure. */
+	error?: string;
+	startedAt?: string;
+	completedAt?: string;
+	durationMs?: number;
+	/** Number of retries already attempted for this step. */
+	retryCount?: number;
+}
+
+/** DAG-level submission options. */
+export interface DagOptions {
+	/** Default: true. */
+	failFast?: boolean;
+	/** Default: 0. */
+	maxRetries?: number;
+}
+
+/** Full file-backed DAG record persisted to `~/.pi/acp-agents/dag/<dagId>.json`. */
+export interface DagRecord {
+	dagId: string;
+	tasks: DagTaskDefinition[];
+	args?: Record<string, string>;
+	options?: DagOptions;
+	status: DagStatus;
+	steps: Record<string, DagStepRecord>;
+	currentWave: number;
+	totalWaves: number;
+	createdAt: string;
+	updatedAt: string;
+	completedAt?: string;
+}
+
+/** Summary entry stored in `~/.pi/acp-agents/dag/dag-index.json`. */
+export interface DagIndexEntry {
+	dagId: string;
+	status: DagStatus;
+	totalSteps: number;
+	completedSteps: number;
+	failedSteps: number;
+	createdAt: string;
+	updatedAt: string;
+	completedAt?: string;
+}