@maxiaochao/pi-toolkit 0.5.2 → 0.6.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2026-09-22 - v0.6.0
+
+- bundle the show-me skill for visual explanations (derived from humanlayer/skills, MIT), invoked explicitly with /skill:show-me
+
+## 2026-09-15 - v0.5.3
+
+- fix pi-worktree remove: worktrees with initialized submodules now remove via forced retry; dirty worktrees confirm the discard explicitly before removal; worktrees whose directory is already gone now prune their stale registration and clean up the branch
+
 ## 2026-09-11 - v0.5.2
 
 - fix btw: side-session and summarize passed a nonexistent `modelRegistry` option to `createAgentSession`, so a fresh ModelRuntime was created that didn't know extension-registered providers (e.g. volcengine-plan) and prompting failed with "No API key found"; now the main session's ModelRuntime is reused via `modelRuntime`

package/README.md

@@ -79,6 +79,8 @@ node skills/chrome-cdp/scripts/cdp.mjs eval <target> 'document.title'
 
 Note: Chrome does not always write the `DevToolsActivePort` file (e.g. `--remote-debugging-port` launches on Chrome 152); in that case synthesize one from `GET http://127.0.0.1:<port>/json/version` — first line the port, second line the path of `webSocketDebuggerUrl`. WSL auto-discovery of Windows Chrome profiles is not built in; set `CDP_PORT_FILE` as above.
 
