@zenobius/pi-worktrees 0.2.0 → 0.3.0

package/README.md

@@ -1,5 +1,8 @@
 # `@zenobius/pi-worktrees`
 
+<img width="1531" height="1172" alt="image" src="https://github.com/user-attachments/assets/33fe4c01-4d9b-41ec-a326-116db6e750df" />
+
+
 Git worktree management for [Pi Coding Agent](https://github.com/badlogic/pi-mono) with a clean `/worktree` command surface.
 
 This extension helps you spin up isolated feature workspaces quickly, with safety checks and optional post-create automation.
@@ -44,6 +47,28 @@ If Pi is already running, use `/reload` to load newly installed extensions.
 
 ---
 
+## Getting started in 2 minutes
+
+1. Install the extension:
+
+```bash
+pi install npm:@zenobius/pi-worktrees
+```
+
+2. Open a git repo in Pi and run:
+
+```text
+/worktree init
+/worktree create auth-refactor
+/worktree list
+```
+
+3. Optional: jump into it from your shell using the printed path:
+
+```text
+/worktree cd auth-refactor
+```
+
 ## Quick start
 
 In Pi:
@@ -58,11 +83,9 @@ In Pi:
 /worktree prune
 ```
 
-### How I use `/worktrees`
-
-Since I use nvim and zellij, i want the worktrees I create to be clones of the workspace
-I have for the current one, so to this end, my `onCreate` looks like: 
+### Example: How I use `/worktree`
 
+I use Neovim and Zellij, and I want each new worktree to boot a ready-to-code workspace. My `onCreate` looks like:
 ```json
 {
   "worktrees": {
@@ -78,12 +101,9 @@ I have for the current one, so to this end, my `onCreate` looks like:
     }
   }
 }
-
 ```
 
-This means when ever i create a new worktree, it creates a new zellij tab with nvim and pi running
-in it on the new worktree path.
-
+This creates a new Zellij tab with Neovim and Pi running in the new worktree path.
 ---
 
 ## Command reference
@@ -92,7 +112,7 @@ in it on the new worktree path.
 |---|---|
 | `/worktree init` | Interactive setup for extension settings |
 | `/worktree settings` | Show all current settings |
-| `/worktree settings <key>` | Get one setting (`worktreeRoot`, `onCreate`) |
+| `/worktree settings <key>` | Get one setting (`worktreeRoot`, `parentDir` alias, `onCreate`) |
 | `/worktree settings <key> <value>` | Set one setting |
 | `/worktree create <feature-name>` | Create a new worktree + branch `feature/<feature-name>` |
 | `/worktree list` | List all worktrees (`/worktree ls` alias) |
@@ -121,6 +141,13 @@ Settings live in `~/.pi/agent/pi-worktrees-settings.json`.
     }
   },
   "matchingStrategy": "fail-on-tie",
+  "onCreateDisplayOutputMaxLines": 5,
+  "onCreateCmdDisplayPending": "[ ] {{cmd}}",
+  "onCreateCmdDisplaySuccess": "[x] {{cmd}}",
+  "onCreateCmdDisplayError": "[ ] {{cmd}} [ERROR]",
+  "onCreateCmdDisplayPendingColor": "dim",
+  "onCreateCmdDisplaySuccessColor": "success",
+  "onCreateCmdDisplayErrorColor": "error",
   "worktree": {
     "worktreeRoot": "~/.local/share/worktrees/{{project}}",
     "onCreate": "mise setup"
@@ -128,6 +155,21 @@ Settings live in `~/.pi/agent/pi-worktrees-settings.json`.
 }
 ```
 
