pi-long-task 0.1.0 → 0.1.1

package/README.md

@@ -24,7 +24,7 @@ A finished run gives you:
 
 ## Install
 
-After this package is published to npm, install it with:
+Install it from npm with:
 
 ```bash
 pi install npm:pi-long-task

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-long-task",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "Pi extension for breaking down and running long coding tasks safely.",
   "keywords": [

package/src/git.ts

@@ -3,10 +3,16 @@ import { realpathSync } from "node:fs";
 import { promisify } from "node:util";
 import path from "node:path";
 
-import { taskLabel, type SessionOutcome } from "./worker_session.ts";
+import type { SessionOutcome } from "./worker_session.ts";
 
 const execFileAsync = promisify(execFile);
 
+const GENERATED_TODO_COMMIT_PREFIX_RE = /^(?:Complete|Progress)\s+TODO\s+\d+(?:\s+[—-]\s*)?/i;
+const TODO_LABEL_PREFIX_RE = /^TODO\s+\d+(?:\s+[—-]\s*)?/i;
+const CONVENTIONAL_SUBJECT_RE = /^([a-z][a-z0-9-]*)(\([^)]*\))?(!)?:\s+(.+)$/;
+const DEFAULT_COMMIT_SUBJECT = "Update project files";
+const RECENT_COMMIT_SUBJECT_LIMIT = 20;
+
 export interface GitRunResult {
   stdout: string;
   stderr: string;
@@ -104,8 +110,7 @@ export async function commitAfterSession(options: CommitAfterSessionOptions): Pr
     return { error: "not inside a git repository" };
   }
 
-  const messagePrefix = options.outcome.done ? "Complete" : "Progress";
-  const commitMessage = `${messagePrefix} ${taskLabel(options.outcome.task)}`;
+  const commitMessage = await commitMessageForOutcome(root, options.outcome);
 
   try {
     const add = await runGit(root, ["add", "-A"]);
@@ -154,6 +159,95 @@ export async function commitAfterSession(options: CommitAfterSessionOptions): Pr
   }
 }
 
+async function commitMessageForOutcome(
+  root: string,
+  outcome: Pick<SessionOutcome, "task" | "reportedStatus" | "done" | "error" | "timedOut" | "aborted">,
+): Promise<string> {
+  const subject = normalizedTaskSubject(outcome.task.title);
+  const recentSubjects = await recentCommitSubjects(root);
+  return formatSubjectLikeRecentCommits(subject, recentSubjects);
+}
+
+async function recentCommitSubjects(root: string): Promise<string[]> {
+  const result = await runGit(root, ["log", `-${RECENT_COMMIT_SUBJECT_LIMIT}`, "--format=%s"]);
+  if (result.code !== 0) {
+    return [];
+  }
+
+  return result.stdout
+    .split(/\r?\n/g)
+    .map((subject) => subject.trim())
+    .filter(Boolean)
+    .filter((subject) => !GENERATED_TODO_COMMIT_PREFIX_RE.test(subject))
+    .filter((subject) => !/^Merge\b/.test(subject) && !/^Revert\b/.test(subject));
+}
+
+function formatSubjectLikeRecentCommits(subject: string, recentSubjects: readonly string[]): string {
+  const sample = recentSubjects[0];
+  if (!sample) {
+    return ensureSafeCommitSubject(subject);
+  }
+
+  const conventional = CONVENTIONAL_SUBJECT_RE.exec(sample);
+  if (conventional) {
+    const prefix = `${conventional[1]}${conventional[2] ?? ""}${conventional[3] ?? ""}: `;
+    return ensureSafeCommitSubject(`${prefix}${formatSubjectBody(subject, conventional[4])}`);
+  }
+
+  return ensureSafeCommitSubject(formatSubjectBody(subject, sample));
+}
+
+function formatSubjectBody(subject: string, sampleBody: string): string {
+  let formatted = normalizedTaskSubject(subject);
+  const sampleFirstLetter = sampleBody.match(/[A-Za-z]/)?.[0];
+  if (sampleFirstLetter && sampleFirstLetter === sampleFirstLetter.toLowerCase()) {
+    formatted = lowercaseFirstLetter(formatted);
+  } else if (sampleFirstLetter && sampleFirstLetter === sampleFirstLetter.toUpperCase()) {
+    formatted = uppercaseFirstLetter(formatted);
+  }
+
+  formatted = formatted.replace(/[.!?]+$/g, "");
+  if (/\.$/.test(sampleBody.trim())) {
+    formatted = `${formatted}.`;
+  }
+  return formatted;
+}
+
+function normalizedTaskSubject(title: string): string {
+  const normalized = stripGeneratedTodoPrefix(title)
+    .replace(/\s+/g, " ")
+    .replace(/[.!?]+$/g, "")
+    .trim();
+  return normalized || DEFAULT_COMMIT_SUBJECT;
+}
+
+function ensureSafeCommitSubject(subject: string): string {
+  const normalized = stripGeneratedTodoPrefix(subject).replace(/\s+/g, " ").trim();
+  return normalized || DEFAULT_COMMIT_SUBJECT;
+}
+
+function stripGeneratedTodoPrefix(subject: string): string {
+  let cleaned = subject.trim();
+  let previous = "";
+  while (cleaned && cleaned !== previous) {
+    previous = cleaned;
+    cleaned = cleaned
+      .replace(GENERATED_TODO_COMMIT_PREFIX_RE, "")
+      .replace(TODO_LABEL_PREFIX_RE, "")
+      .replace(/^[:\s—-]+/g, "")
+      .trim();
+  }
+  return cleaned;
+}
+
+function lowercaseFirstLetter(value: string): string {
+  return value.replace(/[A-Za-z]/, (letter) => letter.toLowerCase());
+}
+
+function uppercaseFirstLetter(value: string): string {
+  return value.replace(/[A-Za-z]/, (letter) => letter.toUpperCase());
+}
+
 async function stagedArtifactPaths(root: string, runDir?: string): Promise<Set<string>> {
   const artifacts = new Set<string>();
   const runDirRel = runDir ? relToRoot(runDir, root) : "";