@soleone/pi-tasks 0.3.0 → 0.4.1

package/README.md

@@ -7,20 +7,20 @@ Task management extension for the [pi coding agent](https://github.com/badlogic/
 ## Quick start
 
 1. Installation: `pi install npm:@soleone/pi-tasks`
-2. Toggle the Tasks UI with `ctrl + x`, or use `/tasks`.
+2. Toggle the Tasks UI with `ctrl + shift + r` or `alt + x`, or use `/tasks`.
 
 ## Usage
 
-- Navigate up with `w` and `s` (arrows also work)
+- Navigate with `w` / `s` (up / down arrows also work)
+- `a` to go back (`Esc` and left arrow also work)
 - `space` to change status
 - `0` to `4` to change priority
 - `t` to change task type
 - `f` for keyword search (title, description)
-- `q` or `Esc` to go back
 
 ### List view
 
-- `e` to edit a task
+- `d` to open task details
 - `Enter` to work off a task
 - `Tab` to insert task details in prompt and close Tasks UI
 - `c` to create a new task
@@ -38,8 +38,13 @@ Set `PI_TASKS_BACKEND` to explicitly choose a backend implementation.
 Currently supported values:
 
 - `beads`
+- `sq`
 - `todo-md`
 
+### Sift Queue (`sq`) backend
+
+The `sq` backend integrates with [sift-queue](https://github.com/shopify-playground/sift) and reads/writes tasks through the `sq` CLI.
+
 ### TODO.md backend
 
 The `todo-md` backend reads/writes a markdown task file (default: `TODO.md`; if `todo.md` already exists, it is used).

package/index.ts

@@ -0,0 +1,3 @@
+import registerExtension from "./src/extension.ts"
+
+export default registerExtension

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleone/pi-tasks",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Task management extension for the pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -14,13 +14,14 @@
   "homepage": "https://github.com/soleone/pi-tasks#readme",
   "pi": {
     "extensions": [
-      "./src/index.ts"
+      "./index.ts"
     ]
   },
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./index.ts"
   },
   "files": [
+    "index.ts",
     "src",
     "README.md",
     "CONTRIBUTING.md",

package/src/backend/adapters/beads.ts

@@ -3,7 +3,14 @@ import { spawnSync } from "node:child_process"
 import { existsSync } from "node:fs"
 import { resolve } from "node:path"
 import type { Task, TaskStatus } from "../../models/task.ts"
-import type { CreateTaskInput, TaskAdapter, TaskAdapterInitializer, TaskStatusMap, TaskUpdate } from "../api.ts"
+import type {
+  CreateTaskInput,
+  TaskAdapter,
+  TaskAdapterInitializer,
+  TaskSessionContextMessage,
+  TaskStatusMap,
+  TaskUpdate,
+} from "../api.ts"
 
 const MAX_LIST_RESULTS = 100
 const STATUS_MAP = {
@@ -21,6 +28,16 @@ const PRIORITY_HOTKEYS: Record<string, string> = {
   "4": "p4",
 }
 
+const SESSION_CONTEXT_MESSAGE: TaskSessionContextMessage = {
+  customType: "pi-tasks-backend-context-beads-v1",
+  content: [
+    "The pi-tasks extension is using the `beads` backend for this project.",
+    "If you need a quick overview of the beads workflow, run `bd quickstart` or `bd onboard`.",
+    "For most beads commands, agents should prefer the `--json` flag so output is structured and machine-readable.",
+    "For more advanced command help, run `bd -h`.",
+  ].join(" "),
+}
+
 const OPEN_TASK_LIST_ARGS = [
   "list",
   "--status", STATUS_MAP.open,
@@ -222,6 +239,7 @@ function initialize(pi: ExtensionAPI): TaskAdapter {
     taskTypes: TASK_TYPES,
     priorities: PRIORITIES,
     priorityHotkeys: PRIORITY_HOTKEYS,
+    sessionContextMessage: SESSION_CONTEXT_MESSAGE,
 
     async list(): Promise<Task[]> {
       const [openOut, inProgressOut] = await Promise.all([

package/src/backend/adapters/sq.ts

@@ -0,0 +1,325 @@
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent"
+import { spawnSync } from "node:child_process"
+import type { Task, TaskStatus } from "../../models/task.ts"
+import type {
+  CreateTaskInput,
+  TaskAdapter,
+  TaskAdapterInitializer,
+  TaskSessionContextMessage,
+  TaskStatusMap,
+  TaskUpdate,
+} from "../api.ts"
+
+const MAX_LIST_RESULTS = 100
+const PI_TASKS_METADATA_KEY = "pi_tasks"
+
+const STATUS_MAP = {
+  open: "pending",
+  inProgress: "in_progress",
+  closed: "closed",
+} satisfies TaskStatusMap
+
+const TASK_TYPES = ["task", "feature", "bug", "chore", "epic"]
+const PRIORITIES = ["p0", "p1", "p2", "p3", "p4"]
+const PRIORITY_HOTKEYS: Record<string, string> = {
+  "0": "p0",
+  "1": "p1",
+  "2": "p2",
+  "3": "p3",
+  "4": "p4",
+}
+
+const SESSION_CONTEXT_MESSAGE: TaskSessionContextMessage = {
+  customType: "pi-tasks-backend-context-sq-v1",
+  content: [
+    "The pi-tasks extension is using the `sq` backend for this project.",
+    "If you need direct `sq` CLI guidance, run `sq prime`.",
+    "When manipulating pi-tasks metadata through `sq`, store it under",
+    "`pi_tasks`, for example",
+    "`--metadata '{\"pi_tasks\":{\"taskType\":\"TYPE\",\"dueAt\":\"TIMESTAMP\"}}'`,",
+    "or merge the same shape with `--merge-metadata`.",
+  ].join(" "),
+}
+
+interface SqItem {
+  id: string
+  title?: string
+  description?: string
+  status: string
+  priority?: number | string
+  metadata?: Record<string, unknown>
+  blocked_by?: string[]
+  created_at?: string
+  updated_at?: string
+}
+
+interface TaskMetadata {
+  taskType?: string
+  dueAt?: string
+}
+
+function normalizePriority(value: unknown): string | undefined {
+  if (typeof value === "number") {
+    const label = `p${value}`
+    return PRIORITIES.includes(label) ? label : undefined
+  }
+
+  if (typeof value !== "string") return undefined
+
+  const numericPriority = Number.parseInt(value, 10)
+  if (String(numericPriority) === value.trim()) {
+    return normalizePriority(numericPriority)
+  }
+
+  const normalized = value.toLowerCase()
+  return PRIORITIES.includes(normalized) ? normalized : undefined
+}
+
+function toBackendPriority(priority: string): string {
+  const normalized = normalizePriority(priority)
+  if (!normalized) throw new Error(`Unsupported priority for sq backend: ${priority}`)
+  return normalized.slice(1)
+}
+
+function normalizeText(value: unknown): string | undefined {
+  if (typeof value !== "string") return undefined
+  const trimmed = value.trim()
+  return trimmed.length > 0 ? trimmed : undefined
+}
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return undefined
+  return value as Record<string, unknown>
+}
+
+function extractTaskMetadata(metadata: Record<string, unknown> | undefined): TaskMetadata {
+  if (!metadata) return {}
+
+  const piTasks = asRecord(metadata[PI_TASKS_METADATA_KEY])
+  if (!piTasks) return {}
+
+  return {
+    taskType: normalizeText(piTasks.taskType),
+    dueAt: normalizeText(piTasks.dueAt),
+  }
+}
+
+function buildPiTasksMetadata(input: { taskType?: string, dueAt?: string }): Record<string, unknown> | undefined {
+  const piTasks: Record<string, unknown> = {}
+
+  if (input.taskType !== undefined) {
+    piTasks.taskType = input.taskType || TASK_TYPES[0]
+  }
+
+  if (input.dueAt !== undefined) {
+    piTasks.dueAt = input.dueAt
+  }
+
+  return Object.keys(piTasks).length > 0
+    ? { [PI_TASKS_METADATA_KEY]: piTasks }
+    : undefined
+}
+
+function toBackendStatus(status: TaskStatus): string {
+  const mapped = STATUS_MAP[status]
+  if (!mapped) throw new Error(`Unsupported status for sq backend: ${status}`)
+  return mapped
+}
+
+function fromBackendStatus(status: string, blockedBy: string[] | undefined): TaskStatus {
+  if (status === STATUS_MAP.inProgress) return "inProgress"
+  if (status === STATUS_MAP.closed) return "closed"
+  if ((blockedBy?.length ?? 0) > 0) return "blocked"
+  return "open"
+}
+
+function toTask(item: SqItem): Task {
+  const metadata = extractTaskMetadata(item.metadata)
+
+  return {
+    ref: item.id,
+    id: item.id,
+    title: item.title?.trim() || item.id,
+    description: item.description ?? "",
+    status: fromBackendStatus(item.status, item.blocked_by),
+    priority: normalizePriority(item.priority),
+    taskType: metadata.taskType,
+    createdAt: item.created_at,
+    updatedAt: item.updated_at,
+    dueAt: metadata.dueAt,
+    dependencyCount: item.blocked_by?.length,
+  }
+}
+
+function taskStatusSortRank(status: TaskStatus): number {
+  if (status === "inProgress") return 0
+  if (status === "open") return 1
+  if (status === "blocked") return 2
+  return 3
+}
+
+function taskPrioritySortRank(priority: string | undefined): number {
+  if (!priority) return PRIORITIES.length + 1
+  const index = PRIORITIES.indexOf(priority)
+  return index >= 0 ? index : PRIORITIES.length
+}
+
+function sortActiveTasks(tasks: Task[]): Task[] {
+  return [...tasks].sort((left, right) => {
+    const statusOrder = taskStatusSortRank(left.status) - taskStatusSortRank(right.status)
+    if (statusOrder !== 0) return statusOrder
+
+    const priorityOrder = taskPrioritySortRank(left.priority) - taskPrioritySortRank(right.priority)
+    if (priorityOrder !== 0) return priorityOrder
+
+    return left.ref.localeCompare(right.ref)
+  })
+}
+
+function parseJsonArray<T>(stdout: string, context: string): T[] {
+  try {
+    const parsed = JSON.parse(stdout)
+    if (!Array.isArray(parsed)) throw new Error("expected JSON array")
+    return parsed as T[]
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new Error(`Failed to parse sq output (${context}): ${message}`)
+  }
+}
+
+function parseJsonObject<T>(stdout: string, context: string): T {
+  try {
+    const parsed = JSON.parse(stdout)
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      throw new Error("expected JSON object")
+    }
+    return parsed as T
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new Error(`Failed to parse sq output (${context}): ${message}`)
+  }
+}
+
+function isApplicable(): boolean {
+  const result = spawnSync("sq", ["--help"], { stdio: "ignore" })
+  return !result.error
+}
+
+function initialize(pi: ExtensionAPI): TaskAdapter {
+  async function execSq(args: string[], timeout = 30_000): Promise<string> {
+    const result = await pi.exec("sq", args, { timeout })
+    if (result.code !== 0) {
+      const details = (result.stderr || result.stdout || "").trim()
+      throw new Error(details.length > 0 ? details : `sq ${args.join(" ")} failed (code ${result.code})`)
+    }
+
+    return result.stdout
+  }
+
+  async function showRaw(ref: string): Promise<SqItem> {
+    const out = await execSq(["show", ref, "--json"])
+    return parseJsonObject<SqItem>(out, `show ${ref}`)
+  }
+
+  return {
+    id: "sq",
+    statusMap: STATUS_MAP,
+    taskTypes: TASK_TYPES,
+    priorities: PRIORITIES,
+    priorityHotkeys: PRIORITY_HOTKEYS,
+    sessionContextMessage: SESSION_CONTEXT_MESSAGE,
+
+    async list(): Promise<Task[]> {
+      const [pendingOut, inProgressOut] = await Promise.all([
+        execSq(["list", "--status", STATUS_MAP.open, "--json"]),
+        execSq(["list", "--status", STATUS_MAP.inProgress, "--json"]),
+      ])
+
+      const pendingItems = parseJsonArray<SqItem>(pendingOut, "list pending")
+      const inProgressItems = parseJsonArray<SqItem>(inProgressOut, "list in_progress")
+
+      const dedupedById = new Map<string, Task>()
+      for (const item of [...inProgressItems, ...pendingItems]) {
+        dedupedById.set(item.id, toTask(item))
+      }
+
+      return sortActiveTasks([...dedupedById.values()]).slice(0, MAX_LIST_RESULTS)
+    },
+
+    async show(ref: string): Promise<Task> {
+      return toTask(await showRaw(ref))
+    },
+
+    async update(ref: string, update: TaskUpdate): Promise<void> {
+      const args = ["edit", ref]
+
+      if (update.title !== undefined) {
+        args.push("--set-title", update.title.trim())
+      }
+
+      if (update.description !== undefined) {
+        args.push("--set-description", update.description)
+      }
+
+      if (update.status !== undefined) {
+        args.push("--set-status", toBackendStatus(update.status))
+      }
+
+      if (update.priority !== undefined) {
+        args.push("--set-priority", toBackendPriority(update.priority))
+      }
+
+      const metadataPatch = buildPiTasksMetadata({
+        taskType: update.taskType,
+        dueAt: update.dueAt,
+      })
+
+      if (metadataPatch) {
+        args.push("--merge-metadata", JSON.stringify(metadataPatch))
+      }
+
+      if (args.length === 2) return
+      await execSq(args)
+    },
+
+    async create(input: CreateTaskInput): Promise<Task> {
+      const title = input.title.trim()
+      const description = input.description ?? ""
+      const selectedPriority = input.priority ?? PRIORITIES[Math.floor(PRIORITIES.length / 2)]
+      const metadata = buildPiTasksMetadata({
+        taskType: input.taskType || TASK_TYPES[0],
+        dueAt: input.dueAt,
+      })
+      const sourceText = description.trim().length > 0 ? description : title
+
+      const args = [
+        "add",
+        "--title", title,
+        "--description", description,
+        "--priority", toBackendPriority(selectedPriority),
+        "--text", sourceText,
+        "--json",
+      ]
+
+      if (metadata) {
+        args.push("--metadata", JSON.stringify(metadata))
+      }
+
+      const out = await execSq(args)
+      const created = parseJsonObject<SqItem>(out, "create")
+
+      if (input.status && input.status !== "open") {
+        await execSq(["edit", created.id, "--set-status", toBackendStatus(input.status)])
+        return toTask(await showRaw(created.id))
+      }
+
+      return toTask(created)
+    },
+  }
+}
+
+export default {
+  id: "sq",
+  isApplicable,
+  initialize,
+} satisfies TaskAdapterInitializer

package/src/backend/api.ts

@@ -20,12 +20,18 @@ export interface CreateTaskInput extends TaskUpdate {
   title: string
 }
 
+export interface TaskSessionContextMessage {
+  customType: string
+  content: string
+}
+
 export interface TaskAdapter {
   readonly id: string
   readonly statusMap: TaskStatusMap
   readonly taskTypes: string[]
   readonly priorities: string[]
   readonly priorityHotkeys?: Record<string, string>
+  readonly sessionContextMessage?: TaskSessionContextMessage
   invalidateCache?(): void
   list(): Promise<Task[]>
   show(ref: string): Promise<Task>

package/src/controllers/list.ts

@@ -2,6 +2,7 @@ import { Key, matchesKey } from "@mariozechner/pi-tui"
 
 export type ListIntent =
   | { type: "cancel" }
+  | { type: "back" }
   | { type: "searchStart" }
   | { type: "searchCancel" }
   | { type: "searchApply" }
@@ -23,7 +24,7 @@ export interface ListControllerState {
   filtered: boolean
   allowSearch: boolean
   allowPriority: boolean
-  closeKey: string
+  closeKeys: string[]
   priorities: string[]
   priorityHotkeys?: Record<string, string>
 }
@@ -68,6 +69,10 @@ function isPrintable(data: string): boolean {
   return data.length === 1 && data.charCodeAt(0) >= 32 && data.charCodeAt(0) < 127
 }
 
+function matchesAnyShortcut(data: string, shortcuts: string[]): boolean {
+  return shortcuts.some(shortcut => matchesKey(data, shortcut))
+}
+
 const MOVE_KEYS: Record<string, number> = {
   w: -1,
   W: -1,
@@ -83,7 +88,7 @@ const SCROLL_KEYS: Record<string, number> = {
 const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
   {
     context: "search",
-    match: (data, state) => data === state.closeKey,
+    match: (data, state) => matchesAnyShortcut(data, state.closeKeys),
     intent: () => ({ type: "cancel" }),
   },
   {
@@ -123,8 +128,8 @@ const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
   },
   {
     context: "default",
-    help: "e edit",
-    match: (data) => data === "e" || data === "E" || matchesKey(data, Key.right),
+    help: "d details",
+    match: (data) => data === "d" || data === "D" || matchesKey(data, Key.right),
     intent: () => ({ type: "edit" }),
   },
   {
@@ -174,7 +179,12 @@ const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
   },
   {
     context: "default",
-    match: (data, state) => data === state.closeKey,
+    match: (data) => data === "a" || data === "A" || matchesKey(data, Key.left),
+    intent: () => ({ type: "back" }),
+  },
+  {
+    context: "default",
+    match: (data, state) => matchesAnyShortcut(data, state.closeKeys),
     intent: () => ({ type: "cancel" }),
   },
 ]
@@ -197,7 +207,7 @@ export function buildListPrimaryHelpText(state: ListControllerState): string {
     .map(s => (typeof s.help === "function" ? s.help(state) : s.help as string))
 
   if (context === "default") {
-    parts.push(state.filtered ? "esc clear filter" : "esc cancel")
+    parts.push(state.filtered ? "a/esc clear filter" : "a/esc back")
   }
 
   return parts.join(" • ")

package/src/controllers/show.ts

@@ -55,9 +55,9 @@ export function getHeaderStatus(
 }
 
 export function buildPrimaryHelpText(focus: FormFocus): string {
-  if (focus === "title") return "enter save • tab description • esc back"
-  if (focus === "desc") return "enter newline • tab save • esc back"
-  return "tab title • enter save • esc/q back • ctrl+x close"
+  if (focus === "title") return "shift+tab nav • enter save • tab description • esc nav"
+  if (focus === "desc") return "shift+enter newline • shift+tab title • enter save • esc nav"
+  return "tab title • enter save • a/esc back"
 }
 
 function buildPriorityHelpText(priorities: string[], priorityHotkeys?: Record<string, string>): string {

package/src/extension.ts

@@ -6,7 +6,7 @@ import { showTaskList } from "./ui/pages/list.ts"
 import { showTaskForm } from "./ui/pages/show.ts"
 import type { TaskUpdate } from "./backend/api.ts"
 
-const CTRL_X = "\x18"
+const TASK_LIST_SHORTCUTS = ["ctrl+shift+r", "alt+x"]
 
 function parsePriorityKey(
   data: string,
@@ -171,10 +171,49 @@ function applyDraftToTask(
   return nextTask
 }
 
+function branchHasCustomMessage(entries: unknown[], customType: string): boolean {
+  return entries.some((entry) => {
+    if (!entry || typeof entry !== "object") return false
+
+    const candidate = entry as {
+      type?: unknown
+      customType?: unknown
+    }
+
+    return candidate.type === "custom_message" && candidate.customType === customType
+  })
+}
+
 export default function registerExtension(pi: ExtensionAPI) {
   const backend = initializeAdapter(pi)
   validateBackendConfiguration(backend)
 
+  const backendContextMessage = backend.sessionContextMessage
+
+  function ensureBackendContextOnBranch(entries: unknown[]): void {
+    if (!backendContextMessage) return
+    if (branchHasCustomMessage(entries, backendContextMessage.customType)) return
+
+    pi.sendMessage({
+      customType: backendContextMessage.customType,
+      content: backendContextMessage.content,
+      display: false,
+      details: { backendId: backend.id },
+    })
+  }
+
+  pi.on("session_start", async (_event, ctx) => {
+    ensureBackendContextOnBranch(ctx.sessionManager.getBranch())
+  })
+
+  pi.on("session_switch", async (_event, ctx) => {
+    ensureBackendContextOnBranch(ctx.sessionManager.getBranch())
+  })
+
+  pi.on("session_fork", async (_event, ctx) => {
+    ensureBackendContextOnBranch(ctx.sessionManager.getBranch())
+  })
+
   const nextStatus = (status: TaskStatus): TaskStatus => cycleStatus(status, backend.statusMap)
   const nextTaskType = (current: string | undefined): string => cycleTaskType(current, backend.taskTypes)
   const nextPriorityFromKey = (data: string): string | null => parsePriorityKey(
@@ -212,7 +251,7 @@ export default function registerExtension(pi: ExtensionAPI) {
       mode: "edit",
       subtitle: "Edit",
       task,
-      closeKey: CTRL_X,
+      closeKeys: TASK_LIST_SHORTCUTS,
       cycleStatus: nextStatus,
       cycleTaskType: nextTaskType,
       parsePriorityKey: nextPriorityFromKey,
@@ -261,7 +300,7 @@ export default function registerExtension(pi: ExtensionAPI) {
         priority: defaultPriority(backend.priorities),
         taskType: defaultTaskType(backend.taskTypes),
       },
-      closeKey: CTRL_X,
+      closeKeys: TASK_LIST_SHORTCUTS,
       cycleStatus: nextStatus,
       cycleTaskType: nextTaskType,
       parsePriorityKey: nextPriorityFromKey,
@@ -323,7 +362,7 @@ export default function registerExtension(pi: ExtensionAPI) {
         title: pageTitle,
         subtitle: backendLabel,
         tasks,
-        closeKey: CTRL_X,
+        closeKeys: TASK_LIST_SHORTCUTS,
         priorities: backend.priorities,
         priorityHotkeys: backend.priorityHotkeys,
         cycleStatus: nextStatus,
@@ -348,11 +387,15 @@ export default function registerExtension(pi: ExtensionAPI) {
     },
   })
 
-  pi.registerShortcut("ctrl+x", {
-    description: "Open task list",
-    handler: async (ctx) => {
-      if (!ctx.hasUI) return
-      await browseTasks(ctx as ExtensionCommandContext)
-    },
-  })
+  const openTaskListShortcut = async (ctx: ExtensionCommandContext): Promise<void> => {
+    if (!ctx.hasUI) return
+    await browseTasks(ctx)
+  }
+
+  for (const shortcut of TASK_LIST_SHORTCUTS) {
+    pi.registerShortcut(shortcut, {
+      description: "Open task list",
+      handler: openTaskListShortcut,
+    })
+  }
 }

package/src/ui/components/blur-editor.ts

@@ -5,8 +5,12 @@ interface BlurEditorFieldOptions {
   blurredBorderColor?: (str: string) => string
   paddingX?: number
   indentX?: number
+  cursorGlyph?: string
+  focusedCursorColor?: (str: string) => string
 }
 
+const INVERSE_CURSOR_SEGMENT = /\x1b\[7m([\s\S]*?)\x1b\[(?:0|27)m/
+
 export class BlurEditorField implements Component, Focusable {
   focused = false
   onChange?: (text: string) => void
@@ -16,6 +20,8 @@ export class BlurEditorField implements Component, Focusable {
   private stripTopBorder: boolean
   private blurredBorderColor: (str: string) => string
   private indentX: number
+  private cursorGlyph: string
+  private focusedCursorColor: (str: string) => string
 
   constructor(tui: any, theme: EditorTheme, options: BlurEditorFieldOptions = {}) {
     const paddingX = options.paddingX ?? 1
@@ -26,6 +32,8 @@ export class BlurEditorField implements Component, Focusable {
     this.stripTopBorder = options.stripTopBorder ?? true
     this.blurredBorderColor = options.blurredBorderColor ?? theme.borderColor
     this.indentX = Math.max(0, options.indentX ?? 0)
+    this.cursorGlyph = options.cursorGlyph ?? "▏"
+    this.focusedCursorColor = options.focusedCursorColor ?? ((str: string) => str)
 
     this.editor.onChange = (text: string) => {
       this.onChange?.(text)
@@ -53,6 +61,25 @@ export class BlurEditorField implements Component, Focusable {
     this.previewText.invalidate()
   }
 
+  private replaceBlockCursor(line: string): string {
+    const cursor = this.focusedCursorColor(this.cursorGlyph)
+    return line.replace(INVERSE_CURSOR_SEGMENT, cursor)
+  }
+
+  private stylizeCursor(lines: string[]): string[] {
+    let replaced = false
+
+    return lines.map((line) => {
+      if (replaced) return line
+
+      const updated = this.replaceBlockCursor(line)
+      if (updated !== line) {
+        replaced = true
+      }
+      return updated
+    })
+  }
+
   render(width: number): string[] {
     const innerWidth = Math.max(1, width - this.indentX)
     const indent = " ".repeat(this.indentX)
@@ -68,7 +95,8 @@ export class BlurEditorField implements Component, Focusable {
 
     const lines = this.editor.render(innerWidth)
     const visibleLines = !this.stripTopBorder || lines.length <= 1 ? lines : lines.slice(1)
-    return withIndent(visibleLines)
+    const styledLines = this.stylizeCursor(visibleLines)
+    return withIndent(styledLines)
   }
 
   handleInput(data: string): void {

package/src/ui/components/select-list-with-columns.ts

@@ -2,7 +2,10 @@ import { Key, matchesKey, truncateToWidth, type Component, type SelectItem, type
 
 // Local variant of pi-tui SelectList with configurable value/description column layout.
 
+const ANSI_ESCAPE_PATTERN = /\x1b\[[0-9;]*m/g
+
 const normalizeToSingleLine = (text: string): string => text.replace(/[\r\n]+/g, " ").trim()
+const visibleWidth = (text: string): number => text.replace(ANSI_ESCAPE_PATTERN, "").length
 
 export interface SelectListColumnLayout {
   valueMaxWidth?: number
@@ -86,8 +89,9 @@ export class SelectListWithColumns implements Component {
 
       const maxValueWidth = Math.min(this.layout.valueMaxWidth, width - prefix.length - 4)
       const truncatedValue = truncateToWidth(displayValue, maxValueWidth, "")
-      const spacing = " ".repeat(Math.max(1, this.layout.valueColumnWidth - truncatedValue.length))
-      const descriptionStart = prefix.length + truncatedValue.length + spacing.length
+      const truncatedValueWidth = visibleWidth(truncatedValue)
+      const spacing = " ".repeat(Math.max(1, this.layout.valueColumnWidth - truncatedValueWidth))
+      const descriptionStart = prefix.length + truncatedValueWidth + spacing.length
       const descriptionWidth = width - descriptionStart - 2
 
       if (descriptionWidth <= this.layout.minDescriptionWidth) {

package/src/ui/pages/list.ts

@@ -10,8 +10,8 @@ import { SelectListWithColumns } from "../components/select-list-with-columns.ts
 
 const LIST_PAGE_CONTENT_MIN_HEIGHT = 20
 const TASK_LIST_ROW_LAYOUT = {
-  valueMaxWidth: 60,
-  valueColumnWidth: 62,
+  valueMaxWidth: 68,
+  valueColumnWidth: 70,
 }
 
 export interface ListPageConfig {
@@ -23,7 +23,7 @@ export interface ListPageConfig {
   filterTerm?: string
   priorities: string[]
   priorityHotkeys?: Record<string, string>
-  closeKey: string
+  closeKeys: string[]
   cycleStatus: (status: TaskStatus) => TaskStatus
   cycleTaskType: (current: string | undefined) => string
   onUpdateTask: (ref: string, update: TaskUpdate) => Promise<void>
@@ -290,7 +290,7 @@ export async function showTaskList(ctx: ExtensionCommandContext, config: ListPag
           filtered: !!filterTerm,
           allowPriority,
           allowSearch,
-          closeKey: config.closeKey,
+          closeKeys: config.closeKeys,
           priorities: config.priorities,
           priorityHotkeys: config.priorityHotkeys,
         })))
@@ -376,7 +376,7 @@ export async function showTaskList(ctx: ExtensionCommandContext, config: ListPag
             filtered: !!filterTerm,
             allowSearch,
             allowPriority,
-            closeKey: config.closeKey,
+            closeKeys: config.closeKeys,
             priorities: config.priorities,
             priorityHotkeys: config.priorityHotkeys,
           })
@@ -386,6 +386,15 @@ export async function showTaskList(ctx: ExtensionCommandContext, config: ListPag
               done("cancel")
               return
 
+            case "back":
+              if (filterTerm) {
+                filterTerm = ""
+                rebuildAndRender()
+              } else {
+                done("cancel")
+              }
+              return
+
             case "searchStart":
               searching = true
               searchBuffer = ""

package/src/ui/pages/show.ts

@@ -26,7 +26,7 @@ interface ShowTaskFormOptions {
   mode: FormMode
   subtitle: string
   task: Task
-  closeKey: string
+  closeKeys: string[]
   cycleStatus: (status: TaskStatus) => TaskStatus
   cycleTaskType: (taskType: string | undefined) => string
   parsePriorityKey: (data: string) => string | null
@@ -61,12 +61,27 @@ function buildSelectedTaskLine(
 
 function fieldLabel(theme: any, label: string, focused: boolean): string {
   const color = focused ? "accent" : "muted"
-  return theme.fg(color, theme.bold(`  ${label}`))
+  return theme.fg(color, theme.bold(label))
 }
 
 const SELECTED_ITEM_PREFIX = "› "
 const DESCRIPTION_FIELD_HEIGHT = 8
 const PAGE_CONTENT_MIN_HEIGHT = 19
+const SHIFT_TAB_SEQUENCE = /^\x1b\[[0-9;]*Z$/
+const SHIFT_ENTER_FALLBACK_SEQUENCE = /^\x1b\[13;2~$/
+
+function isShiftTab(data: string): boolean {
+  return SHIFT_TAB_SEQUENCE.test(data)
+}
+
+function isExplicitNewLineCommand(data: string): boolean {
+  return (
+    matchesKey(data, Key.shift("enter")) ||
+    data === "\n" ||
+    data === "\x1b\r" ||
+    SHIFT_ENTER_FALLBACK_SEQUENCE.test(data)
+  )
+}
 
 class FixedHeightField implements Component {
   constructor(private child: Component, private height: number) {}
@@ -144,7 +159,7 @@ class ReservedLineText implements Component {
 }
 
 export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTaskFormOptions): Promise<TaskFormResult> {
-  const { mode, subtitle, task, closeKey, cycleStatus, cycleTaskType, parsePriorityKey, priorities, priorityHotkeys, onSave } = options
+  const { mode, subtitle, task, closeKeys, cycleStatus, cycleTaskType, parsePriorityKey, priorities, priorityHotkeys, onSave } = options
 
   let taskTypeValue = task.taskType
   let titleValue = task.title
@@ -168,12 +183,13 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
     const titleLabel = new Text("", 0, 0)
     const descLabel = new Text("", 0, 0)
     const helpText = new ReservedLineText(KEYBOARD_HELP_PADDING_X)
-    const shortcutsText = new ReservedLineText(KEYBOARD_HELP_PADDING_X)
 
     let focus: FormFocus = mode === "create" ? "title" : "nav"
     let saveIndicator: "saving" | "saved" | "error" | undefined
     let saveIndicatorTimer: ReturnType<typeof setTimeout> | undefined
     let saving = false
+    let saveQueued = false
+    let savePromise: Promise<void> | null = null
     let disposed = false
 
     const editorTheme = {
@@ -190,8 +206,8 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
     const titleEditor = new BlurEditorField(tui, editorTheme, {
       stripTopBorder: true,
       blurredBorderColor: (s: string) => theme.fg("muted", s),
-      paddingX: 2,
-      indentX: 2,
+      paddingX: 0,
+      focusedCursorColor: (s: string) => theme.fg("accent", s),
     })
     titleEditor.setText(titleValue)
     titleEditor.disableSubmit = true
@@ -207,8 +223,8 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
     const descEditor = new BlurEditorField(tui, editorTheme, {
       stripTopBorder: true,
       blurredBorderColor: (s: string) => theme.fg("muted", s),
-      paddingX: 2,
-      indentX: 2,
+      paddingX: 0,
+      focusedCursorColor: (s: string) => theme.fg("accent", s),
     })
     const descEditorField = new FixedHeightField(descEditor, DESCRIPTION_FIELD_HEIGHT)
     descEditor.setText(descValue)
@@ -228,41 +244,84 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
     let lastSavedDraft: FormDraft = currentDraft()
 
     const triggerSave = async () => {
-      if (saving || disposed) return
+      if (disposed) return
 
       const draft = currentDraft()
+      if (saving) {
+        saveQueued = true
+        await savePromise
+        return
+      }
+
       if (isSameDraft(draft, lastSavedDraft)) return
 
       saving = true
+      saveQueued = false
       if (saveIndicatorTimer) clearTimeout(saveIndicatorTimer)
       saveIndicator = "saving"
       renderLayout()
 
-      try {
-        const didSave = await onSave(draft)
-        if (disposed) return
-        if (!didSave) {
-          saveIndicator = undefined
-          return
+      const activeSave = (async () => {
+        try {
+          const didSave = await onSave(draft)
+          if (disposed) return
+          if (!didSave) {
+            saveIndicator = undefined
+            return
+          }
+          lastSavedDraft = normalizeDraft(draft)
+          saveIndicator = "saved"
+        } catch (e) {
+          if (disposed) return
+          saveIndicator = "error"
+          ctx.ui.notify(e instanceof Error ? e.message : String(e), "error")
+        } finally {
+          saving = false
+          if (!disposed) renderLayout()
         }
-        lastSavedDraft = normalizeDraft(draft)
-        saveIndicator = "saved"
-      } catch (e) {
-        if (disposed) return
-        saveIndicator = "error"
-        ctx.ui.notify(e instanceof Error ? e.message : String(e), "error")
+
+        if (saveIndicator === "saved" && !disposed) {
+          saveIndicatorTimer = setTimeout(() => {
+            if (disposed) return
+            saveIndicator = undefined
+            renderLayout()
+          }, 5000)
+        }
+
+        if (saveQueued && !disposed) {
+          saveQueued = false
+          await triggerSave()
+        }
+      })()
+
+      savePromise = activeSave
+
+      try {
+        await activeSave
       } finally {
-        saving = false
-        if (!disposed) renderLayout()
+        if (savePromise === activeSave) savePromise = null
       }
+    }
 
-      if (saveIndicator === "saved" && !disposed) {
-        saveIndicatorTimer = setTimeout(() => {
-          if (disposed) return
-          saveIndicator = undefined
-          renderLayout()
-        }, 5000)
-      }
+    const canPersistCurrentDraft = (): boolean => {
+      if (mode === "edit") return true
+      return titleValue.trim().length > 0
+    }
+
+    const triggerAutoSave = () => {
+      if (!canPersistCurrentDraft()) return
+      void triggerSave()
+    }
+
+    const exitForm = (action: TaskFormAction) => {
+      void (async () => {
+        if ((saving || !isSameDraft(currentDraft(), lastSavedDraft)) && canPersistCurrentDraft()) {
+          await triggerSave()
+          if (saving || !isSameDraft(currentDraft(), lastSavedDraft)) return
+        }
+
+        done({ action })
+      })()
     }
 
     const renderLayout = () => {
@@ -286,9 +345,11 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
       titleLabel.setText(fieldLabel(theme, "Title", focus === "title"))
       descLabel.setText(fieldLabel(theme, "Description", focus === "desc"))
 
-      helpText.setText(formatKeyboardHelp(theme, buildPrimaryHelpText(focus)))
+      const primaryHelp = buildPrimaryHelpText(focus)
       const secondaryHelp = buildSecondaryHelpText(focus, priorities, priorityHotkeys)
-      shortcutsText.setText(secondaryHelp ? formatKeyboardHelp(theme, secondaryHelp) : "")
+      const combinedHelp = secondaryHelp ? `${primaryHelp} • ${secondaryHelp}` : primaryHelp
+
+      helpText.setText(formatKeyboardHelp(theme, combinedHelp))
 
       container.invalidate()
       tui.requestRender()
@@ -307,7 +368,6 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
 
     footerContainer.addChild(new DynamicBorder((s: string) => theme.fg("dim", s)))
     footerContainer.addChild(helpText)
-    footerContainer.addChild(shortcutsText)
     footerContainer.addChild(new DynamicBorder((s: string) => theme.fg("dim", s)))
 
     renderLayout()
@@ -325,6 +385,12 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
         return
       }
 
+      if (isShiftTab(data)) {
+        focus = "nav"
+        renderLayout()
+        return
+      }
+
       if (matchesKey(data, Key.tab)) {
         focus = "desc"
         renderLayout()
@@ -336,13 +402,19 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
     }
 
     const handleDescInput = (data: string) => {
-      if (matchesKey(data, Key.enter)) {
+      if (isExplicitNewLineCommand(data)) {
         descEditor.insertTextAtCursor("\n")
         requestRender()
         return
       }
 
-      if (matchesKey(data, Key.tab)) {
+      if (isShiftTab(data)) {
+        focus = "title"
+        renderLayout()
+        return
+      }
+
+      if (matchesKey(data, Key.enter) || matchesKey(data, Key.tab)) {
         focus = "nav"
         void triggerSave()
         renderLayout()
@@ -365,20 +437,22 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
         return
       }
 
-      if (matchesKey(data, Key.escape) || matchesKey(data, Key.left) || data === "q" || data === "Q") {
-        done({ action: "back" })
+      if (matchesKey(data, Key.escape) || matchesKey(data, Key.left) || data === "a" || data === "A") {
+        exitForm("back")
         return
       }
 
       if (data === "t" || data === "T") {
         taskTypeValue = cycleTaskType(taskTypeValue)
         renderLayout()
+        triggerAutoSave()
         return
       }
 
       if (data === " ") {
         statusValue = cycleStatus(statusValue)
         renderLayout()
+        triggerAutoSave()
         return
       }
 
@@ -386,6 +460,7 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
       if (priority !== null) {
         priorityValue = priority
         renderLayout()
+        triggerAutoSave()
       }
     }
 
@@ -397,8 +472,8 @@ export async function showTaskForm(ctx: ExtensionCommandContext, options: ShowTa
         if (saveIndicatorTimer) clearTimeout(saveIndicatorTimer)
       },
       handleInput: (data: string) => {
-        if (data === closeKey) {
-          done({ action: "close_list" })
+        if (closeKeys.some(closeKey => matchesKey(data, closeKey))) {
+          exitForm("close_list")
           return
         }
 

package/src/index.ts

@@ -1,7 +0,0 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent"
-
-import registerExtension from "./extension.ts"
-
-export default function (pi: ExtensionAPI) {
-  registerExtension(pi)
-}