@piewf/cli 5.13.2 → 5.14.0

package/dist/src/cli.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import { randomUUID } from "node:crypto";
-import { chmodSync, linkSync, mkdirSync, mkdtempSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { chmodSync, linkSync, mkdirSync, mkdtempSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, extname, join } from "node:path";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
 import { ProjectTrustStore, SessionManager, SettingsManager, createAgentSessionFromServices, createAgentSessionServices, getAgentDir, hasTrustRequiringProjectResources } from "@earendil-works/pi-coding-agent";
 import { Value } from "typebox/value";
 import { doctor, doctorExitCode, formatDoctorReport } from "./doctor.js";
 import { doctorCleanup, doctorCleanupExitCode, formatDoctorCleanupReport } from "./doctor-cleanup.js";
-import workflowExtension, { errorText, formatWorkflowProgress, isNodeError, jsonValue, loadAgentDefinitions, object, registeredWorkflowFunctionSources, truncateWorkflowProgress, workflowCatalog, workflowSettingsPath } from "pi-extensible-workflows";
+import workflowExtension, { errorText, formatWorkflowProgress, isNodeError, jsonValue, loadAgentDefinitions, object, registeredWorkflowFunctionSources, sameFilesystemPath, truncateWorkflowProgress, workflowCatalog, workflowSettingsPath } from "pi-extensible-workflows";
 import { portableEngineVersion, portablePiVersion, writePortableWorkflowBundle } from "./bundles.js";
 import { runSessionInspector, transcriptFileLines } from "./session-inspector.js";
 import { isPersistedRun, listPersistedSessionIds, listRunIds } from "pi-extensible-workflows/persistence";
@@ -716,13 +716,8 @@ async function exportWorkflowCli(rawArgs, options) {
         writeLauncher(destination, workflowName, force);
         if (!output) {
             const binDir = join(homedir(), ".local", "bin");
-            const pathEntries = (process.env.PATH ?? "").split(":").filter(Boolean).map((entry) => { try {
-                return realpathSync(entry);
-            }
-            catch {
-                return entry;
-            } });
-            if (!pathEntries.includes(binDir))
+            const pathEntries = (process.env.PATH ?? "").split(":").filter(Boolean);
+            if (!pathEntries.some((entry) => sameFilesystemPath(entry, binDir)))
                 options.stderr(`Warning: ${binDir} is not in PATH\n`);
         }
         options.write(`Exported ${destination}\n`);
@@ -909,7 +904,7 @@ export async function runCli(args, options = {}, write = (text) => { process.std
     write("Usage: piewf doctor [role] [--role <role>] [--prompt <text>] [--json] | inspect [session-id] [--json|--summary] [--failed] | transcript <session-file> | share <run-id> | bundle <workflow-name> [--name <command>] [--output <path>] [--force] | run <workflow-name> [workflow arguments] | run --script <path> [--name <workflow-name>] [--input <json>] | export <workflow-name> [--name <command>] [--output <path>] [--force] [--bundle]\n");
     return 1;
 }
-if (process.argv[1] && import.meta.url === pathToFileURL(realpathSync(process.argv[1])).href) {
+if (process.argv[1] && sameFilesystemPath(fileURLToPath(import.meta.url), process.argv[1])) {
     const controller = new AbortController();
     const onSignal = () => { controller.abort(); };
     process.once("SIGINT", onSignal);

package/dist/src/doctor.js

@@ -1,10 +1,10 @@
-import { readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
-import { basename, dirname, extname, join, resolve } from "node:path";
+import { readFileSync, readdirSync, statSync } from "node:fs";
+import { basename, dirname, extname, join } from "node:path";
 import { InMemoryCredentialStore, InMemoryModelsStore } from "@earendil-works/pi-ai";
 import { ModelRuntime, createAgentSessionFromServices, createAgentSessionServices, getAgentDir, hasTrustRequiringProjectResources, SessionManager, SettingsManager, } from "@earendil-works/pi-coding-agent";
-import { DEFAULT_SETTINGS, createLocalPiSession, errorText, isNodeError, isObject, loadSettings, prepareAgentSetupForInspection, resolveAgentResourcePolicy, resolveWorkflowSettings, resolveModelReference, resourcePatternHasMagic, parseThinking, parseRoleMarkdown, registeredWorkflowFunctions, registeredWorkflowRoleDirectoryRegistrations, workflowRoleDirectories, workflowProjectSettingsPath, workflowSettingsPath, } from "pi-extensible-workflows";
+import { DEFAULT_SETTINGS, canonicalPath, createLocalPiSession, errorText, isNodeError, isObject, loadSettings, prepareAgentSetupForInspection, resolveAgentResourcePolicy, resolveWorkflowSettings, resolveModelReference, resourcePatternHasMagic, parseThinking, parseRoleMarkdown, registeredWorkflowFunctions, registeredWorkflowRoleDirectoryRegistrations, workflowRoleDirectories, workflowProjectSettingsPath, workflowSettingsPath, } from "pi-extensible-workflows";
 import { loadingRegistry } from "pi-extensible-workflows";
-import { selectResourcesByLayers, unmatchedResourcePatterns } from "pi-extensible-workflows";
+import { selectResourcesByLayers, unmatchedResourcePatterns, mergeWorkflowExtensionSettings } from "pi-extensible-workflows";
 const THINKING_HINT = "Use off, minimal, low, medium, high, xhigh, or max.";
 const AGENT_RESOURCE_SELECTOR_MIGRATION_ISSUE = "https://github.com/vekexasia/pi-extensible-workflows/issues/205";
 const AGENT_RESOURCE_SELECTOR_MIGRATION_MESSAGE = `\`disabledAgentResources\` is no longer supported by #205. Migrate to direct \`skills\`, \`extensions\`, and \`tools\` selectors: legacy patterns exclude resources and \`!pattern\` re-enables them, while new selectors include matches and \`!pattern\` excludes them. See ${AGENT_RESOURCE_SELECTOR_MIGRATION_ISSUE}`;
@@ -25,15 +25,6 @@ function usesLegacyRoleSelectors(path) {
         return false;
     }
 }
-function canonical(path) {
-    const absolute = resolve(path);
-    try {
-        return realpathSync(absolute);
-    }
-    catch {
-        return absolute;
-    }
-}
 function isDynamicModelAlias(value, aliases) {
     const match = /^([^/\s:]+)(?::([^\s]+))?$/.exec(value);
     const name = match?.[1];
@@ -72,7 +63,7 @@ function savedTrust(cwd, agentDir) {
     }
     if (!isObject(parsed))
         throw new Error("Pi trust.json must be an object");
-    let current = canonical(cwd);
+    let current = canonicalPath(cwd);
     while (current !== dirname(current)) {
         const value = parsed[current];
         if (value === true || value === false)
@@ -249,7 +240,7 @@ function inspectRole(path, activeTools, knownModels, availableModels, diagnostic
     return definition;
 }
 function matchResourcePolicy(policy, pi) {
-    const extensions = [...new Set((pi.extensions ?? []).map(canonical))];
+    const extensions = [...new Set((pi.extensions ?? []).map(canonicalPath))];
     const skills = [...new Set(pi.skills ?? [])];
     const tools = [...new Set(pi.activeTools)];
     const layers = policy.selectorSources;
@@ -258,12 +249,12 @@ function matchResourcePolicy(policy, pi) {
     const selectedTools = selectResourcesByLayers([layers.global.tools, layers.project.tools], tools);
     return { ...policy, selectedSkills, selectedExtensions, selectedTools, unmatchedSkills: unmatchedResourcePatterns(policy.effective.skills, skills), unmatchedExtensions: unmatchedResourcePatterns(policy.effective.extensions, extensions), unmatchedTools: unmatchedResourcePatterns(policy.effective.tools ?? [], tools) };
 }
-async function inspectRoleSession(cwd, agentDir, roleName, definition, rolePath, basePolicy, rootModel, activeTools, aliases, knownModels, availableModels, settingsPath, prompt, hooks, diagnostics) {
+async function inspectRoleSession(cwd, agentDir, roleName, definition, rolePath, basePolicy, rootModel, activeTools, aliases, knownModels, availableModels, settingsPath, extensionSettings, prompt, hooks, diagnostics) {
     const setupDiagnostics = [];
     const signal = new AbortController().signal;
     const transport = { id: "doctor-local", createSession: async () => { throw new Error("Doctor inspection does not create transport sessions"); } };
     const run = { cwd, sessionId: "doctor", runId: "doctor", workflow: { name: "doctor" }, args: null, signal };
-    const root = { cwd, model: { ...rootModel }, tools: new Set(activeTools), agentDefinitions: { [roleName]: definition }, agentDir, modelAliases: aliases, knownModels, availableModels, settingsPath, agentSetupHooks: hooks, agentResourcePolicy: () => structuredClone(basePolicy), runContext: run };
+    const root = { cwd, model: { ...rootModel }, tools: new Set(activeTools), agentDefinitions: { [roleName]: definition }, agentDir, extensionSettings, modelAliases: aliases, knownModels, availableModels, settingsPath, agentSetupHooks: hooks, agentResourcePolicy: () => structuredClone(basePolicy), runContext: run };
     const options = { label: roleName, workflowName: "doctor", role: roleName };
     let prepared;
     try {
@@ -313,13 +304,22 @@ async function inspectRoleSession(cwd, agentDir, roleName, definition, rolePath,
     }
 }
 function resourcePolicySource(settingsSource) { return settingsSource; }
+function validateDoctorExtensionSettings(registry, value, source, cwd, projectTrusted, settingsPath, diagnostics, role) {
+    try {
+        registry.validateExtensionSettings(value, { source, cwd, projectTrusted, settingsPath, ...(role === undefined ? {} : { role }) });
+    }
+    catch (error) {
+        diagnostics.push(diagnostic("error", "SETTINGS_INVALID", errorText(error), `${settingsPath}.extensionSettings`, "Fix the extension-owned settings reported in this error."));
+    }
+}
 export async function doctor(options = {}) {
-    const cwd = canonical(options.cwd ?? process.cwd());
-    const agentDir = canonical(options.agentDir ?? getAgentDir());
-    const settingsPath = canonical(options.settingsPath ?? workflowSettingsPath(agentDir));
+    const cwd = canonicalPath(options.cwd ?? process.cwd());
+    const agentDir = canonicalPath(options.agentDir ?? getAgentDir());
+    const settingsPath = canonicalPath(options.settingsPath ?? workflowSettingsPath(agentDir));
     const projectSettingsPath = workflowProjectSettingsPath(cwd);
     const legacyGlobalSettings = usesLegacySettings(settingsPath);
     const diagnostics = [];
+    const registry = options.registry ?? loadingRegistry();
     let settings = DEFAULT_SETTINGS;
     try {
         settings = loadSettings(settingsPath);
@@ -351,6 +351,11 @@ export async function doctor(options = {}) {
         const resolved = resolveWorkflowSettings(cwd, pi.trust.trusted, settingsPath);
         settings = resolved.effective;
         settingsSources = resolved.sources;
+        if (resolved.global.extensionSettings !== undefined)
+            validateDoctorExtensionSettings(registry, resolved.global.extensionSettings, "global", cwd, pi.trust.trusted, resolved.globalSettingsPath, diagnostics);
+        if (pi.trust.trusted && resolved.project.extensionSettings !== undefined)
+            validateDoctorExtensionSettings(registry, resolved.project.extensionSettings, "project", cwd, true, resolved.projectSettingsPath, diagnostics);
+        validateDoctorExtensionSettings(registry, resolved.effective.extensionSettings, "effective", cwd, pi.trust.trusted, settingsSources.extensionSettings ?? settingsPath, diagnostics);
     }
     catch (error) {
         const message = errorText(error);
@@ -384,7 +389,6 @@ export async function doctor(options = {}) {
     const knownModels = new Set(pi.knownModels);
     const availableModels = new Set(pi.availableModels);
     const aliases = settings.modelAliases ?? {};
-    const registry = options.registry ?? loadingRegistry();
     const registeredModelAliases = registry.modelAliases();
     const dynamicAliases = new Set(registeredModelAliases.map(({ name }) => name).filter((name) => !Object.prototype.hasOwnProperty.call(aliases, name)));
     const modelAliases = [
@@ -430,6 +434,8 @@ export async function doctor(options = {}) {
         const overriddenBy = starterOverriddenBy.get(file.path);
         roles.push({ name: file.name, path: file.path, scope: "extension", active: overriddenBy === undefined, extension: file.extension, ...(starterPath ? { overrides: starterPath } : {}), ...(overriddenBy ? { overriddenBy } : {}) });
         const definition = inspectRole(file.path, activeTools, knownModels, availableModels, diagnostics, aliases, dynamicAliases, settingsPath, { directory: file.directory, extension: file.extension });
+        if (definition)
+            validateDoctorExtensionSettings(registry, mergeWorkflowExtensionSettings(settings.extensionSettings, definition.extensionSettings), "role", cwd, pi.trust.trusted, file.path, diagnostics, file.name);
         if (duplicateExtensionNames.has(file.name))
             continue;
         if (extensionPaths.get(file.name) !== file.path)
@@ -452,6 +458,8 @@ export async function doctor(options = {}) {
             }
         }
         const definition = inspectRole(path, activeTools, knownModels, availableModels, diagnostics, aliases, dynamicAliases, settingsPath);
+        if (definition)
+            validateDoctorExtensionSettings(registry, mergeWorkflowExtensionSettings(settings.extensionSettings, definition.extensionSettings), "role", cwd, pi.trust.trusted, path, diagnostics, name);
         if (definition)
             definitions.set(name, definition);
         else
@@ -481,6 +489,8 @@ export async function doctor(options = {}) {
             }
         }
         const definition = inspectRole(path, activeTools, knownModels, availableModels, diagnostics, aliases, dynamicAliases, settingsPath);
+        if (definition)
+            validateDoctorExtensionSettings(registry, mergeWorkflowExtensionSettings(settings.extensionSettings, definition.extensionSettings), "role", cwd, pi.trust.trusted, path, diagnostics, name);
         if (definition)
             definitions.set(name, definition);
         else
@@ -513,7 +523,7 @@ export async function doctor(options = {}) {
                         const dynamic = await registry.resolveModelAliases({ cwd, projectTrusted: pi.trust.trusted, rootModel, knownModels, availableModels, signal: new AbortController().signal });
                         roleAliases = { ...aliases, ...dynamic };
                     }
-                    roleInspection = await inspectRoleSession(cwd, agentDir, options.role, definition, activeRole.path, resourcePolicy, rootModel, [...activeTools], roleAliases, knownModels, availableModels, settingsPath, options.prompt ?? "", registry.agentSetupHooks(), diagnostics);
+                    roleInspection = await inspectRoleSession(cwd, agentDir, options.role, definition, activeRole.path, resourcePolicy, rootModel, [...activeTools], roleAliases, knownModels, availableModels, settingsPath, settings.extensionSettings, options.prompt ?? "", registry.agentSetupHooks(), diagnostics);
                     if (roleInspection)
                         diagnostics.push(...roleInspection.setup.diagnostics);
                 }
@@ -530,7 +540,7 @@ export async function doctor(options = {}) {
     const severityOrder = { error: 0, warning: 1 };
     diagnostics.sort((left, right) => severityOrder[left.severity] - severityOrder[right.severity] || (left.source ?? "").localeCompare(right.source ?? "") || left.code.localeCompare(right.code) || left.message.localeCompare(right.message));
     roles.sort((left, right) => left.name.localeCompare(right.name) || left.scope.localeCompare(right.scope));
-    return { cwd, agentDir, settingsPath, settings, settingsSources, trust: pi.trust, activeTools: [...activeTools].sort(), piExtensions: [...new Set((pi.extensions ?? []).map(canonical))].sort(), piSkills: [...new Set(pi.skills ?? [])].sort(), roles, functions, modelAliases, resourcePolicy, ...(options.role !== undefined ? { roleTarget: options.role } : {}), ...(roleInspection ? { roleInspection } : {}), diagnostics };
+    return { cwd, agentDir, settingsPath, settings, settingsSources, trust: pi.trust, activeTools: [...activeTools].sort(), piExtensions: [...new Set((pi.extensions ?? []).map(canonicalPath))].sort(), piSkills: [...new Set(pi.skills ?? [])].sort(), roles, functions, modelAliases, resourcePolicy, ...(options.role !== undefined ? { roleTarget: options.role } : {}), ...(roleInspection ? { roleInspection } : {}), diagnostics };
 }
 function count(report, severity) { return report.diagnostics.filter((item) => item.severity === severity).length; }
 export function doctorExitCode(report) { return count(report, "error") > 0 ? 1 : 0; }
@@ -608,7 +618,7 @@ export function formatDoctorReport(report) {
         `- Agent dir: \`${report.agentDir}\``,
         `- Global workflow settings: \`${report.settingsPath}\``,
         `- Project workflow settings: \`${report.resourcePolicy.projectSettingsPath}\` (${report.resourcePolicy.projectTrusted ? "trusted" : "ignored: project untrusted"})`,
-        `- Effective setting sources: concurrency=\`${report.settingsSources.concurrency}\`, modelAliases=\`${report.settingsSources.modelAliases}\`, skills=\`${report.settingsSources.skills ?? "(none)"}\`, extensions=\`${report.settingsSources.extensions ?? "(none)"}\`, tools=\`${report.settingsSources.tools ?? "(none)"}\``,
+        `- Effective setting sources: concurrency=\`${report.settingsSources.concurrency}\`, modelAliases=\`${report.settingsSources.modelAliases}\`, skills=\`${report.settingsSources.skills ?? "(none)"}\`, extensions=\`${report.settingsSources.extensions ?? "(none)"}\`, extensionSettings=\`${report.settingsSources.extensionSettings ?? "(none)"}\`, tools=\`${report.settingsSources.tools ?? "(none)"}\``,
         `- Limits: concurrency=${String(report.settings.concurrency)}`,
         "",
         "## Trust/resources",

package/dist/src/session-inspector.js

@@ -173,7 +173,7 @@ async function loadRuns(cwd, sessionId, home) {
     }
     return runs;
 }
-async function agentReport(agent) {
+function agentReport(agent) {
     const fallbackModel = `${agent.model.provider}/${agent.model.model}`;
     const fallbackThinking = agent.model.thinking;
     const attempts = [];
@@ -181,15 +181,10 @@ async function agentReport(agent) {
         const setup = attempt.setup;
         const path = attemptTranscriptPath(attempt);
         const log = path ? readTranscript(path) : undefined;
-        if (log) {
-            const model = log.model ?? `${setup.model.provider}/${setup.model.model}`;
-            const cost = log.cost;
-            attempts.push({ attempt: attempt.attempt, prompt: log.prompt ?? "(transcript unavailable)", model, ...(log.thinking !== undefined ? { thinking: log.thinking } : {}), cost, models: log.models.length ? log.models : [{ model, cost }], ...(attempt.error ? { error: `${attempt.error.code}: ${attempt.error.message}` } : {}), setup });
-            continue;
-        }
-        const model = `${setup.model.provider}/${setup.model.model}`;
-        const cost = attempt.accounting.cost;
-        attempts.push({ attempt: attempt.attempt, prompt: "(transcript unavailable)", model, ...(setup.model.thinking !== undefined ? { thinking: setup.model.thinking } : {}), cost, models: [{ model, cost }], ...(attempt.error ? { error: `${attempt.error.code}: ${attempt.error.message}` } : {}), setup });
+        const model = log?.model ?? `${setup.model.provider}/${setup.model.model}`;
+        const thinking = log ? log.thinking : setup.model.thinking;
+        const cost = log?.cost ?? attempt.accounting.cost;
+        attempts.push({ attempt: attempt.attempt, prompt: log?.prompt ?? "(transcript unavailable)", model, ...(thinking !== undefined ? { thinking } : {}), cost, models: log?.models.length ? log.models : [{ model, cost }], ...(attempt.error ? { error: `${attempt.error.code}: ${attempt.error.message}` } : {}), setup });
     }
     if (!attempts.length) {
         const cost = agent.accounting?.cost ?? 0;
@@ -223,7 +218,7 @@ export async function loadSessionReport(path, home = homedir()) {
         const runId = resultRunId(result);
         const loaded = runId ? runs.get(runId) : undefined;
         const args = call.arguments;
-        const agents = loaded ? await Promise.all(loaded.run.agents.map(agentReport)) : [];
+        const agents = loaded ? loaded.run.agents.map(agentReport) : [];
         const models = mergedModels(agents.flatMap(({ attempts }) => attempts.map(({ models: attemptModels }) => attemptModels)));
         const name = loaded?.run.workflowName ?? (typeof args.name === "string" ? args.name : "workflow");
         const description = typeof args.description === "string" ? args.description : loaded?.snapshot.metadata.description;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@piewf/cli",
-  "version": "5.13.2",
+  "version": "5.14.0",
   "description": "CLI for pi-extensible-workflows",
   "homepage": "https://vekexasia.github.io/pi-extensible-workflows/",
   "repository": {
@@ -43,7 +43,7 @@
     "@earendil-works/pi-coding-agent": "0.85.0",
     "@earendil-works/pi-server": "0.85.0",
     "@earendil-works/pi-tui": "0.85.0",
-    "pi-extensible-workflows": "5.13.2",
+    "pi-extensible-workflows": "5.14.0",
     "typebox": "1.3.7"
   },
   "publishConfig": {