Handle hyphenated project prefix stripping

Author: acartine

src/components/__tests__/terminal-panel-id.test.ts

@@ -7,6 +7,10 @@ describe("splitTerminalTabBeatId", () => {
       prefix: "foolery",
       localId: "da96",
     });
+    expect(splitTerminalTabBeatId("feature-builder-da96")).toEqual({
+      prefix: "feature-builder",
+      localId: "da96",
+    });
   });
 
   it("returns the raw id as localId when no valid prefix is present", () => {

src/components/agent-history-utils.tsx

@@ -129,7 +129,7 @@ export function workflowStateBadgeLabel(
 export function stripIdPrefix(
   id: string,
 ): string {
-  const idx = id.indexOf("-");
+  const idx = id.lastIndexOf("-");
   return idx > 0 ? id.slice(idx + 1) : id;
 }
 

src/lib/__tests__/beat-display.test.ts

@@ -15,11 +15,14 @@ describe("beat-display", () => {
     expect(displayBeatLabel("foolery-df3a")).toBe("df3a");
     expect(displayBeatLabel("foolery-df3a", [])).toBe("df3a");
     expect(stripBeatPrefix("foolery-df3a")).toBe("df3a");
+    expect(displayBeatLabel("feature-builder-df3a")).toBe("df3a");
+    expect(stripBeatPrefix("feature-builder-df3a")).toBe("df3a");
   });
 
   it("strips project prefixes from hierarchical aliases", () => {
     expect(displayBeatLabel("knots-562b.1", ["knots-562b.1"])).toBe("562b.1");
     expect(stripHierarchicalPrefix("proj-a.b.c")).toBe("a.b.c");
+    expect(stripHierarchicalPrefix("feature-builder-a.b.c")).toBe("a.b.c");
   });
 
   it("keeps human-friendly aliases unchanged", () => {

src/lib/__tests__/beat-navigation.test.ts

@@ -12,6 +12,10 @@ describe("stripBeatPrefix", () => {
     expect(stripBeatPrefix("foolery-xmvb")).toBe("xmvb");
   });
 
+  it("uses the last hyphen for multi-hyphen project names", () => {
+    expect(stripBeatPrefix("feature-builder-abc")).toBe("abc");
+  });
+
   it("returns original value when no hyphen exists", () => {
     expect(stripBeatPrefix("xmvb")).toBe("xmvb");
   });

src/lib/beat-display.ts

@@ -1,5 +1,6 @@
 export function stripBeatPrefix(beatId: string): string {
-  return beatId.replace(/^[^-]+-/, "");
+  const pivot = beatId.lastIndexOf("-");
+  return pivot > 0 ? beatId.slice(pivot + 1) : beatId;
 }
 
 export function stripHierarchicalPrefix(alias: string): string {

src/lib/beat-navigation.ts

@@ -1,8 +1,7 @@
-const BEAT_PREFIX_PATTERN = /^[^-]+-/;
-
 /** Render beat IDs without repo prefix (e.g. "foolery-xmvb" -> "xmvb"). */
 export function stripBeatPrefix(beatId: string): string {
-  return beatId.replace(BEAT_PREFIX_PATTERN, "");
+  const pivot = beatId.lastIndexOf("-");
+  return pivot > 0 ? beatId.slice(pivot + 1) : beatId;
 }
 
 /** Extract the repo-name prefix from a beat ID (e.g. "my-project-xmvb" -> "my-project"). */

src/lib/terminal-tab-id.ts

@@ -4,7 +4,7 @@ export interface TerminalTabBeatIdParts {
 }
 
 export function splitTerminalTabBeatId(id: string): TerminalTabBeatIdParts {
-  const separatorIndex = id.indexOf("-");
+  const separatorIndex = id.lastIndexOf("-");
   if (separatorIndex <= 0 || separatorIndex >= id.length - 1) {
     return { prefix: null, localId: id };
   }