Fixed more comments

Author: pipewrk

examples/agentic/client/src/app/transport-helpers.ts

@@ -276,18 +276,39 @@ export const readOutcomeFromEvent = (event: TransportEvent): OutcomeSummary | nu
 };
 
 type UiChunkMessage = Extract<TransportEvent["message"], { type: "ui.chunk" }>;
-type UiChunk = UiChunkMessage["chunk"];
 
-const readUiChunkType = (chunk: UiChunk) => chunk.type;
+const readChunkType = (chunk: unknown) => {
+  if (!chunk || typeof chunk !== "object") {
+    return null;
+  }
+  if (!("type" in chunk)) {
+    return null;
+  }
+  const value = (chunk as { type?: unknown }).type;
+  return typeof value === "string" ? value : null;
+};
 
-const isUiChunk = (message: TransportEvent["message"]): message is UiChunkMessage =>
-  message.type === "ui.chunk";
+const isUiChunk = (message: TransportEvent["message"]): message is UiChunkMessage => {
+  if (!message || typeof message !== "object") {
+    return false;
+  }
+  if (!("type" in message)) {
+    return false;
+  }
+  if ((message as { type?: unknown }).type !== "ui.chunk") {
+    return false;
+  }
+  return "chunk" in message;
+};
 
-const isDataChunk = (chunk: UiChunk) => readUiChunkType(chunk).startsWith("data-");
+const isDataChunk = (chunk: unknown) => {
+  const chunkType = readChunkType(chunk);
+  return typeof chunkType === "string" && chunkType.startsWith("data-");
+};
 
 const readArrayLength = (value: unknown) => (Array.isArray(value) ? value.length : 0);
 
