@piewf/cli 5.13.1 → 5.13.2

package/dist/src/cli.js

@@ -8,12 +8,11 @@ import { ProjectTrustStore, SessionManager, SettingsManager, createAgentSessionF
 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, registeredWorkflowFunctionSources, truncateWorkflowProgress, workflowCatalog, workflowSettingsPath } from "pi-extensible-workflows";
+import workflowExtension, { errorText, formatWorkflowProgress, isNodeError, jsonValue, loadAgentDefinitions, object, registeredWorkflowFunctionSources, 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";
 import { shareTrajectoryRun } from "pi-extensible-workflows/trajectory";
-function object(value) { return typeof value === "object" && value !== null && !Array.isArray(value); }
 function has(value, key) { return Object.prototype.hasOwnProperty.call(value, key); }
 function requiredArg(args, index) {
     const value = args[index];
@@ -97,7 +96,7 @@ function coerce(raw, type, schema) {
     }
     else if (type === "number") {
         value = Number(raw);
-        if (!Number.isFinite(value))
+        if (!raw.trim() || !Number.isFinite(value))
             throw new Error(`Invalid number: ${raw}`);
     }
     else {

package/dist/src/doctor-cleanup.js

@@ -2,27 +2,20 @@ import { createHash } from "node:crypto";
 import { lstat, readdir, readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
-import { validateBudget } from "pi-extensible-workflows";
-import { RUN_STATES } from "pi-extensible-workflows";
-import { errorText, isNodeError, jsonValue, validateModelAliases } from "pi-extensible-workflows";
-import { validateSchema } from "pi-extensible-workflows";
+import { AGENT_STATES as CORE_AGENT_STATES, BUDGET_DIMENSIONS as CORE_BUDGET_DIMENSIONS, BUDGET_EVENT_TYPES as CORE_BUDGET_EVENT_TYPES, HARD_TERMINAL_RUN_STATES, RUN_STATES, errorText, isNodeError, isThinkingLevel, jsonValue, object, validateBudget, validateModelAliases, validateSchema } from "pi-extensible-workflows";
 import { acquireSessionLease, hasLiveSessionLease, projectSessionsDirectory, RunStore } from "pi-extensible-workflows/persistence";
-const TERMINAL_STATES = new Set(["completed", "failed", "stopped"]);
 const DAY_MS = 24 * 60 * 60 * 1000;
 const REQUIRED_RUN_FILES = ["workflow.js", "state.json", "snapshot.json", "journal.json", "ownership.json", "worktrees.json", "borrowed-worktrees.json", "system-prompts.json"];
 const OPTIONAL_RUN_FILES = new Set(["result.json", "summary.json"]);
 const RUN_DIRECTORIES = new Set(["worktrees", ".system-prompts"]);
 const RUN_FILES = new Set([...REQUIRED_RUN_FILES, ...OPTIONAL_RUN_FILES]);
-const AGENT_STATES = new Set(["queued", "running", "waiting_for_child", "paused", "retrying", "completed", "failed", "cancelled"]);
-const SCHEDULER_STATES = new Set(["queued", "running", "waiting_for_child", "paused", "retrying", "completed", "failed", "cancelled"]);
-const BUDGET_DIMENSIONS = new Set(["tokens", "costUsd", "durationMs", "agentLaunches"]);
-const BUDGET_EVENT_TYPES = new Set(["soft_crossed", "hard_overrun", "hard_exhausted", "adjustment_requested", "adjustment_approved", "adjustment_rejected"]);
-function object(value) { return typeof value === "object" && value !== null && !Array.isArray(value); }
+// String-keyed views of the core vocabularies: persisted files are read as unknown, so membership is checked on plain strings.
+const AGENT_STATES = new Set(CORE_AGENT_STATES);
+const BUDGET_DIMENSIONS = new Set(CORE_BUDGET_DIMENSIONS);
+const BUDGET_EVENT_TYPES = new Set(CORE_BUDGET_EVENT_TYPES);
 function isList(value) { return Array.isArray(value); }
-function isThinking(value) { return ["off", "minimal", "low", "medium", "high", "xhigh", "max"].some((candidate) => candidate === value); }
 function isRunState(value) { return RUN_STATES.some((candidate) => candidate === value); }
 function isAgentState(value) { return typeof value === "string" && AGENT_STATES.has(value); }
-function isSchedulerState(value) { return typeof value === "string" && SCHEDULER_STATES.has(value); }
 function isToolCallState(value) { return ["running", "completed", "failed"].some((candidate) => candidate === value); }
 function isActivityKind(value) { return ["reasoning", "tool", "text"].some((candidate) => candidate === value); }
 function positiveDays(value) { if (!Number.isSafeInteger(value) || value < 1 || !Number.isFinite(value * DAY_MS))
@@ -42,7 +35,7 @@ function positiveInteger(value, label) { if (typeof value !== "number" || !Numbe
     throw new Error(`${label} is invalid`); }
 function finiteNumber(value, label) { if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
     throw new Error(`${label} is invalid`); }
-function model(value, label) { if (!object(value) || typeof value.provider !== "string" || !value.provider || typeof value.model !== "string" || !value.model || (value.thinking !== undefined && !isThinking(value.thinking)))
+function model(value, label) { if (!object(value) || typeof value.provider !== "string" || !value.provider || typeof value.model !== "string" || !value.model || (value.thinking !== undefined && !isThinkingLevel(value.thinking)))
     throw new Error(`${label} is invalid`); }
 function accounting(value, label) { if (!object(value))
     throw new Error(`${label} is invalid`); for (const key of ["input", "output", "cacheRead", "cacheWrite", "cost"])
@@ -54,7 +47,7 @@ function resourceSelectors(value, label) { if (value === undefined)
     stringList(value.extensions, `${label}.extensions`); if (value.tools !== undefined)
     stringList(value.tools, `${label}.tools`); }
 function agentDefinition(value, label) { if (!object(value))
-    throw new Error(`${label} is invalid`); optionalString(value.prompt, `${label}.prompt`); optionalString(value.description, `${label}.description`); optionalString(value.model, `${label}.model`); if (value.thinking !== undefined && !isThinking(value.thinking))
+    throw new Error(`${label} is invalid`); optionalString(value.prompt, `${label}.prompt`); optionalString(value.description, `${label}.description`); optionalString(value.model, `${label}.model`); if (value.thinking !== undefined && !isThinkingLevel(value.thinking))
     throw new Error(`${label}.thinking is invalid`); if (value.tools !== undefined)
     stringList(value.tools, `${label}.tools`); if (value.skills !== undefined)
     stringList(value.skills, `${label}.skills`); if (value.extensions !== undefined)
@@ -69,7 +62,7 @@ function validateScheduledOptions(value, label) { if (!object(value) || typeof v
     throw new Error(`${label} is invalid`); optionalString(value.requestedLabel, `${label}.requestedLabel`); optionalString(value.parentBreadcrumb, `${label}.parentBreadcrumb`); stringList(value.tools, `${label}.tools`); if (value.skills !== undefined)
     stringList(value.skills, `${label}.skills`); if (value.extensions !== undefined)
     stringList(value.extensions, `${label}.extensions`); if (value.contextFiles !== undefined)
-    stringList(value.contextFiles, `${label}.contextFiles`); optionalString(value.worktreeOwner, `${label}.worktreeOwner`); optionalString(value.model, `${label}.model`); if (value.thinking !== undefined && !isThinking(value.thinking))
+    stringList(value.contextFiles, `${label}.contextFiles`); optionalString(value.worktreeOwner, `${label}.worktreeOwner`); optionalString(value.model, `${label}.model`); if (value.thinking !== undefined && !isThinkingLevel(value.thinking))
     throw new Error(`${label}.thinking is invalid`); optionalRole(value.role, `${label}.role`); if (value.schema !== undefined)
     validateSchema(value.schema, `${label}.schema`); if (value.retries !== undefined)
     nonNegativeInteger(value.retries, `${label}.retries`); if (value.timeoutMs !== undefined && value.timeoutMs !== null)
@@ -146,7 +139,7 @@ function validateAgent(value, label) {
         finiteNumber(value.lastEventAt, `${label}.lastEventAt`);
 }
 function validateUsage(value, label) { if (!object(value))
-    throw new Error(`${label} is invalid`); for (const key of ["tokens", "costUsd", "durationMs", "agentLaunches"])
+    throw new Error(`${label} is invalid`); for (const key of BUDGET_DIMENSIONS)
     finiteNumber(value[key], `${label}.${key}`); }
 function validateBudgetEvents(value) { if (value === undefined)
     return; if (!isList(value))
@@ -306,7 +299,7 @@ async function validateRunDirectory(store) {
     }
 }
 function validateOwnershipRecord(value, label, ownershipIds) {
-    if (!object(value) || typeof value.id !== "string" || !value.id || ownershipIds.has(value.id) || typeof value.label !== "string" || !value.label || !isSchedulerState(value.state))
+    if (!object(value) || typeof value.id !== "string" || !value.id || ownershipIds.has(value.id) || typeof value.label !== "string" || !value.label || !isAgentState(value.state))
         throw new Error(`${label} is invalid`);
     optionalString(value.parentId, `${label}.parentId`);
     optionalString(value.prompt, `${label}.prompt`);
@@ -443,7 +436,7 @@ async function recheckCandidate(entry, cutoffMs) {
         return "State record disappeared before deletion";
     const loaded = await entry.store.load().catch((error) => { throw new Error(`Candidate could not be reloaded: ${errorText(error)}`); });
     validateRunRecord(loaded.run);
-    if (loaded.run.id !== entry.runId || loaded.run.state !== entry.run.state || !TERMINAL_STATES.has(loaded.run.state))
+    if (loaded.run.id !== entry.runId || loaded.run.state !== entry.run.state || !HARD_TERMINAL_RUN_STATES.has(loaded.run.state))
         return "Candidate state changed before deletion";
     const after = await stat(join(entry.store.directory, "state.json"));
     if (before.mtimeMs !== after.mtimeMs || after.mtimeMs !== entry.stateMtimeMs)
@@ -455,7 +448,7 @@ async function recheckCandidate(entry, cutoffMs) {
 function planSession(scan, cutoffMs) {
     if (scan.liveLease)
         return { candidates: [], skipped: scan.runs.map((entry) => runItem(entry, "skipped", "Session has a live ownership lease")) };
-    const oldTerminal = new Set(scan.runs.filter(({ run, stateMtimeMs }) => TERMINAL_STATES.has(run.state) && stateMtimeMs < cutoffMs).map(({ runId }) => runId));
+    const oldTerminal = new Set(scan.runs.filter(({ run, stateMtimeMs }) => HARD_TERMINAL_RUN_STATES.has(run.state) && stateMtimeMs < cutoffMs).map(({ runId }) => runId));
     const protectedRuns = new Set();
     const visit = (runId) => { if (protectedRuns.has(runId))
         return; protectedRuns.add(runId); const entry = scan.runs.find(({ runId: current }) => current === runId); for (const dependency of entry?.dependencies ?? [])
@@ -466,7 +459,7 @@ function planSession(scan, cutoffMs) {
                 visit(dependency);
     const skipped = [];
     for (const entry of scan.runs) {
-        if (!TERMINAL_STATES.has(entry.run.state))
+        if (!HARD_TERMINAL_RUN_STATES.has(entry.run.state))
             skipped.push(runItem(entry, "skipped", `Run state ${entry.run.state} is active or resumable`));
         else if (entry.stateMtimeMs >= cutoffMs)
             skipped.push(runItem(entry, "skipped", "State record is not older than the cutoff"));

package/dist/src/session-inspector.js

@@ -4,7 +4,7 @@ import { emitKeypressEvents } from "node:readline";
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
 import { highlightCode, initTheme, SessionManager, truncateToVisualLines } from "@earendil-works/pi-coding-agent";
-import { errorText, formatBudgetStatus, inspectWorkflowScript } from "pi-extensible-workflows";
+import { errorText, formatBudgetStatus, inspectWorkflowScript, parseThinking } from "pi-extensible-workflows";
 import { listPersistedSessionIds, listRunIds, RunStore } from "pi-extensible-workflows/persistence";
 function text(content) {
     if (typeof content === "string")
@@ -69,13 +69,6 @@ function mergedModels(groups) {
             totals.set(item.model, (totals.get(item.model) ?? 0) + item.cost);
     return [...totals].map(([model, cost]) => ({ model, cost })).sort((a, b) => b.cost - a.cost || a.model.localeCompare(b.model));
 }
-const thinkingLevels = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
-function isThinkingLevel(value) {
-    return typeof value === "string" && thinkingLevels.some((level) => level === value);
-}
-function parsedThinking(value) {
-    return isThinkingLevel(value) ? value : undefined;
-}
 function modelName(provider, model) {
     return typeof provider === "string" && provider && typeof model === "string" && model ? `${provider}/${model}` : undefined;
 }
@@ -93,7 +86,7 @@ function transcript(manager) {
             continue;
         }
         if (entry.type === "thinking_level_change") {
-            thinking = parsedThinking(entry.thinkingLevel);
+            thinking = parseThinking(entry.thinkingLevel);
             if (thinking === undefined)
                 throw new Error("Invalid thinking policy");
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@piewf/cli",
-  "version": "5.13.1",
+  "version": "5.13.2",
   "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.1",
+    "pi-extensible-workflows": "5.13.2",
     "typebox": "1.3.7"
   },
   "publishConfig": {