+### Configuration reference
+
+| Key | Type | Default | Description |
+|---|---|---|---|
+| `worktrees` | `Record<string, WorktreeSettings>` | `{}` | Pattern-matched settings by repo URL or glob. |
+| `matchingStrategy` | `'fail-on-tie' \| 'first-wins' \| 'last-wins'` | `fail-on-tie` | Tie-break behavior for equally specific patterns. |
+| `onCreateDisplayOutputMaxLines` | `number` (integer, `>= 0`) | `5` | Number of latest stdout/stderr lines shown in live UI updates during `onCreate`. |
+| `onCreateCmdDisplayPending` | `string` | `[ ] {{cmd}}` | Template for pending/running command display lines. |
+| `onCreateCmdDisplaySuccess` | `string` | `[x] {{cmd}}` | Template for successful command display lines. |
+| `onCreateCmdDisplayError` | `string` | `[ ] {{cmd}} [ERROR]` | Template for failed command display lines. |
+| `onCreateCmdDisplayPendingColor` | `string` | `dim` | Pi theme color name for pending/running command lines. |
+| `onCreateCmdDisplaySuccessColor` | `string` | `success` | Pi theme color name for successful command lines. |
+| `onCreateCmdDisplayErrorColor` | `string` | `error` | Pi theme color name for failed command lines. |
+| `worktree` (legacy) | `WorktreeSettings` | n/a | Legacy fallback shape; migrated automatically. |
+
 ### Matching model
 
 For the current repository, settings are resolved in this order:
@@ -151,6 +193,34 @@ For the current repository, settings are resolved in this order:
 
 When an array is used, commands run sequentially and stop on first failure.
 
+### `onCreateDisplayOutputMaxLines`
+
+Controls only live UI output verbosity for `onCreate` command execution.
+- **Default**: `5`
+- **Scope**: display only
+- **Does not affect**: logfile contents (full stdout/stderr is still logged)
+
+### `onCreate` command line display templates
+
+These templates control how each command line is rendered in the live progress list.
+
+- `onCreateCmdDisplayPending` (default: `[ ] {{cmd}}`)
+- `onCreateCmdDisplaySuccess` (default: `[x] {{cmd}}`)
+- `onCreateCmdDisplayError` (default: `[ ] {{cmd}} [ERROR]`)
+
+Supported token:
+- `{{cmd}}` (or `{cmd}`) → expanded command string
+
+### `onCreate` command line display colors
+
+These settings use Pi theme color names:
+
+- `onCreateCmdDisplayPendingColor` (default: `dim`)
+- `onCreateCmdDisplaySuccessColor` (default: `success`)
+- `onCreateCmdDisplayErrorColor` (default: `error`)
+
+Supported color names in this extension: `dim`, `accent`, `info`, `success`, `warning`, `error`.
+
 ### `worktreeRoot`
 
 Where new worktrees are created.

package/dist/cmds/shared.d.ts

