@jwilger/pi-development-system 0.57.0 → 0.58.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwilger/pi-development-system",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "description": "A pi extension package representing a seasoned approach to software development using a full AI SDLC.",
   "keywords": [
     "pi-package"

package/src/planning/task-record.ts

@@ -32,7 +32,8 @@ const STEP = /^\s*(?:\d+[.)]|[-*])\s+(.*)$/;
 const STEPS_MIN = 3;
 const STEPS_MAX = 7;
 /** Words that stand in for a command or an observable result. */
-const PLACEHOLDER = /^(?:n\/?a|none|todo|tbc|-|…|\.\.\.|works?|it works|passes|ok)\.?$/i;
+const PLACEHOLDER =
+  /^(?:(?:todo|tbd|tbc)\b.*|n\/?a|none|-|…|\.\.\.|works?|it works|passes|ok)\.?$/i;
 
 const isSection = (name: string): name is Section => SECTIONS.some((s) => s === name);
 
@@ -85,7 +86,7 @@ const stepsOf = (text: string): string[] =>
 
 function concrete(name: "Run" | "Expected", text: string): string | undefined {
   const bare = stripTicks(text);
-  if (PLACEHOLDER.test(bare))
+  if (bare === "" || PLACEHOLDER.test(bare))
     return `${name} must be a concrete ${name === "Run" ? "command" : "observable result"}, not "${bare}"`;
   if (name === "Expected" && bare.split(/\s+/).length < 2) {
     return "Expected must say what is observed (at least two words, e.g. a count, output or exit status)";
@@ -142,7 +143,7 @@ function locate(markdown: string, id: string | undefined): Located | ParseError
 
 /** Parses one task record (the only one in the file, or the one named by `id`), reporting every problem together. */
 export function parseTaskRecord(markdown: string, id?: string): TaskRecord | ParseError {
-  const found = locate(markdown, id);
+  const found = locate(markdown.replace(/\r\n?/g, "\n"), id);
   if (isParseError(found)) return found;
   const split = splitSections(found.lines);
   const problems = problemsOf(found.lines.join("\n"), split);

package/src/tracker/github.ts

@@ -135,13 +135,14 @@ const createIssue = async (gh: Gh, input: NewWorkItem): Promise<TrackerResult<Wo
 const labelFlags = (current: WorkItem, patch: WorkItemPatch): string[] => {
   const wanted = patch.labels ?? current.labels;
   const marked = (patch.status ?? current.status) === "in-progress";
+  const hadMarker = current.status === "in-progress";
   const add = [
     ...wanted.filter((l) => !current.labels.includes(l)),
-    ...(marked ? [IN_PROGRESS] : []),
+    ...(marked && !hadMarker ? [IN_PROGRESS] : []),
   ];
   const remove = [
     ...current.labels.filter((l) => !wanted.includes(l)),
-    ...(marked ? [] : [IN_PROGRESS]),
+    ...(!marked && hadMarker ? [IN_PROGRESS] : []),
   ];
   return [
     ...add.flatMap((l) => ["--add-label", l]),
@@ -175,8 +176,9 @@ const updateIssue = async (
   const current = await view(gh, id);
   if (!current.ok) return current;
   if (patch.status === "in-progress") {
-    const made = await gh(["label", "create", IN_PROGRESS, "--force"]);
-    if (!made.ok) return made;
+    // No --force: that would recolour the team's existing label. "Already exists" is success.
+    const made = await gh(["label", "create", IN_PROGRESS]);
+    if (!(made.ok || /already exists/i.test(made.error.message))) return made;
   }
   const flags = editFlags(current.value, patch);
   if (flags.length > 0) {

package/src/tracker/repo-files.ts

@@ -46,7 +46,9 @@ const readItem = async (root: string, id: string): Promise<TrackerResult<WorkIte
 const itemIds = async (root: string): Promise<string[]> => {
   try {
     const files = await readdir(itemsDir(root));
-    return files.flatMap((f) => (f.endsWith(".md") ? [f.slice(0, -3)] : []));
+    return files.flatMap((f) =>
+      f.endsWith(".md") && ID.test(f.slice(0, -3)) ? [f.slice(0, -3)] : [],
+    );
   } catch (cause) {
     if (isMissing(cause)) return [];
     throw cause;
@@ -66,11 +68,14 @@ const readAll = async (root: string): Promise<TrackerResult<WorkItem[]>> => {
 const save = async (root: string, item: WorkItem): Promise<TrackerResult<WorkItem>> => {
   const problem = unwritable(item);
   if (problem !== undefined) return trackerError(problem);
+  const others = await readAll(root);
+  if (!others.ok) return others;
   await mkdir(itemsDir(root), { recursive: true });
   await writeFile(fileOf(root, item.id), renderItem(item));
-  const items = await readAll(root);
-  if (!items.ok) return items;
-  await writeFile(join(root, "work", "backlog.md"), renderBacklog(items.value));
+  const items = [...others.value.filter((i) => i.id !== item.id), item].toSorted((a, b) =>
+    byCodeUnit(a.id, b.id),
+  );
+  await writeFile(join(root, "work", "backlog.md"), renderBacklog(items));
   return ok(item);
 };