@mystilleef/pi-subagent 0.10.2 → 0.11.0

package/src/progress/result-details.ts

@@ -79,6 +79,47 @@ function redactSensitiveDebugMessages(messages: unknown): unknown {
   return messages.map(redactSensitiveDebugValue);
 }
 
+function sanitizeProgressObject(
+  progress: SingleResult["progress"],
+  _includeDebugMessages: boolean,
+): StreamingProgress | undefined {
+  if (!progress) return undefined;
+  const {
+    activityText,
+    activeToolActivity,
+    lastToolPreview,
+    toolResultCompleted,
+    ...progBase
+  } = progress;
+  return {
+    toolCalls: progBase.toolCalls.map((tc) => ({
+      id: tc.id,
+      preview: tc.preview,
+    })),
+    ...(activityText !== undefined && { activityText }),
+    ...(activeToolActivity !== undefined && { activeToolActivity }),
+    ...(lastToolPreview !== undefined && { lastToolPreview }),
+    ...(toolResultCompleted !== undefined && { toolResultCompleted }),
+  };
+}
+
+function sanitizeTerminationObject(
+  termination: TerminationMetadata | undefined,
+  includeMessages: boolean,
+  includeDebugMessages: boolean,
+): TerminationMetadata | undefined {
+  if (!includeMessages || !includeDebugMessages || !termination)
+    return undefined;
+  const { cancelReason, terminationSignal, fallbackCause, ...termBase } =
+    termination;
+  return {
+    ...termBase,
+    ...(cancelReason !== undefined && { cancelReason }),
+    ...(terminationSignal !== undefined && { terminationSignal }),
+    ...(fallbackCause !== undefined && { fallbackCause }),
+  };
+}
+
 export function sanitizeResultDetails(
   result: SingleResult,
   includeDebugMessages: boolean,
@@ -88,37 +129,6 @@ export function sanitizeResultDetails(
     includeDebugMessages && (options?.includeMessages ?? true);
   const { messages, termination, progress, stderr, usage, ...core } = result;
   const { contextWindowTokens, ...usageBase } = usage;
-  let progressValue: StreamingProgress | undefined;
-  if (progress) {
-    const {
-      activityText,
-      activeToolActivity,
-      lastToolPreview,
-      toolResultCompleted,
-      ...progBase
-    } = progress;
-    progressValue = {
-      toolCalls: progBase.toolCalls.map((tc) => ({
-        id: tc.id,
-        preview: tc.preview,
-      })),
-      ...(activityText !== undefined && { activityText }),
-      ...(activeToolActivity !== undefined && { activeToolActivity }),
-      ...(lastToolPreview !== undefined && { lastToolPreview }),
-      ...(toolResultCompleted !== undefined && { toolResultCompleted }),
-    };
-  }
-  let terminationValue: TerminationMetadata | undefined;
-  if (includeMessages && includeDebugMessages && termination) {
-    const { cancelReason, terminationSignal, fallbackCause, ...termBase } =
-      termination;
-    terminationValue = {
-      ...termBase,
-      ...(cancelReason !== undefined && { cancelReason }),
-      ...(terminationSignal !== undefined && { terminationSignal }),
-      ...(fallbackCause !== undefined && { fallbackCause }),
-    };
-  }
   const sanitized: SingleResult = {
     ...core,
     stderr: includeDebugMessages ? stderr : "",
@@ -127,6 +137,7 @@ export function sanitizeResultDetails(
       ...(contextWindowTokens !== undefined && { contextWindowTokens }),
     },
   };
+  const progressValue = sanitizeProgressObject(progress, includeDebugMessages);
   if (progressValue !== undefined) sanitized.progress = progressValue;
   if (includeMessages) {
     sanitized.messages = options?.recentMessages
@@ -135,6 +146,11 @@ export function sanitizeResultDetails(
         ? [...messages]
         : undefined;
   }
+  const terminationValue = sanitizeTerminationObject(
+    termination,
+    includeMessages,
+    includeDebugMessages,
+  );
   if (terminationValue !== undefined) sanitized.termination = terminationValue;
   return sanitized;
 }
@@ -224,19 +240,12 @@ export function patchProgressFromDetails(
   patchProgressState(requestId, patch);
 }
 
-function getSubagentText(result: SubagentToolResult): string {
-  return (result.content[0] as { text?: string })?.text ?? "";
-}
-
-export function getResultDisplayText(result: SubagentToolResult): string {
-  return (
-    getLatestResult(result.details)?.finalOutput ?? getSubagentText(result)
-  );
-}
-
 export function getFeedbackSummaryText(result: SubagentToolResult): string {
-  const rawFinalOutput = getLatestResult(result.details)?.finalOutput;
-  if (rawFinalOutput?.trim())
-    return summarizeFeedbackUiFinalOutput(rawFinalOutput);
-  return getSubagentText(result).trim() || "(no output)";
+  const latestResult = getLatestResult(result.details);
+  const rawFinalOutput = latestResult?.finalOutput ?? "";
+  const outcome = latestResult?.outcome;
+  if (!outcome?.trim() && !rawFinalOutput.trim()) {
+    return "(no output)";
+  }
+  return summarizeFeedbackUiFinalOutput(rawFinalOutput, outcome);
 }

package/src/shared/sampling.ts

@@ -0,0 +1,56 @@
+export interface SamplingParams {
+  temperature?: number | undefined;
+  topP?: number | undefined;
+}
+
+export function isValidSamplingValue(value: unknown): value is number {
+  return (
+    typeof value === "number" &&
+    Number.isFinite(value) &&
+    value >= 0.0 &&
+    value <= 1.0
+  );
+}
+
+/**
+ * Parses a JSON-encoded sampling parameters string.
+ * Returns undefined for missing, malformed, or wholly invalid values.
+ */
+export function parseSamplingParams(
+  envVal?: string,
+): SamplingParams | undefined {
+  if (!envVal) return undefined;
+  try {
+    const parsed = JSON.parse(envVal);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+      return undefined;
+    const { temperature: rawTemperature, topP: rawTopP } = parsed as Record<
+      string,
+      unknown
+    >;
+    const result: SamplingParams = {};
+    if (isValidSamplingValue(rawTemperature))
+      result.temperature = rawTemperature;
+    if (isValidSamplingValue(rawTopP)) result.topP = rawTopP;
+    if (result.temperature !== undefined || result.topP !== undefined)
+      return result;
+  } catch {
+    /* malformed env value: run without sampling overrides */
+  }
+  return undefined;
+}
+
+/**
+ * Serializes sampling parameters into a JSON string for environment passing.
+ * Returns undefined when no valid parameters are present.
+ */
+export function serializeSamplingParams(
+  params: SamplingParams,
+): string | undefined {
+  if (params.temperature === undefined && params.topP === undefined)
+    return undefined;
+  const config: SamplingParams = {};
+  if (params.temperature !== undefined) config.temperature = params.temperature;
+  if (params.topP !== undefined) config.topP = params.topP;
+  return JSON.stringify(config);
+}

package/src/shared/types.ts

@@ -52,6 +52,7 @@ export interface SingleResult {
   messages?: Message[] | undefined;
   termination?: TerminationMetadata | undefined;
   thinkingWarning?: string | undefined;
+  outcome?: string | undefined;
 }
 
 export interface SubagentDetails {

package/src/shared/utils.ts

@@ -230,6 +230,15 @@ export function findLastAssistantTextMessage(messages: Message[]): number {
   return -1;
 }
 
+export function extractFinalOutputFromMessages(messages: Message[]): string {
+  const lastAsstIdx = findLastAssistantTextMessage(messages);
+  if (lastAsstIdx < 0) return "";
+  const content = messages[lastAsstIdx]?.content;
+  if (!Array.isArray(content)) return "";
+  const lastText = content.findLast((p) => p.type === "text");
+  return lastText?.type === "text" ? (lastText.text ?? "") : "";
+}
+
 export function detectMessageError(messages: Message[]): boolean {
   const lastAssistantIdx = findLastAssistantTextMessage(messages);
   const from = lastAssistantIdx >= 0 ? lastAssistantIdx + 1 : 0;
@@ -241,6 +250,7 @@ export function detectMessageError(messages: Message[]): boolean {
 }
 
 export function hasSubagentFailed(result: SingleResult): boolean {
+  if (result.outcome?.trim()) return false;
   return (
     result.exitCode !== 0 ||
     result.stopReason === "error" ||