@danypops/pi-papyrus 0.43.3 → 0.43.5

package/extension/src/tool-rendering/artifact-card.ts

@@ -32,6 +32,17 @@ function statusColor(status: string): SemanticColor {
 	return "muted";
 }
 
+function focusLine(focus: ArtifactToolDetails["focus"], theme: Theme): string {
+	if (!focus) return "";
+	// Focus's own active/paused dimension is separate from the artifact's
+	// lifecycle status shown in the header above -- never merge the two.
+	if (focus.status === "paused") {
+		const reason = focus.pauseReason ? ` — ${focus.pauseReason}` : "";
+		return theme.fg("warning", `‖ focus paused${reason}`);
+	}
+	return theme.fg("accent", `▶ focus ${focus.status}`);
+}
+
 export function kindGlyph(kind: string): string {
 	return KIND_GLYPHS[kind] ?? "•";
 }
@@ -48,10 +59,6 @@ export function emptyState(noun: string): string {
 	return `No ${noun}.`;
 }
 
-export function treeConnector(last: boolean): string {
-	return last ? "└─" : "├─";
-}
-
 export function expandHint(): string {
 	return "expand for details";
 }
@@ -91,6 +98,10 @@ export class ArtifactCard implements Component {
 		const lines = [truncateToWidth(header, safeWidth)];
 		lines.push(truncateToWidth(this.theme.fg("text", artifact.title), safeWidth));
 
+		if (this.details.focus) {
+			lines.push(truncateToWidth(focusLine(this.details.focus, this.theme), safeWidth));
+		}
+
 		if (this.expanded) {
 			const metadata = [artifact.subtype, ...artifact.labels].filter(Boolean).join(" · ");
 			if (metadata) lines.push(truncateToWidth(this.theme.fg("muted", metadata), safeWidth));

package/extension/src/tool-rendering/artifact-list.ts

@@ -1,7 +1,8 @@
 import { TOOL_COLLAPSED_ROW_LIMIT } from "@danypops/papyrus";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { type Component, truncateToWidth } from "@earendil-works/pi-tui";
-import { countSummary, expandHint, kindGlyph, statusGlyph, treeConnector } from "./artifact-card.ts";
+import { type TreeNode, TreeView } from "malevich-tui-components";
+import { countSummary, expandHint, kindGlyph, statusGlyph } from "./artifact-card.ts";
 import type { ArtifactListToolDetails, GraphToolDetails, ToolArtifactSummary } from "./render-model.ts";
 
 function pluralKind(rows: readonly ToolArtifactSummary[]): string {
@@ -85,44 +86,79 @@ export class ArtifactListCard implements Component {
 	}
 }
 
-interface HierarchyRow {
-	node: ToolArtifactSummary;
-	prefix: string;
-	connector: string;
+/** A fixed-text Component embedding one already-styled, width-truncated
+ * line -- used for the dependency-edge annotation Malevich's TreeView
+ * renders indented beneath a node. */
+function textLine(text: string): Component {
+	return {
+		render: (width: number) => text.split("\n").map((line) => truncateToWidth(line, width)),
+		invalidate: () => {},
+	};
 }
 
-function hierarchyRows(details: GraphToolDetails): HierarchyRow[] {
+/** Projects GraphToolDetails' containment edges (`relation === "contains"`)
+ * into Malevich TreeNodes, rendered via the real, shared TreeView instead
+ * of hand-rolled connector math. Any non-containment edge (depends_on,
+ * references, blocks, ...) naming a node as its `to` -- previously
+ * silently dropped entirely -- surfaces as a "depends on: ..." annotation
+ * embedded under that node, matching DagView's own edge-annotation wording. */
+function toTreeNodes(details: GraphToolDetails, theme: Theme, expanded: boolean): TreeNode[] {
 	const byId = new Map(details.nodes.map((node) => [node.id, node]));
 	const childIds = new Map<string, string[]>();
 	const contained = new Set<string>();
+	const dependencySources = new Map<string, string[]>();
 	for (const edge of details.edges) {
-		if (edge.relation !== "contains" || !byId.has(edge.from) || !byId.has(edge.to)) continue;
-		const children = childIds.get(edge.from) ?? [];
-		children.push(edge.to);
-		childIds.set(edge.from, children);
-		contained.add(edge.to);
+		if (edge.relation === "contains") {
+			if (!byId.has(edge.from) || !byId.has(edge.to)) continue;
+			const children = childIds.get(edge.from) ?? [];
+			children.push(edge.to);
+			childIds.set(edge.from, children);
+			contained.add(edge.to);
+		} else if (byId.has(edge.to)) {
+			const sources = dependencySources.get(edge.to) ?? [];
+			sources.push(edge.from);
+			dependencySources.set(edge.to, sources);
+		}
 	}
-	const roots = details.nodes.filter((node) => !contained.has(node.id));
-	const rows: HierarchyRow[] = [];
+
 	const visited = new Set<string>();
-	const visit = (node: ToolArtifactSummary, prefix: string, connector: string): void => {
-		if (visited.has(node.id)) return;
+	const buildNode = (node: ToolArtifactSummary): TreeNode => {
 		visited.add(node.id);
-		rows.push({ node, prefix, connector });
-		const children = (childIds.get(node.id) ?? [])
-			.map((id) => byId.get(id))
-			.filter((child): child is ToolArtifactSummary => child !== undefined);
-		children.forEach((child, index) => {
-			const last = index === children.length - 1;
-			visit(child, `${prefix}${connector ? (connector === "└─" ? "  " : "│ ") : ""}`, treeConnector(last));
-		});
+		const identity = expanded ? `${node.id}  ` : "";
+		const label = `${theme.fg("accent", kindGlyph(node.kind))} ${theme.fg("muted", statusGlyph(node.status))} ${theme.fg("accent", identity)}${theme.fg("text", node.title)}`;
+		const children: TreeNode[] = [];
+		for (const id of childIds.get(node.id) ?? []) {
+			if (visited.has(id)) continue;
+			const child = byId.get(id);
+			if (child) children.push(buildNode(child));
+		}
+		const metadata = expanded ? rowMetadata(node) : "";
+		const sources = dependencySources.get(node.id);
+		const annotations = [
+			...(metadata ? [theme.fg("dim", metadata)] : []),
+			...(sources && sources.length > 0
+				? [theme.fg("dim", `depends on: ${sources.map((id) => byId.get(id)?.title ?? id).join(", ")}`)]
+				: []),
+		];
+		return {
+			label,
+			children: children.length > 0 ? children : undefined,
+			component: annotations.length > 0 ? textLine(annotations.join("\n")) : undefined,
+		};
 	};
-	for (const root of roots) visit(root, "", "");
-	for (const node of details.nodes) visit(node, "", "");
-	return rows;
+
+	const tree: TreeNode[] = [];
+	for (const root of details.nodes.filter((node) => !contained.has(node.id))) {
+		if (!visited.has(root.id)) tree.push(buildNode(root));
+	}
+	for (const node of details.nodes) {
+		if (!visited.has(node.id)) tree.push(buildNode(node));
+	}
+	return tree;
 }
 
-/** Bounded task containment preview; dependency graphs use the dedicated graph renderer. */
+/** Bounded task containment preview; dependency edges surface as an
+ * annotation under the node they target (see toTreeNodes). */
 export class TaskHierarchyPreview implements Component {
 	private details: GraphToolDetails;
 	private theme: Theme;
@@ -146,26 +182,12 @@ export class TaskHierarchyPreview implements Component {
 	render(width: number): string[] {
 		const safeWidth = Math.max(1, width);
 		if (this.cachedLines && this.cachedWidth === safeWidth) return this.cachedLines;
-		const rows = hierarchyRows(this.details);
-		const lines = [
-			truncateToWidth(
-				this.theme.fg("toolTitle", this.theme.bold(`${this.details.nodes.length} tasks · ${this.details.edges.length} edges`)),
-				safeWidth,
-			),
-		];
-		for (const row of rows) {
-			const identity = this.expanded ? `${row.node.id}  ` : "";
-			lines.push(
-				truncateToWidth(
-					`${row.prefix}${row.connector}${row.connector ? " " : ""}${this.theme.fg("accent", kindGlyph(row.node.kind))} ${this.theme.fg("muted", statusGlyph(row.node.status))} ${this.theme.fg("accent", identity)}${this.theme.fg("text", row.node.title)}`,
-					safeWidth,
-				),
-			);
-			if (this.expanded) {
-				const metadata = rowMetadata(row.node);
-				if (metadata) lines.push(truncateToWidth(this.theme.fg("dim", `${row.prefix}   ${metadata}`), safeWidth));
-			}
-		}
+		const header = truncateToWidth(
+			this.theme.fg("toolTitle", this.theme.bold(`${this.details.nodes.length} tasks · ${this.details.edges.length} edges`)),
+			safeWidth,
+		);
+		const tree = new TreeView({ nodes: toTreeNodes(this.details, this.theme, this.expanded) });
+		const lines = [header, ...tree.render(safeWidth)];
 		this.cachedWidth = safeWidth;
 		this.cachedLines = lines;
 		return lines;

package/extension/src/tool-rendering/render-model.ts

@@ -37,10 +37,22 @@ interface ToolDetailsBase {
 	kind: string;
 }
 
+/** Distinct from the artifact's own lifecycle status (todo/in-progress/done/...) --
+ * this is Task Focus's own separate active/paused dimension, carried by
+ * tasks.focused/tasks.pause/tasks.unpause's {artifact, status, updatedAt}
+ * wrapper shape. Never conflate the two: an artifact can be "in-progress"
+ * while its focus is "paused". */
+export interface ArtifactFocusAnnotation {
+	status: string;
+	updatedAt: string;
+	pauseReason?: string;
+}
+
 export interface ArtifactToolDetails extends ToolDetailsBase {
 	kind: "artifact";
 	artifact: ToolArtifact;
 	completeness: ResultCompleteness;
+	focus?: ArtifactFocusAnnotation;
 }
 
 export interface ArtifactListToolDetails extends ToolDetailsBase {
@@ -150,7 +162,7 @@ function artifactSummary(artifact: Artifact): ToolArtifactSummary {
 	};
 }
 
-export function createArtifactDetails(operation: string, artifact: Artifact): ArtifactToolDetails {
+export function createArtifactDetails(operation: string, artifact: Artifact, focus?: ArtifactFocusAnnotation): ArtifactToolDetails {
 	const body = boundedText(artifact.body, TOOL_DETAILS_BODY_MAX_CHARACTERS);
 	return {
 		schemaVersion: PAPYRUS_TOOL_DETAILS_SCHEMA,
@@ -163,6 +175,7 @@ export function createArtifactDetails(operation: string, artifact: Artifact): Ar
 			updatedAt: artifact.updated_at,
 		},
 		completeness: body.completeness,
+		...(focus ? { focus } : {}),
 	};
 }
 
@@ -334,6 +347,15 @@ function isToolArtifact(value: unknown): value is ToolArtifact {
 	);
 }
 
+function isFocusAnnotation(value: unknown): value is ArtifactFocusAnnotation {
+	return (
+		isRecord(value) &&
+		isBoundedString(value.status) &&
+		isBoundedString(value.updatedAt) &&
+		(value.pauseReason === undefined || isBoundedString(value.pauseReason))
+	);
+}
+
 function isGraphEdge(value: unknown): value is ToolGraphEdge {
 	return isRecord(value) && isBoundedString(value.from) && isBoundedString(value.relation) && isBoundedString(value.to);
 }
@@ -371,7 +393,11 @@ export function parsePapyrusToolDetails(value: unknown): PapyrusToolDetails | un
 
 	switch (value.kind) {
 		case "artifact":
-			return isToolArtifact(value.artifact) && isCompleteness(value.completeness) ? (value as unknown as ArtifactToolDetails) : undefined;
+			return isToolArtifact(value.artifact) &&
+				isCompleteness(value.completeness) &&
+				(value.focus === undefined || isFocusAnnotation(value.focus))
+				? (value as unknown as ArtifactToolDetails)
+				: undefined;
 		case "artifact-list":
 			return isBoundedArray(value.rows, TOOL_DETAILS_MAX_ITEMS, isArtifactSummary) &&
 				Number.isSafeInteger(value.total) &&

package/extension/src/vehicle-artifact-renderers.ts

@@ -16,9 +16,11 @@ import type { Artifact } from "@danypops/papyrus";
 import type { VehicleToolRenderers } from "@danypops/vehicle-client-pi";
 import { renderVehicleResult } from "@danypops/vehicle-client-pi/vehicle-render";
 import type { VehicleOperationDescriptor } from "@danypops/vehicle-core";
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import { type Component, Text } from "@earendil-works/pi-tui";
 import { ArtifactCard } from "./tool-rendering/artifact-card.ts";
 import { ArtifactListCard } from "./tool-rendering/artifact-list.ts";
-import { createArtifactDetails, createArtifactListDetails } from "./tool-rendering/render-model.ts";
+import { type ArtifactFocusAnnotation, createArtifactDetails, createArtifactListDetails } from "./tool-rendering/render-model.ts";
 
 function isArtifact(value: unknown): value is Artifact {
 	if (typeof value !== "object" || value === null) return false;
@@ -40,6 +42,35 @@ function isArtifactArray(value: unknown): value is Artifact[] {
 	return Array.isArray(value) && value.every(isArtifact);
 }
 
+/** tasks.focused/tasks.pause/tasks.unpause's own wrapper shape -- an Artifact
+ * plus Task Focus's separate active/paused dimension. Detected the same
+ * name-independent, shape-based way as isArtifact/isArtifactArray above. */
+interface TaskFocusOutput {
+	artifact: Artifact;
+	status: string;
+	updatedAt: string;
+	pauseReason?: string;
+}
+
+function isTaskFocus(value: unknown): value is TaskFocusOutput {
+	if (typeof value !== "object" || value === null) return false;
+	const row = value as Record<string, unknown>;
+	return (
+		isArtifact(row.artifact) &&
+		typeof row.status === "string" &&
+		typeof row.updatedAt === "string" &&
+		(row.pauseReason === undefined || typeof row.pauseReason === "string")
+	);
+}
+
+function focusAnnotation(output: TaskFocusOutput): ArtifactFocusAnnotation {
+	return { status: output.status, updatedAt: output.updatedAt, ...(output.pauseReason ? { pauseReason: output.pauseReason } : {}) };
+}
+
+function renderNoFocusedTask(theme: Theme): Component {
+	return new Text(theme.fg("dim", "No focused task."), 0, 0);
+}
+
 export function papyrusVehicleRenderers(descriptor: VehicleOperationDescriptor): VehicleToolRenderers {
 	return {
 		renderResult(result, options, theme, context) {
@@ -51,6 +82,19 @@ export function papyrusVehicleRenderers(descriptor: VehicleOperationDescriptor):
 				if (isArtifact(output)) {
 					return new ArtifactCard(createArtifactDetails(descriptor.name, output), theme, options.expanded);
 				}
+				if (isTaskFocus(output)) {
+					return new ArtifactCard(
+						createArtifactDetails(descriptor.name, output.artifact, focusAnnotation(output)),
+						theme,
+						options.expanded,
+					);
+				}
+				// tasks.focused specifically returns null for "nothing focused" --
+				// scoped to this one operation so an unrelated null-output operation
+				// (e.g. a not-found lookup) is never mislabeled as a focus state.
+				if (output === null && descriptor.name === "tasks.focused") {
+					return renderNoFocusedTask(theme);
+				}
 			}
 			return renderVehicleResult(descriptor, result, options, theme, context);
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-papyrus",
-  "version": "0.43.3",
+  "version": "0.43.5",
   "description": "Pi host extension for Papyrus: native tools, TUI panels, and context injection over the daemon-backed graph store",
   "type": "module",
   "keywords": ["pi-package"],
@@ -20,11 +20,11 @@
     "@danypops/jittor": "^0.14.0",
     "@danypops/papyrus": "^0.42.0",
     "@danypops/vehicle-client": "^0.2.0",
-    "@danypops/vehicle-client-pi": "^0.3.3",
+    "@danypops/vehicle-client-pi": "^0.5.1",
     "@danypops/vehicle-core": "^0.3.0",
     "@danypops/vehicle-server": "^0.4.1",
     "beautiful-mermaid": "1.1.3",
-    "malevich-tui-components": "^0.16.1"
+    "malevich-tui-components": "^0.20.2"
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "^0.80.10",