@cydm/pie 1.0.20 → 1.0.22

package/dist/cli.js

@@ -45461,11 +45461,13 @@ async function probeModelsConfig(options) {
   };
 }
 function parseModelsCommandArgs(args) {
-  const parsed = { force: false, stdout: false };
+  const parsed = { force: false, stdout: false, json: false };
   for (let i = 0; i < args.length; i += 1) {
     const arg = args[i];
     if (arg === "--force") {
       parsed.force = true;
+    } else if (arg === "--json") {
+      parsed.json = true;
     } else if (arg === "--stdout") {
       parsed.stdout = true;
     } else if (arg === "--probe" && args[i + 1]) {
@@ -45556,8 +45558,9 @@ async function listSessions(args) {
 }
 async function readSession(args) {
   const json = hasFlag(args, "--json");
+  const includeMessage = hasFlag(args, "--raw") || hasFlag(args, "--include-message");
   const sessionId = positionalArgs(args, /* @__PURE__ */ new Set(["--limit", "--before"]))[0];
-  if (!sessionId) throw new Error("Usage: pie sessions read <sessionId> [--json] [--limit <n>] [--before <cursor>]");
+  if (!sessionId) throw new Error("Usage: pie sessions read <sessionId> [--json] [--raw|--include-message] [--limit <n>] [--before <cursor>]");
   const limit = numericFlag(args, "--limit", 200);
   const before = stringFlag(args, "--before");
   const store = new FileSessionStore(getSessionsDir());
@@ -45572,7 +45575,7 @@ async function readSession(args) {
     session: sessionSummary(data.metadata),
     currentHead: data.metadata.activeEntryId,
     activeEntryId: data.metadata.activeEntryId,
-    events: page,
+    events: json && !includeMessage ? page.map(stableTranscriptEvent) : page,
     hasMoreBefore: start > 0,
     nextBefore: start > 0 ? String(start) : void 0
   };
@@ -45694,7 +45697,7 @@ async function forkSession(args) {
 function printSessionsUsage() {
   console.log(`Usage:
   pie sessions list [--json] [--limit <n>] [--cursor <cursor>] [--cwd <path>]
-  pie sessions read <sessionId> [--json] [--limit <n>] [--before <cursor>]
+  pie sessions read <sessionId> [--json] [--raw|--include-message] [--limit <n>] [--before <cursor>]
   pie sessions rename <sessionId> <name> [--json] [--cwd <path>]
   pie sessions rewind <sessionId> --to <entryId> [--json]
   pie sessions fork <sessionId> --from <entryId> --target <newSessionId> --name <name> [--cwd <path>] [--json]`);
@@ -45709,10 +45712,16 @@ function stringFlag(args, flag) {
   return value && !value.startsWith("-") ? value : void 0;
 }
 function numericFlag(args, flag, fallback) {
-  const value = stringFlag(args, flag);
-  if (!value) return fallback;
+  const index = args.indexOf(flag);
+  if (index < 0) return fallback;
+  const value = args[index + 1];
+  if (!value) throw new Error(`${flag} requires a value.`);
   const parsed = Number(value);
-  return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
+  const max = 1e3;
+  if (!Number.isInteger(parsed) || parsed <= 0 || parsed > max) {
+    throw new Error(`${flag} must be a positive integer no greater than ${max}.`);
+  }
+  return parsed;
 }
 function positionalArgs(args, valueFlags) {
   const result = [];
@@ -45758,6 +45767,7 @@ function realpathOrInput(value) {
 function activeTranscriptEvents(entries) {
   return entries.map((entry, index) => {
     const role = isRecord2(entry.message) && typeof entry.message.role === "string" ? entry.message.role : void 0;
+    const turnId = isRecord2(entry.message) && typeof entry.message.turnId === "string" ? entry.message.turnId : void 0;
     return {
       logicalSeq: index + 1,
       checkpointId: entry.id,
@@ -45767,11 +45777,26 @@ function activeTranscriptEvents(entries) {
       timestamp: entry.timestamp,
       occurredAt: entry.timestamp,
       role,
+      turnId,
       content: textFromMessage(entry.message),
       message: entry.message ? cloneJson(entry.message) : void 0
     };
   });
 }
+function stableTranscriptEvent(event) {
+  return {
+    logicalSeq: event.logicalSeq,
+    checkpointId: event.checkpointId,
+    entryId: event.entryId,
+    id: event.id,
+    type: event.type,
+    timestamp: event.timestamp,
+    occurredAt: event.occurredAt,
+    ...event.role ? { role: event.role } : {},
+    ...event.turnId ? { turnId: event.turnId } : {},
+    ...event.content ? { content: event.content } : {}
+  };
+}
 function activePathEntries(data) {
   const activeEntryId = data.metadata.activeEntryId;
   if (!activeEntryId) return [];
@@ -59771,6 +59796,11 @@ var ToolExecutionComponent = class extends Container {
     const textBlocks = this.result.content?.filter((content) => content.type === "text") || [];
     return textBlocks.map((content) => (content.text || "").replace(/\r/g, "")).join("\n");
   }
+  getExpandedOutputLineLimit(collapsedMaxLines) {
+    if (!this.expanded) return collapsedMaxLines;
+    const visibleOutputRows = Math.max(collapsedMaxLines, this.ui.terminal.rows - 15);
+    return visibleOutputRows;
+  }
   formatToolExecution() {
     let text = "";
     const invalidArg = theme.fg("error", "[invalid arg]");
@@ -60076,7 +60106,7 @@ ${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
         const output = this.getTextOutput().trim();
         if (output) {
           const lines = output.split("\n");
-          const maxLines = this.expanded ? lines.length : 5;
+          const maxLines = this.getExpandedOutputLineLimit(5);
           const displayLines = lines.slice(0, maxLines);
           const remaining = lines.length - maxLines;
           text += "\n\n" + displayLines.map((line) => theme.fg("toolOutput", line)).join("\n");
@@ -60327,7 +60357,10 @@ async function loadSession(host, sessionId) {
     host.ui.requestRender();
   }
 }
-function updateTerminalTitle(host) {
+var TITLE_SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var TITLE_SPINNER_INTERVAL_MS = 80;
+var titleSpinnerTimers = /* @__PURE__ */ new WeakMap();
+function updateTerminalTitle(host, spinnerFrame) {
   const activeSession = host.sessionManager.getActiveSession();
   if (!activeSession) {
     host.ui.terminal.setTitle("Pie");
@@ -60338,14 +60371,41 @@ function updateTerminalTitle(host) {
     messages: host.sessionManager.getMessages()
   });
   const activityState = host.submitLock ? "busy" : "ready";
-  host.ui.terminal.setTitle(`Pie \xB7 ${sessionLabel} [ms:session=${activeSession.id};state=${activityState}]`);
+  const prefix = spinnerFrame ? `${spinnerFrame} ` : "";
+  host.ui.terminal.setTitle(`${prefix}Pie \xB7 ${sessionLabel} [ms:session=${activeSession.id};state=${activityState}]`);
+}
+function stopTitleSpinner(host) {
+  const timer = titleSpinnerTimers.get(host);
+  if (timer) {
+    clearInterval(timer);
+    titleSpinnerTimers.delete(host);
+  }
+}
+function startTitleSpinner(host) {
+  stopTitleSpinner(host);
+  let frameIndex = 0;
+  const timer = setInterval(() => {
+    const frame = TITLE_SPINNER_FRAMES[frameIndex % TITLE_SPINNER_FRAMES.length];
+    updateTerminalTitle(host, frame);
+    frameIndex++;
+  }, TITLE_SPINNER_INTERVAL_MS);
+  if (typeof timer.unref === "function") {
+    timer.unref();
+  }
+  titleSpinnerTimers.set(host, timer);
+  updateTerminalTitle(host, TITLE_SPINNER_FRAMES[0]);
 }
 function setSubmitLock(host, locked) {
   if (host.submitLock === locked) {
     return;
   }
   host.submitLock = locked;
-  host.updateTerminalTitle();
+  stopTitleSpinner(host);
+  if (locked) {
+    startTitleSpinner(host);
+  } else {
+    host.updateTerminalTitle();
+  }
 }
 async function handleTreeCommand(host) {
   const entries = host.sessionManager.getEntries();
@@ -68379,6 +68439,9 @@ async function runJsonEventsMode(params) {
   let trace;
   let lastRetryEvent;
   let mockActiveEntryId;
+  let thinkingLevel = "off";
+  let defaultRuntime;
+  let defaultModelState;
   const noProgressTimeoutMs = Number(process.env.PIE_JSON_EVENTS_NO_PROGRESS_MS || 6e5);
   const mockResponseDelayMs = Number(process.env.PIE_TEST_MOCK_RESPONSE_DELAY_MS || 0);
   writeEvent({ type: "agent.ready", sessionId });
@@ -68724,6 +68787,10 @@ async function runJsonEventsMode(params) {
     if (!runtime) {
       throw new Error("JSON events mode requires a CLI runtime");
     }
+    if (defaultRuntime !== runtime) {
+      defaultRuntime = runtime;
+      defaultModelState = configuredDefaultModelState(runtime);
+    }
     if (runtime.initialModel.unconfigured || controller) {
       return;
     }
@@ -68752,7 +68819,7 @@ async function runJsonEventsMode(params) {
         systemPrompt: baseSystemPrompt,
         model: runtime.model,
         tools,
-        thinkingLevel: "off"
+        thinkingLevel
       },
       apiKey: runtime.apiKey,
       streamFn: params.streamFn
@@ -68805,6 +68872,77 @@ async function runJsonEventsMode(params) {
     controller.updateRuntimeContext({ tools: agent.state.tools });
     disposeSemanticSubscription = agent.subscribeSemantic(handleSemanticEvent);
   }
+  function metadataSelection(metadata, key) {
+    if (!metadata || !(key in metadata)) return void 0;
+    const value = metadata[key];
+    if (value === null) return null;
+    if (typeof value !== "string") throw new Error(`${key} must be a string or null`);
+    const normalized = value.trim();
+    return normalized && normalized !== "default" ? normalized : null;
+  }
+  function configuredDefaultModelState(runtime2) {
+    const model = runtime2.initialModel.model ?? runtime2.model;
+    const apiKey = runtime2.initialModel.apiKey || runtime2.modelRegistry.getApiKey(model) || runtime2.apiKey;
+    return {
+      provider: runtime2.initialModel.provider || model.provider || runtime2.provider,
+      modelId: runtime2.initialModel.modelId || model.id || runtime2.modelId,
+      model,
+      apiKey
+    };
+  }
+  function parseRequestedModel(value) {
+    const separator = value.indexOf("/");
+    if (separator <= 0 || separator === value.length - 1) return void 0;
+    return {
+      provider: value.slice(0, separator),
+      modelId: value.slice(separator + 1)
+    };
+  }
+  function applyRuntimeSelection(message) {
+    if (!runtime || !agent) return;
+    const requestedModel = metadataSelection(message.metadata, "model");
+    const requestedThinkingLevel = metadataSelection(message.metadata, "thinkingLevel");
+    if (requestedModel !== void 0) {
+      if (requestedModel === null) {
+        const defaults = defaultModelState;
+        if (defaults) {
+          agent.setModel(defaults.model);
+          agent.apiKey = defaults.apiKey;
+          runtime.model = defaults.model;
+          runtime.provider = defaults.provider;
+          runtime.modelId = defaults.modelId;
+          runtime.apiKey = defaults.apiKey;
+        }
+      } else {
+        const parsed = parseRequestedModel(requestedModel);
+        if (!parsed) throw new Error(`model must use profile/modelId format: ${requestedModel}`);
+        const { provider, modelId } = parsed;
+        const model = runtime.modelRegistry.find(provider, modelId);
+        if (!model) throw new Error(`Model "${requestedModel}" not found`);
+        const apiKey = runtime.modelRegistry.getApiKey(model);
+        agent.setModel(model);
+        agent.apiKey = apiKey;
+        runtime.model = model;
+        runtime.provider = provider;
+        runtime.modelId = modelId;
+        runtime.apiKey = apiKey;
+      }
+    }
+    if (requestedThinkingLevel !== void 0) {
+      const nextLevel = requestedThinkingLevel === null ? "off" : requestedThinkingLevel;
+      if (!isThinkingLevel(nextLevel)) throw new Error(`Unsupported thinkingLevel: ${nextLevel}`);
+      thinkingLevel = nextLevel;
+      applyThinkingLevel({
+        level: thinkingLevel,
+        agent,
+        settingsManager: runtime.settingsManager,
+        sessionManager: runtime.sessionManager,
+        model: runtime.model
+      });
+    } else {
+      syncSessionModelMetadata(runtime.sessionManager, runtime.model, thinkingLevel);
+    }
+  }
   async function runTurn(message) {
     if (isSessionMismatch(message)) {
       writeEvent({
@@ -68887,6 +69025,14 @@ async function runJsonEventsMode(params) {
       if (activeTurn === turn) activeTurn = null;
       return;
     }
+    try {
+      applyRuntimeSelection(message);
+    } catch (error) {
+      finalize("failed", error instanceof Error ? error.message : String(error));
+      if (activeTurn === turn) emitSettled(turn);
+      if (activeTurn === turn) activeTurn = null;
+      return;
+    }
     const progressTimer = setInterval(() => {
       const turn2 = activeTurn;
       if (!turn2 || turn2.finalized) return;
@@ -69107,6 +69253,12 @@ async function runModelsCommand(args) {
   }
   if (subcommand === "validate") {
     const result = validateModelsConfig({ path: parsed.path });
+    if (parsed.json) {
+      const probe = result.ok && parsed.probe ? await probeModelsConfig({ path: parsed.path, probe: parsed.probe }) : void 0;
+      console.log(JSON.stringify({ ...result, ...probe ? { probe } : {} }, null, 2));
+      if (!result.ok || probe?.status === "failed") process.exitCode = 1;
+      return;
+    }
     if (!result.ok) {
       console.error(result.message);
       process.exitCode = 1;
@@ -69147,7 +69299,7 @@ async function runModelsCommand(args) {
   }
   console.log(`Usage:
   pie models init [--path <path>] [--force] [--stdout]
-  pie models validate [--path <path>] [--probe web_search]`);
+  pie models validate [--path <path>] [--probe web_search] [--json]`);
 }
 function parseRepeatedFlag(args, flag) {
   const values = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-  "version": "1.0.20",
+	"version": "1.0.22",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {
@@ -17,6 +17,7 @@
 		"test": "npm run test:offline",
 		"pretest:offline": "npm run build --workspace @pie/agent-framework && npm run build --workspace @pie/shared-headless-capabilities && npm run build",
 		"test:offline": "node --test --import tsx test/core-services.test.ts test/cli.test.ts test/cli-auto-compaction.test.ts test/execution-state-manager.test.ts test/queued-steer-execution-state.test.ts test/architecture-boundaries.test.ts test/attachment-resolver.test.ts test/kimi-attachment-extension.test.ts test/document-attachment-extension.test.ts test/auto-compact-overflow.test.ts test/hierarchical-command-system.test.ts test/message-queue-unit.test.ts test/evals-harness.test.ts test/session-trace.test.ts test/runtime-mode-context.test.ts test/tool-policy.test.ts test/yolo-command.test.ts test/footer-lifecycle.test.ts test/files-utils.test.ts test/source-size-guard.test.ts test/runtime-logger.test.ts test/release-readiness.test.ts test/code-intel-typescript-provider.test.ts test/init-extension-contract.test.ts test/skills-runtime.test.ts test/cross-host-parity.test.ts test/tool-name-rendering.test.ts test/tools-registry.test.ts test/system-prompt-contract.test.ts test/daily-agent-smoke.terminal.test.ts",
+		"test:all": "npm run test:offline && npm run test:terminal:vitest",
 		"test:terminal:vitest": "vitest run test/mention-file-select.terminal.test.ts test/tool-partial-display.terminal.test.ts test/viewport-position-final.test.ts",
 		"test:todo-tui": "PIE_REAL_TODO_TUI=1 node --test --import tsx test/todo-closure.terminal.test.ts",
 		"test:daily-tui": "npm run test:daily-tui:quick",