@danypops/pi-papyrus 0.38.2 → 0.38.4

package/extension/src/artifact-detail-view.ts

@@ -1,5 +1,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { matchesKey, sliceByColumn, truncateToWidth, visibleWidth, wrapTextWithAnsi, type TUI } from "@earendil-works/pi-tui";
+import { buildDetailLines, type DetailField, type DetailSection } from "malevich-tui-components";
 import {
 	ARTIFACT_DETAIL_HORIZONTAL_PAN_COLUMNS,
 	ARTIFACT_DETAIL_MAX_VISIBLE_LINES,
@@ -90,12 +91,34 @@ class ArtifactDetailViewport {
 			{ text: "", wide: false },
 		];
 		const body = renderMarkdownBody(this.content.body, width, this.activeTheme).map((text) => ({ text, wide: false }));
-		const labels = this.content.labels.length > 0
-			? [{ text: "", wide: false }, ...wrap("Labels:", "muted"), ...wrap(this.content.labels.join(", "))]
+
+		// Labels + Metadata are plain field/flat-line shapes -- delegated to malevich's
+		// buildDetailLines. The body (markdown-rendered) and relationships (horizontally
+		// pannable "wide" lines) stay hand-rolled: buildDetailLines has no concept of
+		// either, and forcing them through it would either drop markdown formatting or
+		// lose the pan feature.
+		const fields: DetailField[] = this.content.labels.length > 0 ? [{ label: "Labels", value: this.content.labels.join(", ") }] : [];
+		const sections: DetailSection[] = this.content.metadata.length > 0
+			? [{ heading: "Metadata:", lines: this.content.metadata.map((line) => `  ${line}`) }]
 			: [];
-		const metadata = this.content.metadata.length > 0
-			? [{ text: "", wide: false }, ...wrap("Metadata:", "muted"), ...this.content.metadata.flatMap((line) => wrap(`  ${line}`, "dim"))]
+		const labelsAndMetadata = (fields.length > 0 || sections.length > 0)
+			? buildDetailLines(width, {
+				fields,
+				sections,
+				theme: {
+					field: (s) => theme.fg("muted", s),
+					heading: (s) => theme.fg("muted", s),
+					byline: (s) => theme.fg("dim", s),
+					body: (s) => theme.fg("text", s),
+					line: (s) => theme.fg("dim", s),
+				},
+			}).map((text) => ({ text, wide: false }))
 			: [];
+		// buildDetailLines' fields/sections don't insert a leading blank before the
+		// first field the way the original hand-rolled labels block did -- add it back
+		// when either piece rendered anything, matching the original layout exactly.
+		const labelsAndMetadataWithLeadingBlank = fields.length > 0 ? [{ text: "", wide: false }, ...labelsAndMetadata] : labelsAndMetadata;
+
 		const relationships = this.content.relationships.length > 0
 			? [
 				{ text: "", wide: false },
@@ -103,7 +126,7 @@ class ArtifactDetailViewport {
 				...this.content.relationships.map((text) => ({ text: theme.fg("text", text), wide: true })),
 			]
 			: [];
-		this.lines = [...identity, ...body, ...labels, ...metadata, ...relationships];
+		this.lines = [...identity, ...body, ...labelsAndMetadataWithLeadingBlank, ...relationships];
 		this.offsetY = Math.min(this.offsetY, Math.max(0, this.lines.length - this.visibleLines));
 	}
 }

package/extension/src/index.ts

@@ -26,7 +26,7 @@ import {
 } from "@danypops/papyrus";
 import { formatMetadata } from "./artifact-format.ts";
 import { callService, subscribeTaskPushChannel } from "./service-client.ts";
-import type { PushChannelClient } from "@danypops/daemon-kit/pi-client";
+import type { PushChannelClient } from "@danypops/vehicle-client/daemon-client";
 import { registerDomainTools, resolveNameFields } from "./domain-tools.ts";
 import { registerNotesVehicle } from "./vehicle-notes-client.ts";
 import { BoundedPoll } from "./bounded-poll.ts";

package/extension/src/service-client.ts

@@ -1,4 +1,4 @@
-import { connectPushChannel, createRetryingClient, type PushChannelClient, type PushChannelState, type RetryingClient } from "@danypops/daemon-kit/pi-client";
+import { connectPushChannel, createRetryingClient, type PushChannelClient, type PushChannelState, type RetryingClient } from "@danypops/vehicle-client/daemon-client";
 import { connectPapyrusClient, resolvePushChannelTarget, resolveVehicleClientTarget, type OperationName, type PapyrusClient, type VehicleClientTarget } from "@danypops/papyrus";
 
 type ClientConnector = () => Promise<PapyrusClient>;

