agent-trellis 0.16.0 → 0.17.0

package/dist/commands/doctor.d.ts

@@ -6,6 +6,7 @@
  */
 import { loadCanonicalSource } from "../core/canonical.js";
 import type { AgentId, AgentSnapshot, CanonicalSource } from "../core/types.js";
+import { type VersionExecutor } from "../lib/cliEntrypoints.js";
 import { type WorkspaceDoctorSection } from "../lib/workspaceDoctor.js";
 /**
  * Interim default until P1 wires this from `.trellis/mcp/servers.yaml`'s
@@ -15,7 +16,7 @@ import { type WorkspaceDoctorSection } from "../lib/workspaceDoctor.js";
  * machine.
  */
 export declare const DEFAULT_KNOWN_HOST_INJECTED: readonly string[];
-export type FindingKind = "probe-failed" | "duplication" | "collision" | "drift" | "case-mismatch" | "parse-diagnostic" | "runtime-drift" | "oauth-expired" | "mcp-unreachable" | "workspace-toml-invalid";
+export type FindingKind = "probe-failed" | "duplication" | "collision" | "drift" | "case-mismatch" | "parse-diagnostic" | "runtime-drift" | "oauth-expired" | "mcp-unreachable" | "workspace-toml-invalid" | "cli-version-split";
 export interface Finding {
     kind: FindingKind;
     /** Omitted for a finding that names more than one agent (drift). */
@@ -52,6 +53,10 @@ export interface RunDoctorOptions {
      * seam. CLI discovery walks up from cwd via `findWorkspaceRoot`;
      * null = no workspace layer. */
     workspaceDir?: string | null;
+    /** PATH to scan for `trellis` entrypoints; defaults to the real one.
+     * Test seam, with `execVersion`. */
+    pathEnv?: string;
+    execVersion?: VersionExecutor;
 }
 export interface OAuthHealthEntry {
     server: string;

package/dist/commands/doctor.js

@@ -17,6 +17,7 @@ import { ALL_AGENTS, isOAuthAuth, oauthOwner } from "../core/types.js";
 import { classifyStoredToken, remediationFor } from "../lib/oauth/renew.js";
 import { readToken } from "../lib/oauth/store.js";
 import { findWorkspaceRoot } from "../lib/workspace.js";
+import { detectCliVersionSplit, findCliEntrypoints } from "../lib/cliEntrypoints.js";
 import { collectWorkspaceDoctorSection } from "../lib/workspaceDoctor.js";
 /**
  * Interim default until P1 wires this from `.trellis/mcp/servers.yaml`'s
@@ -48,6 +49,9 @@ const EXIT_NONZERO_KINDS = new Set([
     // *agent*'s own startup regardless of ownership — catch it here before
     // the next session does (trellis-doctor-workspace-toml-validation).
     "workspace-toml-invalid",
+    // A stale `trellis` that wins on PATH silently changes behavior (e.g.
+    // rejecting config keys a newer copy accepts) — trellis-doctor-cli-version-split.
+    "cli-version-split",
 ]);
 /** Exported so tests can assert on this resolution directly, without
  * routing through real per-agent probes `runDoctor` also runs. */
@@ -66,6 +70,12 @@ export function resolveKnownHostInjected(opts) {
 export async function runDoctor(opts = {}) {
     const workspaceDir = opts.workspaceDir !== undefined ? opts.workspaceDir : findWorkspaceRoot(process.cwd());
     const report = await collectDoctorReport(opts.homeDir, resolveKnownHostInjected(opts), opts.probeMcp, workspaceDir);
+    // CLI boundary only: spawning `trellis --version` belongs here, not in
+    // collectDoctorReport, so library callers and their tests never depend
+    // on the developer's real PATH.
+    const split = detectCliVersionSplit(findCliEntrypoints({ pathEnv: opts.pathEnv, execVersion: opts.execVersion }));
+    if (split)
+        report.findings.push({ kind: "cli-version-split", message: split });
     const exitCode = report.findings.some((f) => EXIT_NONZERO_KINDS.has(f.kind)) ? 1 : 0;
     if (opts.json) {
         console.log(JSON.stringify(report, null, 2));

package/dist/lib/cliEntrypoints.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Locates every `trellis` executable on PATH and compares their versions
+ * (trellis-doctor-cli-version-split). Read-only: it never edits, removes
+ * or upgrades an entrypoint — a wrapper script may be deliberately
+ * maintained by the user, so Trellis only reports.
+ */
+export interface CliEntrypoint {
+    path: string;
+    version: string;
+}
+export type VersionExecutor = (path: string) => string | undefined;
+/** Runs `<path> --version` via argv (no shell). `undefined` on any
+ * failure or unrecognizable output, so a broken entry is skipped rather
+ * than reported as a split. */
+export declare const defaultExecVersion: VersionExecutor;
+export declare function findCliEntrypoints(opts?: {
+    pathEnv?: string;
+    execVersion?: VersionExecutor;
+    name?: string;
+}): CliEntrypoint[];
+/** A finding message when two or more entries disagree; `undefined`
+ * otherwise. The first entry is the one a bare `trellis` runs. */
+export declare function detectCliVersionSplit(entries: readonly CliEntrypoint[]): string | undefined;

package/dist/lib/cliEntrypoints.js

@@ -0,0 +1,79 @@
+/**
+ * Locates every `trellis` executable on PATH and compares their versions
+ * (trellis-doctor-cli-version-split). Read-only: it never edits, removes
+ * or upgrades an entrypoint — a wrapper script may be deliberately
+ * maintained by the user, so Trellis only reports.
+ */
+import { execFileSync } from "node:child_process";
+import { accessSync, constants, realpathSync, statSync } from "node:fs";
+import { delimiter, join } from "node:path";
+const VERSION_RE = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/;
+/** Runs `<path> --version` via argv (no shell). `undefined` on any
+ * failure or unrecognizable output, so a broken entry is skipped rather
+ * than reported as a split. */
+export const defaultExecVersion = (path) => {
+    try {
+        const out = execFileSync(path, ["--version"], { encoding: "utf-8", timeout: 5_000, stdio: ["ignore", "pipe", "ignore"] });
+        return VERSION_RE.exec(out)?.[0];
+    }
+    catch {
+        return undefined;
+    }
+};
+function isExecutableFile(path) {
+    try {
+        if (!statSync(path).isFile())
+            return false;
+        accessSync(path, constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function findCliEntrypoints(opts = {}) {
+    const pathEnv = opts.pathEnv ?? process.env.PATH ?? "";
+    const execVersion = opts.execVersion ?? defaultExecVersion;
+    const name = opts.name ?? "trellis";
+    const seenDirs = new Set();
+    const seenReal = new Set();
+    const entries = [];
+    for (const dir of pathEnv.split(delimiter)) {
+        if (!dir || seenDirs.has(dir))
+            continue;
+        seenDirs.add(dir);
+        const candidate = join(dir, name);
+        if (!isExecutableFile(candidate))
+            continue;
+        let real;
+        try {
+            real = realpathSync(candidate);
+        }
+        catch {
+            continue;
+        }
+        if (seenReal.has(real))
+            continue;
+        seenReal.add(real);
+        // Spawn the PATH-visible path, not the resolved target: a shim's
+        // behavior depends on the name it is invoked by.
+        const version = execVersion(candidate);
+        if (version)
+            entries.push({ path: candidate, version });
+    }
+    return entries;
+}
+/** A finding message when two or more entries disagree; `undefined`
+ * otherwise. The first entry is the one a bare `trellis` runs. */
+export function detectCliVersionSplit(entries) {
+    if (entries.length < 2)
+        return undefined;
+    if (new Set(entries.map((e) => e.version)).size < 2)
+        return undefined;
+    const lines = entries.map((e, i) => `  ${i === 0 ? "▶ runs" : "  also"}  ${e.path}  ${e.version}`);
+    return [
+        `${entries.length} \`trellis\` entrypoints on PATH report different versions — a bare \`trellis\` runs ${entries[0].path} (${entries[0].version}), so upgrading another copy has no effect:`,
+        ...lines,
+        "Reconcile them (upgrade or remove the stale one, or reorder PATH) — Trellis does not modify entrypoints.",
+    ].join("\n");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-trellis",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "A unified Code Agent Runtime for Skills, MCP, Memory, and shared instructions across Claude Code, Codex, Kiro, pi, Kimi Code, and ZCode.",
   "license": "MIT",
   "author": "Paul Leo",