+The bundled `show-me` skill (derived from [humanlayer/skills](https://github.com/humanlayer/skills), MIT) explains the current topic with the smallest visual that makes the point — pseudocode, call trees, component or file trees, diffs, Mermaid, or one focused HTML artifact. It is hidden from automatic skill selection, so invoke it explicitly with `/skill:show-me`.
+
 ## Tiny Subagent
 
 The tiny subagent is a separate npm package. Install it independently when you want the `tiny_subagents` tool:

package/bin/pi-worktree

@@ -141,17 +141,68 @@ cmd_remove() {
   require_repo
   [[ $# -eq 1 ]] || die "usage: pi-worktree -r <name>"
   local dir; dir="$(wt_dir "$1")"
-  [[ -d "$dir" ]] || die "worktree not found: $dir"
-  # refuse to remove if the branch is not merged into main
-  local branch; branch=$(git -C "$dir" branch --show-current)
-  local rm_anyway=0
-  if [[ -n "$branch" ]] && ! git merge-base --is-ancestor "$branch" main 2>/dev/null; then
-    warn "branch '$branch' does not appear merged into 'main' (or no main branch exists)."
-    read -rp "Remove anyway? [y/N] " ans
-    [[ "$ans" =~ ^[Yy]$ ]] || die "aborted"
-    rm_anyway=1
+  local branch registered rm_anyway=0 force=0
+  if [[ ! -d "$dir" ]]; then
+    # Directory already gone but possibly still registered (prunable), or a
+    # stale branch left behind by an earlier prune: clean the registration,
+    # then fall through to the branch cleanup.
+    local registered
+    registered=$(git worktree list --porcelain | awk -v p="$(pwd -P)/$dir" '
+      $0=="worktree "p {f=1; next}
+      f && /^branch /  {print substr($0,8); exit}
+      f && /^detached/ {print "-"; exit}
+      f && /^$/        {exit}')
+    if [[ "$registered" == "-" ]]; then
+      git worktree prune
+      ok "pruned stale registration: $dir (directory already gone)"
+      return 0  # detached HEAD, nothing else to clean up
+    fi
+    if [[ -n "$registered" ]]; then
+      branch=${registered#refs/heads/}
+    elif git show-ref --verify --quiet "refs/heads/$1"; then
+      branch=$1  # registration already pruned; only the stale branch remains
+    else
+      die "worktree not found: $dir"
+    fi
+    if [[ -n "$registered" ]]; then
+      git worktree prune
+      ok "pruned stale registration: $dir (directory already gone)"
+    fi
+  else
+    # dirty worktree: removing discards modified/untracked files, which git
+    # refuses to do without --force — so confirm the loss explicitly
+    if ! git -C "$dir" diff --quiet 2>/dev/null \
+       || ! git -C "$dir" diff --cached --quiet 2>/dev/null \
+       || [[ -n "$(git -C "$dir" ls-files --others --exclude-standard)" ]]; then
+      warn "worktree contains modified/untracked files that will be discarded:"
+      git -C "$dir" status --short | head -10
+      read -rp "Discard and remove anyway? [y/N] " ans
+      [[ "$ans" =~ ^[Yy]$ ]] || die "aborted"
+      force=1
+    fi
+    branch=$(git -C "$dir" branch --show-current)
+    # refuse to remove if the branch is not merged into main
+    if [[ -n "$branch" ]] && ! git merge-base --is-ancestor "$branch" main 2>/dev/null; then
+      warn "branch '$branch' does not appear merged into 'main' (or no main branch exists)."
+      read -rp "Remove anyway? [y/N] " ans
+      [[ "$ans" =~ ^[Yy]$ ]] || die "aborted"
+      rm_anyway=1
+    fi
+    local out
+    if [[ "$force" == 1 ]]; then
+      git worktree remove --force "$dir" && ok "removed: $dir (discarded changes as confirmed)"
+    elif out=$(git worktree remove "$dir" 2>&1); then
+      ok "removed: $dir"
+    elif [[ "$out" == *"submodules cannot be moved or removed"* ]]; then
+      # git refuses to remove worktrees with initialized submodules unless
+      # --force is used (--force only overrides the submodule check here; the
+      # branch deletion below still asks before dropping unmerged commits)
+      git worktree remove --force "$dir" && ok "removed: $dir (contained submodules)"
+    else
+      printf '%s\n' "$out" >&2
+      die "failed to remove worktree: $dir"
+    fi
   fi
-  git worktree remove "$dir" && ok "removed: $dir"
   # The branch survives `git worktree remove`; recreating the same name would
   # silently reuse this stale branch. Delete merged branches automatically.
   if [[ -n "$branch" ]] && git show-ref --verify --quiet "refs/heads/$branch"; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maxiaochao/pi-toolkit",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Personal pi coding agent toolkit: /todos, /btw, /cache_export extensions, browser automation, and bundled theme/skills.",
   "type": "module",
   "keywords": [

package/skills/show-me/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 HumanLayer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/skills/show-me/NOTICE

@@ -0,0 +1,2 @@
+show-me skill is derived from humanlayer/skills (plugins/show-me, v1.0.1)
+(https://github.com/humanlayer/skills), MIT License — see LICENSE.

package/skills/show-me/SKILL.md

@@ -0,0 +1,133 @@
+---
+name: show-me
+description: Help the user understand the current topic visually with concise diagrams, code-shape sketches, and focused HTML artifacts.
+license: MIT
+disable-model-invocation: true
+---
+
+Help the user understand the current topic of conversation visually. Skip the preamble and keep prose brief. Pick the smallest view that makes the key point clear.
+
+- Show logic or an algorithm as pseudocode:
+
+```text
+on(save)
+  if content is unchanged
+    return cached result
+  write new content
+  return fresh result
+```
+
+- Show runtime control flow as a call tree:
+
+```text
+submitForm
+  createSession
+    persistPrompt
+    launchAgent
+  navigateToSession
+```
+
+- Show UI structure as a component tree, including state and module boundaries that matter:
+
+```tsx
+<SessionPage> (apps/example/src/routes/session.tsx)
+  useSessionEvents()
+  <SessionToolbar>
+    <RunSkillButton> (packages/ui)
+```
+
+- Show file responsibility or a broad refactor as a shallow file tree:
+
+```text
+src/
+├── commands/       # parses user actions
+├── sessions/       # owns session state
+└── transport/      # sends API requests
+```
+
+- Show component interaction, control flow, or data flow with Mermaid:
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant UI
+    participant Daemon
+    User->>UI: choose command
+    UI->>Daemon: send expanded prompt
+    Daemon-->>UI: stream result
+```
+
+- Use `diff` when the point is what changes and the surrounding shape already exists. Match the diff shape to the topic.
+
+For a component change:
+
+```diff
+ <SessionPage>
+   useSessionEvents()
+   <SessionToolbar>
++    <RunSkillButton />
+   <SessionTimeline>
++    <SkillResultCard />
+```
+
+For a file-layout change:
+
+```diff
+ src/
+ ├── commands/
++│   └── show-me.ts       # expands the slash command
+ ├── sessions/
+-└── transport.ts
++└── transport/
++    ├── client.ts
++    └── stream.ts
+```
+
+For a call-tree or call-stack change:
+
+```diff
+ submitForm
+   createSession
+     persistPrompt
++    expandSkillMention
+     launchAgent
+-  navigateToSession
++  navigateToSession
++    subscribeToEvents
+```
+
+For a state or control-flow change:
+
+```diff
+ on(save)
+-  write content
++  if content is unchanged
++    return cached result
++  write new content
++  invalidate cache
+```
+
+- Show the whole block when most of it is new, when omitted context would hide ownership or order, or when the user needs a copyable target shape:
+
+```ts
+function expandSkill(command: string): string {
+  const skillName = command.slice(1)
+  return `use the ${skillName} skill`
+}
+```
+
+- For a visual UI, layout, state comparison, or concept too dense for Mermaid, write one focused HTML file — a diagram, an infographic, or a short slide deck, whichever fits the point. Match the product's colors, type, spacing, and components; use real labels and data; support desktop and mobile. Follow the project's HTML output convention, or write to `.cache/html/show-me-<description>.html` when none exists. Then open it for the user:
+
+```bash
+open path/to/show-me-<description>.html          # macOS
+xdg-open path/to/show-me-<description>.html      # Linux
+cmd.exe /c start "" "$(wslpath -w <abs path>)"   # WSL
+```
+
+For a heavier standalone artifact, the `html-artifact` skill applies.
+
+### guidance
+
+Place each visual next to the short text it supports. Keep only the calls, files, props, states, and boundaries needed to answer the user's current question or the options to resolve the current discussion point.
+
+You may use one of these, you may use several, it is unlikely you will use all of them. Use your judgement and don't overwhelm the user.