package/extension/src/task-detail-view.ts

@@ -1,5 +1,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { matchesKey, sliceByColumn, truncateToWidth, visibleWidth, wrapTextWithAnsi, type TUI } from "@earendil-works/pi-tui";
+import { buildDetailLines, type DetailField, type DetailSection } from "malevich-tui-components";
 import {
 	TASK_DETAIL_HORIZONTAL_PAN_COLUMNS,
 	TASK_DETAIL_MAX_VISIBLE_LINES,
@@ -92,17 +93,32 @@ class TaskDetailViewport {
 			(text.length === 0 ? [""] : wrapTextWithAnsi(theme.fg(color, text), width)).map((line) => ({ text: line, graph: false }));
 		const status = TASK_STATUS_PRESENTATION[this.status as keyof typeof TASK_STATUS_PRESENTATION];
 		const headline = status ? theme.fg(status.color, theme.bold(this.content.headline)) : theme.bold(this.content.headline);
+
+		// Labels + the checklist/gates/metadata/history sections are plain field/flat-line
+		// shapes -- delegated to malevich's buildDetailLines. The headline/identity (styled
+		// per task status), body (markdown-rendered), and the relationship graph
+		// (horizontally pannable "wide" lines) stay hand-rolled: buildDetailLines has no
+		// concept of any of those.
 		const identity = [
 			...wrapTextWithAnsi(headline, width).map((text) => ({ text, graph: false })),
 			...wrap(this.content.identity, "muted"),
-			...(this.content.labels.length > 0 ? wrap(`Labels: ${this.content.labels.join(", ")}`, "muted") : []),
-			{ text: "", graph: false },
 		];
+		const detailTheme = {
+			field: (s: string) => theme.fg("muted", s),
+			heading: (s: string) => theme.fg("muted", s),
+			byline: (s: string) => theme.fg("dim", s),
+			body: (s: string) => theme.fg("text", s),
+			line: (s: string) => theme.fg("dim", s),
+		};
+		const fields: DetailField[] = this.content.labels.length > 0 ? [{ label: "Labels", value: this.content.labels.join(", ") }] : [];
+		const labels = fields.length > 0
+			? [...buildDetailLines(width, { fields, theme: detailTheme }).map((text) => ({ text, graph: false })), { text: "", graph: false }]
+			: [{ text: "", graph: false }];
 		const body = renderMarkdownBody(this.content.body, width, this.activeTheme).map((text) => ({ text, graph: false }));
-		const sections = this.content.sections.flatMap((section) => [
-			{ text: "", graph: false },
-			...section.flatMap((line, index) => wrap(line, index === 0 ? "muted" : "dim")),
-		]);
+		const sections: DetailSection[] = this.content.sections.map((section) => ({ heading: section[0], lines: section.slice(1) }));
+		const sectionLines = sections.length > 0
+			? buildDetailLines(width, { sections, theme: detailTheme }).map((text) => ({ text, graph: false }))
+			: [];
 		const relationshipHeader = this.graphLines.length > 0
 			? [
 				{ text: "", graph: false },
@@ -112,8 +128,9 @@ class TaskDetailViewport {
 			: [];
 		this.detailLines = [
 			...identity,
+			...labels,
 			...body,
-			...sections,
+			...sectionLines,
 			...relationshipHeader,
 			...this.graphLines.map((text) => ({ text: theme.fg("text", text), graph: true })),
 		];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-papyrus",
-  "version": "0.38.2",
+  "version": "0.38.4",
   "description": "Pi host extension for Papyrus: native tools, TUI panels, and context injection over the daemon-backed graph store",
   "type": "module",
   "keywords": ["pi-package"],
@@ -17,12 +17,13 @@
     "typebox": "*"
   },
   "dependencies": {
-    "@danypops/daemon-kit": "^0.10.0",
-    "@danypops/papyrus": "^0.38.0",
-    "@danypops/vehicle-core": "^0.1.0",
+    "@danypops/papyrus": "^0.38.1",
+    "@danypops/vehicle-core": "^0.1.1",
+    "@danypops/vehicle-server": "^0.1.1",
     "@danypops/vehicle-client": "^0.1.1",
     "@danypops/vehicle-client-pi": "^0.1.5",
-    "beautiful-mermaid": "1.1.3"
+    "beautiful-mermaid": "1.1.3",
+    "malevich-tui-components": "^0.5.0"
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "^0.80.10",