@mystilleef/pi-subagent 0.8.0 → 0.10.1

package/src/shared/types.ts

@@ -2,6 +2,8 @@ import type { Message } from "@earendil-works/pi-ai";
 import type { AgentScope } from "../agent/agents.js";
 import type { TerminationMetadata } from "../child/termination.js";
 
+export const TOOL_RESULT_FAILED_MESSAGE = "Subagent tool result failed.";
+
 export interface UsageStats {
   input: number;
   output: number;
@@ -15,9 +17,9 @@ export interface UsageStats {
 
 export interface ToolActivity {
   toolName: string;
-  inputSummary?: string;
-  instanceName?: string;
-  child?: ToolActivity;
+  inputSummary?: string | undefined;
+  instanceName?: string | undefined;
+  child?: ToolActivity | undefined;
 }
 
 export interface StreamingProgressToolCall {
@@ -26,30 +28,30 @@ export interface StreamingProgressToolCall {
 }
 
 export interface StreamingProgress {
-  activityText?: string;
-  activeToolActivity?: ToolActivity;
+  activityText?: string | undefined;
+  activeToolActivity?: ToolActivity | undefined;
   toolCalls: StreamingProgressToolCall[];
-  lastToolPreview?: string;
-  toolResultCompleted?: boolean;
+  lastToolPreview?: string | undefined;
+  toolResultCompleted?: boolean | undefined;
 }
 
 export interface SingleResult {
   agent: string;
-  instanceName?: string;
+  instanceName?: string | undefined;
   agentSource: "user" | "project" | "unknown";
   task: string;
   exitCode: number;
   finalOutput: string;
   stderr: string;
   usage: UsageStats;
-  model?: string;
-  stopReason?: string;
-  errorMessage?: string;
-  durationMs?: number;
-  progress?: StreamingProgress;
-  messages?: Message[];
-  termination?: TerminationMetadata;
-  thinkingWarning?: string;
+  model?: string | undefined;
+  stopReason?: string | undefined;
+  errorMessage?: string | undefined;
+  durationMs?: number | undefined;
+  progress?: StreamingProgress | undefined;
+  messages?: Message[] | undefined;
+  termination?: TerminationMetadata | undefined;
+  thinkingWarning?: string | undefined;
 }
 
 export interface SubagentDetails {

package/src/shared/utils.ts

@@ -6,38 +6,67 @@ import {
   DefaultResourceLoader,
   getAgentDir,
 } from "@earendil-works/pi-coding-agent";
+import type { SingleResult } from "./types.js";
 
 export const DEFAULT_MAX_OUTPUT_BYTES = 50_000;
 export const DEFAULT_MAX_OUTPUT_LINES = 500;
+export const DEFAULT_AGENT_END_GRACE_MS = 250;
+export const DEFAULT_MAX_STDERR_BYTES = 10_000;
+export const DEFAULT_MAX_SUBAGENT_DEPTH = 3;
+const MAX_SUBAGENT_DEPTH_CEILING = 10;
 
 export interface SubagentOutputLimits {
   maxBytes: number;
   maxLines: number;
 }
 
-type OutputLimitConfig = Partial<Record<string, string | number | undefined>>;
+export interface SubagentRuntimeLimits {
+  agentEndGraceMs: number;
+  maxStderrBytes: number;
+  maxDepth: number;
+}
+
+type EnvLimitConfig = Partial<Record<string, string | number | undefined>>;
 
 function parsePositiveInteger(
   value: string | number | undefined,
 ): number | undefined {
   const parsed = typeof value === "number" ? value : Number(value);
-  if (!Number.isFinite(parsed) || parsed < 1) return undefined;
-  return Math.floor(parsed);
+  if (!Number.isFinite(parsed) || !Number.isInteger(parsed) || parsed < 1)
+    return undefined;
+  return parsed;
 }
 
 export function getSubagentOutputLimits(
-  config: OutputLimitConfig = process.env,
+  config: EnvLimitConfig = process.env,
 ): SubagentOutputLimits {
   return {
     maxBytes:
-      parsePositiveInteger(config.PI_SUBAGENT_MAX_OUTPUT_BYTES) ??
+      parsePositiveInteger(config["PI_SUBAGENT_MAX_OUTPUT_BYTES"]) ??
       DEFAULT_MAX_OUTPUT_BYTES,
     maxLines:
-      parsePositiveInteger(config.PI_SUBAGENT_MAX_OUTPUT_LINES) ??
+      parsePositiveInteger(config["PI_SUBAGENT_MAX_OUTPUT_LINES"]) ??
       DEFAULT_MAX_OUTPUT_LINES,
   };
 }
 
+export function getSubagentRuntimeLimits(
+  config: EnvLimitConfig = process.env,
+): SubagentRuntimeLimits {
+  const maxDepth =
+    parsePositiveInteger(config["PI_SUBAGENT_MAX_DEPTH"]) ??
+    DEFAULT_MAX_SUBAGENT_DEPTH;
+  return {
+    agentEndGraceMs:
+      parsePositiveInteger(config["PI_SUBAGENT_AGENT_END_GRACE_MS"]) ??
+      DEFAULT_AGENT_END_GRACE_MS,
+    maxStderrBytes:
+      parsePositiveInteger(config["PI_SUBAGENT_MAX_STDERR_BYTES"]) ??
+      DEFAULT_MAX_STDERR_BYTES,
+    maxDepth: Math.min(maxDepth, MAX_SUBAGENT_DEPTH_CEILING),
+  };
+}
+
 export function truncateOutput(
   text: string,
   limits: SubagentOutputLimits = getSubagentOutputLimits(),
@@ -102,6 +131,7 @@ async function canonicalPath(filePath: string): Promise<string> {
   try {
     return await fs.promises.realpath(filePath);
   } catch {
+    /* symlinks or missing paths fall back to absolute path resolution */
     return path.resolve(filePath);
   }
 }
@@ -181,18 +211,27 @@ export function subagentDepthEnv(): Record<string, string> {
   return { PI_SUBAGENT_DEPTH: String(getSubagentDepth() + 1) };
 }
 
-export function detectMessageError(messages: Message[]): boolean {
-  let lastAssistantIdx = -1;
+export function findLastAssistantTextMessage(messages: Message[]): number {
   for (let i = messages.length - 1; i >= 0; i--) {
     const msg = messages[i];
     if (
       msg?.role === "assistant" &&
-      msg.content.some((c) => c.type === "text" && c.text.trim().length > 0)
+      Array.isArray(msg.content) &&
+      msg.content.some(
+        (c) =>
+          c.type === "text" &&
+          typeof c.text === "string" &&
+          c.text.trim().length > 0,
+      )
     ) {
-      lastAssistantIdx = i;
-      break;
+      return i;
     }
   }
+  return -1;
+}
+
+export function detectMessageError(messages: Message[]): boolean {
+  const lastAssistantIdx = findLastAssistantTextMessage(messages);
   const from = lastAssistantIdx >= 0 ? lastAssistantIdx + 1 : 0;
   for (let i = messages.length - 1; i >= from; i--) {
     const msg = messages[i];
@@ -200,3 +239,13 @@ export function detectMessageError(messages: Message[]): boolean {
   }
   return false;
 }
+
+export function hasSubagentFailed(result: SingleResult): boolean {
+  return (
+    result.exitCode !== 0 ||
+    result.stopReason === "error" ||
+    result.stopReason === "aborted" ||
+    Boolean(result.errorMessage?.trim()) ||
+    detectMessageError(result.messages ?? [])
+  );
+}

package/tsconfig.json

@@ -1,30 +1,28 @@
 {
   "compilerOptions": {
-    // Environment setup & latest features
     "lib": ["ESNext"],
     "target": "ESNext",
     "module": "Preserve",
     "moduleDetection": "force",
     "jsx": "react-jsx",
-    "allowJs": true,
     "types": ["bun"],
-
-    // Bundler mode
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,
-
-    // Best practices
     "strict": true,
     "skipLibCheck": true,
     "noFallthroughCasesInSwitch": true,
     "noUncheckedIndexedAccess": true,
     "noImplicitOverride": true,
-
-    // Some stricter flags (disabled by default)
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noPropertyAccessFromIndexSignature": false
+    "noImplicitReturns": true,
+    "erasableSyntaxOnly": true,
+    "forceConsistentCasingInFileNames": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "exactOptionalPropertyTypes": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false
   }
 }