Merge origin/main into feat/collab

Main landed 32 commits while this branch was open, including the big
#597 markdown-reader refactor that broke Viewer.tsx into a shell +
BlockRenderer + InlineMarkdown + blocks/* architecture, added GitHub
alert callouts, HTML blocks, directive blocks, bare-URL autolinks,
and balanced-paren URL handling. Other landings: code tour agent
provider, wide annotate mode, self-hosted paste-service URLs, ~-path
expansion, ancestor-PID session resolution, OpenCode origin detection,
thumbs-up quick label, PDF/print flow.

Conflict resolution:

- bun.lock regenerated.
- package.json/shared/ui package.jsons: combined both sides' exports
  and devDeps. Kept our per-package test script (UI needs happy-dom
  preload) and added main's pi-extension typecheck path.
- VSCodeIcon.tsx: kept our style={{ maskType: 'alpha' }} form (same
  DOM output as main's spread-attribute form).
- sharing.ts, useSharing.ts: kept our explanatory comment + defensive
  null check; main didn't touch the logic.
- App.tsx: combined imports, adopted main's ThemeProvider +
  TooltipProvider root wrap, kept our room-aware Viewer props
  (showDemoBadge gated on !roomModeActive, onOpenLinkedDoc gated,
  localDocLinksEnabled, authorOverride, attachmentsEnabled), kept
  main's annotateReaderMaxWidth for wide-mode support.
- Viewer.tsx: accepted main's refactored slim shell wholesale (our
  fork-point monolith was already main's pre-refactor shape; our
  152-line delta was pure prop-threading with no rendering logic).
  Re-applied our 4 collab props onto main's Viewer:
    * authorOverride — stamps annotations with room display name
    * attachmentsEnabled — hides image button in room mode
    * localDocLinksEnabled — drilled through BlockRenderer,
      InlineMarkdown, AlertBlock, Callout, TableBlock, TablePopout,
      proseBody; read in the wikilink + markdown-link handlers so
      local doc links render as plain text in room mode
    * onHighlightSurfaceReset — passed straight to the hook (the
      hook's internal ref handles callback-identity stability)
  HtmlBlock deliberately not threaded (raw HTML bypasses the
  markdown renderer).

Post-merge fixes needed:
- Added VITE_DIFF_DEMO to packages/editor/env.d.ts (main's wide mode
  reads it via import.meta.env).
- Made openSidebarTab param optional to match useLinkedDoc's
  sidebar.open signature (main narrowed it).

Verified: typecheck green, 1,179 tests pass (875 shared + 285 UI +
19 editor). Bundle build and runtime smoke verification still
recommended as a follow-up before shipping.

For provenance purposes, this commit was AI assisted.

Author: backnotprop

.github/renovate.json

@@ -13,6 +13,19 @@
       "matchManagers": ["github-actions"],
       "groupName": "GitHub Actions",
       "automerge": false
+    },
+    {
+      "description": "Pin Bun to 1.3.11: 1.3.12+ broke macOS binary codesign for bun build --compile (hotfixed in v0.17.9). Unpin only after verifying signed builds work on the target version.",
+      "matchManagers": ["github-actions"],
+      "matchDepNames": ["oven-sh/setup-bun"],
+      "matchDepTypes": ["action"],
+      "enabled": true
+    },
+    {
+      "description": "Do not bump the bun-version input passed to oven-sh/setup-bun. See v0.17.9 hotfix.",
+      "matchManagers": ["github-actions"],
+      "matchDepNames": ["bun"],
+      "enabled": false
     }
   ]
 }

.gitignore

@@ -38,6 +38,10 @@ apps/pi-extension/review-core.ts
 .idea
 .DS_Store
 *.suo
+
+# Claude Code session-local runtime state (lock files, scheduled-task state).
+# Machine-specific; never belongs in the repo.
+.claude/
 *.ntvs*
 *.njsproj
 *.sln

AGENTS.md

@@ -131,6 +131,7 @@ claude --plugin-dir ./apps/hook
 | `PLANNOTATOR_SHARE` | Set to `disabled` to turn off URL sharing entirely. Default: enabled. |
 | `PLANNOTATOR_SHARE_URL` | Custom base URL for share links (self-hosted portal). Default: `https://share.plannotator.ai`. |
 | `PLANNOTATOR_PASTE_URL` | Base URL of the paste service API for short URL sharing. Default: `https://plannotator-paste.plannotator.workers.dev`. |
+| `PLANNOTATOR_ORIGIN` | Explicit agent-origin override at the top of the detection chain. Valid values: `claude-code`, `opencode`, `codex`, `copilot-cli`, `gemini-cli`. Invalid values silently fall through to env-based detection. Unset by default. |
 | `PLANNOTATOR_JINA` | Set to `0` / `false` to disable Jina Reader for URL annotation, or `1` / `true` to enable. Default: enabled. Can also be set via `~/.plannotator/config.json` (`{ "jina": false }`) or per-invocation via `--no-jina`. |
 | `JINA_API_KEY` | Optional Jina Reader API key for higher rate limits (500 RPM vs 20 RPM unauthenticated). Free keys include 10M tokens. |
 | `PLANNOTATOR_VERIFY_ATTESTATION` | **Read by the install scripts only**, not by the runtime binary. Set to `1` / `true` to have `scripts/install.sh` / `install.ps1` / `install.cmd` run `gh attestation verify` on every install. Off by default. Can also be set persistently via `~/.plannotator/config.json` (`{ "verifyAttestation": true }`) or per-invocation via `--verify-attestation`. Requires `gh` installed and authenticated. |
@@ -280,12 +281,14 @@ work; it is not part of the room-origin approve/deny surface.
 | `/api/external-annotations` | POST | Add external annotations (single or batch `{ annotations: [...] }`) |
 | `/api/external-annotations` | PATCH | Update fields on a single annotation (`?id=`) |
 | `/api/external-annotations` | DELETE | Remove by `?id=`, `?source=`, or clear all |
-| `/api/agents/capabilities` | GET | Check available agent providers (claude, codex) |
+| `/api/agents/capabilities` | GET | Check available agent providers (claude, codex, tour) |
 | `/api/agents/jobs/stream` | GET | SSE stream for real-time agent job status updates |
 | `/api/agents/jobs` | GET | Snapshot of agent jobs (polling fallback, `?since=N` for version gating) |
 | `/api/agents/jobs` | POST | Launch an agent job (body: `{ provider, command, label }`) |
 | `/api/agents/jobs` | DELETE | Kill all running agent jobs |
 | `/api/agents/jobs/:id` | DELETE | Kill a specific agent job |
+| `/api/tour/:jobId` | GET | Fetch Code Tour result (greeting, stops, checklist) for a completed tour job |
+| `/api/tour/:jobId/checklist` | PUT | Persist checklist item state for a Code Tour |
 
 ### Annotate Server (`packages/server/annotate.ts`)
 
@@ -387,10 +390,11 @@ interface Annotation {
 
 interface Block {
   id: string;
-  type: "paragraph" | "heading" | "blockquote" | "list-item" | "code" | "hr";
+  type: "paragraph" | "heading" | "blockquote" | "list-item" | "code" | "hr" | "table" | "html" | "directive";
   content: string;
   level?: number; // For headings (1-6)
   language?: string; // For code blocks
+  alertKind?: "note" | "tip" | "warning" | "caution" | "important"; // GitHub alerts (blockquote subtype)
   order: number;
   startLine: number;
 }
@@ -402,12 +406,15 @@ interface Block {
 
 `parseMarkdownToBlocks(markdown)` splits markdown into Block objects. Handles:
 
-- Headings (`#`, `##`, etc.)
+- Headings (`#`, `##`, etc.) with slug-derived anchor ids
 - Code blocks (``` with language extraction)
 - List items (`-`, `*`, `1.`)
-- Blockquotes (`>`)
+- Blockquotes (`>`) — including GitHub alerts (`> [!NOTE|TIP|WARNING|CAUTION|IMPORTANT]`) which set `alertKind`
 - Horizontal rules (`---`)
-- Paragraphs (default)
+- Tables (pipe-delimited) — rendered via `TableBlock` with a `TableToolbar` (copy as markdown/CSV) and `TablePopout` overlay
+- Raw HTML blocks (`<details>`, `<summary>`, etc.) — rendered via `HtmlBlock` through `marked` + DOMPurify
+- Directive containers (`:::kind ... :::`) — rendered via `Callout`
+- Paragraphs (default) with inline extras: bare URL autolinks, `@mentions` / `#issue-refs`, emoji shortcodes, smart punctuation
 
 `exportAnnotations(blocks, annotations, globalAttachments)` generates human-readable feedback for Claude. Images are referenced by name: `[image-name] /tmp/path...`. Annotations with `diffContext` include `[In diff content]` labels.
 

README.md

@@ -35,7 +35,7 @@ Interactive Plan & Code Review for AI Coding Agents. Mark up and refine your pla
 <tr><td><strong>Visual Plan Review</strong></td><td>Built-in hook</td><td>Approve or deny agent plans with inline annotations</td></tr>
 <tr><td><strong>Plan Diff</strong></td><td>Automatic</td><td>See what changed when the agent revises a plan</td></tr>
 <tr><td><strong>Code Review</strong></td><td><code>/plannotator-review</code></td><td>View git diffs or remote PRs. Package annotations and ask AI about the code as you review.</td></tr>
-<tr><td><strong>Annotate Any File</strong></td><td><code>/plannotator-annotate</code></td><td>Annotate any markdown file and send feedback to your agent</td></tr>
+<tr><td><strong>Annotate Any File</strong></td><td><code>/plannotator-annotate &lt;file|folder|url&gt;</code></td><td>Annotate markdown, HTML, URLs, or folders and send feedback to your agent</td></tr>
 <tr><td><strong>Annotate Last Message</strong></td><td><code>/plannotator-last</code></td><td>Annotate the agent's last response and send structured feedback</td></tr>
 </table>
 

apps/copilot/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "plannotator-copilot",
   "description": "Interactive Plan & Code Review for GitHub Copilot CLI. Visual annotations, team sharing, structured feedback.",
-  "version": "0.17.10",
+  "version": "0.19.0",
   "author": { "name": "backnotprop" },
   "repository": "https://github.com/backnotprop/plannotator",
   "license": "MIT OR Apache-2.0",

apps/hook/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "plannotator",
   "description": "Interactive Plan Review: Mark up and refine your plans using a UI, easily share for team collaboration, automatically integrates with plan mode hooks.",
-  "version": "0.17.10",
+  "version": "0.19.0",
   "author": {
     "name": "backnotprop"
   },

apps/hook/commands/plannotator-annotate.md

@@ -1,6 +1,7 @@
 ---
 description: Open interactive annotation UI for a markdown file or folder
 allowed-tools: Bash(plannotator:*)
+disable-model-invocation: true
 ---
 
 ## Markdown Annotations

apps/hook/commands/plannotator-archive.md

@@ -1,6 +1,7 @@
 ---
 description: Browse saved plan decisions in the archive
 allowed-tools: Bash(plannotator:*)
+disable-model-invocation: true
 ---
 
 ## Plan Archive

apps/hook/commands/plannotator-last.md

@@ -1,6 +1,7 @@
 ---
 description: Annotate the last rendered assistant message
 allowed-tools: Bash(plannotator:*)
+disable-model-invocation: true
 ---
 
 ## Message Annotations

apps/hook/commands/plannotator-review.md

@@ -1,6 +1,7 @@
 ---
 description: Open interactive code review for current changes or a PR URL
 allowed-tools: Bash(plannotator:*)
+disable-model-invocation: true
 ---
 
 ## Code Review Feedback