@danypops/pi-papyrus 0.43.1 → 0.43.4

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

@@ -1,4 +1,5 @@
 import {
+	type Artifact,
 	TOOL_DETAILS_BODY_MAX_CHARACTERS,
 	TOOL_DETAILS_FIELD_MAX_CHARACTERS,
 	TOOL_DETAILS_MAX_EDGES,
@@ -6,7 +7,6 @@ import {
 	TOOL_DETAILS_MAX_SERIALIZED_CHARACTERS,
 	TOOL_DETAILS_ROW_OUTPUT_MAX_CHARACTERS,
 	TOOL_MODEL_CONTENT_MAX_CHARACTERS,
-	type Artifact,
 } from "@danypops/papyrus";
 
 export const PAPYRUS_TOOL_DETAILS_SCHEMA = "papyrus.tool-details/v1" as const;
@@ -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 } : {}),
 	};
 }
 
@@ -198,11 +211,7 @@ export function createTransitionDetails(
 	};
 }
 
-export function createGraphDetails(
-	operation: string,
-	artifacts: readonly Artifact[],
-	edges: readonly ToolGraphEdge[],
-): GraphToolDetails {
+export function createGraphDetails(operation: string, artifacts: readonly Artifact[], edges: readonly ToolGraphEdge[]): GraphToolDetails {
 	const nodes = artifacts.slice(0, TOOL_DETAILS_MAX_ITEMS).map(artifactSummary);
 	const boundedEdges = edges.slice(0, TOOL_DETAILS_MAX_EDGES).map((edge) => ({ ...edge }));
 	return {
@@ -237,11 +246,7 @@ export function createGateRunDetails(
 	};
 }
 
-export function createInvocationDetails(
-	operation: string,
-	runId: string,
-	created: ToolInvocationCreated,
-): InvocationToolDetails {
+export function createInvocationDetails(operation: string, runId: string, created: ToolInvocationCreated): InvocationToolDetails {
 	const bounded: ToolInvocationCreated = {
 		tasks: created.tasks.slice(0, TOOL_DETAILS_MAX_ITEMS),
 		docs: created.docs.slice(0, TOOL_DETAILS_MAX_ITEMS),
@@ -318,13 +323,15 @@ function isCompleteness(value: unknown): value is ResultCompleteness {
 }
 
 function isArtifactSummary(value: unknown): value is ToolArtifactSummary {
-	return isRecord(value)
-		&& isBoundedString(value.id)
-		&& isBoundedString(value.kind)
-		&& isBoundedString(value.title)
-		&& isBoundedString(value.status)
-		&& isBoundedString(value.subtype)
-		&& isStringArray(value.labels);
+	return (
+		isRecord(value) &&
+		isBoundedString(value.id) &&
+		isBoundedString(value.kind) &&
+		isBoundedString(value.title) &&
+		isBoundedString(value.status) &&
+		isBoundedString(value.subtype) &&
+		isStringArray(value.labels)
+	);
 }
 
 function isToolArtifact(value: unknown): value is ToolArtifact {
@@ -332,10 +339,21 @@ function isToolArtifact(value: unknown): value is ToolArtifact {
 	const body = value.body;
 	const createdAt = value.createdAt;
 	const updatedAt = value.updatedAt;
-	return isArtifactSummary(value)
-		&& isBoundedString(body, TOOL_DETAILS_BODY_MAX_CHARACTERS)
-		&& isBoundedString(createdAt)
-		&& isBoundedString(updatedAt);
+	return (
+		isArtifactSummary(value) &&
+		isBoundedString(body, TOOL_DETAILS_BODY_MAX_CHARACTERS) &&
+		isBoundedString(createdAt) &&
+		isBoundedString(updatedAt)
+	);
+}
+
+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 {
@@ -343,11 +361,13 @@ function isGraphEdge(value: unknown): value is ToolGraphEdge {
 }
 
 function isGateRow(value: unknown): value is ToolGateRow {
-	return isRecord(value)
-		&& typeof value.passed === "boolean"
-		&& isBoundedString(value.type)
-		&& isBoundedString(value.target)
-		&& isBoundedString(value.output, TOOL_DETAILS_ROW_OUTPUT_MAX_CHARACTERS);
+	return (
+		isRecord(value) &&
+		typeof value.passed === "boolean" &&
+		isBoundedString(value.type) &&
+		isBoundedString(value.target) &&
+		isBoundedString(value.output, TOOL_DETAILS_ROW_OUTPUT_MAX_CHARACTERS)
+	);
 }
 
 function isBoundedArray<T>(value: unknown, maximum: number, predicate: (entry: unknown) => entry is T): value is T[] {
@@ -362,48 +382,68 @@ export function parsePapyrusToolDetails(value: unknown): PapyrusToolDetails | un
 	} catch {
 		return undefined;
 	}
-	if (serializedLength > TOOL_DETAILS_MAX_SERIALIZED_CHARACTERS || !isRecord(value)
-		|| value.schemaVersion !== PAPYRUS_TOOL_DETAILS_SCHEMA
-		|| !isBoundedString(value.operation)
-		|| !isBoundedString(value.kind)) return undefined;
+	if (
+		serializedLength > TOOL_DETAILS_MAX_SERIALIZED_CHARACTERS ||
+		!isRecord(value) ||
+		value.schemaVersion !== PAPYRUS_TOOL_DETAILS_SCHEMA ||
+		!isBoundedString(value.operation) ||
+		!isBoundedString(value.kind)
+	)
+		return undefined;
 
 	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) && Number(value.total) >= value.rows.length
-				&& isCompleteness(value.completeness)
-				? value as unknown as ArtifactListToolDetails : undefined;
+			return isBoundedArray(value.rows, TOOL_DETAILS_MAX_ITEMS, isArtifactSummary) &&
+				Number.isSafeInteger(value.total) &&
+				Number(value.total) >= value.rows.length &&
+				isCompleteness(value.completeness)
+				? (value as unknown as ArtifactListToolDetails)
+				: undefined;
 		case "transition":
 			return isArtifactSummary(value.artifact) && isBoundedString(value.fromStatus) && isBoundedString(value.toStatus)
-				? value as unknown as TransitionToolDetails : undefined;
+				? (value as unknown as TransitionToolDetails)
+				: undefined;
 		case "graph":
-			return isBoundedArray(value.nodes, TOOL_DETAILS_MAX_ITEMS, isArtifactSummary)
-				&& isBoundedArray(value.edges, TOOL_DETAILS_MAX_EDGES, isGraphEdge)
-				&& isCompleteness(value.nodeCompleteness) && isCompleteness(value.edgeCompleteness)
-				? value as unknown as GraphToolDetails : undefined;
+			return isBoundedArray(value.nodes, TOOL_DETAILS_MAX_ITEMS, isArtifactSummary) &&
+				isBoundedArray(value.edges, TOOL_DETAILS_MAX_EDGES, isGraphEdge) &&
+				isCompleteness(value.nodeCompleteness) &&
+				isCompleteness(value.edgeCompleteness)
+				? (value as unknown as GraphToolDetails)
+				: undefined;
 		case "gate-run":
-			return isBoundedString(value.artifactId)
-				&& isBoundedString(value.artifactTitle)
-				&& isBoundedArray(value.gates, TOOL_DETAILS_MAX_ITEMS, isGateRow)
-				&& isCompleteness(value.completeness)
-				? value as unknown as GateRunToolDetails : undefined;
+			return isBoundedString(value.artifactId) &&
+				isBoundedString(value.artifactTitle) &&
+				isBoundedArray(value.gates, TOOL_DETAILS_MAX_ITEMS, isGateRow) &&
+				isCompleteness(value.completeness)
+				? (value as unknown as GateRunToolDetails)
+				: undefined;
 		case "invocation": {
 			if (!isRecord(value.created)) return undefined;
-			return isBoundedString(value.runId)
-				&& isStringArray(value.created.tasks) && isStringArray(value.created.docs)
-				&& isStringArray(value.created.rules) && isStringArray(value.created.roots)
-				&& isCompleteness(value.completeness)
-				? value as unknown as InvocationToolDetails : undefined;
+			return isBoundedString(value.runId) &&
+				isStringArray(value.created.tasks) &&
+				isStringArray(value.created.docs) &&
+				isStringArray(value.created.rules) &&
+				isStringArray(value.created.roots) &&
+				isCompleteness(value.completeness)
+				? (value as unknown as InvocationToolDetails)
+				: undefined;
 		}
 		case "preview":
-			return isBoundedString(value.title) && isBoundedString(value.content, TOOL_DETAILS_BODY_MAX_CHARACTERS) && isCompleteness(value.completeness)
-				? value as unknown as PreviewToolDetails : undefined;
+			return isBoundedString(value.title) &&
+				isBoundedString(value.content, TOOL_DETAILS_BODY_MAX_CHARACTERS) &&
+				isCompleteness(value.completeness)
+				? (value as unknown as PreviewToolDetails)
+				: undefined;
 		case "error":
 			return isBoundedString(value.code) && isBoundedString(value.message, TOOL_DETAILS_BODY_MAX_CHARACTERS)
-				? value as unknown as ErrorToolDetails : undefined;
+				? (value as unknown as ErrorToolDetails)
+				: undefined;
 		default:
 			return undefined;
 	}

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

@@ -0,0 +1,102 @@
+/**
+ * Curated result rendering for Papyrus's own Vehicle-projected operations
+ * (notes.*, tasks.*, docs.*, rules.*, playbooks.*, artifact.*): reuses the
+ * same ArtifactCard/ArtifactListCard components the pre-Vehicle native tool
+ * used, instead of the generic Vehicle renderer's raw full-column table
+ * dump -- a human reading a task/note list doesn't need id/subtype/extra/
+ * timestamps up front, only title + status, with the rest available on
+ * expand. Detection is by output shape, not operation name: every operation
+ * registered through this client is one of Papyrus's own artifact domains,
+ * so "looks like an Artifact" is a safe, name-independent signal here.
+ * Falls back to the generic Vehicle renderer for any other output shape
+ * (progress, transitions, gate runs, errors).
+ */
+
+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 { 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;
+	const row = value as Record<string, unknown>;
+	return (
+		typeof row.id === "string" &&
+		typeof row.kind === "string" &&
+		typeof row.title === "string" &&
+		typeof row.status === "string" &&
+		typeof row.subtype === "string" &&
+		typeof row.body === "string" &&
+		Array.isArray(row.labels) &&
+		typeof row.created_at === "string" &&
+		typeof row.updated_at === "string"
+	);
+}
+
+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) {
+			if (!options.isPartial && !context.isError) {
+				const output = (result.details as { output?: unknown } | undefined)?.output;
+				if (isArtifactArray(output)) {
+					return new ArtifactListCard(createArtifactListDetails(descriptor.name, output), theme, options.expanded);
+				}
+				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/extension/src/vehicle-notes-client.ts

@@ -10,18 +10,37 @@
  * Uses service-client.ts's currentVehicleClientTarget() (test-injectable) rather
  * than resolveVehicleClientTarget() directly, so a test exercising the full
  * extension entrypoint doesn't resolve a real daemonStateDir().
+ *
+ * The client itself is wrapped in createReconnectingVehicleClient(), re-resolving
+ * currentVehicleClientTarget() on every reconnect attempt rather than closing over
+ * one target captured here at session_start -- confirmed live: the daemon rebinds
+ * a new random port on every restart, and a bare RemoteVehicleClient built once had
+ * no way to notice its baseUrl had died, breaking every Vehicle tool call for the
+ * rest of the Pi session until a full extension reload.
  */
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+import { createReconnectingVehicleClient } from "@danypops/vehicle-client/daemon-client";
 import { RemoteVehicleClient } from "@danypops/vehicle-client/http";
 import { registerVehicleTools } from "@danypops/vehicle-client-pi";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { currentVehicleClientTarget } from "./service-client.ts";
 import { sessionSecretField } from "./session-identity.ts";
 import { emitTaskFocusEvent } from "./task-focus-events.ts";
+import { papyrusVehicleRenderers } from "./vehicle-artifact-renderers.ts";
 
 const REGISTERED_PERMISSIONS = [
-	"notes:read", "notes:write", "rules:read", "rules:write", "docs:read", "docs:write",
-	"playbooks:read", "playbooks:write", "tasks:read", "tasks:write",
-	"artifact:read", "artifact:write",
+	"notes:read",
+	"notes:write",
+	"rules:read",
+	"rules:write",
+	"docs:read",
+	"docs:write",
+	"playbooks:read",
+	"playbooks:write",
+	"tasks:read",
+	"tasks:write",
+	"artifact:read",
+	"artifact:write",
 ];
 
 /** Task Focus's own internal write needs a real, per-session secret -- see below. Every other tasks.* operation reads session_id purely for read-scoping and needs no secret. */
@@ -31,10 +50,15 @@ export async function registerNotesVehicle(pi: ExtensionAPI): Promise<void> {
 	const target = currentVehicleClientTarget();
 	if (!target) return;
 	try {
-		const client = new RemoteVehicleClient({ baseUrl: target.baseUrl, token: target.token });
+		const client = createReconnectingVehicleClient(async () => {
+			const resolved = currentVehicleClientTarget();
+			if (!resolved) throw new Error("Papyrus daemon is not running");
+			return new RemoteVehicleClient({ baseUrl: resolved.baseUrl, token: resolved.token });
+		});
 		await registerVehicleTools(pi, client, {
 			permissions: REGISTERED_PERMISSIONS,
 			principal: { id: "pi-papyrus" },
+			renderers: papyrusVehicleRenderers,
 			// playbooks.invoke's own module handler, and tasks.focus/pause/unpause/clear_focus's
 			// own module handlers, authorize an internal Task Focus write via
 			// sessionIdentity.assertAuthorized(session_id, session_secret) -- see
@@ -52,7 +76,10 @@ export async function registerNotesVehicle(pi: ExtensionAPI): Promise<void> {
 				// explicitly overrides session_id to a DIFFERENT session never gets this
 				// session's secret smuggled in on its behalf.
 				const requestedSessionId = (input as { session_id?: unknown } | undefined)?.session_id;
-				const sessionId = typeof requestedSessionId === "string" && requestedSessionId.length > 0 ? requestedSessionId : context.sessionManager.getSessionId();
+				const sessionId =
+					typeof requestedSessionId === "string" && requestedSessionId.length > 0
+						? requestedSessionId
+						: context.sessionManager.getSessionId();
 				const { session_secret: sessionSecret } = sessionSecretField(sessionId);
 				// Omit sessionSecret entirely when nothing is cached (unregistered session) --
 				// {sessionSecret: null} would fail the module's own optionalString(input,
@@ -73,7 +100,8 @@ export async function registerNotesVehicle(pi: ExtensionAPI): Promise<void> {
 				}
 				if (descriptor.name === "tasks.pause" || descriptor.name === "tasks.unpause") {
 					const focus = output as { artifact: { id: string } } | undefined;
-					if (focus?.artifact?.id) emitTaskFocusEvent({ taskId: focus.artifact.id, status: descriptor.name === "tasks.pause" ? "paused" : "unpaused" });
+					if (focus?.artifact?.id)
+						emitTaskFocusEvent({ taskId: focus.artifact.id, status: descriptor.name === "tasks.pause" ? "paused" : "unpaused" });
 					return;
 				}
 				if (descriptor.name === "tasks.clear_focus") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-papyrus",
-  "version": "0.43.1",
+  "version": "0.43.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"],
@@ -19,10 +19,10 @@
   "dependencies": {
     "@danypops/jittor": "^0.14.0",
     "@danypops/papyrus": "^0.42.0",
-    "@danypops/vehicle-client": "^0.1.1",
-    "@danypops/vehicle-client-pi": "^0.3.1",
-    "@danypops/vehicle-core": "^0.2.0",
-    "@danypops/vehicle-server": "^0.1.1",
+    "@danypops/vehicle-client": "^0.2.0",
+    "@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"
   },