-const readChunkData = (chunk: UiChunk): unknown | null => {
+const readChunkData = (chunk: unknown): unknown | null => {
   if (!chunk || typeof chunk !== "object") {
     return null;
   }
@@ -315,8 +336,7 @@ const readSourcesSummary = (data: unknown) => {
   return count > 0 ? `(${count})` : "";
 };
 
-const formatDataChunk = (chunk: UiChunk) => {
-  const chunkType = readUiChunkType(chunk);
+const formatDataChunk = (chunk: unknown, chunkType: string) => {
   if (chunkType === "data-diagnostic") {
     return `${chunkType}${readDiagnosticSummary(readChunkData(chunk))}`;
   }
@@ -326,11 +346,15 @@ const formatDataChunk = (chunk: UiChunk) => {
   return chunkType;
 };
 
-const formatUiChunk = (chunk: UiChunk) => {
+const formatUiChunk = (chunk: unknown) => {
+  const chunkType = readChunkType(chunk);
+  if (!chunkType) {
+    return "ui.chunk: invalid";
+  }
   if (isDataChunk(chunk)) {
-    return `ui.chunk: ${formatDataChunk(chunk)}`;
+    return `ui.chunk: ${formatDataChunk(chunk, chunkType)}`;
   }
-  return `ui.chunk: ${readUiChunkType(chunk)}`;
+  return `ui.chunk: ${chunkType}`;
 };
 
 export const formatTransportEvent = (event: TransportEvent) => {

examples/agentic/client/src/components/assistant-ui/tool-fallback.tsx

@@ -1,21 +1,49 @@
 import type { ToolCallMessagePartComponent, ToolCallMessagePartProps } from "@assistant-ui/react";
+import { bindFirst } from "@geekist/llm-core";
 import { CheckIcon, ChevronDownIcon, ChevronUpIcon, XCircleIcon } from "lucide-react";
-import { useState } from "react";
+import type { Dispatch, SetStateAction } from "react";
+import { useId, useState } from "react";
 import { Button } from "../ui/button";
 import { cn } from "../../lib/utils";
 
 type ToolFallbackProps = ToolCallMessagePartProps;
 
+const applyToggleCollapsed = (value: boolean) => !value;
+
+const toggleCollapsed = (setIsCollapsed: Dispatch<SetStateAction<boolean>>) => {
+  setIsCollapsed(applyToggleCollapsed);
+  return true;
+};
+
+const safeStringify = (value: unknown) => {
+  if (typeof value === "string") {
+    return value;
+  }
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+};
+
+const safeStringifyPretty = (value: unknown) => {
+  if (typeof value === "string") {
+    return value;
+  }
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return safeStringify(value);
+  }
+};
+
 const ToolFallbackImpl = ({ toolName, argsText, result, status }: ToolFallbackProps) => {
   const [isCollapsed, setIsCollapsed] = useState(true);
+  const contentId = useId();
+  const handleToggleCollapsed = bindFirst(toggleCollapsed, setIsCollapsed);
 
   const isCancelled = status?.type === "incomplete" && status.reason === "cancelled";
-  const cancelledReason =
-    isCancelled && status.error
-      ? typeof status.error === "string"
-        ? status.error
-        : JSON.stringify(status.error)
-      : null;
+  const cancelledReason = isCancelled && status.error ? safeStringify(status.error) : null;
 
   return (
     <div
@@ -40,21 +68,18 @@ const ToolFallbackImpl = ({ toolName, argsText, result, status }: ToolFallbackPr
           <b>{toolName}</b>
         </p>
         <Button
-          onClick={() => setIsCollapsed(!isCollapsed)}
+          onClick={handleToggleCollapsed}
           size="icon"
           variant="ghost"
           aria-expanded={!isCollapsed}
-          aria-controls="tool-fallback-content"
+          aria-controls={contentId}
           aria-label={isCollapsed ? "Expand tool details" : "Collapse tool details"}
         >
           {isCollapsed ? <ChevronUpIcon /> : <ChevronDownIcon />}
         </Button>
       </div>
       {!isCollapsed && (
-        <div
-          id="tool-fallback-content"
-          className="aui-tool-fallback-content flex flex-col gap-2 border-t pt-2"
-        >
+        <div id={contentId} className="aui-tool-fallback-content flex flex-col gap-2 border-t pt-2">
           {cancelledReason && (
             <div className="aui-tool-fallback-cancelled-root px-4">
               <p className="aui-tool-fallback-cancelled-header font-semibold text-muted-foreground">
@@ -72,7 +97,7 @@ const ToolFallbackImpl = ({ toolName, argsText, result, status }: ToolFallbackPr
             <div className="aui-tool-fallback-result-root border-t border-dashed px-4 pt-2">
               <p className="aui-tool-fallback-result-header font-semibold">Result:</p>
               <pre className="aui-tool-fallback-result-content whitespace-pre-wrap">
-                {typeof result === "string" ? result : JSON.stringify(result, null, 2)}
+                {safeStringifyPretty(result)}
               </pre>
             </div>
           )}

src/interaction/agent-runtime-subagents-helpers.ts

@@ -213,16 +213,18 @@ export const buildSubagentCompleted = (record: SubagentRecord) =>
 export const buildSubagentFailed = (record: SubagentRecord, error?: string) =>
   buildSubagentEvent("failed", record, error);
 
-export function applySubagentCompleted(record: SubagentRecord, outcome: Outcome<unknown>) {
+const applySubagentOutcomeRecord = (record: SubagentRecord, outcome: Outcome<unknown>) => {
   record.status = "idle";
   record.lastOutcome = outcome;
   return outcome;
+};
+
+export function applySubagentCompleted(record: SubagentRecord, outcome: Outcome<unknown>) {
+  return applySubagentOutcomeRecord(record, outcome);
 }
 
-export function applySubagentFailed(record: SubagentRecord, error: unknown) {
-  record.status = "idle";
-  record.lastOutcome = toSubagentErrorOutcome(error);
-  return error;
+export function applySubagentFailed(record: SubagentRecord, outcome: Outcome<unknown>) {
+  return applySubagentOutcomeRecord(record, outcome);
 }
 
 export function emitSubagentCompleted(input: { manager: SubagentManager; record: SubagentRecord }) {
@@ -244,7 +246,7 @@ export function applySubagentOutcome(
   if (outcome.status === "error") {
     const applyError = bindFirst(applySubagentFailed, input.record);
     const emitError = bindFirst(emitSubagentFailed, input);
-    applyError(outcome.error);
+    applyError(outcome);
     return maybeTap(emitError, outcome);
   }
   const applyCompleted = bindFirst(applySubagentCompleted, input.record);