@groeponline/pi-wishcraft 0.25.0 → 0.27.0

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.27.0] - 2026-08-20
+
+### Added
+- `/ideas` review overlay: `reviewStatus` (idea / in-progress / done), tags, and Run with skill X. Welcome queue widget shows the next idea plus `/ideas next`.
+
+## [0.26.0] - 2026-08-20
+
+### Added
+- `/skills new <name> [template]` writes a SKILL.md from standard, browser-workflow, CLI-workflow, or review-checklist. `ctrl+n` opens the template picker.
+
 ## [0.25.0] - 2026-08-20
 
 ## [0.24.0] - 2026-08-20

package/docs/commands.md

@@ -18,8 +18,8 @@ Commands and capture shortcuts:
 - `/compact <text>`: compact now and queue `<text>` as the next prompt after successful compaction
 - `/idea [@target] <text>`: command form of idea capture, useful for scripts and users who disable the sigil
 - `/idea issue [id]`: hand the oldest active idea, or a specific idea, to the current agent for safe GitHub issue triage
-- `/ideas`: open the captured-ideas picker
-- `/ideas next`: send the oldest active idea to the current session
+- `/ideas`: open the idea-review overlay (status, tags, run with skill)
+- `/ideas next`: send the oldest active idea that is not review-done
 - `/ideas issue [id]`: ask the current agent to dedupe and file a GitHub issue only when the target repo is clear and owned/controlled
 - `/ideas send <id>`: send an idea to the current session
 - `/queue`: open the queued-prompt picker
@@ -55,7 +55,7 @@ Set `captureSigil` to `false` if you often submit markdown headings and prefer `
 }
 ```
 
-Captured data is stored under the Pi agent directory in `powerline-footer/inbox.jsonl` and `powerline-footer/projects.json`. `inbox.jsonl` is a stable read surface for orchestrators and helper agents; each line is a queue item with `id`, `text`, `createdAt`, `updatedAt`, `source`, `target`, `intent`, `status`, and optional `error`. Writes should still go through Powerline commands or the store so locking and atomic writes are preserved. Ideas sent with `/ideas next` or `/ideas send <id>` include a small provenance header so the receiving agent can treat them as deferred captured context. `/idea issue` and `/ideas issue` do not file issues directly from the extension; they send a guarded handoff prompt that tells the current agent to dedupe open issues first, create a GitHub issue only for a clear owned/controlled repo, and ask before filing when the target is unclear.
+Captured data is stored under the Pi agent directory in `powerline-footer/inbox.jsonl` and `powerline-footer/projects.json`. `inbox.jsonl` is a stable read surface for orchestrators and helper agents; each line is a queue item with `id`, `text`, `createdAt`, `updatedAt`, `source`, `target`, `intent`, `status`, optional `error`, and for ideas optional `reviewStatus` (`idea` | `in-progress` | `done`) and `tags`. Legacy lines without those fields still parse. Writes should still go through Powerline commands or the store so locking and atomic writes are preserved. Ideas sent with `/ideas next` or `/ideas send <id>` include a small provenance header so the receiving agent can treat them as deferred captured context. `/ideas` opens the review overlay (same chrome as `/skills`): set review status and tags, or **Run with skill X** to insert the skill body plus the idea into the editor. The welcome queue widget shows the next idea and `/ideas next`; welcome dismisses on any key, so that widget does not bind enter-to-send. `/idea issue` and `/ideas issue` do not file issues directly from the extension; they send a guarded handoff prompt that tells the current agent to dedupe open issues first, create a GitHub issue only for a clear owned/controlled repo, and ask before filing when the target is unclear.
 
 ### Placement
 

package/docs/index.md

@@ -8,7 +8,7 @@ The README is the public landing page (`banner.png` only). Everything below live
 - [Configuration](./configuration.md) — custom items, hooks, repairs, token budget, labels, templates, layout, cost alert, and display formats.
 - [Bash mode](./bash-mode.md) — sticky shell, ghost suggestions, and shell config.
 - [Stash & shortcuts](./stash-and-shortcuts.md) — editor stash, prompt history, clipboard/navigation shortcuts, and shortcut config.
-- [Skill manager](./skill-manager.md) — browsing and inserting installed skills, `/skills doctor` health table.
+- [Skill manager](./skill-manager.md) — browsing, inserting, `/skills doctor`, and `/skills new` templates.
 - [Working vibes](./working-vibes.md) — themed loading messages, modes, and configuration.
 - [Segments & theming](./segments.md) — segment reference, separators, thinking/path/git options, and theme overrides.
 

package/docs/skill-manager.md

