@markjaquith/agency 2.32.0 → 2.32.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "2.32.0",
+  "version": "2.32.2",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",

package/src/utils/interactive.test.tsx

@@ -1,5 +1,8 @@
 import { describe, expect, test } from "bun:test"
 import { testRender } from "@opentui/solid"
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises"
+import { tmpdir } from "node:os"
+import { dirname, join } from "node:path"
 import {
 	fuzzyChoices,
 	InteractiveSelectPrompt,
@@ -8,10 +11,40 @@ import {
 } from "./interactive"
 
 describe("OpenTUI interaction", () => {
+	test("selects the Solid JSX runtime without the project preload", async () => {
+		const source = await Bun.file(
+			new URL("./interactive.tsx", import.meta.url),
+		).text()
+		const root = await mkdtemp(join(tmpdir(), "agency-interactive-jsx-"))
+		const entrypoint = join(
+			root,
+			"node_modules",
+			"@markjaquith",
+			"agency",
+			"interactive.tsx",
+		)
+		await mkdir(dirname(entrypoint), { recursive: true })
+		await writeFile(entrypoint, source)
+
+		try {
+			const result = await Bun.build({
+				entrypoints: [entrypoint],
+				packages: "external",
+				target: "bun",
+			})
+			expect(result.success).toBeTrue()
+			const output = await result.outputs[0]!.text()
+			expect(output).toContain("@opentui/solid/jsx-dev-runtime")
+			expect(output).not.toContain("react/jsx-dev-runtime")
+		} finally {
+			await rm(root, { recursive: true, force: true })
+		}
+	})
+
 	test("uses the split-footer renderer contract", () => {
 		expect(interactiveRendererConfig).toMatchObject({
 			screenMode: "split-footer",
-			footerHeight: 4,
+			footerHeight: 5,
 			externalOutputMode: "capture-stdout",
 			clearOnShutdown: false,
 		})
@@ -179,6 +212,26 @@ describe("OpenTUI interaction", () => {
 		}
 	})
 
+	test("wraps text prompt input onto another line", async () => {
+		const setup = await testRender(
+			() => <InteractiveTextPrompt prompt="Task ID" onDone={() => {}} />,
+			{ width: 16, height: 5 },
+		)
+		try {
+			await setup.renderer.setupTerminal()
+			await setup.renderOnce()
+			await Bun.sleep(0)
+			await setup.mockInput.typeText("alpha beta gamma delta")
+			await setup.flush()
+			const frame = setup.captureCharFrame()
+			expect(frame).toContain("alpha beta")
+			expect(frame).toContain("gamma")
+			expect(frame).toMatch(/alpha beta\s*\ngamma delta/)
+		} finally {
+			setup.renderer.destroy()
+		}
+	})
+
 	test("submits text and cancels with ctrl-c or escape", async () => {
 		let submitted: string | null | undefined
 		const input = await testRender(

package/src/utils/interactive.tsx

@@ -1,8 +1,10 @@
+/** @jsxImportSource @opentui/solid */
+
 import {
 	createCliRenderer,
 	type CliRenderer,
 	type CliRendererConfig,
-	type InputRenderable,
+	type TextareaRenderable,
 } from "@opentui/core"
 import { render, useKeyboard, type JSX } from "@opentui/solid"
 import { createMemo, createSignal, For } from "solid-js"
@@ -14,7 +16,7 @@ export interface InteractiveChoice {
 
 export const interactiveRendererConfig = {
 	screenMode: "split-footer",
-	footerHeight: 4,
+	footerHeight: 5,
 	externalOutputMode: "capture-stdout",
 	consoleMode: "disabled",
 	clearOnShutdown: false,
@@ -33,7 +35,7 @@ const isCancel = (key: { name: string; ctrl: boolean }) =>
 	key.name === "escape" || (key.ctrl && key.name === "c")
 
 export const InteractiveTextPrompt = (props: PromptProps<string>) => {
-	let input: InputRenderable | undefined
+	let input: TextareaRenderable | undefined
 	let value = ""
 	useKeyboard((key) => {
 		if (isCancel(key)) {
@@ -51,10 +53,13 @@ export const InteractiveTextPrompt = (props: PromptProps<string>) => {
 	return (
 		<box flexDirection="column" width="100%" height="100%">
 			<text fg="#7aa2f7">{props.prompt}</text>
-			<input
+			<textarea
 				focused
-				onInput={(next) => {
-					value = next
+				height={2}
+				wrapMode="word"
+				keyBindings={[{ name: "return", action: "submit" }]}
+				onContentChange={() => {
+					value = input?.plainText ?? ""
 				}}
 				ref={(next) => {
 					input = next
@@ -138,7 +143,7 @@ export const fuzzyChoices = (
 }
 
 export const InteractiveSelectPrompt = (props: SelectPromptProps) => {
-	let input: InputRenderable | undefined
+	let input: TextareaRenderable | undefined
 	const [query, setQuery] = createSignal("")
 	const [selected, setSelected] = createSignal(0)
 	const choices = createMemo(() => fuzzyChoices(props.choices, query()))
@@ -193,13 +198,16 @@ export const InteractiveSelectPrompt = (props: SelectPromptProps) => {
 					{props.prompt}
 				</text>
 				<text fg="#7aa2f7">{" > "}</text>
-				<input
+				<textarea
 					focused
 					flexGrow={1}
 					minWidth={8}
+					height={2}
+					wrapMode="word"
 					placeholder="filter"
-					onInput={(next) => {
-						setQuery(next)
+					keyBindings={[{ name: "return", action: "submit" }]}
+					onContentChange={() => {
+						setQuery(input?.plainText ?? "")
 						setSelected(0)
 					}}
 					ref={(next) => {
@@ -264,7 +272,6 @@ async function runInteractive<T>(
 	} finally {
 		if (renderer) {
 			await shutdown(renderer)
-			process.stdout.write("\n")
 		}
 	}
 }