Add Droid slash-command integration (#787)

* feat: add Droid slash-command integration

* fix: restore Droid command launcher behavior

* chore: remove archive command from homepage

* fix(droid): tighten last-message session resolution

Author: backnotprop

.factory-plugin/marketplace.json

@@ -0,0 +1,14 @@
+{
+  "name": "plannotator",
+  "description": "Plannotator slash commands for Droid.",
+  "owner": {
+    "name": "backnotprop"
+  },
+  "plugins": [
+    {
+      "name": "plannotator",
+      "source": "./apps/droid-plugin",
+      "description": "Interactive code review and annotation slash commands for Droid. No plan-mode integration."
+    }
+  ]
+}

README.md

@@ -4,7 +4,7 @@
 
 # Plannotator
 
-Interactive Plan & Code Review for AI Coding Agents. Mark up and refine your plans or code diffs using a visual UI, share for team collaboration, and seamlessly integrate with **Claude Code**, **Copilot CLI**, **Gemini CLI**, **OpenCode**, **Pi**, and **Codex**.
+Interactive Plan & Code Review for AI Coding Agents. Mark up and refine your plans or code diffs using a visual UI, share for team collaboration, and seamlessly integrate with **Claude Code**, **Copilot CLI**, **Gemini CLI**, **OpenCode**, **Pi**, **Codex**, and **Droid**.
 
 **Plan Mode Demos:**
 <table>
@@ -64,6 +64,7 @@ Plannotator lets you privately share plans, annotations, and feedback with colle
 - [OpenCode](#install-for-opencode)
 - [Pi](#install-for-pi)
 - [Codex](#install-for-codex)
+- [Droid](#install-for-droid)
 
 ## Install for Claude Code
 
@@ -249,6 +250,44 @@ See [apps/codex/README.md](apps/codex/README.md) for details.
 
 ---
 
+## Install for Droid
+
+**Install the `plannotator` command:**
+
+**macOS / Linux / WSL:**
+
+```bash
+curl -fsSL https://plannotator.ai/install.sh | bash
+```
+
+**Windows PowerShell:**
+
+```powershell
+irm https://plannotator.ai/install.ps1 | iex
+```
+
+**Then in Droid:**
+
+```bash
+droid plugin marketplace add https://github.com/backnotprop/plannotator
+droid plugin install plannotator@plannotator
+```
+
+This Droid plugin is commands-only. It adds:
+
+```text
+/plannotator-review
+/plannotator-annotate <file|folder|url>
+/plannotator-last
+/plannotator-archive
+```
+
+It does not currently intercept Droid's planning flow.
+
+See [apps/droid-plugin/README.md](apps/droid-plugin/README.md) for details.
+
+---
+
 ## How It Works
 
 When your AI agent finishes planning, Plannotator:

apps/droid-plugin/.factory-plugin/plugin.json

@@ -0,0 +1,11 @@
+{
+  "name": "plannotator",
+  "description": "Interactive code review and annotation slash commands for Droid. No plan-mode integration.",
+  "version": "0.19.21",
+  "author": {
+    "name": "backnotprop"
+  },
+  "homepage": "https://github.com/backnotprop/plannotator",
+  "repository": "https://github.com/backnotprop/plannotator",
+  "license": "MIT OR Apache-2.0"
+}

apps/droid-plugin/README.md

@@ -0,0 +1,39 @@
+# Plannotator for Droid
+
+Plannotator's Droid plugin ships the manual slash-command workflow only:
+
+- `/plannotator-review`
+- `/plannotator-annotate <file|folder|url>`
+- `/plannotator-last`
+- `/plannotator-archive`
+
+It does not attempt plan-mode interception or host-level planning integration.
+
+## Install
+
+Install the `plannotator` CLI first:
+
+```bash
+curl -fsSL https://plannotator.ai/install.sh | bash
+```
+
+Then add the marketplace and install the plugin:
+
+```bash
+droid plugin marketplace add https://github.com/backnotprop/plannotator
+droid plugin install plannotator@plannotator
+```
+
+For local development:
+
+```bash
+cd /path/to/plannotator
+droid plugin marketplace add "$PWD"
+droid plugin install plannotator@plannotator
+```
+
+## Notes
+
+- The plugin expects `plannotator` on `PATH`.
+- Review and annotate flows still open the Plannotator browser UI and return the result to the Droid session.
+- The command wrappers set `PLANNOTATOR_ORIGIN=droid` so the UI can label the host correctly.

apps/droid-plugin/commands/plannotator-annotate.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+const { emitAnnotateDecision, exitWithFailure, runPlannotator } = require("../lib/run-plannotator");
+
+const result = runPlannotator(["annotate", ...process.argv.slice(2), "--json"]);
+
+if (result.error || result.status !== 0) {
+  exitWithFailure(result, "plannotator annotate");
+}
+
+emitAnnotateDecision(result.stdout, "Markdown Annotations");

apps/droid-plugin/commands/plannotator-archive.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+const { exitWithFailure, runPlannotator } = require("../lib/run-plannotator");
+
+const result = runPlannotator(["archive", ...process.argv.slice(2)]);
+
+if (result.error || result.status !== 0) {
+  exitWithFailure(result, "plannotator archive");
+}
+
+process.stdout.write("Archive browsing finished.\n");

apps/droid-plugin/commands/plannotator-last.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+const { emitAnnotateDecision, exitWithFailure, runPlannotator } = require("../lib/run-plannotator");
+
+const result = runPlannotator(["annotate-last", ...process.argv.slice(2), "--json"]);
+
+if (result.error || result.status !== 0) {
+  exitWithFailure(result, "plannotator annotate-last");
+}
+
+emitAnnotateDecision(result.stdout, "Message Annotations");

apps/droid-plugin/commands/plannotator-review.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+
+const { exitWithFailure, runPlannotator } = require("../lib/run-plannotator");
+
+const result = runPlannotator(["review", ...process.argv.slice(2)]);
+
+if (result.error || result.status !== 0) {
+  exitWithFailure(result, "plannotator review");
+}
+
+const output = result.stdout.trim();
+process.stdout.write(output ? `${output}\n` : "Review session closed without feedback.\n");

apps/droid-plugin/lib/run-plannotator.js

@@ -0,0 +1,125 @@
+#!/usr/bin/env node
+
+const childProcess = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
+
+const bundledRepoBin = path.resolve(__dirname, "..", "..", "..", "bin", "plannotator.js");
+
+function findRepoBin(startDir) {
+  let dir = path.resolve(startDir);
+
+  while (true) {
+    const packageJsonPath = path.join(dir, "package.json");
+    const candidateBin = path.join(dir, "bin", "plannotator.js");
+
+    if (fs.existsSync(packageJsonPath) && fs.existsSync(candidateBin)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+        if (pkg && pkg.name === "plannotator") {
+          return candidateBin;
+        }
+      } catch {
+        // Ignore malformed package.json while walking up.
+      }
+    }
+
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+
+  return fs.existsSync(bundledRepoBin) ? bundledRepoBin : null;
+}
+
+function writeIfPresent(stream, text) {
+  if (!text) return;
+  stream.write(text.endsWith("\n") ? text : `${text}\n`);
+}
+
+function runPlannotator(args) {
+  const repoBin = findRepoBin(process.cwd());
+  const env = {
+    ...process.env,
+    PLANNOTATOR_CWD: process.cwd(),
+    PLANNOTATOR_ORIGIN: "droid",
+  };
+
+  let result = childProcess.spawnSync("plannotator", args, {
+    encoding: "utf8",
+    env,
+  });
+
+  if (result.error && result.error.code === "ENOENT" && repoBin) {
+    result = childProcess.spawnSync(process.execPath, [repoBin, ...args], {
+      encoding: "utf8",
+      env,
+    });
+  }
+
+  return result;
+}
+
+function exitWithFailure(result, invocation) {
+  writeIfPresent(process.stderr, result.stderr);
+  writeIfPresent(process.stderr, result.stdout);
+
+  if (result.error && result.error.code === "ENOENT") {
+    writeIfPresent(
+      process.stderr,
+      [
+        `Could not run \`${invocation}\` because the \`plannotator\` CLI is not installed or not on PATH.`,
+        "Install it first: https://plannotator.ai/docs/getting-started/installation/",
+      ].join("\n"),
+    );
+  } else if (result.error) {
+    writeIfPresent(process.stderr, `${invocation} failed: ${result.error.message}`);
+  }
+
+  process.exit(typeof result.status === "number" ? result.status : 1);
+}
+
+function emitAnnotateDecision(rawOutput, heading) {
+  const output = rawOutput.trim();
+  if (!output) {
+    process.stdout.write("Annotation session closed.\n");
+    return;
+  }
+
+  try {
+    const parsed = JSON.parse(output);
+    if (parsed && typeof parsed === "object") {
+      if (parsed.decision === "approved") {
+        process.stdout.write("Approved.\n");
+        return;
+      }
+
+      if (parsed.decision === "dismissed") {
+        process.stdout.write("Annotation session closed.\n");
+        return;
+      }
+
+      if (parsed.decision === "annotated") {
+        const feedback = typeof parsed.feedback === "string" ? parsed.feedback.trim() : "";
+        if (!feedback) {
+          process.stdout.write("Annotation session closed.\n");
+          return;
+        }
+        process.stdout.write(
+          `# ${heading}\n\n${feedback}\n\nPlease address the annotation feedback above.\n`,
+        );
+        return;
+      }
+    }
+  } catch {
+    // Fall back to the raw output below.
+  }
+
+  writeIfPresent(process.stdout, output);
+}
+
+module.exports = {
+  emitAnnotateDecision,
+  exitWithFailure,
+  runPlannotator,
+};

apps/hook/server/index.ts

@@ -1,5 +1,5 @@
 /**
- * Plannotator CLI for Claude Code, Codex, Gemini CLI, and Copilot CLI
+ * Plannotator CLI for Claude Code, Droid, Codex, Gemini CLI, and Copilot CLI
  *
  * Supports nine modes:
  *
@@ -105,9 +105,12 @@ import { readImprovementHook } from "@plannotator/shared/improvement-hooks";
 import { composeImproveContext } from "@plannotator/shared/pfm-reminder";
 import { AGENT_CONFIG, type Origin } from "@plannotator/shared/agents";
 import {
+  findDroidSessionLogsByAncestorWalk,
+  findDroidSessionLogsForCwd,
   findSessionLogsByAncestorWalk,
   findSessionLogsForCwd,
   getLastRenderedMessage,
+  resolveDroidSessionLogForCwd,
   resolveSessionLogByAncestorPids,
   resolveSessionLogByCwdScan,
   type RenderedMessage,
@@ -258,6 +261,7 @@ const pasteApiUrl = process.env.PLANNOTATOR_PASTE_URL || undefined;
 // Detect calling agent from environment variables set by agent runtimes.
 // Priority:
 //   PLANNOTATOR_ORIGIN (explicit override, validated against AGENT_CONFIG)
+//   > Droid command wrappers (PLANNOTATOR_ORIGIN=droid)
 //   > Codex (CODEX_THREAD_ID)
 //   > Copilot CLI (COPILOT_CLI)
 //   > OpenCode (OPENCODE)
@@ -843,6 +847,7 @@ if (args[0] === "sessions") {
   const projectRoot = process.env.PLANNOTATOR_CWD || process.cwd();
   const codexThreadId = process.env.CODEX_THREAD_ID;
   const isCodex = !!codexThreadId;
+  const isDroid = detectedOrigin === "droid";
 
   let lastMessage: RenderedMessage | null = null;
 
@@ -861,6 +866,36 @@ if (args[0] === "sessions") {
         lastMessage = { messageId: codexThreadId, text: msg.text, lineNumbers: [] };
       }
     }
+  } else if (isDroid) {
+    // Droid/Factory path: resolve the current repo's session log from
+    // ~/.factory/sessions/<cwd-slug>/*.jsonl. Factory does not expose the same
+    // per-process session metadata files as Claude Code, so the best available
+    // selector is "newest current-session candidate for this cwd", with an
+    // ancestor walk fallback for users who `cd` into a subdirectory after
+    // session start.
+    if (process.env.PLANNOTATOR_DEBUG) {
+      console.error(`[DEBUG] Droid detected, project root: ${projectRoot}`);
+    }
+
+    const cwdLogs = findDroidSessionLogsForCwd(projectRoot);
+    const ancestorLogs = cwdLogs.length === 0
+      ? findDroidSessionLogsByAncestorWalk(projectRoot)
+      : [];
+
+    if (process.env.PLANNOTATOR_DEBUG) {
+      console.error(`[DEBUG] Droid CWD session logs (mtime): ${cwdLogs.length ? cwdLogs.join(", ") : "(none)"}`);
+      if (cwdLogs.length === 0) {
+        console.error(`[DEBUG] Droid ancestor walk: ${ancestorLogs.length ? ancestorLogs.join(", ") : "(none)"}`);
+      }
+    }
+
+    const droidLog = resolveDroidSessionLogForCwd(projectRoot);
+    if (process.env.PLANNOTATOR_DEBUG) {
+      console.error(`[DEBUG] Droid selected log: ${droidLog ?? "(none)"}`);
+    }
+    if (droidLog) {
+      lastMessage = getLastRenderedMessage(droidLog);
+    }
   } else {
     // Claude Code path: resolve session log
     //
@@ -920,10 +955,11 @@ if (args[0] === "sessions") {
     console.error(`[DEBUG] Found message ${lastMessage.messageId} (${lastMessage.text.length} chars)`);
   }
 
+  const annotatedMessage = lastMessage;
   const annotateProject = (await detectProjectName()) ?? "_unknown";
 
   const server = await startAnnotateServer({
-    markdown: lastMessage.text,
+    markdown: annotatedMessage.text,
     filePath: "last-message",
     origin: detectedOrigin,
     mode: "annotate-last",
@@ -936,7 +972,7 @@ if (args[0] === "sessions") {
       handleAnnotateServerReady(url, isRemote, port);
 
       if (isRemote && sharingEnabled) {
-        await writeRemoteShareLink(lastMessage.text, shareBaseUrl, "annotate", "message only").catch(() => {});
+        await writeRemoteShareLink(annotatedMessage.text, shareBaseUrl, "annotate", "message only").catch(() => {});
       }
     },
   });