@@ -4,5 +4,6 @@ Browse and insert your installed skills (`SKILL.md` files and `*.md`/`*.txt` pro
 
 - **`/skills`** — open the skill manager. Filter with plain typing, `↑↓` to move, `enter` to open a skill's detail body, `↑↓` in the detail to scroll, `enter`/`tab` to insert the skill content into your prompt, `esc` to go back/close.
 - **`/skills doctor`** — health table (not an essay): broken or missing frontmatter, descriptions over 240 characters, the same name in global and project, unused skills (usage ledger count 0). `↑↓` navigate, `enter` copies a row, `esc` closes.
+- **`/skills new <name> [template]`** — write `~/.pi/agent/skills/<name>/SKILL.md` from a template (`standard`, `browser-workflow`, `CLI-workflow`, `review-checklist`), then drop an `$EDITOR` command in the prompt. `/skills new` or `ctrl+n` in the manager opens the template picker. Names reject empty values, `..`, and path separators. No GitHub/npm install.
 
 The manager reuses the same skill discovery as inline `/command`/`$skill` triggers, so anything you can inline you can also browse and insert manually.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groeponline/pi-wishcraft",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "description": "Wishcraft cockpit for the pi coding agent — powerline status, vibes, idea inbox, bash mode, and full customization.",
   "type": "module",
   "files": [

package/queue/store.ts

@@ -11,6 +11,7 @@ import { randomUUID } from "node:crypto";
 import { getAgentPath } from "../src/paths/agent-dirs.ts";
 import type {
   CreateQueueItemInput,
+  IdeaReviewStatus,
   PowerlineQueueItem,
   QueueAliasMap,
   QueueContext,
@@ -19,7 +20,7 @@ import type {
   QueueSummary,
   QueueTarget,
 } from "./types.ts";
-import { ACTIVE_QUEUE_STATUSES } from "./types.ts";
+import { ACTIVE_QUEUE_STATUSES, IDEA_REVIEW_STATUSES } from "./types.ts";
 
 const STORE_DIR = "powerline-footer";
 const INBOX_FILE = "inbox.jsonl";
@@ -77,6 +78,30 @@ function normalizeStatus(value: unknown): QueueStatus | null {
     : null;
 }
 
+function normalizeReviewStatus(value: unknown): IdeaReviewStatus | undefined {
+  return IDEA_REVIEW_STATUSES.includes(value as IdeaReviewStatus)
+    ? (value as IdeaReviewStatus)
+    : undefined;
+}
+
+const MAX_IDEA_TAGS = 8;
+const MAX_TAG_CHARS = 32;
+
+export function normalizeIdeaTags(value: unknown): string[] | undefined {
+  if (!Array.isArray(value)) return undefined;
+  const seen = new Set<string>();
+  const tags: string[] = [];
+  for (const entry of value) {
+    if (typeof entry !== "string") continue;
+    const tag = entry.trim().slice(0, MAX_TAG_CHARS);
+    if (!tag || seen.has(tag)) continue;
+    seen.add(tag);
+    tags.push(tag);
+    if (tags.length >= MAX_IDEA_TAGS) break;
+  }
+  return tags.length > 0 ? tags : undefined;
+}
+
 function normalizeItem(value: unknown): PowerlineQueueItem | null {
   if (!isRecord(value)) return null;
   if (typeof value.id !== "string" || !value.id.trim()) return null;
@@ -99,6 +124,9 @@ function normalizeItem(value: unknown): PowerlineQueueItem | null {
 
   const sessionId = normalizeOptionalString(value.source.sessionId);
   const error = normalizeOptionalString(value.error);
+  const reviewStatus =
+    intent === "idea" ? normalizeReviewStatus(value.reviewStatus) : undefined;
+  const tags = intent === "idea" ? normalizeIdeaTags(value.tags) : undefined;
 
   return {
     id: value.id.trim(),
@@ -112,6 +140,8 @@ function normalizeItem(value: unknown): PowerlineQueueItem | null {
     intent,
     status,
     ...(error ? { error } : {}),
+    ...(reviewStatus ? { reviewStatus } : {}),
+    ...(tags ? { tags } : {}),
   };
 }
 
@@ -142,6 +172,12 @@ export function createQueueItem(
 ): PowerlineQueueItem {
   const now = input.now ?? Date.now();
   const sourceSessionId = input.source.sessionId?.trim();
+  const reviewStatus =
+    input.intent === "idea"
+      ? (input.reviewStatus ?? "idea")
+      : undefined;
+  const tags =
+    input.intent === "idea" ? normalizeIdeaTags(input.tags) : undefined;
   return {
     id: randomUUID().slice(0, 8),
     text: input.text,
@@ -153,6 +189,8 @@ export function createQueueItem(
     target: normalizeTarget(input.target) ?? input.target,
     intent: input.intent,
     status: input.status ?? "queued",
+    ...(reviewStatus ? { reviewStatus } : {}),
+    ...(tags ? { tags } : {}),
   };
 }
 

package/queue/types.ts

@@ -1,5 +1,12 @@
 export type QueueIntent = "steer" | "follow-up" | "post-compact" | "idea";
 export type QueueStatus = "queued" | "blocked" | "delivering" | "sent" | "failed";
+/** Review language for captured ideas. Separate from delivery `QueueStatus`. */
+export type IdeaReviewStatus = "idea" | "in-progress" | "done";
+export const IDEA_REVIEW_STATUSES = [
+  "idea",
+  "in-progress",
+  "done",
+] as const satisfies readonly IdeaReviewStatus[];
 
 export type QueueTarget =
   | { kind: "current-session" }
@@ -21,6 +28,8 @@ export interface PowerlineQueueItem {
   intent: QueueIntent;
   status: QueueStatus;
   error?: string;
+  reviewStatus?: IdeaReviewStatus;
+  tags?: string[];
 }
 
 export interface QueueAliasMap {
@@ -43,6 +52,8 @@ export interface CreateQueueItemInput {
   target: QueueTarget;
   intent: QueueIntent;
   status?: QueueStatus;
+  reviewStatus?: IdeaReviewStatus;
+  tags?: string[];
   now?: number;
 }
 

package/src/extension/commands/queue-commands.ts

@@ -10,6 +10,7 @@ import {
   sendIdeaIssueHandoffById,
   sendOrRetryQueueItem,
 } from "../queue/queue-integration.ts";
+import { openIdeasReview } from "../queue/idea-review.ts";
 import { getCurrentEditorText } from "../shortcuts/shortcuts-router.ts";
 import { getQueueContext } from "../queue/queue-context.ts";
 import { config } from "../core/state.ts";
@@ -65,7 +66,7 @@ export function registerQueueCommands(
       const id = parts[1];
 
       if (!action) {
-        await openQueuePicker(pi, rt, ctx, "ideas");
+        await openIdeasReview(pi, rt, ctx);
         return;
       }
 
@@ -78,6 +79,7 @@ export function registerQueueCommands(
         const updated = rt.queueStore.update(item.id, {
           status: "queued",
           target: { kind: "current-session" },
+          reviewStatus: "in-progress",
           error: undefined,
         });
         if (updated) deliverQueueItem(pi, rt, ctx, updated);
@@ -107,6 +109,7 @@ export function registerQueueCommands(
         const updated = rt.queueStore.update(item.id, {
           status: "queued",
           target: { kind: "current-session" },
+          reviewStatus: "in-progress",
           error: undefined,
         });
         if (updated) deliverQueueItem(pi, rt, ctx, updated);
@@ -121,7 +124,11 @@ export function registerQueueCommands(
       }
 
       if (action === "clear") {
-        rt.queueStore.clear(item.id);
+        rt.queueStore.update(item.id, {
+          status: "sent",
+          reviewStatus: "done",
+          error: undefined,
+        });
         ctx.ui.notify(`Cleared idea ${item.id}`, "info");
         requestQueueRender(rt);
         return;

package/src/extension/queue/idea-review.ts

@@ -0,0 +1,330 @@
+/**
+ * Idea-review overlay for `/ideas`.
+ * Review language (`reviewStatus`, `tags`) is separate from delivery QueueStatus.
+ * Overlay chrome matches `/skills` (showSelectOverlay, not ctx.ui.select).
+ */
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { SelectItem } from "@earendil-works/pi-tui";
+
+import {
+  IDEA_REVIEW_STATUSES,
+  type IdeaReviewStatus,
+  type PowerlineQueueItem,
+} from "../../../queue/types.ts";
+import { buildStashPreview } from "../history/stash-history.ts";
+import {
+  loadSkillCatalog,
+  readSkillBodyStrict,
+  insertSkillBody,
+} from "../skills/skill-registry.ts";
+import { showSelectOverlay } from "../ui/overlay-chrome.ts";
+import type { RuntimeState } from "../core/types.ts";
+
+export type IdeaSelectOverlay = (
+  ctx: any,
+  title: string,
+  hint: string,
+  items: SelectItem[],
+  maxVisible: number,
+) => Promise<SelectItem | null>;
+import { getQueueContext } from "./queue-context.ts";
+import {
+  deliverQueueItem,
+  requestQueueRender,
+} from "./queue-integration.ts";
+
+export const IDEA_TAG_PRESETS = [
+  "review",
+  "later",
+  "bug",
+  "feature",
+  "chore",
+] as const;
+
+export function ideaReviewStatusOf(
+  item: Pick<PowerlineQueueItem, "reviewStatus">,
+): IdeaReviewStatus {
+  return item.reviewStatus ?? "idea";
+}
+
+export function formatIdeaReviewLabel(
+  item: PowerlineQueueItem,
+  previewWidth = 48,
+): string {
+  const review = ideaReviewStatusOf(item);
+  const tags = item.tags?.length ? ` [${item.tags.join(", ")}]` : "";
+  return `${item.id} ${review}${tags} ${buildStashPreview(item.text, previewWidth)}`;
+}
+
+export function buildIdeaPickerItems(
+  items: readonly PowerlineQueueItem[],
+): SelectItem[] {
+  return items.map((item) => ({
+    value: item.id,
+    label: formatIdeaReviewLabel(item),
+    description: item.tags?.join(", ") || ideaReviewStatusOf(item),
+  }));
+}
+
+export function buildIdeaActionItems(item: PowerlineQueueItem): SelectItem[] {
+  const review = ideaReviewStatusOf(item);
+  const tagSummary = item.tags?.length ? item.tags.join(", ") : "none";
+  return [
+    {
+      value: "send",
+      label: "Send to current session",
+      description: "Deliver as a prompt",
+    },
+    {
+      value: "skill",
+      label: "Run with skill X",
+      description: "Insert skill body plus this idea into the editor",
+    },
+    {
+      value: "status",
+      label: `Set status (${review})`,
+      description: "idea / in-progress / done",
+    },
+    {
+      value: "tags",
+      label: `Tags (${tagSummary})`,
+      description: "Toggle presets or clear",
+    },
+    {
+      value: "edit",
+      label: "Edit in prompt",
+      description: "Move text into the editor",
+    },
+    {
+      value: "clear",
+      label: "Clear",
+      description: "Mark delivery sent and review done",
+    },
+    { value: "cancel", label: "Cancel" },
+  ];
+}
+
+export function buildReviewStatusItems(
+  current: IdeaReviewStatus,
+): SelectItem[] {
+  return IDEA_REVIEW_STATUSES.map((status) => ({
+    value: status,
+    label: status === current ? `${status} (current)` : status,
+    description:
+      status === "idea"
+        ? "Captured, not started"
+        : status === "in-progress"
+          ? "Being worked"
+          : "Reviewed or finished",
+  }));
+}
+
+export function buildTagItems(tags: readonly string[] | undefined): SelectItem[] {
+  const current = new Set(tags ?? []);
+  const items: SelectItem[] = IDEA_TAG_PRESETS.map((tag) => ({
+    value: `toggle:${tag}`,
+    label: current.has(tag) ? `✓ ${tag}` : tag,
+    description: current.has(tag) ? "Remove tag" : "Add tag",
+  }));
+  items.push({
+    value: "clear",
+    label: "Clear tags",
+    description: "Remove all tags",
+  });
+  items.push({ value: "back", label: "Back" });
+  return items;
+}
+
+export function toggleIdeaTag(
+  tags: readonly string[] | undefined,
+  tag: string,
+): string[] | undefined {
+  const current = [...(tags ?? [])];
+  const next = current.includes(tag)
+    ? current.filter((entry) => entry !== tag)
+    : [...current, tag];
+  return next.length > 0 ? next : undefined;
+}
+
+export function composeSkillIdeaInsert(
+  skillBody: string,
+  ideaText: string,
+): string {
+  const body = skillBody.trim();
+  const idea = ideaText.trim();
+  if (!body) return idea;
+  if (!idea) return body;
+  return `${body}\n\n${idea}`;
+}
+
+export function pickNextReviewIdea(
+  items: readonly PowerlineQueueItem[],
+): PowerlineQueueItem | null {
+  const ideas = items.filter((item) => item.intent === "idea");
+  return ideas.find((item) => ideaReviewStatusOf(item) !== "done") ?? null;
+}
+
+function activeIdeas(rt: RuntimeState, ctx: any): PowerlineQueueItem[] {
+  return rt.queueStore
+    .activeItems(getQueueContext(ctx))
+    .filter((item) => item.intent === "idea");
+}
+
+export function insertSkillAndIdea(
+  ctx: any,
+  skillName: string,
+  filePath: string,
+  ideaText: string,
+): void {
+  try {
+    insertSkillBody(ctx, skillName, readSkillBodyStrict(filePath), ideaText);
+    ctx.ui.notify("Skill and idea inserted into the prompt", "info");
+  } catch (error) {
+    ctx.ui.notify(`Could not read skill: ${error instanceof Error ? error.message : String(error)}`, "error");
+  }
+}
+
+async function pickSkillForIdea(
+  ctx: any,
+  item: PowerlineQueueItem,
+  selectOverlay: IdeaSelectOverlay,
+): Promise<void> {
+  const entries = loadSkillCatalog(ctx.cwd ?? process.cwd());
+  if (entries.length === 0) {
+    ctx.ui.notify("No skills installed", "info");
+    return;
+  }
+  const selected = await selectOverlay(
+    ctx,
+    `Run ${item.id} with skill`,
+    "↑↓ navigate • enter insert • esc cancel",
+    entries.map((entry) => ({
+      value: entry.filePath,
+      label: entry.name,
+      description: entry.description || entry.category,
+    })),
+    Math.min(entries.length, 12),
+  );
+  if (!selected) return;
+  const entry = entries.find((candidate) => candidate.filePath === selected.value);
+  if (entry) insertSkillAndIdea(ctx, entry.name, entry.filePath, item.text);
+}
+
+async function chooseIdeaReviewAction(
+  pi: ExtensionAPI,
+  rt: RuntimeState,
+  ctx: any,
+  item: PowerlineQueueItem,
+  selectOverlay: IdeaSelectOverlay,
+): Promise<void> {
+  const selected = await selectOverlay(
+    ctx,
+    `Idea ${item.id}`,
+    buildStashPreview(item.text, 72),
+    buildIdeaActionItems(item),
+    8,
+  );
+  if (!selected || selected.value === "cancel") return;
+
+  if (selected.value === "send") {
+    const updated = rt.queueStore.update(item.id, {
+      status: "queued",
+      target: { kind: "current-session" },
+      reviewStatus: "in-progress",
+      error: undefined,
+    });
+    if (updated) deliverQueueItem(pi, rt, ctx, updated);
+    return;
+  }
+
+  if (selected.value === "skill") {
+    await pickSkillForIdea(ctx, item, selectOverlay);
+    return;
+  }
+
+  if (selected.value === "status") {
+    const next = await selectOverlay(
+      ctx,
+      `Status for ${item.id}`,
+      "idea / in-progress / done",
+      buildReviewStatusItems(ideaReviewStatusOf(item)),
+      IDEA_REVIEW_STATUSES.length,
+    );
+    if (!next) return;
+    rt.queueStore.update(item.id, {
+      reviewStatus: next.value as IdeaReviewStatus,
+    });
+    ctx.ui.notify(`Idea ${item.id} → ${next.value}`, "info");
+    requestQueueRender(rt);
+    const fresh = rt.queueStore.get(item.id);
+    if (fresh) await chooseIdeaReviewAction(pi, rt, ctx, fresh, selectOverlay);
+    return;
+  }
+
+  if (selected.value === "tags") {
+    const next = await selectOverlay(
+      ctx,
+      `Tags for ${item.id}`,
+      "enter toggles • esc back",
+      buildTagItems(item.tags),
+      IDEA_TAG_PRESETS.length + 2,
+    );
+    if (!next || next.value === "back") {
+      const fresh = rt.queueStore.get(item.id);
+      if (fresh) await chooseIdeaReviewAction(pi, rt, ctx, fresh, selectOverlay);
+      return;
+    }
+    const tags =
+      next.value === "clear"
+        ? undefined
+        : toggleIdeaTag(item.tags, next.value.replace(/^toggle:/, ""));
+    rt.queueStore.update(item.id, { tags });
+    requestQueueRender(rt);
+    const fresh = rt.queueStore.get(item.id);
+    if (fresh) await chooseIdeaReviewAction(pi, rt, ctx, fresh, selectOverlay);
+    return;
+  }
+
+  if (selected.value === "edit") {
+    ctx.ui.setEditorText(item.text);
+    rt.queueStore.clear(item.id);
+    requestQueueRender(rt);
+    return;
+  }
+
+  if (selected.value === "clear") {
+    rt.queueStore.update(item.id, {
+      status: "sent",
+      reviewStatus: "done",
+      error: undefined,
+    });
+    ctx.ui.notify(`Cleared idea ${item.id}`, "info");
+    requestQueueRender(rt);
+  }
+}
+
+export async function openIdeasReview(
+  pi: ExtensionAPI,
+  rt: RuntimeState,
+  ctx: any,
+  selectOverlay: IdeaSelectOverlay = showSelectOverlay,
+): Promise<void> {
+  const ideas = activeIdeas(rt, ctx);
+  if (ideas.length === 0) {
+    ctx.ui.notify("No ideas captured", "info");
+    return;
+  }
+
+  const selected = await selectOverlay(
+    ctx,
+    "Wishcraft ideas",
+    "↑↓ navigate • enter review • esc cancel",
+    buildIdeaPickerItems(ideas),
+    Math.min(ideas.length, 12),
+  );
+  if (!selected) return;
+
+  const item = ideas.find((candidate) => candidate.id === selected.value);
+  if (item) await chooseIdeaReviewAction(pi, rt, ctx, item, selectOverlay);
+}

package/src/extension/queue/queue-integration.ts

@@ -384,11 +384,10 @@ export function findNextIdea(
   rt: RuntimeState,
   ctx: any,
 ): PowerlineQueueItem | null {
-  return (
-    rt.queueStore
-      .activeItems(getQueueContext(ctx))
-      .find((candidate) => candidate.intent === "idea") ?? null
-  );
+  const ideas = rt.queueStore
+    .activeItems(getQueueContext(ctx))
+    .filter((candidate) => candidate.intent === "idea");
+  return ideas.find((candidate) => candidate.reviewStatus !== "done") ?? null;
 }
 
 export function sendIdeaIssueHandoff(

package/src/extension/skills/skill-manager.ts

@@ -14,21 +14,20 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { rmSync } from "node:fs";
-import { join } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { RuntimeState } from "../core/types.ts";
-import { getAgentPath } from "../../paths/agent-dirs.ts";
 import {
   applySkillFilter,
   getSkillUsage,
   invalidateSkillCache,
   loadSkillCatalog,
+  insertSkillBody,
   readSkillBody,
-  recordSkillUsage,
   type SkillCategory,
   type SkillEntry,
 } from "./skill-registry.ts";
 import { runSkillDoctor } from "./skill-doctor.ts";
+import { runSkillsNew } from "./skill-templates.ts";
 
 const CATEGORY_LABELS: Record<SkillCategory | "all", string> = {
   all: "alles",
@@ -90,21 +89,20 @@ function editorCommand(path: string): string {
   return `!${ed} ${shellQuote(path)}`;
 }
 
-export async function showSkillManager(ctx: any): Promise<void> {
+export async function showSkillManager(ctx: any): Promise<"new" | null> {
   invalidateSkillCache();
   let entries = loadSkillCatalog(ctx.cwd ?? process.cwd());
   const usage = getSkillUsage();
   if (entries.length === 0) {
     ctx.ui.notify("No skills found", "info");
-    return;
   }
 
-  await ctx.ui.custom(
+  return ctx.ui.custom(
     (
       tui: any,
       theme: Theme,
       _keybindings: any,
-      done: (result: null) => void,
+      done: (result: "new" | null) => void,
     ) => {
       const border = (text: string) => theme.fg("dim", text);
       const wrapRow = (text: string, innerWidth: number): string =>
@@ -161,11 +159,7 @@ export async function showSkillManager(ctx: any): Promise<void> {
       };
 
       const insertBody = (entry: SkillEntry) => {
-        const body = readSkillBody(entry.filePath);
-        const current = ctx.ui.getEditorText?.() ?? "";
-        const separator = current && !current.endsWith("\n") ? "\n\n" : "";
-        ctx.ui.setEditorText(`${current}${separator}${body}\n`);
-        recordSkillUsage(entry.name);
+        insertSkillBody(ctx, entry.name, readSkillBody(entry.filePath));
         ctx.ui.notify("Skill ingevoegd in je prompt", "info");
       };
 
@@ -183,11 +177,12 @@ export async function showSkillManager(ctx: any): Promise<void> {
             lines.push(border(`├${"─".repeat(innerWidth)}┤`));
 
             if (f.length === 0) {
+              const emptyMsg =
+                entries.length === 0 && !query
+                  ? "No skills installed — ctrl+n to create one"
+                  : `Geen skills voor "${query}"`;
               lines.push(
-                wrapRow(
-                  theme.fg("warning", `Geen skills voor "${query}"`),
-                  innerWidth,
-                ),
+                wrapRow(theme.fg("warning", emptyMsg), innerWidth),
               );
             } else {
               // scroll-window rondom de selectie
@@ -396,13 +391,8 @@ export async function showSkillManager(ctx: any): Promise<void> {
                 return;
               }
             } else if (data === "\x0e") {
-              // ctrl+n = nieuwe skill
-              appendToEditor(
-                ctx,
-                `!mkdir -p ${shellQuote(join(getAgentPath("skills"), "<naam>"))} && ${editorCommand(join(getAgentPath("skills"), "<naam>", "SKILL.md")).slice(1)}`,
-                "Nieuwe skill: vervang <naam>, enter draait 'm",
-              );
-              close();
+              // ctrl+n = new skill from a template
+              done("new");
               return;
             } else if (data === "\x04") {
               // ctrl+d = verwijderen (met confirm)
@@ -482,7 +472,7 @@ export function registerSkillManagerCommand(
 ): void {
   const runDoctor = deps.runDoctor ?? runSkillDoctor;
   pi.registerCommand("skills", {
-    description: "Browse installed skills, or `doctor` for a health table",
+    description: "Browse installed skills, or `doctor` / `new [template]`",
     handler: async (args: string, ctx: any) => {
       if (!rt.enabled || !ctx.hasUI) {
         ctx.ui.notify("Powerline UI is disabled", "info");
@@ -493,7 +483,12 @@ export function registerSkillManagerCommand(
         await runDoctor(ctx);
         return;
       }
-      await showSkillManager(ctx);
+      if (sub === "new") {
+        await runSkillsNew(ctx, args);
+        return;
+      }
+      const result = await showSkillManager(ctx);
+      if (result === "new") await runSkillsNew(ctx, "");
     },
   });
 }

package/src/extension/skills/skill-registry.ts

@@ -407,6 +407,25 @@ export function readSkillBody(path: string): string {
   }
 }
 
+export function readSkillBodyStrict(path: string): string {
+  return stripFrontmatter(readFileSync(path, "utf8")).trim();
+}
+
+export function insertSkillBody(
+  ctx: any,
+  skillName: string,
+  body: string,
+  appendedText = "",
+): void {
+  const chunk = appendedText.trim()
+    ? `${body.trim()}\n\n${appendedText.trim()}`
+    : body.trim();
+  const current = ctx.ui.getEditorText?.() ?? "";
+  const separator = current && !current.endsWith("\n") ? "\n\n" : "";
+  ctx.ui.setEditorText(`${current}${separator}${chunk}\n`);
+  recordSkillUsage(skillName);
+}
+
 /** Compat-export: catalogus als ouderwets SkillInfo[] (manager v1 API). */
 export function listSkills(): { name: string; description: string; path: string; source: string }[] {
   return loadSkillCatalog().map((e) => ({

package/src/extension/skills/skill-templates.ts

@@ -0,0 +1,267 @@
+/**
+ * `/skills new` templates. No marketplace, no GitHub/npm install.
+ * Writes `~/.pi/agent/skills/<name>/SKILL.md` then opens $EDITOR.
+ */
+
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import type { SelectItem } from "@earendil-works/pi-tui";
+
+import { getAgentPath } from "../../paths/agent-dirs.ts";
+import { showSelectOverlay } from "../ui/overlay-chrome.ts";
+import { invalidateSkillCache } from "./skill-registry.ts";
+
+export const SKILL_TEMPLATE_IDS = [
+  "standard",
+  "browser-workflow",
+  "cli-workflow",
+  "review-checklist",
+] as const;
+
+export type SkillTemplateId = (typeof SKILL_TEMPLATE_IDS)[number];
+
+export class SkillNameError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "SkillNameError";
+  }
+}
+
+const TEMPLATE_META: Record<
+  SkillTemplateId,
+  { label: string; description: string }
+> = {
+  standard: {
+    label: "standard",
+    description: "Name, description, and a short body",
+  },
+  "browser-workflow": {
+    label: "browser-workflow",
+    description: "UI verify with screenshots, no profile wipe",
+  },
+  "cli-workflow": {
+    label: "CLI-workflow",
+    description: "Command, flags, and expected output",
+  },
+  "review-checklist": {
+    label: "review-checklist",
+    description: "Diff review gates before merge",
+  },
+};
+
+export function isSkillTemplateId(value: string): value is SkillTemplateId {
+  return (SKILL_TEMPLATE_IDS as readonly string[]).includes(value);
+}
+
+export function sanitizeSkillName(raw: string): string {
+  const trimmed = raw.trim().toLowerCase().replace(/_/g, "-");
+  if (!trimmed) {
+    throw new SkillNameError("Skill name is required");
+  }
+  if (trimmed === "." || trimmed === ".." || trimmed.includes("..")) {
+    throw new SkillNameError("Skill name cannot contain path traversal");
+  }
+  if (trimmed.includes("/") || trimmed.includes("\\")) {
+    throw new SkillNameError("Skill name cannot contain path separators");
+  }
+  if (trimmed.length > 64) {
+    throw new SkillNameError("Skill name must be 64 characters or fewer");
+  }
+  if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(trimmed)) {
+    throw new SkillNameError(
+      "Skill name must be lowercase letters, digits, and hyphens",
+    );
+  }
+  return trimmed;
+}
+
+export function parseSkillsNewArgs(args: string): {
+  name?: string;
+  template: SkillTemplateId;
+} {
+  const parts = args.trim().split(/\s+/).filter(Boolean);
+  if (parts[0]?.toLowerCase() === "new") parts.shift();
+  if (parts.length === 0) return { template: "standard" };
+  if (parts.length === 1) {
+    const singleRaw = parts[0]!.toLowerCase();
+    if (isSkillTemplateId(singleRaw)) return { template: singleRaw };
+    return { name: parts[0], template: "standard" };
+  }
+  const templateRaw = parts[1]!.toLowerCase();
+  if (!isSkillTemplateId(templateRaw)) {
+    throw new SkillNameError(
+      `Unknown template '${parts[1]}'. Use: ${SKILL_TEMPLATE_IDS.join(", ")}`,
+    );
+  }
+  return { name: parts[0], template: templateRaw };
+}
+
+export function renderSkillTemplate(
+  id: SkillTemplateId,
+  name: string,
+): string {
+  const title = name;
+  switch (id) {
+    case "standard":
+      return `---
+name: ${title}
+description: Short skill for ${title}. State when to use it in one sentence.
+---
+
+# ${title}
+
+Use this skill when the operator asks for ${title}.
+
+## Steps
+
+1. Restate the goal in one line.
+2. Do the work with the tools already in session.
+3. Report what changed and how to verify it.
+`;
+    case "browser-workflow":
+      return `---
+name: ${title}
+description: Browser UI verify for ${title}. Screenshot evidence, no profile wipe.
+---
+
+# ${title}
+
+Use for visual checks in a real browser. Do not author layout here.
+
+## Steps
+
+1. Open the target URL in the existing session.
+2. Snapshot the page, then act on stable refs.
+3. Take a screenshot of the result.
+4. Do not wipe profiles, cookies, or login state unless the operator asked.
+`;
+    case "cli-workflow":
+      return `---
+name: ${title}
+description: CLI workflow for ${title}. Command, flags, and expected output.
+---
+
+# ${title}
+
+Use when the work is a command-line tool or script.
+
+## Steps
+
+1. Name the binary and the exact invocation.
+2. List required flags and inputs.
+3. Run the command and capture exit code plus stdout/stderr.
+4. State the expected output and how to rerun it.
+`;
+    case "review-checklist":
+      return `---
+name: ${title}
+description: Review checklist for ${title}. Gates before merge, no rubber-stamp.
+---
+
+# ${title}
+
+Use before marking a change merge-ready.
+
+## Checklist
+
+- [ ] Scope matches the request; no drive-by edits
+- [ ] Tests cover the changed behavior
+- [ ] No secrets in the diff
+- [ ] Docs match the new surface
+- [ ] Independent review is present; do not self-approve
+`;
+  }
+}
+
+export function writeSkillFromTemplate(
+  name: string,
+  template: SkillTemplateId,
+  skillsRoot: string = getAgentPath("skills"),
+): { filePath: string } {
+  const safe = sanitizeSkillName(name);
+  const dir = join(skillsRoot, safe);
+  const filePath = join(dir, "SKILL.md");
+  if (existsSync(filePath)) {
+    throw new SkillNameError(`Skill already exists: ${safe}`);
+  }
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(filePath, renderSkillTemplate(template, safe), "utf8");
+  invalidateSkillCache();
+  return { filePath };
+}
+
+export function buildSkillTemplateItems(): SelectItem[] {
+  return SKILL_TEMPLATE_IDS.map((id) => ({
+    value: id,
+    label: TEMPLATE_META[id].label,
+    description: TEMPLATE_META[id].description,
+  }));
+}
+
+function shellQuote(value: string): string {
+  return `'${value.replace(/'/g, `'"'"'`)}'`;
+}
+
+export function editorCommandFor(path: string): string {
+  const ed = process.env.EDITOR?.trim() || "nvim";
+  return `!${ed} ${shellQuote(path)}`;
+}
+
+function appendEditorText(ctx: any, text: string): void {
+  const current = ctx.ui.getEditorText?.() ?? "";
+  const separator = current && !current.endsWith("\n") ? "\n" : "";
+  ctx.ui.setEditorText(`${current}${separator}${text}\n`);
+}
+
+export async function pickSkillTemplate(
+  ctx: any,
+): Promise<SkillTemplateId | null> {
+  const selected = await showSelectOverlay(
+    ctx,
+    "New skill template",
+    "↑↓ navigate • enter choose • esc cancel",
+    buildSkillTemplateItems(),
+    SKILL_TEMPLATE_IDS.length,
+  );
+  return selected && isSkillTemplateId(selected.value)
+    ? selected.value
+    : null;
+}
+
+export async function runSkillsNew(ctx: any, args: string): Promise<void> {
+  let parsed: { name?: string; template: SkillTemplateId };
+  try {
+    parsed = parseSkillsNewArgs(args);
+  } catch (error) {
+    ctx.ui.notify(
+      error instanceof Error ? error.message : String(error),
+      "error",
+    );
+    return;
+  }
+
+  let template = parsed.template;
+  let name = parsed.name;
+  if (!name) {
+    const picked = await pickSkillTemplate(ctx);
+    if (!picked) return;
+    template = picked;
+    appendEditorText(ctx, `/skills new <name> ${template}`);
+    ctx.ui.notify(
+      `Replace <name> and run to create a ${template} skill.`,
+      "info",
+    );
+    return;
+  }
+
+  try {
+    const { filePath } = writeSkillFromTemplate(name, template);
+    appendEditorText(ctx, editorCommandFor(filePath));
+    ctx.ui.notify(`Created ${name} (${template}). Enter runs the editor.`, "info");
+  } catch (error) {
+    ctx.ui.notify(
+      error instanceof Error ? error.message : String(error),
+      "error",
+    );
+  }
+}

package/src/extension/welcome/welcome-integration.ts

@@ -9,6 +9,7 @@ import { estimateInitialContextTokens } from "../../usage/context.ts";
 import { isRecord } from "../settings/settings-io.ts";
 import type { RuntimeState } from "../core/types.ts";
 import { getQueueContext } from "../queue/queue-context.ts";
+import { pickNextReviewIdea } from "../queue/idea-review.ts";
 
 export function setupWelcomeHeader(rt: RuntimeState, ctx: any) {
   const modelName = ctx.model?.name || ctx.model?.id || "No model";
@@ -20,6 +21,9 @@ export function setupWelcomeHeader(rt: RuntimeState, ctx: any) {
   const queueCount = queueSummary.queueCount + queueSummary.ideaCount;
   const hasStash =
     rt.stashedEditorText !== null || rt.stashedPromptHistory.length > 0;
+  const nextIdeaText = pickNextReviewIdea(
+    rt.queueStore.activeItems(getQueueContext(ctx)),
+  )?.text;
   const whatsNew = discoverWhatsNew();
 
   const header = new WelcomeHeader(
@@ -31,6 +35,7 @@ export function setupWelcomeHeader(rt: RuntimeState, ctx: any) {
     queueCount,
     hasStash,
     whatsNew,
+    nextIdeaText,
   );
   rt.welcomeHeaderActive = true;
 
@@ -86,6 +91,9 @@ export function setupWelcomeOverlay(rt: RuntimeState, ctx: any) {
     const queueCount = queueSummary.queueCount + queueSummary.ideaCount;
     const hasStash =
       rt.stashedEditorText !== null || rt.stashedPromptHistory.length > 0;
+    const nextIdeaText = pickNextReviewIdea(
+      rt.queueStore.activeItems(getQueueContext(ctx)),
+    )?.text;
     const whatsNew = discoverWhatsNew();
 
     ctx.ui
@@ -105,6 +113,7 @@ export function setupWelcomeOverlay(rt: RuntimeState, ctx: any) {
             queueCount,
             hasStash,
             whatsNew,
+            nextIdeaText,
           );
 
           let countdown = 30;

package/src/welcome/banner.ts

@@ -24,6 +24,7 @@ export class WelcomeHeader implements Component {
     queueCount?: number,
     hasStash?: boolean,
     whatsNew?: string[],
+    nextIdeaText?: string,
   ) {
     this.data = {
       modelName,
@@ -34,6 +35,7 @@ export class WelcomeHeader implements Component {
       queueCount,
       hasStash,
       whatsNew,
+      nextIdeaText,
     };
   }
 

package/src/welcome/overlay.ts

@@ -30,6 +30,7 @@ export class WelcomeComponent implements Component {
     queueCount?: number,
     hasStash?: boolean,
     whatsNew?: string[],
+    nextIdeaText?: string,
   ) {
     this.data = {
       modelName,
@@ -40,6 +41,7 @@ export class WelcomeComponent implements Component {
       queueCount,
       hasStash,
       whatsNew,
+      nextIdeaText,
     };
   }
 

package/src/welcome/types.ts

@@ -18,6 +18,7 @@ export interface WelcomeData {
   initialContextTokens: number | null;
   queueCount?: number;
   hasStash?: boolean;
+  nextIdeaText?: string;
   whatsNew?: string[];
 }
 

package/src/welcome/widgets/queue-widget.ts

@@ -5,9 +5,19 @@ export const QueueWidget: WelcomeWidget = {
   render(ctx: WidgetRenderContext): string[] {
     const { data, dim, color } = ctx;
     const lines: string[] = [];
-    
+
     const prefix = dim("- ");
-    if (data.queueCount && data.queueCount > 0) {
+    const idea = data.nextIdeaText?.trim();
+    if (idea) {
+      const singleLine = idea.replace(/\s+/g, " ");
+      const budget = Math.max(1, ctx.width - prefix.length - 3 - "/ideas next".length - 2);
+      const preview = singleLine.length > budget
+        ? `${singleLine.slice(0, Math.max(0, budget - 1))}…`
+        : singleLine;
+      lines.push(
+        ` ${prefix}${color("gitClean", preview)} · ${color("model", "/ideas next")}`,
+      );
+    } else if (data.queueCount && data.queueCount > 0) {
       lines.push(` ${prefix}${color("gitClean", `${data.queueCount}`)} queued items ready`);
     } else {
       lines.push(` ${prefix}type ${color("model", "# <idea>")} to capture a thought`);
@@ -20,7 +30,7 @@ export const QueueWidget: WelcomeWidget = {
     }
 
     lines.push(` ${prefix}${dim("dreaming & mission queue ready")}`);
-    
+
     return lines;
   }
 };