@jakkrichm/create-nexus-devflow 2.8.0 → 2.9.3

package/dist/lib/skill-manager.js

@@ -0,0 +1,510 @@
+import { execFile } from "node:child_process";
+import fs from "node:fs/promises";
+import fsSync from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { promisify } from "node:util";
+import { loadCoreSkillInventory } from "./core-skill-inventory.js";
+const execFileAsync = promisify(execFile);
+const SKILL_NAME_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+const MANIFEST_PATH = path.join(".nexus", "nexus-devflow.json");
+const AGENT_MANIFEST_PATH = "agent-bundle.manifest.json";
+export function parseSkillFrontmatter(content) {
+    if (!content.startsWith("---"))
+        return {};
+    const parts = content.split("---");
+    if (parts.length < 3)
+        return {};
+    const lines = parts[1].split("\n");
+    let name;
+    let description;
+    let version;
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (trimmed.startsWith("name:")) {
+            name = trimmed.replace("name:", "").trim().replace(/^["']|["']$/g, "");
+        }
+        else if (trimmed.startsWith("description:")) {
+            description = trimmed.replace("description:", "").trim().replace(/^["']|["']$/g, "");
+        }
+        else if (trimmed.startsWith("version:")) {
+            version = trimmed.replace("version:", "").trim().replace(/^["']|["']$/g, "");
+        }
+    }
+    // Also check metadata: version block
+    const metaMatch = parts[1].match(/version:\s*["']?([^"'\r\n]+)["']?/);
+    if (!version && metaMatch) {
+        version = metaMatch[1].trim();
+    }
+    return { name, description, version };
+}
+export async function readDevflowManifest(projectRoot) {
+    const fullPath = path.join(projectRoot, MANIFEST_PATH);
+    try {
+        const raw = await fs.readFile(fullPath, "utf8");
+        return JSON.parse(raw);
+    }
+    catch (err) {
+        if (err.code === "ENOENT") {
+            return null;
+        }
+        throw err;
+    }
+}
+export async function writeDevflowManifest(projectRoot, manifest) {
+    const fullPath = path.join(projectRoot, MANIFEST_PATH);
+    await fs.mkdir(path.dirname(fullPath), { recursive: true });
+    await fs.writeFile(fullPath, `${JSON.stringify(manifest, null, 2)}\n`, "utf8");
+}
+export async function listInstalledSkills(projectRoot) {
+    let coreNameSet = new Set();
+    try {
+        const inventory = await loadCoreSkillInventory(path.join(projectRoot, AGENT_MANIFEST_PATH));
+        coreNameSet = inventory.nameSet;
+    }
+    catch {
+        // fallback if manifest not found
+    }
+    const manifest = await readDevflowManifest(projectRoot);
+    const recordedThirdParty = Array.isArray(manifest?.thirdPartySkills)
+        ? manifest.thirdPartySkills
+        : [];
+    const thirdPartyMap = new Map();
+    for (const record of recordedThirdParty) {
+        if (record?.name) {
+            thirdPartyMap.set(record.name, record);
+        }
+    }
+    const agentsDir = path.join(projectRoot, ".agents", "skills");
+    const claudeDir = path.join(projectRoot, ".claude", "skills");
+    const agentsSkills = new Set();
+    const claudeSkills = new Set();
+    try {
+        const entries = await fs.readdir(agentsDir, { withFileTypes: true });
+        for (const e of entries) {
+            if (e.isDirectory())
+                agentsSkills.add(e.name);
+        }
+    }
+    catch {
+        // ignore missing dir
+    }
+    try {
+        const entries = await fs.readdir(claudeDir, { withFileTypes: true });
+        for (const e of entries) {
+            if (e.isDirectory())
+                claudeSkills.add(e.name);
+        }
+    }
+    catch {
+        // ignore missing dir
+    }
+    const allNames = new Set([...agentsSkills, ...claudeSkills, ...thirdPartyMap.keys()]);
+    const coreSkills = [];
+    const thirdPartySkills = [];
+    for (const name of [...allNames].sort()) {
+        const inAgents = agentsSkills.has(name);
+        const inClaude = claudeSkills.has(name);
+        const adapters = [];
+        if (inAgents)
+            adapters.push(".agents");
+        if (inClaude)
+            adapters.push(".claude");
+        const skillFilePath = inAgents
+            ? path.join(agentsDir, name, "SKILL.md")
+            : path.join(claudeDir, name, "SKILL.md");
+        let description = "";
+        let version = "";
+        try {
+            const content = await fs.readFile(skillFilePath, "utf8");
+            const meta = parseSkillFrontmatter(content);
+            description = meta.description || "";
+            version = meta.version || "";
+        }
+        catch {
+            // no readable SKILL.md
+        }
+        const recorded = thirdPartyMap.get(name);
+        const isCore = coreNameSet.has(name);
+        let category = "local-extension";
+        if (isCore) {
+            category = "core";
+        }
+        else if (recorded) {
+            category = "third-party";
+        }
+        const detail = {
+            name,
+            category,
+            description: description || recorded?.description || "",
+            version: version || recorded?.version,
+            source: recorded?.source,
+            adapters,
+            synced: inAgents && inClaude,
+            path: inAgents ? `.agents/skills/${name}` : `.claude/skills/${name}`
+        };
+        if (isCore) {
+            coreSkills.push(detail);
+        }
+        else {
+            thirdPartySkills.push(detail);
+        }
+    }
+    return {
+        coreSkills,
+        thirdPartySkills,
+        totalCount: coreSkills.length + thirdPartySkills.length
+    };
+}
+export async function discoverSkillsInDirectory(rootDir, maxDepth = 5, currentDepth = 0) {
+    const results = [];
+    if (currentDepth > maxDepth)
+        return results;
+    const skillMdPath = path.join(rootDir, "SKILL.md");
+    if (fsSync.existsSync(skillMdPath)) {
+        try {
+            const content = await fs.readFile(skillMdPath, "utf8");
+            const meta = parseSkillFrontmatter(content);
+            const skillName = meta.name || path.basename(rootDir);
+            results.push({
+                sourceSkillPath: rootDir,
+                skillName,
+                meta
+            });
+            return results;
+        }
+        catch {
+            // ignore read error
+        }
+    }
+    let entries;
+    try {
+        entries = await fs.readdir(rootDir, { withFileTypes: true });
+    }
+    catch {
+        return results;
+    }
+    const IGNORED_DIRS = new Set([".git", "node_modules", "dist", ".nexus", "build", "coverage", ".turbo"]);
+    for (const entry of entries) {
+        if (entry.isDirectory() && !IGNORED_DIRS.has(entry.name)) {
+            const subDir = path.join(rootDir, entry.name);
+            const subResults = await discoverSkillsInDirectory(subDir, maxDepth, currentDepth + 1);
+            results.push(...subResults);
+        }
+    }
+    return results;
+}
+export async function findSkillSourceDirectory(sourceDir, requestedName) {
+    const discovered = await discoverSkillsInDirectory(sourceDir);
+    if (discovered.length === 0) {
+        throw new Error(`Could not find any valid skill with SKILL.md in source: ${sourceDir}`);
+    }
+    if (requestedName) {
+        const match = discovered.find((s) => s.skillName === requestedName || path.basename(s.sourceSkillPath) === requestedName);
+        if (match) {
+            return {
+                sourceSkillPath: match.sourceSkillPath,
+                skillName: requestedName,
+                meta: match.meta
+            };
+        }
+        const available = discovered.map((s) => s.skillName).join(", ");
+        throw new Error(`Skill "${requestedName}" not found in source. Available skills (${discovered.length}): ${available}`);
+    }
+    if (discovered.length === 1) {
+        return {
+            sourceSkillPath: discovered[0].sourceSkillPath,
+            skillName: discovered[0].skillName,
+            meta: discovered[0].meta
+        };
+    }
+    // Check if one matches the sourceDir basename
+    const baseName = path.basename(sourceDir);
+    const baseMatch = discovered.find((s) => s.skillName === baseName || path.basename(s.sourceSkillPath) === baseName);
+    if (baseMatch) {
+        return {
+            sourceSkillPath: baseMatch.sourceSkillPath,
+            skillName: baseMatch.skillName,
+            meta: baseMatch.meta
+        };
+    }
+    const available = discovered.map((s) => s.skillName).join(", ");
+    throw new Error(`Multiple skills found in source (${discovered.length} skills: ${available}). Please specify --name <skill-name> or use --all to install all skills.`);
+}
+export async function installThirdPartySkill(projectRoot, source, options) {
+    const isGitUrl = /^https?:\/\/|^git@|^ssh:\/\/|\.git$/.test(source);
+    let tempCloneDir = null;
+    let sourceDirectory = source;
+    let coreNameSet = new Set();
+    try {
+        const inventory = await loadCoreSkillInventory(path.join(projectRoot, AGENT_MANIFEST_PATH));
+        coreNameSet = inventory.nameSet;
+    }
+    catch {
+        // ignore
+    }
+    try {
+        if (isGitUrl) {
+            tempCloneDir = await fs.mkdtemp(path.join(os.tmpdir(), "nexus-skill-"));
+            await execFileAsync("git", ["clone", "--depth", "1", source, tempCloneDir]);
+            sourceDirectory = tempCloneDir;
+        }
+        else {
+            sourceDirectory = path.isAbsolute(source) ? source : path.resolve(projectRoot, source);
+            if (!fsSync.existsSync(sourceDirectory)) {
+                throw new Error(`Source directory does not exist: ${source}`);
+            }
+        }
+        const recordedSource = options?.overrideSource || source;
+        const recordedType = isGitUrl || options?.overrideSource ? "git" : "local";
+        if (options?.all) {
+            const discovered = await discoverSkillsInDirectory(sourceDirectory);
+            if (discovered.length === 0) {
+                throw new Error(`Could not find any valid skill with SKILL.md in source: ${source}`);
+            }
+            const installedList = [];
+            const manifest = (await readDevflowManifest(projectRoot)) || {
+                schemaVersion: 1,
+                name: "nexus-devflow",
+                package: "@jakkrichm/create-nexus-devflow",
+                version: "2.9.3"
+            };
+            const existingThirdParty = Array.isArray(manifest.thirdPartySkills)
+                ? manifest.thirdPartySkills
+                : [];
+            let updatedThirdParty = [...existingThirdParty];
+            for (const skill of discovered) {
+                const skillName = skill.skillName;
+                if (!SKILL_NAME_PATTERN.test(skillName)) {
+                    continue; // skip invalid names in batch mode
+                }
+                if (coreNameSet.has(skillName) && !options?.force) {
+                    continue; // skip core collisions in batch mode
+                }
+                const targetAgentsSkillDir = path.join(projectRoot, ".agents", "skills", skillName);
+                const targetClaudeSkillDir = path.join(projectRoot, ".claude", "skills", skillName);
+                await fs.rm(targetAgentsSkillDir, { recursive: true, force: true });
+                await fs.rm(targetClaudeSkillDir, { recursive: true, force: true });
+                await fs.mkdir(path.dirname(targetAgentsSkillDir), { recursive: true });
+                await fs.mkdir(path.dirname(targetClaudeSkillDir), { recursive: true });
+                await fs.cp(skill.sourceSkillPath, targetAgentsSkillDir, { recursive: true });
+                await fs.cp(skill.sourceSkillPath, targetClaudeSkillDir, { recursive: true });
+                updatedThirdParty = updatedThirdParty.filter((s) => s.name !== skillName);
+                updatedThirdParty.push({
+                    name: skillName,
+                    source: recordedSource,
+                    version: skill.meta.version || "1.0.0",
+                    description: skill.meta.description || "",
+                    installedAt: new Date().toISOString(),
+                    type: recordedType
+                });
+                installedList.push({
+                    name: skillName,
+                    category: "third-party",
+                    description: skill.meta.description || "",
+                    version: skill.meta.version || "1.0.0",
+                    source: recordedSource,
+                    adapters: [".agents", ".claude"],
+                    synced: true,
+                    path: `.agents/skills/${skillName}`
+                });
+            }
+            manifest.thirdPartySkills = updatedThirdParty;
+            await writeDevflowManifest(projectRoot, manifest);
+            return installedList;
+        }
+        const { sourceSkillPath, skillName, meta } = await findSkillSourceDirectory(sourceDirectory, options?.name);
+        if (!SKILL_NAME_PATTERN.test(skillName)) {
+            throw new Error(`Invalid skill name: "${skillName}". Must use kebab-case (e.g. "diagram-design").`);
+        }
+        if (coreNameSet.has(skillName) && !options?.force) {
+            throw new Error(`Cannot install skill with name "${skillName}" as it conflicts with a Core DevFlow Skill.`);
+        }
+        const targetAgentsSkillDir = path.join(projectRoot, ".agents", "skills", skillName);
+        const targetClaudeSkillDir = path.join(projectRoot, ".claude", "skills", skillName);
+        await fs.rm(targetAgentsSkillDir, { recursive: true, force: true });
+        await fs.rm(targetClaudeSkillDir, { recursive: true, force: true });
+        await fs.mkdir(path.dirname(targetAgentsSkillDir), { recursive: true });
+        await fs.mkdir(path.dirname(targetClaudeSkillDir), { recursive: true });
+        // Copy verbatim to .agents/skills/<name>
+        await fs.cp(sourceSkillPath, targetAgentsSkillDir, { recursive: true });
+        // Copy verbatim to .claude/skills/<name>
+        await fs.cp(sourceSkillPath, targetClaudeSkillDir, { recursive: true });
+        // Update .nexus/nexus-devflow.json
+        const manifest = (await readDevflowManifest(projectRoot)) || {
+            schemaVersion: 1,
+            name: "nexus-devflow",
+            package: "@jakkrichm/create-nexus-devflow",
+            version: "2.9.3"
+        };
+        const existingThirdParty = Array.isArray(manifest.thirdPartySkills)
+            ? manifest.thirdPartySkills
+            : [];
+        const filtered = existingThirdParty.filter((s) => s.name !== skillName);
+        filtered.push({
+            name: skillName,
+            source: recordedSource,
+            version: meta.version || "1.0.0",
+            description: meta.description || "",
+            installedAt: new Date().toISOString(),
+            type: recordedType
+        });
+        manifest.thirdPartySkills = filtered;
+        await writeDevflowManifest(projectRoot, manifest);
+        return {
+            name: skillName,
+            category: "third-party",
+            description: meta.description || "",
+            version: meta.version || "1.0.0",
+            source: recordedSource,
+            adapters: [".agents", ".claude"],
+            synced: true,
+            path: `.agents/skills/${skillName}`
+        };
+    }
+    finally {
+        if (tempCloneDir) {
+            try {
+                await fs.rm(tempCloneDir, { recursive: true, force: true });
+            }
+            catch {
+                // ignore cleanup error
+            }
+        }
+    }
+}
+export async function removeThirdPartySkill(projectRoot, name) {
+    let coreNameSet = new Set();
+    try {
+        const inventory = await loadCoreSkillInventory(path.join(projectRoot, AGENT_MANIFEST_PATH));
+        coreNameSet = inventory.nameSet;
+    }
+    catch {
+        // ignore
+    }
+    if (coreNameSet.has(name)) {
+        throw new Error(`Cannot remove Core Skill: "${name}". Core skills are managed by Nexus-DevFlow.`);
+    }
+    const targetAgentsSkillDir = path.join(projectRoot, ".agents", "skills", name);
+    const targetClaudeSkillDir = path.join(projectRoot, ".claude", "skills", name);
+    let removedAny = false;
+    if (fsSync.existsSync(targetAgentsSkillDir)) {
+        await fs.rm(targetAgentsSkillDir, { recursive: true, force: true });
+        removedAny = true;
+    }
+    if (fsSync.existsSync(targetClaudeSkillDir)) {
+        await fs.rm(targetClaudeSkillDir, { recursive: true, force: true });
+        removedAny = true;
+    }
+    const manifest = await readDevflowManifest(projectRoot);
+    if (manifest && Array.isArray(manifest.thirdPartySkills)) {
+        const prevList = manifest.thirdPartySkills;
+        const nextList = prevList.filter((s) => s.name !== name);
+        if (nextList.length !== prevList.length) {
+            manifest.thirdPartySkills = nextList;
+            await writeDevflowManifest(projectRoot, manifest);
+            removedAny = true;
+        }
+    }
+    return removedAny;
+}
+export async function syncSkills(projectRoot) {
+    const agentsDir = path.join(projectRoot, ".agents", "skills");
+    const claudeDir = path.join(projectRoot, ".claude", "skills");
+    if (!fsSync.existsSync(agentsDir)) {
+        return { syncedCount: 0, skills: [] };
+    }
+    await fs.rm(claudeDir, { recursive: true, force: true });
+    await fs.mkdir(claudeDir, { recursive: true });
+    const entries = await fs.readdir(agentsDir, { withFileTypes: true });
+    const syncedSkills = [];
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            const src = path.join(agentsDir, entry.name);
+            const dst = path.join(claudeDir, entry.name);
+            await fs.cp(src, dst, { recursive: true });
+            syncedSkills.push(entry.name);
+        }
+    }
+    return {
+        syncedCount: syncedSkills.length,
+        skills: syncedSkills
+    };
+}
+export async function updateThirdPartySkills(projectRoot, targetSkillName, options) {
+    const manifest = await readDevflowManifest(projectRoot);
+    const existingThirdParty = Array.isArray(manifest?.thirdPartySkills)
+        ? manifest.thirdPartySkills
+        : [];
+    if (existingThirdParty.length === 0) {
+        return { updatedSkills: [], failedSkills: [], totalUpdated: 0 };
+    }
+    let skillsToUpdate = existingThirdParty;
+    if (targetSkillName && targetSkillName !== "--all") {
+        skillsToUpdate = existingThirdParty.filter((s) => s.name === targetSkillName);
+        if (skillsToUpdate.length === 0) {
+            throw new Error(`Skill "${targetSkillName}" is not installed as a third-party skill.`);
+        }
+    }
+    // Group by source to avoid duplicate cloning
+    const sourceToSkillsMap = new Map();
+    for (const skill of skillsToUpdate) {
+        const list = sourceToSkillsMap.get(skill.source) || [];
+        list.push(skill);
+        sourceToSkillsMap.set(skill.source, list);
+    }
+    const updatedSkills = [];
+    const failedSkills = [];
+    for (const [source, skills] of sourceToSkillsMap) {
+        const isGit = /^https?:\/\/|^git@|^ssh:\/\/|\.git$/.test(source);
+        let tempCloneDir = null;
+        try {
+            let sourceDir = source;
+            if (isGit) {
+                tempCloneDir = await fs.mkdtemp(path.join(os.tmpdir(), "nexus-skill-update-"));
+                await execFileAsync("git", ["clone", "--depth", "1", source, tempCloneDir]);
+                sourceDir = tempCloneDir;
+            }
+            for (const skill of skills) {
+                try {
+                    const detail = (await installThirdPartySkill(projectRoot, sourceDir, {
+                        name: skill.name,
+                        force: true,
+                        overrideSource: isGit ? source : undefined
+                    }));
+                    updatedSkills.push(detail);
+                }
+                catch (err) {
+                    failedSkills.push({
+                        name: skill.name,
+                        reason: err instanceof Error ? err.message : String(err)
+                    });
+                }
+            }
+        }
+        catch (err) {
+            for (const skill of skills) {
+                failedSkills.push({
+                    name: skill.name,
+                    reason: err instanceof Error ? err.message : String(err)
+                });
+            }
+        }
+        finally {
+            if (tempCloneDir) {
+                try {
+                    await fs.rm(tempCloneDir, { recursive: true, force: true });
+                }
+                catch {
+                    // ignore
+                }
+            }
+        }
+    }
+    return {
+        updatedSkills,
+        failedSkills,
+        totalUpdated: updatedSkills.length
+    };
+}
+//# sourceMappingURL=skill-manager.js.map

package/dist/lib/skill-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-manager.js","sourceRoot":"","sources":["../../lib/skill-manager.ts"],"names":[],"mappings":"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"}

package/dist/lib/status.d.ts

@@ -5,6 +5,7 @@ import type { GitStatusSummary } from "./git-status.js";
 import type { ProjectAdapter } from "./project-metadata.js";
 import type { IdeasSummary } from "./ideas.js";
 import type { ProjectConfig, ProjectConfigState } from "./project-config.js";
+import type { RunStateSummary } from "./run-state.js";
 type CompletionState = "blocked" | "needs_verification" | "ready";
 interface StatusWarning {
     code: string;
@@ -15,6 +16,7 @@ interface StatusConfiguration {
     state: ProjectConfigState;
     values: ProjectConfig;
 }
+type StatusActivity = Omit<RunStateSummary, "warnings">;
 interface StatusCurrentWork {
     state: CurrentWorkSummary["state"];
     type: CurrentWorkType | null;
@@ -57,6 +59,7 @@ interface ProjectStatus {
         adapters: ProjectAdapter[];
     };
     configuration: StatusConfiguration;
+    activity: StatusActivity;
     currentWork: StatusCurrentWork;
     activeRuns: ActiveRunSummary[];
     findings: StatusFindings;
@@ -70,4 +73,4 @@ declare function readProjectStatus(startPath?: string): Promise<ProjectStatus>;
 declare function formatHumanStatus(status: ProjectStatus, options?: HumanStatusOptions): string;
 declare function shouldUseColor(isTTY?: boolean | undefined, environment?: NodeJS.ProcessEnv): boolean;
 export { formatHumanStatus, readProjectStatus, shouldUseColor };
-export type { CompletionState, HumanStatusOptions, ProjectStatus, StatusCompletion, StatusCurrentWork, StatusFindings, StatusNextAction, StatusWarning };
+export type { CompletionState, HumanStatusOptions, ProjectStatus, StatusActivity, StatusCompletion, StatusCurrentWork, StatusFindings, StatusNextAction, StatusWarning };

package/dist/lib/status.js

@@ -6,16 +6,18 @@ import { readGitStatus } from "./git-status.js";
 import { readProjectMetadata } from "./project-metadata.js";
 import { readIdeas } from "./ideas.js";
 import { readProjectConfig } from "./project-config.js";
+import { readRunState } from "./run-state.js";
 async function readProjectStatus(startPath = process.cwd()) {
     const metadata = await readProjectMetadata(startPath);
-    const [contextPaths, config, currentWork, activeRuns, findings, git, ideas] = await Promise.all([
+    const [contextPaths, config, currentWork, activeRuns, findings, git, ideas, runState] = await Promise.all([
         resolveActiveContextPaths(metadata.project.root),
         readProjectConfig(metadata.project.root),
         readCurrentWork(metadata.project.root),
         listActiveRunContexts(metadata.project.root),
         readFindings(metadata.project.root),
         readGitStatus(metadata.project.root),
-        readIdeas(metadata.project.root)
+        readIdeas(metadata.project.root),
+        readRunState(metadata.project.root)
     ]);
     let stageMarkdown = "";
     try {
@@ -27,6 +29,7 @@ async function readProjectStatus(startPath = process.cwd()) {
         ...config.warnings,
         ...currentWork.warnings,
         ...findings.warnings,
+        ...runState.warnings,
         ...findDrift(currentWork, git)
     ];
     const completion = selectCompletion(currentWork, findings, git, stageMarkdown);
@@ -43,6 +46,21 @@ async function readProjectStatus(startPath = process.cwd()) {
             state: config.state,
             values: config.values
         },
+        activity: {
+            state: runState.state,
+            mode: runState.mode,
+            command: runState.command,
+            status: runState.status,
+            freshness: runState.freshness,
+            summary: runState.summary,
+            detail: runState.detail,
+            boundary: runState.boundary,
+            startedAt: runState.startedAt,
+            updatedAt: runState.updatedAt,
+            resumeCommand: runState.resumeCommand,
+            progress: runState.progress,
+            feature: runState.feature
+        },
         currentWork: formatCurrentWork(currentWork),
         activeRuns,
         findings: formatFindings(findings),
@@ -69,8 +87,11 @@ function formatHumanStatus(status, options = {}) {
         formatRow("Quality gates", formatQualityGates(status.configuration.values.qualityGates.regular), style),
         "",
         formatSection("Progress", style),
-        formatRow("Work", formatWorkValue(status.currentWork, style), style)
+        formatRow("Progress", formatWorkValue(status.currentWork, style), style)
     ];
+    if (status.activity && status.activity.state === "recorded" && status.activity.command) {
+        lines.push(formatRow("Activity", formatActivityValue(status.activity, style), style));
+    }
     if (status.currentWork.state === "active") {
         lines.push(formatRow("Steps", `${status.currentWork.completed}/${status.currentWork.total} complete`, style));
         if (status.currentWork.nextStep) {
@@ -116,6 +137,31 @@ function formatSection(label, style) {
 function formatRow(label, value, style) {
     return `  ${style.cyan(label.padEnd(14))}${value}`;
 }
+function formatActivityValue(activity, style) {
+    if (activity.state !== "recorded" || !activity.command) {
+        return style.dim("none");
+    }
+    const parts = [`/${activity.command}`];
+    if (activity.status) {
+        parts.push(activity.status === "running"
+            ? style.brightCyan(activity.status)
+            : activity.status === "ready"
+                ? style.green(activity.status)
+                : activity.status === "blocked"
+                    ? style.red(activity.status)
+                    : activity.status);
+    }
+    if (activity.progress) {
+        parts.push(`${activity.progress.current}/${activity.progress.total} ${activity.progress.label}`);
+    }
+    if (activity.boundary) {
+        parts.push(`(${activity.boundary})`);
+    }
+    if (activity.freshness === "stale") {
+        parts.push(style.yellow("[stale]"));
+    }
+    return parts.join(" ");
+}
 function formatWorkValue(work, style) {
     if (work.state === "idle") {
         return style.dim("none");