@danypops/pi-papyrus 0.45.8 → 0.45.10

package/extension/src/{artifact-browser.ts → artifact/artifact-browser.ts}

@@ -2,9 +2,9 @@ import { type Artifact, type OperationName, SEED_RELATIONS } from "@danypops/pap
 import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder, rawKeyHint } from "@earendil-works/pi-coding-agent";
 import { Container, Input, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { callService } from "../service-client.ts";
 import { showArtifactDetailView } from "./artifact-detail-view.ts";
 import type { StatusPresentation } from "./artifact-status-presentation.ts";
-import { callService } from "./service-client.ts";
 
 export { artifactDetailsText } from "./artifact-detail-format.ts";
 

package/extension/src/{artifact-detail-view.ts → artifact/artifact-detail-view.ts}

@@ -9,10 +9,10 @@ import {
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { matchesKey, sliceByColumn, type TUI, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { buildDetailLines, type DetailField, type DetailSection } from "malevich-tui-components";
+import { BeautifulMermaidRenderer } from "../beautiful-mermaid-renderer.ts";
+import { type ActiveTheme, renderMarkdownBody } from "../markdown.ts";
 import { type ArtifactDetailContent, artifactDetailContent, artifactDetailsText } from "./artifact-detail-format.ts";
 import { buildArtifactRelationshipLines } from "./artifact-relationship-lines.ts";
-import { BeautifulMermaidRenderer } from "./beautiful-mermaid-renderer.ts";
-import { type ActiveTheme, renderMarkdownBody } from "./markdown.ts";
 
 interface ArtifactDetailLine {
 	text: string;

package/extension/src/{context-budget.ts → context/context-budget.ts}

@@ -2,7 +2,7 @@ import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import type { ContextSegmentItem } from "@danypops/jittor";
 import { type Artifact, CONTEXT_ESTIMATE_CHARACTERS_PER_TOKEN, CONTEXT_TREE_MAX_NODES, type TaskGraph } from "@danypops/papyrus";
-import { ruleInjectionPreview } from "./rules.ts";
+import { ruleInjectionPreview } from "../rules/rules.ts";
 import { discoverSkillDirectories, type SkillCatalogFootprint, scanSkillCatalogFootprint } from "./skill-catalog-footprint.ts";
 
 /**

package/extension/src/{context-injection-telemetry.ts → context/context-injection-telemetry.ts}

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
 import { type Artifact, CONTEXT_ESTIMATE_CHARACTERS_PER_TOKEN, PAPYRUS_CONTEXT_INJECTION_SCHEMA } from "@danypops/papyrus";
-import { playbookInjectionPreview } from "./playbook-bridge.ts";
-import { ruleInjectionPreview } from "./rules.ts";
+import { playbookInjectionPreview } from "../playbook/playbook-bridge.ts";
+import { ruleInjectionPreview } from "../rules/rules.ts";
 
 export interface ContextPayloadSize {
 	characters: number;

package/extension/src/{discuss-live-follow-up.ts → discuss/discuss-live-follow-up.ts}

@@ -2,7 +2,7 @@
  * discuss.open/discuss.reply's live:true synchronous human round-trip -- the
  * one piece of discuss's own retired pi.registerTool() the plain
  * request/response Vehicle projection can't express on its own, wired in via
- * vehicle-client-pi's interactiveFollowUps hook (vehicle-notes-client.ts).
+ * vehicle-client-pi's interactiveFollowUps hook (../tools/vehicle-notes-client.ts).
  *
  * The primary invoke() always durably records the round first, exactly like
  * every other Vehicle operation -- this only ever adds an OPTIONAL synchronous

package/extension/src/{discuss.ts → discuss/discuss.ts}

@@ -10,18 +10,18 @@
  * surfaces history count, both also not the row glyph.
  *
  * Creating a new Discussion is left to the agent (discuss_open, Vehicle-projected -- see
- * vehicle-notes-client.ts), matching docs.ts/rules.ts/playbooks.ts precedent -- Notes is the one
+ * ../tools/vehicle-notes-client.ts), matching docs.ts/rules.ts/playbooks.ts precedent -- Notes is the one
  * kind with a human-facing creation command (/note), because Notes exists specifically as a
  * human-authored inbox.
  */
 
 import { type Artifact, type DiscussionAndRounds, readDiscussionExtra } from "@danypops/papyrus";
 import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-agent";
-import { showArtifactBrowser } from "./artifact-browser.ts";
-import { DISCUSSION_STATE_PRESENTATION, DOC_STATUS_PRESENTATION } from "./artifact-status-presentation.ts";
+import { showArtifactBrowser } from "../artifact/artifact-browser.ts";
+import { DISCUSSION_STATE_PRESENTATION, DOC_STATUS_PRESENTATION } from "../artifact/artifact-status-presentation.ts";
+import { callService } from "../service-client.ts";
 import { askQuestion } from "./discuss-ask-view.ts";
 import { discussionRoundCountOf, discussionStateOf, showDiscussionDetailView } from "./discussion-detail-view.ts";
-import { callService } from "./service-client.ts";
 
 const SOURCE = "discuss-tui";
 const ACTOR = "human";

package/extension/src/{discussion-detail-view.ts → discuss/discussion-detail-view.ts}

@@ -1,11 +1,11 @@
 /**
  * discussion-detail-view.ts — the transcript view for a single Discussion.
  *
- * The generic artifact detail view (artifact-detail-view.ts) formats an artifact's own
+ * The generic artifact detail view (artifact/artifact-detail-view.ts) formats an artifact's own
  * fields (title, body, extra as JSON, edges); it has no way to show a Discussion's rounds,
  * since those live in a dedicated child table fetched separately (discuss.show / discuss.rounds),
  * not in the artifact row itself. Tasks needed the same kind of dedicated view for the same
- * underlying reason (task-detail-view.ts) -- this mirrors that scrolling-viewport idiom rather
+ * underlying reason (task/task-detail-view.ts) -- this mirrors that scrolling-viewport idiom rather
  * than inventing a new one.
  */
 
@@ -19,8 +19,8 @@ import {
 } from "@danypops/papyrus";
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { matchesKey, type TUI, truncateToWidth } from "@earendil-works/pi-tui";
-import { DISCUSSION_STATE_PRESENTATION } from "./artifact-status-presentation.ts";
-import { type ActiveTheme, renderMarkdownBody } from "./markdown.ts";
+import { DISCUSSION_STATE_PRESENTATION } from "../artifact/artifact-status-presentation.ts";
+import { type ActiveTheme, renderMarkdownBody } from "../markdown.ts";
 
 interface TranscriptLine {
 	text: string;

package/extension/src/{docs.ts → docs/docs.ts}

@@ -1,8 +1,8 @@
 import type { Artifact } from "@danypops/papyrus";
 import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-agent";
-import { showArtifactBrowser, showArtifactDetails } from "./artifact-browser.ts";
-import { DOC_STATUS_PRESENTATION } from "./artifact-status-presentation.ts";
-import { callService } from "./service-client.ts";
+import { showArtifactBrowser, showArtifactDetails } from "../artifact/artifact-browser.ts";
+import { DOC_STATUS_PRESENTATION } from "../artifact/artifact-status-presentation.ts";
+import { callService } from "../service-client.ts";
 
 const DOC_ACTIONS: Record<string, string[]> = {
 	draft: ["Activate", "Archive"],

package/extension/src/domain-tools.ts

@@ -111,7 +111,7 @@ export async function resolveNameFields(
 }
 
 // notes.*, rules.*, docs.*, playbooks.*, tasks.*, discuss.*, and the shared artifact.*
-// are all registered as Vehicles (see ../vehicle-notes-client.ts and @danypops/papyrus's
-// src/vehicle/papyrus-vehicle.ts) -- no domain has a hand-rolled pi.registerTool() left
+// are all registered as Vehicles (see ./tools/vehicle-notes-client.ts and @danypops/papyrus's
+// src/handlers/registry.ts) -- no domain has a hand-rolled pi.registerTool() left
 // in this file. What remains here (above) is name-resolution machinery still used
 // directly by index.ts's own low-level tools (papyrus_graph).

package/extension/src/index.ts

@@ -25,26 +25,26 @@ import type { PushChannelClient } from "@danypops/vehicle-client/daemon-client";
 import type { ExtensionAPI, ExtensionContext, ExtensionUIContext, Theme } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
+import { formatMetadata } from "./artifact/artifact-format.ts";
+import { BoundedPoll } from "./bounded-poll.ts";
+import { buildTaskItemTree, computeContextBudget } from "./context/context-budget.ts";
+import { PAPYRUS_CONTEXT_HUB_PRODUCER_NAME, papyrusContextSegment } from "./context/context-hub-contribution.ts";
+import { buildContextInjection } from "./context/context-injection-telemetry.ts";
+import { ensureTypingCourtesyTracking, isLiveAskPending } from "./discuss/discuss-ask-view.ts";
+import { resolveNameFields } from "./domain-tools.ts";
+import { renderNoteWidgetLines } from "./note/note-widget.ts";
+import { PLAYBOOK_BRIDGE_MAX_PLAYBOOKS, registerPlaybookBridge } from "./playbook/playbook-bridge.ts";
+import { callService, subscribeTaskPushChannel } from "./service-client.ts";
+import { cacheSessionSecret, forgetSessionSecret, sessionSecretField } from "./session-identity.ts";
 import {
 	ActiveTaskContinuation,
 	type ActiveTaskMarker,
 	automaticPauseReason,
 	shouldResumeFocusOnHumanInput,
-} from "./active-task-continuation.ts";
-import { formatMetadata } from "./artifact-format.ts";
-import { BoundedPoll } from "./bounded-poll.ts";
-import { buildTaskItemTree, computeContextBudget } from "./context-budget.ts";
-import { PAPYRUS_CONTEXT_HUB_PRODUCER_NAME, papyrusContextSegment } from "./context-hub-contribution.ts";
-import { buildContextInjection } from "./context-injection-telemetry.ts";
-import { ensureTypingCourtesyTracking, isLiveAskPending } from "./discuss-ask-view.ts";
-import { resolveNameFields } from "./domain-tools.ts";
-import { renderNoteWidgetLines } from "./note-widget.ts";
-import { PLAYBOOK_BRIDGE_MAX_PLAYBOOKS, registerPlaybookBridge } from "./playbook-bridge.ts";
-import { callService, subscribeTaskPushChannel } from "./service-client.ts";
-import { cacheSessionSecret, forgetSessionSecret, sessionSecretField } from "./session-identity.ts";
-import { emitTaskFocusEvent, setTaskFocusEventBus } from "./task-focus-events.ts";
-import { TASK_STATUS_PRESENTATION, taskTreeConnector } from "./task-presentation.ts";
-import { buildTaskWidgetProjection, type TaskWidgetProjection } from "./task-widget.ts";
+} from "./task/active-task-continuation.ts";
+import { emitTaskFocusEvent, setTaskFocusEventBus } from "./task/task-focus-events.ts";
+import { TASK_STATUS_PRESENTATION, taskTreeConnector } from "./task/task-presentation.ts";
+import { buildTaskWidgetProjection, type TaskWidgetProjection } from "./task/task-widget.ts";
 import { renderPapyrusToolCall, renderPapyrusToolResult } from "./tool-rendering/index.ts";
 import {
 	createArtifactDetails,
@@ -53,7 +53,7 @@ import {
 	createModelContent,
 	createPreviewDetails,
 } from "./tool-rendering/render-model.ts";
-import { registerNotesVehicle } from "./vehicle-notes-client.ts";
+import { registerNotesVehicle } from "./tools/vehicle-notes-client.ts";
 
 function text(value: string, details: unknown = {}) {
 	const modelContent = createModelContent(value);
@@ -357,7 +357,7 @@ export default async function (pi: ExtensionAPI) {
 	let previousContextInjectionFingerprint: string | undefined;
 	let logTurnSequence = 0;
 	// Papyrus's own Context Hub contribution (rules/tasks/Pi's own skill catalog, bundled into one segment --
-	// see context-hub-contribution.ts) re-emits every turn alongside the existing injection
+	// see context/context-hub-contribution.ts) re-emits every turn alongside the existing injection
 	// observation, its own independent monotonic sequence, same cadence and shape as
 	// contextInjectionSequence but on a different channel/schema.
 	let contextHubContributionSequence = 0;
@@ -371,7 +371,7 @@ export default async function (pi: ExtensionAPI) {
 		// ctx.isIdle() means "not streaming a model response" -- it reads true while a live discuss
 		// ask is still genuinely pending, blocked on the human. Queuing a "continue the active task"
 		// nudge here would start a second, concurrent turn reasoning about the very Discussion this
-		// live ask is already resolving. See discuss-ask-view.ts's isLiveAskPending() doc comment.
+		// live ask is already resolving. See discuss/discuss-ask-view.ts's isLiveAskPending() doc comment.
 		if (isLiveAskPending()) return;
 		try {
 			const sessionId = ctx.sessionManager.getSessionId();
@@ -627,12 +627,12 @@ export default async function (pi: ExtensionAPI) {
 
 	// Lazy imports keep TUI components out of non-interactive startup paths.
 	const [tasksModule, docsModule, notesModule, rulesModule, playbooksModule, discussModule] = await Promise.all([
-		import("./tasks.ts"),
-		import("./docs.ts"),
-		import("./notes.ts"),
-		import("./rules.ts"),
-		import("./playbooks.ts"),
-		import("./discuss.ts"),
+		import("./task/tasks.ts"),
+		import("./docs/docs.ts"),
+		import("./note/notes.ts"),
+		import("./rules/rules.ts"),
+		import("./playbook/playbooks.ts"),
+		import("./discuss/discuss.ts"),
 	]);
 	let overlay: TaskOverlay | undefined;
 	let noteOverlay: NoteOverlay | undefined;

package/extension/src/{notes.ts → note/notes.ts}

@@ -1,8 +1,8 @@
 import { type Artifact, NOTE_DISPOSITIONS, NOTE_LIST_MAX_LIMIT } from "@danypops/papyrus";
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { showArtifactBrowser, showArtifactDetails } from "./artifact-browser.ts";
-import { NOTE_STATUS_PRESENTATION } from "./artifact-status-presentation.ts";
-import { callService } from "./service-client.ts";
+import { showArtifactBrowser, showArtifactDetails } from "../artifact/artifact-browser.ts";
+import { NOTE_STATUS_PRESENTATION } from "../artifact/artifact-status-presentation.ts";
+import { callService } from "../service-client.ts";
 
 export function noteRowMeta(note: Artifact): string {
 	const history = Array.isArray(note.extra.noteHistory) ? note.extra.noteHistory.length : 0;

package/extension/src/{playbook-bridge.ts → playbook/playbook-bridge.ts}

@@ -20,7 +20,7 @@
 
 import type { Artifact } from "@danypops/papyrus";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { callService } from "./service-client.ts";
+import { callService } from "../service-client.ts";
 
 export const PLAYBOOK_BRIDGE_MAX_PLAYBOOKS = 100;
 

package/extension/src/{playbooks.ts → playbook/playbooks.ts}

@@ -1,10 +1,10 @@
 import type { Artifact } from "@danypops/papyrus";
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import type { AutocompleteItem } from "@earendil-works/pi-tui";
-import { showArtifactBrowser, showArtifactDetails } from "./artifact-browser.ts";
-import { PLAYBOOK_STATUS_PRESENTATION } from "./artifact-status-presentation.ts";
-import { matchArtifactByName } from "./domain-tools.ts";
-import { callService } from "./service-client.ts";
+import { showArtifactBrowser, showArtifactDetails } from "../artifact/artifact-browser.ts";
+import { PLAYBOOK_STATUS_PRESENTATION } from "../artifact/artifact-status-presentation.ts";
+import { matchArtifactByName } from "../domain-tools.ts";
+import { callService } from "../service-client.ts";
 
 const PLAYBOOK_COMPLETION_MAX_CANDIDATES = 100;
 

package/extension/src/{rules.ts → rules/rules.ts}

@@ -1,8 +1,8 @@
 import type { Artifact } from "@danypops/papyrus";
 import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-agent";
-import { showArtifactBrowser, showArtifactDetails } from "./artifact-browser.ts";
-import { RULE_STATUS_PRESENTATION, severityColor } from "./artifact-status-presentation.ts";
-import { callService } from "./service-client.ts";
+import { showArtifactBrowser, showArtifactDetails } from "../artifact/artifact-browser.ts";
+import { RULE_STATUS_PRESENTATION, severityColor } from "../artifact/artifact-status-presentation.ts";
+import { callService } from "../service-client.ts";
 
 export function ruleRowMeta(rule: Artifact, theme: Theme): string {
 	const severity = typeof rule.extra.severity === "string" ? rule.extra.severity : "info";

package/extension/src/{task-detail-format.ts → task/task-detail-format.ts}

@@ -1,5 +1,5 @@
 import { type Artifact, checklistEntries, type ProofReference, type TaskEvent } from "@danypops/papyrus";
-import { formatMetadata } from "./artifact-format.ts";
+import { formatMetadata } from "../artifact/artifact-format.ts";
 
 const TASK_STATUS_GLYPHS: Record<string, string> = {
 	todo: "○",

package/extension/src/{task-detail-view.ts → task/task-detail-view.ts}

@@ -12,8 +12,8 @@ import {
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { matchesKey, sliceByColumn, type TUI, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { buildDetailLines, type DetailField, type DetailSection } from "malevich-tui-components";
-import { BeautifulMermaidRenderer } from "./beautiful-mermaid-renderer.ts";
-import { type ActiveTheme, renderMarkdownBody } from "./markdown.ts";
+import { BeautifulMermaidRenderer } from "../beautiful-mermaid-renderer.ts";
+import { type ActiveTheme, renderMarkdownBody } from "../markdown.ts";
 import { type TaskDetailContent, taskDetailContent, taskDetailsText } from "./task-detail-format.ts";
 import { TASK_STATUS_PRESENTATION } from "./task-presentation.ts";
 

package/extension/src/{task-graph.ts → task/task-graph.ts}

@@ -10,7 +10,7 @@ import {
 } from "@danypops/papyrus";
 import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-agent";
 import { matchesKey, sliceByColumn, type TUI, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { BeautifulMermaidRenderer } from "./beautiful-mermaid-renderer.ts";
+import { BeautifulMermaidRenderer } from "../beautiful-mermaid-renderer.ts";
 import { TASK_STATUS_PRESENTATION } from "./task-presentation.ts";
 
 const GRAPH_VIEWS: TaskGraphView[] = ["execution", "dependencies", "composition"];

package/extension/src/{tasks.ts → task/tasks.ts}

@@ -6,8 +6,8 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder, rawKeyHint } from "@earendil-works/pi-coding-agent";
 import { Container, Input, matchesKey, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { callService } from "./service-client.ts";
-import { sessionSecretField } from "./session-identity.ts";
+import { callService } from "../service-client.ts";
+import { sessionSecretField } from "../session-identity.ts";
 import { showTaskDetails } from "./task-detail-view.ts";
 import { emitTaskFocusEvent } from "./task-focus-events.ts";
 import { showTaskGraph } from "./task-graph.ts";

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

@@ -1,8 +1,33 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { type Component, truncateToWidth } from "@earendil-works/pi-tui";
-import { buildDetailLines, type DetailField, type DetailSection } from "malevich-tui-components";
+import { type Component, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { buildDetailLines, type DetailField, type DetailSection, type DetailViewTheme, type TextMeasure } from "malevich-tui-components";
 import type { ArtifactToolDetails } from "./render-model.ts";
 
+/**
+ * Real ANSI-aware measurement/wrapping -- without this, buildDetailLines falls back to
+ * Malevich's own asciiTextMeasure, which is documented as having "no ANSI-code awareness"
+ * and is only meant for short, unstyled labels. A themed multi-paragraph body (this file's
+ * own Body: section) styles the whole text once before wrapping; the ASCII fallback then
+ * slices that already-colored string by raw character index, so only the first and last
+ * resulting physical lines keep the color escape -- every line in between renders in the
+ * terminal's default color. wrapTextWithAnsi re-injects the active codes on every wrapped
+ * line instead.
+ */
+const measure: TextMeasure = { visibleWidth, truncateToWidth, wrapTextWithAnsi };
+
+/** Shared by every buildDetailLines caller in this extension (ArtifactCard, and
+ * tools/vehicle-artifact-renderers.ts's discuss/tasks.complete renderers) -- one Theme -> DetailViewTheme
+ * mapping instead of the same four-field object literal re-typed at each call site. */
+export function detailViewTheme(theme: Theme): DetailViewTheme {
+	return {
+		field: (s) => theme.fg("text", s),
+		heading: (s) => theme.fg("toolTitle", theme.bold(s)),
+		byline: (s) => theme.fg("muted", s),
+		body: (s) => theme.fg("text", s),
+		line: (s) => theme.fg("warning", s),
+	};
+}
+
 const KIND_GLYPHS: Readonly<Record<string, string>> = {
 	task: "◇",
 	doc: "▤",
@@ -100,6 +125,7 @@ export class ArtifactCard implements Component {
 		const status = this.theme.fg(statusColor(artifact.status), `${statusGlyph(artifact.status)} ${artifact.status}`);
 		return [
 			{ label: "Title", value: artifact.title },
+			{ label: "Alias", value: artifact.alias ?? artifact.id },
 			{ label: "Kind", value: `${kindGlyph(artifact.kind)} ${artifact.kind}` },
 			{ label: "Status", value: status },
 			...(this.expanded ? [{ label: "ID", value: artifact.id }] : []),
@@ -128,13 +154,8 @@ export class ArtifactCard implements Component {
 			fields: this.fields(),
 			sections: this.sections(),
 			alignFields: true,
-			theme: {
-				field: (s) => theme.fg("text", s),
-				heading: (s) => theme.fg("toolTitle", theme.bold(s)),
-				byline: (s) => theme.fg("muted", s),
-				body: (s) => theme.fg("text", s),
-				line: (s) => theme.fg("warning", s),
-			},
+			theme: detailViewTheme(theme),
+			measure,
 		});
 
 		if (this.details.focus) {

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

@@ -18,6 +18,8 @@ export interface ResultCompleteness {
 
 export interface ToolArtifactSummary {
 	id: string;
+	/** Optional only for a detail object persisted before this field existed -- ArtifactCard falls back to id when absent. */
+	alias?: string;
 	kind: string;
 	title: string;
 	status: string;
@@ -154,6 +156,7 @@ function boundedText(value: string, maximum: number): { value: string; completen
 function artifactSummary(artifact: Artifact): ToolArtifactSummary {
 	return {
 		id: artifact.id,
+		alias: artifact.alias,
 		kind: artifact.kind,
 		title: artifact.title,
 		status: artifact.status,

package/extension/src/{vehicle-artifact-renderers.ts → tools/vehicle-artifact-renderers.ts}

@@ -20,9 +20,9 @@ import type { VehicleOperationDescriptor } from "@danypops/vehicle-core";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { type Component, Text, truncateToWidth } from "@earendil-works/pi-tui";
 import { buildDetailLines, type DagEdge, type DagNode, DagView, type DetailField, type DetailSection } from "malevich-tui-components";
-import { ArtifactCard, expandHint, statusColor, statusGlyph } 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";
+import { ArtifactCard, detailViewTheme, expandHint, statusColor, statusGlyph } 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;
@@ -261,13 +261,6 @@ function isDiscussionListOutput(value: unknown): value is DiscussionListOutput {
 	return isArtifactArray(row.discussions);
 }
 
-const discussTheme = (theme: Theme) => ({
-	field: (s: string) => theme.fg("text", s),
-	heading: (s: string) => theme.fg("toolTitle", theme.bold(s)),
-	byline: (s: string) => theme.fg("muted", s),
-	body: (s: string) => theme.fg("text", s),
-});
-
 function roundsSection(rounds: readonly DiscussionRoundOutput[]): DetailSection {
 	return {
 		heading: `Rounds (${rounds.length}):`,
@@ -275,35 +268,35 @@ function roundsSection(rounds: readonly DiscussionRoundOutput[]): DetailSection
 	};
 }
 
+/** A one-shot render function with nothing to invalidate -- every buildDetailLines-based
+ * renderer in this file (unlike ArtifactCard/DagView) has no cache to clear. */
+function statelessComponent(render: (width: number) => string[]): Component {
+	return { render, invalidate: () => {} };
+}
+
 function renderDiscussionAndRounds(output: DiscussionAndRoundsOutput, theme: Theme, expanded: boolean): Component {
 	const discussion = output.discussion;
-	return {
-		render: (width: number) => {
-			const safeWidth = Math.max(1, width);
-			const fields: DetailField[] = [
-				{ label: "Title", value: discussion.title },
-				{ label: "Status", value: theme.fg(statusColor(discussion.status), `${statusGlyph(discussion.status)} ${discussion.status}`) },
-			];
-			const sections: DetailSection[] = expanded && output.rounds.length > 0 ? [roundsSection(output.rounds)] : [];
-			const lines = buildDetailLines(safeWidth, { fields, sections, alignFields: true, theme: discussTheme(theme) });
-			if (!expanded && output.rounds.length > 0) {
-				const count = output.rounds.length;
-				lines.push(truncateToWidth(theme.fg("dim", `${count} round${count === 1 ? "" : "s"} · ${expandHint()}`), safeWidth));
-			}
-			return lines;
-		},
-		invalidate: () => {},
-	};
+	return statelessComponent((width) => {
+		const safeWidth = Math.max(1, width);
+		const fields: DetailField[] = [
+			{ label: "Title", value: discussion.title },
+			{ label: "Status", value: theme.fg(statusColor(discussion.status), `${statusGlyph(discussion.status)} ${discussion.status}`) },
+		];
+		const sections: DetailSection[] = expanded && output.rounds.length > 0 ? [roundsSection(output.rounds)] : [];
+		const lines = buildDetailLines(safeWidth, { fields, sections, alignFields: true, theme: detailViewTheme(theme) });
+		if (!expanded && output.rounds.length > 0) {
+			const count = output.rounds.length;
+			lines.push(truncateToWidth(theme.fg("dim", `${count} round${count === 1 ? "" : "s"} · ${expandHint()}`), safeWidth));
+		}
+		return lines;
+	});
 }
 
 function renderDiscussionRoundsOnly(output: DiscussionRoundsOnlyOutput, theme: Theme): Component {
-	return {
-		render: (width: number) => {
-			const sections: DetailSection[] = output.rounds.length > 0 ? [roundsSection(output.rounds)] : [{ lines: ["No rounds."] }];
-			return buildDetailLines(Math.max(1, width), { sections, theme: discussTheme(theme) });
-		},
-		invalidate: () => {},
-	};
+	return statelessComponent((width) => {
+		const sections: DetailSection[] = output.rounds.length > 0 ? [roundsSection(output.rounds)] : [{ lines: ["No rounds."] }];
+		return buildDetailLines(Math.max(1, width), { sections, theme: detailViewTheme(theme) });
+	});
 }
 
 /** tasks.complete's own TaskCompletion shape -- a completed (or rejected) task plus its own
@@ -350,45 +343,42 @@ function isTaskCompletion(value: unknown): value is TaskCompletionOutput {
 
 function renderTaskCompletion(result: TaskCompletionOutput, theme: Theme, expanded: boolean): Component {
 	const task = result.artifact;
-	return {
-		render: (width: number) => {
-			const safeWidth = Math.max(1, width);
-			const fields: DetailField[] = [
-				{ label: "Title", value: task.title },
-				{ label: "Status", value: theme.fg(statusColor(task.status), `${statusGlyph(task.status)} ${task.status}`) },
-			];
-			const sections: DetailSection[] = [];
-			if (result.gates.length > 0) {
-				sections.push({
-					heading: "Gates:",
-					lines: result.gates.map((gate) => theme.fg(gate.passed ? "success" : "error", `${gate.passed ? "✓" : "✗"} ${gate.output}`)),
-				});
-			}
-			if (result.checklist.length > 0) {
-				sections.push({
-					heading: "Checklist:",
-					lines: result.checklist.map((entry) =>
-						theme.fg(
-							entry.accepted ? "success" : "error",
-							`${entry.accepted ? "✓" : "✗"} ${entry.item}${entry.reason ? ` — ${entry.reason}` : ""}`,
-						),
+	return statelessComponent((width) => {
+		const safeWidth = Math.max(1, width);
+		const fields: DetailField[] = [
+			{ label: "Title", value: task.title },
+			{ label: "Status", value: theme.fg(statusColor(task.status), `${statusGlyph(task.status)} ${task.status}`) },
+		];
+		const sections: DetailSection[] = [];
+		if (result.gates.length > 0) {
+			sections.push({
+				heading: "Gates:",
+				lines: result.gates.map((gate) => theme.fg(gate.passed ? "success" : "error", `${gate.passed ? "✓" : "✗"} ${gate.output}`)),
+			});
+		}
+		if (result.checklist.length > 0) {
+			sections.push({
+				heading: "Checklist:",
+				lines: result.checklist.map((entry) =>
+					theme.fg(
+						entry.accepted ? "success" : "error",
+						`${entry.accepted ? "✓" : "✗"} ${entry.item}${entry.reason ? ` — ${entry.reason}` : ""}`,
 					),
-				});
-			}
-			if (result.blocked.length > 0) {
-				sections.push({
-					heading: "Still blocked:",
-					lines: result.blocked.map((entry) => theme.fg("warning", `◼ ${entry.artifact.title}`)),
-				});
-			}
-			const lines = buildDetailLines(safeWidth, { fields, sections, alignFields: true, theme: discussTheme(theme) });
-			if (result.focused && expanded) {
-				lines.push(truncateToWidth(theme.fg("accent", `▶ focus ${result.focused.title}`), safeWidth));
-			}
-			return lines;
-		},
-		invalidate: () => {},
-	};
+				),
+			});
+		}
+		if (result.blocked.length > 0) {
+			sections.push({
+				heading: "Still blocked:",
+				lines: result.blocked.map((entry) => theme.fg("warning", `◼ ${entry.artifact.title}`)),
+			});
+		}
+		const lines = buildDetailLines(safeWidth, { fields, sections, alignFields: true, theme: detailViewTheme(theme) });
+		if (result.focused && expanded) {
+			lines.push(truncateToWidth(theme.fg("accent", `▶ focus ${result.focused.title}`), safeWidth));
+		}
+		return lines;
+	});
 }
 
 export function papyrusVehicleRenderers(descriptor: VehicleOperationDescriptor): VehicleToolRenderers {

package/extension/src/{vehicle-notes-client.ts → tools/vehicle-notes-client.ts}

@@ -1,7 +1,7 @@
 /**
  * Registers every Vehicle-projected domain (notes.*, rules.*, docs.*, playbooks.*,
  * tasks.*, discuss.*, artifact.*) as real Pi tools -- see @danypops/papyrus's
- * src/vehicle/papyrus-vehicle.ts. discuss.* is the last of the six domains to
+ * src/handlers/registry.ts. discuss.* is the last of the six domains to
  * migrate off pi-papyrus's own retired hand-rolled pi.registerTool() mega-tool.
  *
  * Fails silently on a stale/unreachable daemon handle instead of aborting extension
@@ -24,10 +24,10 @@ import { createReconnectingVehicleClient } from "@danypops/vehicle-client/daemon
 import { RemoteVehicleClient } from "@danypops/vehicle-client/http";
 import { registerVehicleTools } from "@danypops/vehicle-client-pi";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { discussLiveFollowUp } from "./discuss-live-follow-up.ts";
-import { currentVehicleClientTarget } from "./service-client.ts";
-import { sessionSecretField } from "./session-identity.ts";
-import { emitTaskFocusEvent } from "./task-focus-events.ts";
+import { discussLiveFollowUp } from "../discuss/discuss-live-follow-up.ts";
+import { currentVehicleClientTarget } from "../service-client.ts";
+import { sessionSecretField } from "../session-identity.ts";
+import { emitTaskFocusEvent } from "../task/task-focus-events.ts";
 import { papyrusVehicleRenderers } from "./vehicle-artifact-renderers.ts";
 
 const REGISTERED_PERMISSIONS = [
@@ -66,7 +66,7 @@ export async function registerNotesVehicle(pi: ExtensionAPI): Promise<void> {
 			// 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
-			// @danypops/papyrus's src/vehicle/playbooks-vehicle.ts and tasks-vehicle.ts. That
+			// @danypops/papyrus's src/handlers/playbooks.ts and tasks.ts. That
 			// secret must never be a model-visible input field (the model has no business
 			// knowing or supplying it), so it travels here instead, in principal.claims, from
 			// this extension's own already-cached secret (registered at session_start -- see
@@ -97,7 +97,7 @@ export async function registerNotesVehicle(pi: ExtensionAPI): Promise<void> {
 			// -- has no Vehicle-transport equivalent, so it's emitted here, client-side, rather
 			// than from the operation's own output.
 			// discuss.open/discuss.reply's own live:true synchronous human round-trip --
-			// see discuss-live-follow-up.ts. Every other operation's resolver call
+			// see discuss/discuss-live-follow-up.ts. Every other operation's resolver call
 			// returns undefined, meaning zero behavior change for the other 5 domains.
 			interactiveFollowUps: (descriptor) =>
 				descriptor.name === "discuss.open" || descriptor.name === "discuss.reply" ? discussLiveFollowUp : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-papyrus",
-  "version": "0.45.8",
+  "version": "0.45.10",
   "description": "Pi host extension for Papyrus: native tools, TUI panels, and context injection over the daemon-backed graph store",
   "type": "module",
   "keywords": ["pi-package"],
@@ -21,8 +21,8 @@
     "@danypops/papyrus": "^0.44.0",
     "@danypops/vehicle-client": "^0.5.0",
     "@danypops/vehicle-client-pi": "^0.16.8",
-    "@danypops/vehicle-core": "^0.10.0",
-    "@danypops/vehicle-server": "^0.13.0",
+    "@danypops/vehicle-core": "^0.12.3",
+    "@danypops/vehicle-server": "^0.18.1",
     "beautiful-mermaid": "1.1.3",
     "malevich-tui-components": "^0.21.2"
   },