@@ -11,6 +11,13 @@ export interface OnCreateResult {
 }
 export interface OnCreateHookOptions {
     logPath?: string;
+    displayOutputMaxLines?: number;
+    cmdDisplayPending?: string;
+    cmdDisplaySuccess?: string;
+    cmdDisplayError?: string;
+    cmdDisplayPendingColor?: string;
+    cmdDisplaySuccessColor?: string;
+    cmdDisplayErrorColor?: string;
 }
 /**
  * Runs post-create hooks sequentially.

package/dist/index.js

@@ -21,7 +21,8 @@ import {
   Optional,
   Record as TypeRecord,
   String as TypeString,
-  Union
+  Union,
+  Integer as TypeInteger
 } from "typebox";
 var OnCreateSchema = Union([TypeString(), TypeArray(TypeString())]);
 var WorktreeSettingsSchema = TypeObject({
@@ -40,10 +41,24 @@ var MatchingStrategySchema = Union([
 var MatchStrategyResultSchema = Union([Literal("exact"), Literal("unmatched")]);
 var WorktreesMapSchema = TypeRecord(TypeString(), WorktreeSettingsSchema);
 var LogfileSchema = TypeString();
+var OnCreateDisplayOutputMaxLinesSchema = TypeInteger({ minimum: 0 });
+var OnCreateCmdDisplayPendingSchema = TypeString();
+var OnCreateCmdDisplaySuccessSchema = TypeString();
+var OnCreateCmdDisplayErrorSchema = TypeString();
+var OnCreateCmdDisplayPendingColorSchema = TypeString();
+var OnCreateCmdDisplaySuccessColorSchema = TypeString();
+var OnCreateCmdDisplayErrorColorSchema = TypeString();
 var PiWorktreeConfigSchema = TypeObject({
   worktrees: Optional(WorktreesMapSchema),
   matchingStrategy: Optional(MatchingStrategySchema),
-  logfile: Optional(LogfileSchema)
+  logfile: Optional(LogfileSchema),
+  onCreateDisplayOutputMaxLines: Optional(OnCreateDisplayOutputMaxLinesSchema),
+  onCreateCmdDisplayPending: Optional(OnCreateCmdDisplayPendingSchema),
+  onCreateCmdDisplaySuccess: Optional(OnCreateCmdDisplaySuccessSchema),
+  onCreateCmdDisplayError: Optional(OnCreateCmdDisplayErrorSchema),
+  onCreateCmdDisplayPendingColor: Optional(OnCreateCmdDisplayPendingColorSchema),
+  onCreateCmdDisplaySuccessColor: Optional(OnCreateCmdDisplaySuccessColorSchema),
+  onCreateCmdDisplayErrorColor: Optional(OnCreateCmdDisplayErrorColorSchema)
 }, {
   $id: "UnresolvedConfig",
   additionalProperties: true
@@ -268,8 +283,94 @@ var migration3 = {
   }
 };
 
+// src/services/config/migrations/04-oncreate-display-output-max-lines.ts
+var DEFAULT_ONCREATE_DISPLAY_OUTPUT_MAX_LINES = 5;
+function toRecord4(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    return {};
+  }
+  return { ...value };
+}
+var migration4 = {
+  id: "oncreate-display-output-max-lines-default",
+  up(config) {
+    const record = toRecord4(config);
+    if (record.onCreateDisplayOutputMaxLines !== undefined) {
+      return record;
+    }
+    return {
+      ...record,
+      onCreateDisplayOutputMaxLines: DEFAULT_ONCREATE_DISPLAY_OUTPUT_MAX_LINES
+    };
+  },
+  down(config) {
+    const record = toRecord4(config);
+    const next = { ...record };
+    delete next.onCreateDisplayOutputMaxLines;
+    return next;
+  }
+};
+
+// src/services/config/migrations/05-oncreate-command-display-format.ts
+var DEFAULT_ONCREATE_CMD_DISPLAY_PENDING = "[ ] {{cmd}}";
+var DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS = "[x] {{cmd}}";
+var DEFAULT_ONCREATE_CMD_DISPLAY_ERROR = "[ ] {{cmd}} [ERROR]";
+var DEFAULT_ONCREATE_CMD_DISPLAY_PENDING_COLOR = "dim";
+var DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS_COLOR = "success";
+var DEFAULT_ONCREATE_CMD_DISPLAY_ERROR_COLOR = "error";
+function toRecord5(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    return {};
+  }
+  return { ...value };
+}
+var migration5 = {
+  id: "oncreate-command-display-format-defaults",
+  up(config) {
+    const record = toRecord5(config);
+    const next = { ...record };
+    if (next.onCreateCmdDisplayPending === undefined) {
+      next.onCreateCmdDisplayPending = DEFAULT_ONCREATE_CMD_DISPLAY_PENDING;
+    }
+    if (next.onCreateCmdDisplaySuccess === undefined) {
+      next.onCreateCmdDisplaySuccess = DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS;
+    }
+    if (next.onCreateCmdDisplayError === undefined) {
+      next.onCreateCmdDisplayError = DEFAULT_ONCREATE_CMD_DISPLAY_ERROR;
+    }
+    if (next.onCreateCmdDisplayPendingColor === undefined) {
+      next.onCreateCmdDisplayPendingColor = DEFAULT_ONCREATE_CMD_DISPLAY_PENDING_COLOR;
+    }
+    if (next.onCreateCmdDisplaySuccessColor === undefined) {
+      next.onCreateCmdDisplaySuccessColor = DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS_COLOR;
+    }
+    if (next.onCreateCmdDisplayErrorColor === undefined) {
+      next.onCreateCmdDisplayErrorColor = DEFAULT_ONCREATE_CMD_DISPLAY_ERROR_COLOR;
+    }
+    return next;
+  },
+  down(config) {
+    const record = toRecord5(config);
+    const next = { ...record };
+    delete next.onCreateCmdDisplayPending;
+    delete next.onCreateCmdDisplaySuccess;
+    delete next.onCreateCmdDisplayError;
+    delete next.onCreateCmdDisplayPendingColor;
+    delete next.onCreateCmdDisplaySuccessColor;
+    delete next.onCreateCmdDisplayErrorColor;
+    return next;
+  }
+};
+
 // src/services/config/config.ts
 var DEFAULT_LOGFILE_TEMPLATE = "/tmp/pi-worktree-{sessionId}-{name}.log";
+var DEFAULT_ONCREATE_DISPLAY_OUTPUT_MAX_LINES2 = 5;
+var DEFAULT_ONCREATE_CMD_DISPLAY_PENDING2 = "[ ] {{cmd}}";
+var DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS2 = "[x] {{cmd}}";
+var DEFAULT_ONCREATE_CMD_DISPLAY_ERROR2 = "[ ] {{cmd}} [ERROR]";
+var DEFAULT_ONCREATE_CMD_DISPLAY_PENDING_COLOR2 = "dim";
+var DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS_COLOR2 = "success";
+var DEFAULT_ONCREATE_CMD_DISPLAY_ERROR_COLOR2 = "error";
 async function createPiWorktreeConfigService() {
   const parse = (value) => {
     return Parse2(PiWorktreeConfigSchema, value);
@@ -277,7 +378,7 @@ async function createPiWorktreeConfigService() {
   const store = await createConfigService("pi-worktrees", {
     defaults: {},
     parse,
-    migrations: [migration, migration2, migration3]
+    migrations: [migration, migration2, migration3, migration4, migration5]
   });
   await store.reload();
   const save = async (data) => {
@@ -290,6 +391,27 @@ async function createPiWorktreeConfigService() {
     if (data.logfile !== undefined) {
       await store.set("logfile", data.logfile, "home");
     }
+    if (data.onCreateDisplayOutputMaxLines !== undefined) {
+      await store.set("onCreateDisplayOutputMaxLines", data.onCreateDisplayOutputMaxLines, "home");
+    }
+    if (data.onCreateCmdDisplayPending !== undefined) {
+      await store.set("onCreateCmdDisplayPending", data.onCreateCmdDisplayPending, "home");
+    }
+    if (data.onCreateCmdDisplaySuccess !== undefined) {
+      await store.set("onCreateCmdDisplaySuccess", data.onCreateCmdDisplaySuccess, "home");
+    }
+    if (data.onCreateCmdDisplayError !== undefined) {
+      await store.set("onCreateCmdDisplayError", data.onCreateCmdDisplayError, "home");
+    }
+    if (data.onCreateCmdDisplayPendingColor !== undefined) {
+      await store.set("onCreateCmdDisplayPendingColor", data.onCreateCmdDisplayPendingColor, "home");
+    }
+    if (data.onCreateCmdDisplaySuccessColor !== undefined) {
+      await store.set("onCreateCmdDisplaySuccessColor", data.onCreateCmdDisplaySuccessColor, "home");
+    }
+    if (data.onCreateCmdDisplayErrorColor !== undefined) {
+      await store.set("onCreateCmdDisplayErrorColor", data.onCreateCmdDisplayErrorColor, "home");
+    }
     await store.save("home");
   };
   const worktrees = new Map(Object.entries(store.config.worktrees || {}));
@@ -310,6 +432,13 @@ async function createPiWorktreeConfigService() {
       mainWorktree,
       parentDir,
       logfile: store.config.logfile ?? DEFAULT_LOGFILE_TEMPLATE,
+      onCreateDisplayOutputMaxLines: store.config.onCreateDisplayOutputMaxLines ?? DEFAULT_ONCREATE_DISPLAY_OUTPUT_MAX_LINES2,
+      onCreateCmdDisplayPending: store.config.onCreateCmdDisplayPending ?? DEFAULT_ONCREATE_CMD_DISPLAY_PENDING2,
+      onCreateCmdDisplaySuccess: store.config.onCreateCmdDisplaySuccess ?? DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS2,
+      onCreateCmdDisplayError: store.config.onCreateCmdDisplayError ?? DEFAULT_ONCREATE_CMD_DISPLAY_ERROR2,
+      onCreateCmdDisplayPendingColor: store.config.onCreateCmdDisplayPendingColor ?? DEFAULT_ONCREATE_CMD_DISPLAY_PENDING_COLOR2,
+      onCreateCmdDisplaySuccessColor: store.config.onCreateCmdDisplaySuccessColor ?? DEFAULT_ONCREATE_CMD_DISPLAY_SUCCESS_COLOR2,
+      onCreateCmdDisplayErrorColor: store.config.onCreateCmdDisplayErrorColor ?? DEFAULT_ONCREATE_CMD_DISPLAY_ERROR_COLOR2,
       matchedPattern: resolution.matchedPattern
     };
   };
@@ -622,20 +751,45 @@ var ANSI = {
   gray: "\x1B[90m",
   blue: "\x1B[34m",
   green: "\x1B[32m",
-  red: "\x1B[31m"
+  red: "\x1B[31m",
+  yellow: "\x1B[33m"
 };
-function formatCommandLine(index, command, state) {
-  const number = String(index + 1).padStart(2, "0");
-  if (state === "pending") {
-    return `${ANSI.gray}\u25CB [${number}] ${command}${ANSI.reset}`;
+function applyCommandTemplate(template, command) {
+  return template.replace(/\{\{cmd\}\}|\{cmd\}/g, command);
+}
+function resolveAnsiColor(colorName) {
+  if (colorName === "dim") {
+    return ANSI.gray;
   }
-  if (state === "running") {
-    return `${ANSI.blue}\uD83D\uDEA7 [${number}] ${command}${ANSI.reset}`;
+  if (colorName === "accent" || colorName === "info") {
+    return ANSI.blue;
+  }
+  if (colorName === "success") {
+    return ANSI.green;
+  }
+  if (colorName === "error") {
+    return ANSI.red;
+  }
+  if (colorName === "warning") {
+    return ANSI.yellow;
+  }
+  return "";
+}
+function colorize(text, colorName) {
+  const ansi = resolveAnsiColor(colorName);
+  if (!ansi) {
+    return text;
   }
+  return `${ansi}${text}${ANSI.reset}`;
+}
+function formatCommandLine(command, state, config) {
   if (state === "success") {
-    return `${ANSI.green}\u2705 [${number}] ${command}${ANSI.reset}`;
+    return colorize(applyCommandTemplate(config.successTemplate, command), config.successColor);
+  }
+  if (state === "failed") {
+    return colorize(applyCommandTemplate(config.errorTemplate, command), config.errorColor);
   }
-  return `${ANSI.red}\u274C [${number}] ${command}${ANSI.reset}`;
+  return colorize(applyCommandTemplate(config.pendingTemplate, command), config.pendingColor);
 }
 function toLines(text) {
   return text.replace(/\r/g, "").split(`
@@ -648,15 +802,25 @@ function formatOutputLine(stream, line, state) {
   }
   return `${ANSI.gray}   ${prefix} ${line}${ANSI.reset}`;
 }
-function formatCommandList(commands, states, outputs, logPath) {
+function getDisplayLines(text, maxLines) {
+  const lines = toLines(text);
+  if (maxLines < 0) {
+    return lines;
+  }
+  if (maxLines === 0) {
+    return [];
+  }
+  return lines.slice(-maxLines);
+}
+function formatCommandList(commands, states, outputs, commandDisplay, logPath, displayOutputMaxLines = 5) {
   const lines = ["onCreate steps:"];
   for (const [index, command] of commands.entries()) {
     const state = states[index];
-    lines.push(formatCommandLine(index, command, state));
-    for (const line of toLines(outputs[index].stdout)) {
+    lines.push(formatCommandLine(command, state, commandDisplay));
+    for (const line of getDisplayLines(outputs[index].stdout, displayOutputMaxLines)) {
       lines.push(formatOutputLine("stdout", line, state));
     }
-    for (const line of toLines(outputs[index].stderr)) {
+    for (const line of getDisplayLines(outputs[index].stderr, displayOutputMaxLines)) {
       lines.push(formatOutputLine("stderr", line, state));
     }
   }
@@ -738,13 +902,22 @@ async function runOnCreateHook(createdCtx, settings, notify, options) {
     ].join(`
 `));
   }
-  notify(formatCommandList(commands, commandStates, commandOutputs), "info");
+  const displayOutputMaxLines = options?.displayOutputMaxLines ?? 5;
+  const commandDisplay = {
+    pendingTemplate: options?.cmdDisplayPending ?? "[ ] {{cmd}}",
+    successTemplate: options?.cmdDisplaySuccess ?? "[x] {{cmd}}",
+    errorTemplate: options?.cmdDisplayError ?? "[ ] {{cmd}} [ERROR]",
+    pendingColor: options?.cmdDisplayPendingColor ?? "dim",
+    successColor: options?.cmdDisplaySuccessColor ?? "success",
+    errorColor: options?.cmdDisplayErrorColor ?? "error"
+  };
+  notify(formatCommandList(commands, commandStates, commandOutputs, commandDisplay, undefined, displayOutputMaxLines), "info");
   for (const [index, command] of commands.entries()) {
     commandStates[index] = "running";
-    notify(formatCommandList(commands, commandStates, commandOutputs), "info");
+    notify(formatCommandList(commands, commandStates, commandOutputs, commandDisplay, undefined, displayOutputMaxLines), "info");
     const result = await runCommand(command, createdCtx.path, (stream, chunk) => {
       commandOutputs[index][stream] += chunk;
-      notify(formatCommandList(commands, commandStates, commandOutputs), "info");
+      notify(formatCommandList(commands, commandStates, commandOutputs, commandDisplay, undefined, displayOutputMaxLines), "info");
     });
     if (options?.logPath) {
       appendCommandLog(options.logPath, command, result);
@@ -752,7 +925,7 @@ async function runOnCreateHook(createdCtx, settings, notify, options) {
     executed.push(command);
     if (!result.success) {
       commandStates[index] = "failed";
-      notify(formatCommandList(commands, commandStates, commandOutputs, options?.logPath), "error");
+      notify(formatCommandList(commands, commandStates, commandOutputs, commandDisplay, options?.logPath, displayOutputMaxLines), "error");
       notify(`onCreate failed (exit ${result.code}): ${result.stderr.slice(0, 200)}${options?.logPath ? `
 log: ${options.logPath}` : ""}`, "error");
       return {
@@ -766,9 +939,9 @@ log: ${options.logPath}` : ""}`, "error");
       };
     }
     commandStates[index] = "success";
-    notify(formatCommandList(commands, commandStates, commandOutputs), "info");
+    notify(formatCommandList(commands, commandStates, commandOutputs, commandDisplay, undefined, displayOutputMaxLines), "info");
   }
-  notify(formatCommandList(commands, commandStates, commandOutputs, options?.logPath), "info");
+  notify(formatCommandList(commands, commandStates, commandOutputs, commandDisplay, options?.logPath, displayOutputMaxLines), "info");
   return { success: true, executed };
 }
 
@@ -824,7 +997,16 @@ async function cmdCreate(args, ctx, deps) {
     name: safeName,
     timestamp
   });
-  await runOnCreateHook(createdCtx, current, ctx.ui.notify.bind(ctx.ui), { logPath });
+  await runOnCreateHook(createdCtx, current, ctx.ui.notify.bind(ctx.ui), {
+    logPath,
+    displayOutputMaxLines: current.onCreateDisplayOutputMaxLines,
+    cmdDisplayPending: current.onCreateCmdDisplayPending,
+    cmdDisplaySuccess: current.onCreateCmdDisplaySuccess,
+    cmdDisplayError: current.onCreateCmdDisplayError,
+    cmdDisplayPendingColor: current.onCreateCmdDisplayPendingColor,
+    cmdDisplaySuccessColor: current.onCreateCmdDisplaySuccessColor,
+    cmdDisplayErrorColor: current.onCreateCmdDisplayErrorColor
+  });
 }
 
 // src/cmds/cmdInit.ts
@@ -1237,6 +1419,27 @@ async function cmdTemplates(_args, ctx, deps) {
 `), "info");
 }
 
+// src/services/completions.ts
+function toItem(command) {
+  return {
+    value: command,
+    label: command
+  };
+}
+function createCompletionFactory(commands) {
+  const commandNames = Object.keys(commands).sort();
+  return (argumentPrefix) => {
+    const prefix = argumentPrefix.trimStart();
+    if (prefix.includes(" ")) {
+      return null;
+    }
+    if (!prefix) {
+      return commandNames.map(toItem);
+    }
+    return commandNames.filter((command) => command.startsWith(prefix)).map(toItem);
+  };
+}
+
 // src/index.ts
 var HELP_TEXT = `
 /worktree - Git worktree management
@@ -1266,6 +1469,13 @@ Configuration (~/.pi/agent/pi-worktrees-settings.json):
     },
     "matchingStrategy": "fail-on-tie",
     "logfile": "/tmp/pi-worktree-{sessionId}-{name}.log",
+    "onCreateDisplayOutputMaxLines": 5,
+    "onCreateCmdDisplayPending": "[ ] {{cmd}}",
+    "onCreateCmdDisplaySuccess": "[x] {{cmd}}",
+    "onCreateCmdDisplayError": "[ ] {{cmd}} [ERROR]",
+    "onCreateCmdDisplayPendingColor": "dim",
+    "onCreateCmdDisplaySuccessColor": "success",
+    "onCreateCmdDisplayErrorColor": "error",
     "worktree": {
       "worktreeRoot": "~/.worktrees/{{project}}",
       "onCreate": "mise setup"
@@ -1320,8 +1530,12 @@ var PiWorktreeExtension = async function(pi) {
       ctx.ui.setStatus(`Worktrees`, notification.msg);
     }
   });
+  const getSubcommandCompletions = createCompletionFactory(commands);
   pi.registerCommand("worktree", {
     description: "Git worktree management for isolated workspaces",
+    getArgumentCompletions(argumentPrefix) {
+      return getSubcommandCompletions(argumentPrefix);
+    },
     handler: async (args, ctx) => {
       const [cmd, ...rest] = args.trim().split(/\s+/);
       const command = commands[cmd];

package/dist/services/completions.d.ts

@@ -0,0 +1,4 @@
+import type { RegisteredCommand } from '@mariozechner/pi-coding-agent';
+type CommandMap = Record<string, unknown>;
+export declare function createCompletionFactory(commands: CommandMap): NonNullable<RegisteredCommand['getArgumentCompletions']>;
+export {};

package/dist/services/config/config.d.ts

@@ -13,6 +13,13 @@ export declare function createPiWorktreeConfigService(): Promise<{
         mainWorktree: string;
         parentDir: string;
         logfile: string;
+        onCreateDisplayOutputMaxLines: number;
+        onCreateCmdDisplayPending: string;
+        onCreateCmdDisplaySuccess: string;
+        onCreateCmdDisplayError: string;
+        onCreateCmdDisplayPendingColor: string;
+        onCreateCmdDisplaySuccessColor: string;
+        onCreateCmdDisplayErrorColor: string;
         matchedPattern: string | null;
         onCreate?: string | string[] | undefined;
         worktreeRoot?: string | undefined;
@@ -27,12 +34,26 @@ export declare function createPiWorktreeConfigService(): Promise<{
             }>>>;
             matchingStrategy: import("typebox").TOptional<import("typebox").TUnion<[import("typebox").TLiteral<"fail-on-tie">, import("typebox").TLiteral<"first-wins">, import("typebox").TLiteral<"last-wins">]>>;
             logfile: import("typebox").TOptional<import("typebox").TString>;
+            onCreateDisplayOutputMaxLines: import("typebox").TOptional<import("typebox").TInteger>;
+            onCreateCmdDisplayPending: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplaySuccess: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplayError: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplayPendingColor: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplaySuccessColor: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplayErrorColor: import("typebox").TOptional<import("typebox").TString>;
         }, "^.*$", import("typebox").TObject<{
             worktreeRoot: import("typebox").TOptional<import("typebox").TString>;
             parentDir: import("typebox").TOptional<import("typebox").TString>;
             onCreate: import("typebox").TOptional<import("typebox").TUnion<[import("typebox").TString, import("typebox").TArray<import("typebox").TString>]>>;
         }>> | undefined;
         logfile?: string | undefined;
+        onCreateDisplayOutputMaxLines?: number | undefined;
+        onCreateCmdDisplayPending?: string | undefined;
+        onCreateCmdDisplaySuccess?: string | undefined;
+        onCreateCmdDisplayError?: string | undefined;
+        onCreateCmdDisplayPendingColor?: string | undefined;
+        onCreateCmdDisplaySuccessColor?: string | undefined;
+        onCreateCmdDisplayErrorColor?: string | undefined;
         matchingStrategy?: "fail-on-tie" | "first-wins" | "last-wins" | undefined;
     };
     ready: Promise<void>;
@@ -47,16 +68,37 @@ export declare function createPiWorktreeConfigService(): Promise<{
             }>>>;
             matchingStrategy: import("typebox").TOptional<import("typebox").TUnion<[import("typebox").TLiteral<"fail-on-tie">, import("typebox").TLiteral<"first-wins">, import("typebox").TLiteral<"last-wins">]>>;
             logfile: import("typebox").TOptional<import("typebox").TString>;
+            onCreateDisplayOutputMaxLines: import("typebox").TOptional<import("typebox").TInteger>;
+            onCreateCmdDisplayPending: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplaySuccess: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplayError: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplayPendingColor: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplaySuccessColor: import("typebox").TOptional<import("typebox").TString>;
+            onCreateCmdDisplayErrorColor: import("typebox").TOptional<import("typebox").TString>;
         }, "^.*$", import("typebox").TObject<{
             worktreeRoot: import("typebox").TOptional<import("typebox").TString>;
             parentDir: import("typebox").TOptional<import("typebox").TString>;
             onCreate: import("typebox").TOptional<import("typebox").TUnion<[import("typebox").TString, import("typebox").TArray<import("typebox").TString>]>>;
         }>> | undefined;
         logfile?: string | undefined;
+        onCreateDisplayOutputMaxLines?: number | undefined;
+        onCreateCmdDisplayPending?: string | undefined;
+        onCreateCmdDisplaySuccess?: string | undefined;
+        onCreateCmdDisplayError?: string | undefined;
+        onCreateCmdDisplayPendingColor?: string | undefined;
+        onCreateCmdDisplaySuccessColor?: string | undefined;
+        onCreateCmdDisplayErrorColor?: string | undefined;
         matchingStrategy?: "fail-on-tie" | "first-wins" | "last-wins" | undefined;
     }>;
 }>;
 export declare const DefaultWorktreeSettings: WorktreeSettingsConfig;
 export declare const DefaultLogfileTemplate = "/tmp/pi-worktree-{sessionId}-{name}.log";
+export declare const DefaultOnCreateDisplayOutputMaxLines = 5;
+export declare const DefaultOnCreateCmdDisplayPending = "[ ] {{cmd}}";
+export declare const DefaultOnCreateCmdDisplaySuccess = "[x] {{cmd}}";
+export declare const DefaultOnCreateCmdDisplayError = "[ ] {{cmd}} [ERROR]";
+export declare const DefaultOnCreateCmdDisplayPendingColor = "dim";
+export declare const DefaultOnCreateCmdDisplaySuccessColor = "success";
+export declare const DefaultOnCreateCmdDisplayErrorColor = "error";
 export type PiWorktreeConfigService = Awaited<ReturnType<typeof createPiWorktreeConfigService>>;
 export type PiWorktreeConfiguredWorktreeMap = PiWorktreeConfigService['worktrees'];

package/dist/services/config/migrations/04-oncreate-display-output-max-lines.d.ts

@@ -0,0 +1,2 @@
+import { type Migration } from '@zenobius/pi-extension-config';
+export declare const migration: Migration;

package/dist/services/config/migrations/05-oncreate-command-display-format.d.ts

@@ -0,0 +1,2 @@
+import { type Migration } from '@zenobius/pi-extension-config';
+export declare const migration: Migration;

package/dist/services/config/schema.d.ts

@@ -14,6 +14,13 @@ export declare const PiWorktreeConfigSchema: import("typebox").TObject<{
     }>>>;
     matchingStrategy: import("typebox").TOptional<import("typebox").TUnion<[import("typebox").TLiteral<"fail-on-tie">, import("typebox").TLiteral<"first-wins">, import("typebox").TLiteral<"last-wins">]>>;
     logfile: import("typebox").TOptional<import("typebox").TString>;
+    onCreateDisplayOutputMaxLines: import("typebox").TOptional<import("typebox").TInteger>;
+    onCreateCmdDisplayPending: import("typebox").TOptional<import("typebox").TString>;
+    onCreateCmdDisplaySuccess: import("typebox").TOptional<import("typebox").TString>;
+    onCreateCmdDisplayError: import("typebox").TOptional<import("typebox").TString>;
+    onCreateCmdDisplayPendingColor: import("typebox").TOptional<import("typebox").TString>;
+    onCreateCmdDisplaySuccessColor: import("typebox").TOptional<import("typebox").TString>;
+    onCreateCmdDisplayErrorColor: import("typebox").TOptional<import("typebox").TString>;
 }>;
 export type WorktreeSettingsConfig = Static<typeof WorktreeSettingsSchema>;
 export type MatchingStrategy = Static<typeof MatchingStrategySchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenobius/pi-worktrees",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Worktrees extension for Pi Coding Agent",
   "author": {
     "name": "Zenobius",