ahead-pi 0.8.3 → 0.8.5

package/README.md

@@ -127,7 +127,11 @@ INDEPENDENT HUMAN REVIEWS AND ACCEPTS
 
 A draft branch or draft PR may exist earlier. The handoff gate is requesting human review or marking the PR ready, not ordinary draft pushes.
 
-`/ahead-review` opens the first editor-neutral review workbench. It fingerprints the current Git changeset, shows the changed paths and diff in Pi, can open a selected path in VS Code when detected or configured with `AHEAD_EDITOR=vscode`, requests snapshot-bound AI findings, and opens the required human disposition or independent-review record. Any engineering change produces a new fingerprint and requires review again. `.ahead/**` evidence is excluded from that fingerprint so recording the review does not invalidate it.
+`/ahead-review` opens the first editor-neutral review workbench. It fingerprints the current Git changeset, shows the changed paths and diff in Pi, can open a selected path in VS Code or Zed when detected or configured with `AHEAD_EDITOR=vscode` or `AHEAD_EDITOR=zed`, requests snapshot-bound AI findings, and opens the required human disposition or independent-review record. Any engineering change produces a new fingerprint and requires review again. `.ahead/**` evidence is excluded from that fingerprint so recording the review does not invalidate it.
+
+VS Code is detected from its terminal environment. For a deterministic Zed terminal, add `"AHEAD_EDITOR": "zed"` under Zed's `terminal.env` settings; Zed's CLI must be installed. `AHEAD_EDITOR=none` disables external opening.
+
+Human-owned plans and other artifacts open in that detected editor as a temporary Markdown draft. Save your work, then close only that temporary tab; AHEAD copies the draft into `.ahead/runs/` after the tab closes and the form passes validation. The host editor stays open, and saving alone does not record the artifact.
 
 ## Human commands
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ahead-pi",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "AHEAD workflow enforcement and context for Pi",
   "keywords": [
     "ahead",

package/src/guidance.ts

@@ -424,7 +424,9 @@ export function nextAction(state: RunState, workflow: WorkflowDefinition): Guide
         ? "Ask AI to challenge the human option and expand alternatives"
         : state.phase.id === "plan"
           ? "Ask AI to challenge the human first-pass plan"
-          : `Ask AI to contribute ${artifact.title}`;
+          : artifact.title.startsWith("AI ")
+            ? `Ask AI for ${lowercaseFirst(artifact.title.slice(3))}`
+            : `Ask AI to contribute ${artifact.title}`;
     return artifact.required
       ? { actor, label, artifactKind: artifact.kind }
       : { actor, label, artifactKind: artifact.kind, optional: true };
@@ -606,6 +608,10 @@ export function validateArtifactForm(content: string, prompts: string[]): string
   return errors;
 }
 
+function lowercaseFirst(value: string): string {
+  return value.charAt(0).toLowerCase() + value.slice(1);
+}
+
 function formatArtifactStatus(artifact: ArtifactState): string {
   const owner = artifact.actor === "ai" ? "AI" : artifact.actor === "human" ? "you" : "you/AI";
   return `${artifact.present ? "✓" : "○"} ${artifact.title} [${owner}]`;

package/src/index.ts

@@ -1,5 +1,7 @@
 import { execFile } from "node:child_process";
-import { readFile } from "node:fs/promises";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import type {
   ExtensionAPI,
@@ -32,6 +34,7 @@ import {
 import { showReferenceViewer } from "./reference-viewer.js";
 import {
   collectReviewSnapshot,
+  detectEditor,
   extractFindingIds,
   extractReviewFingerprint,
   openInConfiguredEditor,
@@ -702,7 +705,7 @@ async function openAheadMode(
         });
       } else if (missingRequired.length === 0) {
         actions.push({
-          label: `Continue without optional AI contribution · Accept ${state.gate.title}`,
+          label: `Continue without optional AI contribution · ${state.gate.title}`,
           run: async () => acceptAndContinue(ctx),
         });
       }
@@ -752,8 +755,12 @@ async function openAheadMode(
       });
     }
 
