alignfirst 0.1.0-beta.4 → 0.1.0-beta.5

package/dist/commands/doctor.js

@@ -1,4 +1,3 @@
-import { execFileSync } from "node:child_process";
 import { existsSync, realpathSync } from "node:fs";
 import { createRequire } from "node:module";
 import { join } from "node:path";
@@ -6,12 +5,11 @@ import { fileURLToPath } from "node:url";
 import semver from "semver";
 import { resolveDefaultBranch } from "../default-branch.js";
 import { errorMessage } from "../errors.js";
-import { findExecutable } from "../executables.js";
 import { parseBareCommandArgs } from "../parse-args.js";
 import { resolvePlansMode } from "../plans/mode.js";
 import { findStoppedRebase } from "../plans/rebase.js";
-import { resolveProjectConfig } from "../project-config.js";
-import { findInstalledSkill, STUB_SKILLS } from "../skills.js";
+import { PROJECT_CONFIG_FILENAME, resolveProjectConfig, } from "../project-config.js";
+import { COMMAND_SKILLS, findInstalledSkill } from "../skills.js";
 import { cliRangeResult } from "../version-guard.js";
 export function runDoctor(ctx, args) {
     const usage = `Usage: ${ctx.form} doctor\n`;
@@ -19,7 +17,7 @@ export function runDoctor(ctx, args) {
         return 0;
     writeSection(ctx, "CLI", () => inspectCli(ctx));
     let resolved;
-    writeSection(ctx, "Config", () => {
+    writeSection(ctx, PROJECT_CONFIG_FILENAME, () => {
         resolved = resolveProjectConfig(ctx.cwd);
         return inspectConfig(ctx, resolved);
     });
@@ -27,7 +25,6 @@ export function runDoctor(ctx, args) {
     writeSection(ctx, "Plans", () => inspectPlans(ctx));
     writeSection(ctx, "Docmap", () => inspectDocmap(ctx));
     writeSection(ctx, "Skills", () => inspectSkills(ctx));
-    writeSection(ctx, "Companion", () => inspectCompanion(ctx));
     return 0;
 }
 function writeSection(ctx, section, inspect) {
@@ -54,7 +51,7 @@ function inspectCli(ctx) {
     ];
 }
 function inspectConfig(ctx, resolved) {
-    const lines = [{ level: "ok", text: resolved?.source ?? "none" }];
+    const lines = [{ level: "ok", text: resolved === undefined ? "none" : "present" }];
     const result = cliRangeResult(resolved?.config, ctx.version);
     if (result === undefined) {
         lines.push({ level: "ok", text: "no cli range" });
@@ -104,42 +101,30 @@ function isRecord(value) {
     return typeof value === "object" && value !== null;
 }
 function inspectSkills(ctx) {
-    return STUB_SKILLS.map((name) => {
-        const installed = findInstalledSkill(ctx.home, name);
-        if (installed === undefined)
-            return { level: "warn", text: `${name} missing` };
-        const version = installed.version ?? "unknown";
-        const parsed = semver.parse(installed.version);
-        if (parsed === null || parsed.major < 4)
-            return {
-                level: "warn",
-                text: `${name} ${version} predates v4; update: npx -y skills update --global --yes`,
-            };
-        return { level: "ok", text: `${name} ${version} (${installed.root})` };
-    });
+    const alignfirst = findInstalledSkill(ctx.home, "alignfirst");
+    const alignfirstLine = alignfirst === undefined
+        ? { level: "ok", text: "alignfirst none" }
+        : describeInstalledSkill("alignfirst", alignfirst);
+    const commands = COMMAND_SKILLS.map((name) => ({
+        name,
+        installed: findInstalledSkill(ctx.home, name),
+    }));
+    if (commands.every(({ installed }) => installed === undefined))
+        return [alignfirstLine, { level: "ok", text: "no command skill installed" }];
+    return [alignfirstLine, ...commands.map(describeCommandSkill)];
 }
-function inspectCompanion(ctx) {
-    const executable = findExecutable(ctx.env, "alcode");
-    if (executable === undefined)
-        return [
-            {
-                level: "warn",
-                text: "alcode not installed (optional; npm install -g @paleo/alcode)",
-            },
-        ];
-    try {
-        const version = execFileSync(executable, ["--version"], {
-            encoding: "utf-8",
-            env: ctx.env,
-        }).trim();
-        return [{ level: "ok", text: `alcode ${version} (${executable})` }];
-    }
-    catch (error) {
-        return [{ level: "error", text: `alcode ${executable}: ${commandError(error)}` }];
-    }
+function describeCommandSkill({ name, installed }) {
+    if (installed === undefined)
+        return { level: "warn", text: `${name} missing` };
+    return describeInstalledSkill(name, installed);
 }
-function commandError(error) {
-    if (isRecord(error) && typeof error.stderr === "string" && error.stderr !== "")
-        return firstLine(error.stderr);
-    return firstLine(errorMessage(error));
+function describeInstalledSkill(name, installed) {
+    const version = installed.version ?? "unknown";
+    const parsed = semver.parse(installed.version);
+    if (parsed === null || parsed.major < 4)
+        return {
+            level: "warn",
+            text: `${name} ${version} predates v4; update: npx -y skills update --global --yes`,
+        };
+    return { level: "ok", text: `${name} ${version} (${installed.root})` };
 }

package/dist/commands/ticket.js

@@ -119,7 +119,7 @@ function resolveTicketId(ctx, positional, side, dryRun) {
     if (side)
         return { id: dryRun ? peekSideTicket(ctx.cwd) : reserveSideTicket(ctx.cwd) };
     if (pattern === undefined)
-        throw new CliError("No ticket id given. Pass it.\nSetting ticketIdPattern in .alignfirst.json enables deduction from the current branch.");
+        throw new CliError("No ticket id given. Pass it.");
     const deduced = deduceTicketFromBranch(ctx.cwd, pattern);
     validateTicketId(deduced.id, pattern);
     return deduced;
@@ -165,7 +165,7 @@ function jsonReport(ctx, options, result) {
 }
 function renderReport(ctx, options, result) {
     const reservation = options.side && options.dryRun ? " (would be reserved)" : "";
-    const deduction = options.branch === undefined ? "" : ` (deduced from branch ${options.branch})`;
+    const deduction = options.branch === undefined ? "" : ` (deduced from branch \`${options.branch}\`)`;
     const directoryState = renderDirectoryState(result.state, options.dryRun);
     const directory = `${relative(ctx.cwd, result.dir)}/`;
     const lines = [
@@ -173,15 +173,16 @@ function renderReport(ctx, options, result) {
         `- TICKET_DIR: \`${directory}\`${directoryState}`,
     ];
     if (result.entries.length === 0)
-        lines.push("Entries: (none)");
+        lines.push("- Entries: (none)");
     else
-        lines.push("Entries:", ...result.entries.map((entry) => `  ${renderEntry(entry)}`));
+        lines.push("- Entries:", ...result.entries.map((entry) => `  - ${renderEntry(entry)}`));
     return `${lines.join("\n")}\n`;
 }
 function renderEntry(entry) {
+    const name = `\`${entry.name}\``;
     if (entry.size === undefined)
-        return entry.name;
-    return `${entry.name} (${formatSize(entry.size)}, ${formatLocalTimestamp(entry.modifiedAt)})`;
+        return name;
+    return `${name} (${formatSize(entry.size)}, ${formatLocalTimestamp(entry.modifiedAt)})`;
 }
 function renderDirectoryState(state, dryRun) {
     if (state === "existing")

package/dist/skills.d.ts

@@ -1,4 +1,4 @@
-export declare const STUB_SKILLS: readonly ["alignfirst", "alspec", "alplan", "al", "alcatchup", "alcatchupaad", "alcatchupspec", "almerge", "alreview", "aldescription"];
+export declare const COMMAND_SKILLS: readonly ["alspec", "alplan", "al", "alcatchup", "alcatchupaad", "alcatchupspec", "almerge", "alreview", "aldescription"];
 export declare const SKILL_ROOTS: readonly [".agents/skills", ".claude/skills", ".codex/skills"];
 export interface InstalledSkill {
     root: string;

package/dist/skills.js

@@ -1,7 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-export const STUB_SKILLS = [
-    "alignfirst",
+export const COMMAND_SKILLS = [
     "alspec",
     "alplan",
     "al",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alignfirst",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.5",
   "license": "CC0-1.0",
   "author": "Thomas MUR",
   "description": "The AlignFirst CLI: protocols, plans and docs in one command.",

package/dist/executables.d.ts

@@ -1 +0,0 @@
-export declare function findExecutable(env: NodeJS.ProcessEnv, name: string): string | undefined;

package/dist/executables.js

@@ -1,24 +0,0 @@
-import { accessSync, constants, statSync } from "node:fs";
-import { delimiter, join } from "node:path";
-export function findExecutable(env, name) {
-    const path = env.PATH;
-    if (path === undefined || path === "")
-        return;
-    for (const dir of path.split(delimiter)) {
-        const candidate = join(dir, name);
-        if (isExecutableFile(candidate))
-            return candidate;
-    }
-    return;
-}
-function isExecutableFile(path) {
-    try {
-        if (!statSync(path).isFile())
-            return false;
-        accessSync(path, constants.X_OK);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}