@abdullahsahmad/work-kit 0.1.3 → 0.1.5

package/cli/src/observer/data.ts

@@ -15,9 +15,12 @@ export interface WorkItemView {
   status: string;
   currentPhase: string | null;
   currentSubStage: string | null;
+  currentPhaseStartedAt?: string;
+  currentSubStageIndex?: number;
+  currentPhaseTotal?: number;
   startedAt: string;
   progress: { completed: number; total: number; percent: number };
-  phases: { name: string; status: string }[];
+  phases: { name: string; status: string; startedAt?: string; completedAt?: string }[];
   loopbacks: { count: number; lastReason?: string; lastFrom?: string; lastTo?: string };
 }
 
@@ -81,12 +84,17 @@ export function collectWorkItem(worktreeRoot: string): WorkItemView | null {
   // Compute progress
   let completed = 0;
   let total = 0;
-  const phaseViews: { name: string; status: string }[] = [];
+  const phaseViews: { name: string; status: string; startedAt?: string; completedAt?: string }[] = [];
 
   const phaseList: PhaseName[] = state.mode === "auto-kit" && state.workflow
     ? getAutoKitPhases(state)
     : [...PHASE_NAMES];
 
+  // Track current phase substage position
+  let currentPhaseStartedAt: string | undefined;
+  let currentSubStageIndex: number | undefined;
+  let currentPhaseTotal: number | undefined;
+
   for (const phaseName of phaseList) {
     const phase = state.phases[phaseName];
     if (!phase) {
@@ -97,7 +105,12 @@ export function collectWorkItem(worktreeRoot: string): WorkItemView | null {
       continue;
     }
 
-    phaseViews.push({ name: phaseName, status: phase.status });
+    phaseViews.push({
+      name: phaseName,
+      status: phase.status,
+      startedAt: phase.startedAt,
+      completedAt: phase.completedAt,
+    });
 
     const subStageKeys = Object.keys(phase.subStages);
     if (subStageKeys.length === 0) {
@@ -107,15 +120,25 @@ export function collectWorkItem(worktreeRoot: string): WorkItemView | null {
       total += defaults.length;
       if (phase.status === "completed") completed += defaults.length;
     } else {
-      for (const key of subStageKeys) {
+      let phaseIdx = 0;
+      const activeKeys = subStageKeys.filter(k => phase.subStages[k].status !== "skipped");
+      for (const key of activeKeys) {
         const sub = phase.subStages[key];
-        // Skip excluded substages — they shouldn't affect progress
-        if (sub.status === "skipped") continue;
         total++;
+        phaseIdx++;
         if (sub.status === "completed") {
           completed++;
         }
       }
+      // Track position within current phase
+      if (phaseName === state.currentPhase) {
+        currentPhaseStartedAt = phase.startedAt;
+        currentPhaseTotal = activeKeys.length;
+        const idx = state.currentSubStage
+          ? activeKeys.indexOf(state.currentSubStage)
+          : -1;
+        currentSubStageIndex = idx >= 0 ? idx + 1 : undefined;
+      }
     }
   }
 
@@ -142,6 +165,9 @@ export function collectWorkItem(worktreeRoot: string): WorkItemView | null {
     status: state.status,
     currentPhase: state.currentPhase,
     currentSubStage: state.currentSubStage,
+    currentPhaseStartedAt,
+    currentSubStageIndex,
+    currentPhaseTotal,
     startedAt: state.started,
     progress: { completed, total, percent },
     phases: phaseViews,
@@ -173,35 +199,19 @@ export function collectCompletedItems(mainRepoRoot: string): CompletedItemView[]
   }
 
   const items: CompletedItemView[] = [];
-  // Parse markdown table or list entries
-  // Expected format: | slug | PR | date | phases |
-  // or list format: - slug (#PR) - date - phases
+  // Format: | Date | Slug | PR | Status | Phases |
   const lines = content.split("\n");
   for (const line of lines) {
-    // Try table format: | slug | #PR | date | phases |
-    const tableMatch = line.match(/^\|\s*(.+?)\s*\|\s*(#?\d+)?\s*\|\s*(.+?)\s*\|\s*(.+?)\s*\|/);
-    if (tableMatch) {
-      const slug = tableMatch[1].trim();
-      if (slug === "Slug" || slug === "---" || slug.startsWith("-")) continue; // skip header
-      items.push({
-        slug,
-        pr: tableMatch[2]?.trim() || undefined,
-        completedAt: tableMatch[3].trim(),
-        phases: tableMatch[4].trim(),
-      });
-      continue;
-    }
-
-    // Try list format: - **slug** (#38) completed 2d ago — plan→review
-    const listMatch = line.match(/^[-*]\s+\*?\*?(.+?)\*?\*?\s+\(?(#\d+)?\)?\s*[-—]?\s*(.+?)?\s*[-—]\s*(.+)$/);
-    if (listMatch) {
-      items.push({
-        slug: listMatch[1].trim(),
-        pr: listMatch[2]?.trim() || undefined,
-        completedAt: listMatch[3]?.trim() || "",
-        phases: listMatch[4]?.trim() || "",
-      });
-    }
+    const match = line.match(/^\|\s*(.+?)\s*\|\s*(.+?)\s*\|\s*(.+?)\s*\|\s*(.+?)\s*\|\s*(.+?)\s*\|/);
+    if (!match) continue;
+    const col1 = match[1].trim();
+    if (col1 === "Date" || col1.startsWith("-")) continue;
+    items.push({
+      slug: match[2].trim(),
+      pr: match[3].trim() !== "n/a" ? match[3].trim() : undefined,
+      completedAt: col1,
+      phases: match[5].trim(),
+    });
   }
 
   return items;

package/cli/src/observer/renderer.ts

@@ -113,9 +113,15 @@ function statusDot(status: string): string {
 
 // ── Render Work Item ────────────────────────────────────────────────
 
+function formatMode(mode: string, classification?: string): string {
+  const label = mode === "full-kit" ? "Full Kit" : "Auto Kit";
+  return classification ? `${label} · ${classification}` : label;
+}
+
 function renderWorkItem(item: WorkItemView, innerWidth: number): string[] {
   const lines: string[] = [];
 
+  // Line 1: slug + branch (right-aligned)
   const slugText = `${statusDot(item.status)} ${bold(item.slug)}`;
   const branchText = dim(item.branch);
   const slugPlainLen = stripAnsi(slugText).length;
@@ -123,18 +129,31 @@ function renderWorkItem(item: WorkItemView, innerWidth: number): string[] {
   const gap1 = Math.max(2, innerWidth - slugPlainLen - branchPlainLen);
   lines.push(slugText + " ".repeat(gap1) + branchText);
 
-  const modeText = item.mode + (item.classification ? ` (${item.classification})` : "");
+  // Line 2: mode + timing (right-aligned)
+  const modeText = formatMode(item.mode, item.classification);
   const pausedBadge = item.status === "paused" ? "  " + bgYellow(" PAUSED ") : "";
-  const startedText = dim(`Started: ${formatTimeAgo(item.startedAt)}`);
+  const elapsed = formatTimeAgo(item.startedAt);
+  let timingRight = `Elapsed: ${elapsed}`;
+  if (item.currentPhaseStartedAt) {
+    timingRight += `  Phase: ${formatTimeAgo(item.currentPhaseStartedAt)}`;
+  }
+  const timingText = dim(timingRight);
   const modeStr = `  ${modeText}${pausedBadge}`;
   const modePlainLen = stripAnsi(modeStr).length;
-  const startedPlainLen = stripAnsi(startedText).length;
-  const gap2 = Math.max(2, innerWidth - modePlainLen - startedPlainLen);
-  lines.push(modeStr + " ".repeat(gap2) + startedText);
-
-  const phaseLabel = item.currentPhase
-    ? (item.currentSubStage ? `${item.currentPhase}/${item.currentSubStage}` : item.currentPhase)
-    : "—";
+  const timingPlainLen = stripAnsi(timingText).length;
+  const gap2 = Math.max(2, innerWidth - modePlainLen - timingPlainLen);
+  lines.push(modeStr + " ".repeat(gap2) + timingText);
+
+  // Line 3: progress bar with phase label + substage position
+  let phaseLabel = "—";
+  if (item.currentPhase) {
+    phaseLabel = item.currentSubStage
+      ? `${item.currentPhase}/${item.currentSubStage}`
+      : item.currentPhase;
+    if (item.currentSubStageIndex != null && item.currentPhaseTotal != null) {
+      phaseLabel += ` (${item.currentSubStageIndex}/${item.currentPhaseTotal})`;
+    }
+  }
   const barMaxWidth = Math.max(20, Math.min(40, innerWidth - 30));
   lines.push("  " + renderProgressBar(
     item.progress.completed,
@@ -144,9 +163,11 @@ function renderWorkItem(item: WorkItemView, innerWidth: number): string[] {
     barMaxWidth
   ));
 
+  // Line 4: phase indicators
   const phaseStrs = item.phases.map(p => `${p.name} ${phaseIndicator(p.status)}`);
   lines.push("  " + phaseStrs.join("  "));
 
+  // Line 5 (optional): loopbacks
   if (item.loopbacks.count > 0) {
     const lb = item.loopbacks;
     let loopStr = `  ${cyan("⟳")} ${lb.count} loopback${lb.count > 1 ? "s" : ""}`;
@@ -164,14 +185,29 @@ function renderWorkItem(item: WorkItemView, innerWidth: number): string[] {
 
 // ── Render Completed Item ───────────────────────────────────────────
 
-function renderCompletedItem(item: CompletedItemView, innerWidth: number): string {
+interface CompletedColumnWidths {
+  slug: number;
+  pr: number;
+  date: number;
+}
+
+function computeCompletedWidths(items: CompletedItemView[]): CompletedColumnWidths {
+  let slug = 4, pr = 2, date = 4; // minimums
+  for (const item of items) {
+    slug = Math.max(slug, item.slug.length);
+    pr = Math.max(pr, (item.pr || "—").length);
+    date = Math.max(date, (item.completedAt || "").length);
+  }
+  return { slug, pr, date };
+}
+
+function renderCompletedItem(item: CompletedItemView, cols: CompletedColumnWidths): string {
   const check = green("✓");
-  const slug = item.slug;
-  const pr = item.pr ? `  ${dim(item.pr)}` : "";
-  const date = item.completedAt ? `  ${dim(item.completedAt)}` : "";
-  const phases = item.phases ? `  ${dim(item.phases)}` : "";
-  const content = `${check} ${slug}${pr}${date}${phases}`;
-  return content;
+  const slug = padRight(item.slug, cols.slug);
+  const pr = padRight(dim(item.pr || "—"), cols.pr);
+  const date = padRight(dim(item.completedAt || ""), cols.date);
+  const phases = item.phases ? dim(item.phases) : "";
+  return `${check} ${slug}  ${pr}  ${date}  ${phases}`;
 }
 
 // ── Main Render Function ────────────────────────────────────────────
@@ -243,8 +279,9 @@ export function renderDashboard(
 
       const maxCompleted = 5;
       const displayed = data.completedItems.slice(0, maxCompleted);
+      const cols = computeCompletedWidths(displayed);
       for (const item of displayed) {
-        const content = renderCompletedItem(item, innerWidth);
+        const content = renderCompletedItem(item, cols);
         allLines.push(boxLine("  " + content, innerWidth));
       }
       if (data.completedItems.length > maxCompleted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abdullahsahmad/work-kit",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Structured development workflow for Claude Code. Two modes, 6 phases, 27 sub-stages.",
   "type": "module",
   "bin": {

package/skills/auto-kit/SKILL.md

@@ -79,7 +79,7 @@ Based on the classification, select sub-stages. Use this table as a starting poi
 | **Review: Performance**| skip    | skip         | YES      | skip    | YES           |
 | **Review: Compliance** | skip    | skip         | skip     | YES     | YES           |
 | **Review: Handoff**    | YES     | YES          | YES      | YES     | YES           |
-| **Deploy**             | optional| optional     | optional | optional| optional      |
+| **Deploy: Merge**      | YES     | YES          | YES      | YES     | YES           |
 | **Wrap-up**            | YES     | YES          | YES      | YES     | YES           |
 
 The table is a guide, not a rigid rule. Adjust based on the actual request:
@@ -87,6 +87,8 @@ The table is a guide, not a rigid rule. Adjust based on the actual request:
 - A refactor that changes DB queries → add Migration, Performance review
 - A small-change that affects public API → add Investigate, Blueprint
 
+**Deploy and Wrap-up are MANDATORY and cannot be removed from any workflow.** Deploy handles syncing with the default branch, creating a PR, and merging it — fully autonomous, no user confirmation needed. Wrap-up archives the work history so past work is discoverable in future sessions. Always spawn real agents for both — never just mark them complete.
+
 ### Step 3: Initialize
 
 1. Create a git worktree and initialize state with the CLI:

package/skills/deploy/stages/merge.md

@@ -54,4 +54,6 @@ description: "Deploy sub-stage: Get the PR merged safely."
 - NEVER merge with failing CI
 - If CI fails, diagnose the issue — don't just retry
 - If rebase conflicts are non-trivial, explain them to the user before resolving
-- Merge is automatic — do NOT ask the user for permission (review phase already approved it)
+- Merge is fully autonomous — do NOT ask the user for permission at any step (review phase already approved it)
+- Push, create PR, and merge without stopping for confirmation
+- The entire sync → push → PR → merge flow should complete in one agent pass

package/skills/full-kit/SKILL.md

@@ -28,7 +28,7 @@ Do not proceed until `doctor` reports all checks passed.
 2. **Build** (8 steps) — Setup → Migration → Red → Core → UI → Refactor → Integration → Commit
 3. **Test** (3 steps) — Verify → E2E → Validate
 4. **Review** (5 steps) — Self-Review → Security → Performance → Compliance → Handoff
-5. **Deploy** (3 steps, optional) — Merge → Monitor → Remediate
+5. **Deploy** (3 steps) — Merge → Monitor → Remediate
 6. **Wrap-up** — Synthesize work-kit summary, clean up worktree
 
 ## Starting New Work (`/full-kit <description>`)
@@ -186,6 +186,8 @@ When all phases are done (or deploy is skipped):
 
 Run **Wrap-up** — read `.claude/skills/wrap-up.md` and follow its instructions. It handles writing the work-kit summary, committing it, and cleaning up the worktree.
 
+**Deploy and Wrap-up are MANDATORY.** Deploy handles syncing, PR creation, and merging — fully autonomous, no user confirmation needed. Wrap-up archives the work history so past work is discoverable in future sessions. Always spawn real agents for both — never just mark them complete or skip them.
+
 ## Important
 
 - **Always work inside the worktree directory** — `cd worktrees/<slug>` before running any commands

package/skills/wrap-up/SKILL.md

@@ -73,10 +73,9 @@ After writing the summary:
    git add .claude/work-kit/
    git commit -m "work-kit: <slug>"
    ```
-3. Ask the user: "Remove the worktree `worktrees/<slug>` and delete branch `feature/<slug>`?"
-4. If yes:
+3. Remove the worktree and delete the feature branch (merge already happened, cleanup is safe):
    ```bash
-   git worktree remove worktrees/<slug>
-   git branch -d feature/<slug>
+   git worktree remove worktrees/<slug> --force
+   git branch -d feature/<slug> 2>/dev/null || true
    ```
-5. Report: summary written, worktree removed, branch deleted, done.
+4. Report: summary written, worktree removed, branch deleted, done.