@anvia/studio 0.6.1 → 0.7.0

package/dist/index.js

@@ -1,7 +1,12 @@
 // src/runtime/studio.ts
 import {
-  createHook as createHook3
+  createHook as createHook2
 } from "@anvia/core/agent";
+import { Message } from "@anvia/core/completion";
+import { Agent } from "@anvia/core/internal/agent";
+import { Pipeline } from "@anvia/core/pipeline";
+import { serve } from "@hono/node-server";
+import { Hono as HonoApp } from "hono";
 
 // src/runtime/compact.ts
 function compact(obj) {
@@ -14,13 +19,6 @@ function compact(obj) {
   return result;
 }
 
-// src/runtime/studio.ts
-import { Message } from "@anvia/core/completion";
-import { Agent } from "@anvia/core/internal/agent";
-import { Pipeline } from "@anvia/core/pipeline";
-import { serve } from "@hono/node-server";
-import { Hono as HonoApp } from "hono";
-
 // src/runtime/json.ts
 function toJsonValue(value) {
   return toJsonValueInternal(value, /* @__PURE__ */ new WeakSet());
@@ -843,14 +841,6 @@ function escapeHtml(value) {
   return value.replaceAll("&", "&amp;").replaceAll('"', "&quot;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
 }
 
-// src/runtime/approvals.ts
-import {
-  createHook
-} from "@anvia/core/agent";
-import {
-  parseToolArgs
-} from "@anvia/core/tool";
-
 // src/runtime/type-guards.ts
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -1040,62 +1030,23 @@ function createApprovalRuntime() {
   const approvals = /* @__PURE__ */ new Map();
   return {
     approvals,
-    createHook(context) {
-      const handleApprovalRequest = async ({ toolName, toolCallId, internalCallId, args, tool: control }, request) => {
-        const decision = await requestApproval(approvals, context, compact({
-          toolName,
-          toolCallId,
-          internalCallId,
-          args,
-          reason: request.reason,
-          rejectMessage: request.rejectMessage
-        }));
-        return decision.approved ? control.run() : control.skip(decision.reason ?? request.rejectMessage ?? "Rejected in Anvia Studio.");
-      };
+    createApprovals(context) {
       return {
-        ...createHook({
-          async onToolCall({ toolName, toolCallId, internalCallId, args, tool: control }) {
-            const registeredTool = context.getTool(toolName);
-            if (registeredTool?.approval === void 0) {
-              return control.run();
-            }
-            const approval = registeredTool.approval;
-            const rawParsedArgs = parseToolArgs(args);
-            const parsedArgs = registeredTool.parseApprovalArgs?.(rawParsedArgs) ?? rawParsedArgs;
-            const approvalContext = compact({
-              toolName,
-              args: parsedArgs,
-              rawArgs: args,
-              toolCallId,
-              internalCallId,
-              run: compact({
-                agentId: context.agentId,
-                runId: context.runId,
-                sessionId: context.sessionId,
-                metadata: context.metadata
-              })
-            });
-            const required = await approval.when(approvalContext);
-            if (!required) {
-              return control.run();
-            }
-            const reason = await resolveApprovalText(approval.reason, approvalContext);
-            const rejectMessage = await resolveApprovalText(
-              approval.rejectMessage,
-              approvalContext
-            );
-            const decision = await requestApproval(approvals, context, compact({
-              toolName,
-              toolCallId,
-              internalCallId,
-              args,
-              reason,
-              rejectMessage
-            }));
-            return decision.approved ? control.run() : control.skip(decision.reason ?? rejectMessage ?? "Rejected in Anvia Studio.");
-          }
-        }),
-        handleApprovalRequest
+        async handler(request) {
+          const decision = await requestApproval(
+            approvals,
+            context,
+            compact({
+              toolName: request.toolName,
+              toolCallId: request.toolCallId,
+              internalCallId: request.internalCallId,
+              args: request.rawArgs,
+              reason: request.reason,
+              rejectMessage: request.rejectMessage
+            })
+          );
+          return decision.approved ? compact({ approved: true, reason: decision.reason }) : compact({ approved: false, reason: decision.reason });
+        }
       };
     },
     list(options) {
@@ -1127,13 +1078,19 @@ function createApprovalRuntime() {
         return "resolved";
       }
       const reason = decision.approved ? decision.reason : decision.reason ?? approval.rejectMessage ?? "Rejected in Anvia Studio.";
-      const resolved = resolveApproval(approval, decision.approved ? "approved" : "rejected", compact({ reason }));
+      const resolved = resolveApproval(
+        approval,
+        decision.approved ? "approved" : "rejected",
+        compact({ reason })
+      );
       approvals.set(id, resolved);
       approval.emit?.({ type: "tool_approval_result", approval: resolved });
-      approval.resolve(compact({
-        approved: decision.approved,
-        reason
-      }));
+      approval.resolve(
+        compact({
+          approved: decision.approved,
+          reason
+        })
+      );
       return publicApproval(resolved);
     }
   };
@@ -1164,30 +1121,35 @@ async function requestApproval(approvals, context, request) {
       const current = approvals.get(id);
       if (!isPendingApproval(current)) {
         if (current !== void 0) {
-          resolve2(compact({
-            approved: current.status === "approved",
-            reason: current.reason
-          }));
+          resolve2(
+            compact({
+              approved: current.status === "approved",
+              reason: current.reason
+            })
+          );
         }
         return;
       }
       const reason = decision2.approved ? decision2.reason : decision2.reason ?? request.rejectMessage ?? "Rejected in Anvia Studio.";
-      const resolved = resolveApproval(current, decision2.approved ? "approved" : "rejected", compact({ reason }));
+      const resolved = resolveApproval(
+        current,
+        decision2.approved ? "approved" : "rejected",
+        compact({ reason })
+      );
       approvals.set(id, resolved);
       context.emit?.({ type: "tool_approval_result", approval: resolved });
-      resolve2(compact({
-        approved: decision2.approved,
-        reason
-      }));
+      resolve2(
+        compact({
+          approved: decision2.approved,
+          reason
+        })
+      );
     };
   });
   approvals.set(id, approval);
   context.emit?.({ type: "tool_approval_request", approval: publicApproval(approval) });
   return decision;
 }
-async function resolveApprovalText(value, context) {
-  return typeof value === "function" ? value(context) : value;
-}
 function isPendingApproval(approval) {
   return approval !== void 0 && approval.status === "pending" && "resolve" in approval;
 }
@@ -1209,9 +1171,6 @@ function publicApproval(approval) {
   return rest;
 }
 
-// src/runtime/evals.ts
-import { runEvalSuite } from "@anvia/core/evals";
-
 // src/runtime/models.ts
 var STUDIO_MODEL_METADATA_KEY = "studioModel";
 function createStudioModelRegistry(config) {
@@ -1713,6 +1672,7 @@ function toJsonValue2(value) {
 }
 
 // src/runtime/evals.ts
+import { runEvalSuite } from "@anvia/core/evals";
 function registerEvalRoutes(app, props) {
   app.get(
     "/evals",
@@ -3767,8 +3727,8 @@ function isJsonValue2(value) {
 }
 
 // src/runtime/questions.ts
-import { createHook as createHook2 } from "@anvia/core/agent";
-import { parseToolArgs as parseToolArgs2 } from "@anvia/core/tool";
+import { createHook } from "@anvia/core/agent";
+import { parseToolArgs } from "@anvia/core/tool";
 function registerQuestionRoutes(app, questions) {
   app.get("/questions", (c) => {
     const status = parseQuestionStatus(c.req.query("status"));
@@ -3859,12 +3819,12 @@ function createQuestionRuntime() {
   return {
     questions,
     createHook(context) {
-      return createHook2({
+      return createHook({
         async onToolCall({ toolName, toolCallId, internalCallId, args, tool: control }) {
           if (toolName !== "ask_question") {
             return control.run();
           }
-          const prompts = normalizeQuestionPrompts(parseToolArgs2(args));
+          const prompts = normalizeQuestionPrompts(parseToolArgs(args));
           if ("error" in prompts) {
             return control.skip(prompts.error);
           }
@@ -5455,18 +5415,17 @@ function createStudioApp(options) {
     }
     if (body.stream === true) {
       const runtimeEvents = new AsyncEventQueue();
+      request.approvals(
+        approvalRuntime.createApprovals({
+          runId,
+          agentId,
+          ...compact({ sessionId: session?.id }),
+          ...compact({ metadata: body.metadata }),
+          emit: (event) => runtimeEvents.push(event)
+        })
+      );
       const effectiveHook = composeHooks(
-        composeHooks(
-          runAgent.hook,
-          approvalRuntime.createHook({
-            runId,
-            agentId,
-            ...compact({ sessionId: session?.id }),
-            ...compact({ metadata: body.metadata }),
-            getTool: (toolName) => runAgent.getTool(toolName),
-            emit: (event) => runtimeEvents.push(event)
-          })
-        ),
+        runAgent.hook,
         questionRuntime.createHook({
           runId,
           agentId,
@@ -5501,16 +5460,7 @@ function createStudioApp(options) {
         await appendSessionLog(sessionStore, memoryLoadedLog(session, runId));
       }
       const effectiveHook = composeHooks(
-        composeHooks(
-          runAgent.hook,
-          approvalRuntime.createHook({
-            runId,
-            agentId,
-            ...compact({ sessionId: session?.id }),
-            ...compact({ metadata: body.metadata }),
-            getTool: (toolName) => runAgent.getTool(toolName)
-          })
-        ),
+        runAgent.hook,
         questionRuntime.createHook({
           runId,
           agentId,
@@ -5518,6 +5468,14 @@ function createStudioApp(options) {
           ...compact({ metadata: body.metadata })
         })
       );
+      request.approvals(
+        approvalRuntime.createApprovals({
+          runId,
+          agentId,
+          ...compact({ sessionId: session?.id }),
+          ...compact({ metadata: body.metadata })
+        })
+      );
       if (effectiveHook !== void 0) {
         request.requestHook(effectiveHook);
       }
@@ -5667,7 +5625,7 @@ function composeHooks(first, second) {
   if (second === void 0) {
     return first;
   }
-  return createHook3({
+  return createHook2({
     async onCompletionCall(args) {
       const firstAction = await first.onCompletionCall?.(args);
       return firstAction?.type === "terminate" ? firstAction : await second.onCompletionCall?.(args) ?? void 0;
@@ -5678,12 +5636,9 @@ function composeHooks(first, second) {
     },
     async onToolCall(args) {
       const firstAction = await first.onToolCall?.(args);
-      if (firstAction?.type === "skip" || firstAction?.type === "terminate") {
+      if (firstAction?.type === "skip" || firstAction?.type === "terminate" || firstAction?.type === "approval_request") {
         return firstAction;
       }
-      if (firstAction?.type === "approval_request") {
-        return await approvalRequestHandler(second)?.(args, firstAction) ?? firstAction;
-      }
       const secondAction = await second.onToolCall?.(args);
       return secondAction ?? firstAction ?? void 0;
     },
@@ -5693,10 +5648,6 @@ function composeHooks(first, second) {
     }
   });
 }
-function approvalRequestHandler(hook) {
-  const candidate = hook;
-  return typeof candidate.handleApprovalRequest === "function" ? candidate.handleApprovalRequest : void 0;
-}
 
 // src/storage/sqlite-store.ts
 import { mkdirSync } from "fs";