+    // The generic challenger appears only when the next move is the human's.
+    // When the primary action is already an AI contribution, the formal AI
+    // artifact owns that job and a second "challenge me" entry is noise.
     if (
       state.allowed_ai_capabilities.length > 0 &&
+      action.actor !== "ai" &&
       state.artifacts.some(
         (artifact) => artifact.present && artifact.recorded_by?.kind === "human" && artifact.path,
       )
@@ -1363,7 +1370,7 @@ async function openReviewWorkbench(pi: ExtensionAPI, ctx: ExtensionCommandContex
     const path = await ctx.ui.select("Open changed file", snapshot.changed_files);
     if (path && !openInConfiguredEditor(store.projectRoot, { path })) {
       ctx.ui.notify(
-        `No supported editor was detected. Open ${path} from the repository, or set AHEAD_EDITOR=vscode.`,
+        `No supported editor was detected. Open ${path} from the repository, or set AHEAD_EDITOR=vscode or AHEAD_EDITOR=zed.`,
         "info",
       );
     }
@@ -1651,7 +1658,8 @@ async function recordHumanArtifact(
     // "failed" (timeout, unparseable output, transient error) stays silent:
     // the plain template is the fallback and needs no apology.
   }
-  let content = await ctx.ui.editor(
+  let content = await editHumanArtifact(
+    ctx,
     `AHEAD mode · ${artifact.title} · write in your own words`,
     template,
   );
@@ -1680,7 +1688,8 @@ async function recordHumanArtifact(
         ctx.ui.notify("Draft discarded. Nothing was saved.", "info");
         return;
       }
-      const revised = await ctx.ui.editor(
+      const revised = await editHumanArtifact(
+        ctx,
         `AHEAD mode · ${artifact.title} · finish the required fields`,
         content,
       );
@@ -1722,6 +1731,29 @@ async function recordHumanArtifact(
   );
 }
 
+async function editHumanArtifact(
+  ctx: ExtensionCommandContext,
+  title: string,
+  content: string,
+): Promise<string | undefined> {
+  if (!detectEditor()) {
+    return ctx.ui.editor(title, content);
+  }
+
+  const temporaryRoot = await mkdtemp(join(tmpdir(), "ahead-artifact-"));
+  const temporaryPath = join(temporaryRoot, "artifact.md");
+  try {
+    await writeFile(temporaryPath, content, "utf8");
+    if (openInConfiguredEditor(temporaryRoot, { path: "artifact.md" }, { wait: true })) {
+      return await readFile(temporaryPath, "utf8");
+    }
+    ctx.ui.notify("The configured editor could not be opened; using Pi's editor instead.", "info");
+    return await ctx.ui.editor(title, content);
+  } finally {
+    await rm(temporaryRoot, { recursive: true, force: true });
+  }
+}
+
 async function humanArtifactTemplate(
   store: RunStore,
   state: RunState,

package/src/review.ts

@@ -13,6 +13,8 @@ export interface SourceLocation {
   column?: number;
 }
 
+export type EditorKind = "vscode" | "zed";
+
 export interface ReviewSnapshot {
   api_version: "ahead.review-snapshot/v0.1";
   base_ref: string;
@@ -242,16 +244,23 @@ export function validateReviewDisposition(
   return errors;
 }
 
-export function openInConfiguredEditor(root: string, location: SourceLocation): boolean {
-  const command = configuredEditorCommand();
-  if (!command) {
+export function openInConfiguredEditor(
+  root: string,
+  location: SourceLocation,
+  options: { wait?: boolean } = {},
+): boolean {
+  const editor = detectEditor();
+  if (!editor) {
     return false;
   }
   const absolute = safeRepositoryPath(root, location.path);
   const line = location.line ?? 1;
   const column = location.column ?? 1;
   const target = `${absolute}:${line}:${column}`;
-  const result = spawnSync(command, ["--goto", target], { stdio: "ignore" });
+  const command = editor === "zed" ? "zed" : "code";
+  const wait = options.wait ? ["--wait"] : [];
+  const args = editor === "zed" ? [...wait, target] : [...wait, "--goto", target];
+  const result = spawnSync(command, args, { stdio: "ignore" });
   return !result.error && result.status === 0;
 }
 
@@ -280,16 +289,22 @@ function resolveReviewBase(root: string): string {
   return "HEAD";
 }
 
-function configuredEditorCommand(): string | undefined {
+export function detectEditor(): EditorKind | undefined {
   const explicit = process.env.AHEAD_EDITOR?.trim();
   if (explicit === "vscode" || explicit === "code") {
-    return "code";
+    return "vscode";
+  }
+  if (explicit === "zed") {
+    return "zed";
   }
   if (explicit === "none") {
     return undefined;
   }
+  if (process.env.ZED === "1" || process.env.TERM_PROGRAM === "zed") {
+    return "zed";
+  }
   return process.env.VSCODE_IPC_HOOK_CLI || process.env.TERM_PROGRAM === "vscode"
-    ? "code"
+    ? "vscode"
     : undefined;
 }