veryfront 0.1.1077 → 0.1.1079
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/deno.js +1 -1
- package/esm/src/agent/runtime/chat-stream-handler.d.ts.map +1 -1
- package/esm/src/agent/runtime/chat-stream-handler.js +6 -16
- package/esm/src/agent/runtime/tool-result-continuation.d.ts +1 -1
- package/esm/src/agent/runtime/tool-result-continuation.d.ts.map +1 -1
- package/esm/src/agent/runtime/tool-result-continuation.js +1 -32
- package/esm/src/server/runtime-handler/project-middleware.d.ts.map +1 -1
- package/esm/src/server/runtime-handler/project-middleware.js +4 -0
- package/esm/src/tool/result.d.ts +4 -0
- package/esm/src/tool/result.d.ts.map +1 -1
- package/esm/src/tool/result.js +51 -0
- package/esm/src/utils/version-constant.d.ts +1 -1
- package/esm/src/utils/version-constant.js +1 -1
- package/package.json +5 -5
package/esm/deno.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-stream-handler.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/chat-stream-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAqB,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-stream-handler.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/chat-stream-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ import { getHostEnv } from "../../platform/compat/process.js";
|
|
|
18
18
|
import { stringifyToolError, throwIfAborted } from "./error-utils.js";
|
|
19
19
|
import { redactSensitive, sanitizeSerializedError, sanitizeUrlCredentials, } from "../../utils/logger/redact.js";
|
|
20
20
|
import { buildRuntimeUsageTraceAttributes } from "./trace-usage.js";
|
|
21
|
+
import { getToolResultError, isIntegrationAuthenticationActionResult, } from "../../tool/result.js";
|
|
21
22
|
const logger = serverLogger.component("agent");
|
|
22
23
|
const LOCAL_TOOL_COMMIT_GRACE_MS = 250;
|
|
23
24
|
const LOCAL_TOOL_INPUT_IDLE_MS = 15_000;
|
|
@@ -67,18 +68,6 @@ function resolveToolResultOutput(part) {
|
|
|
67
68
|
}
|
|
68
69
|
return undefined;
|
|
69
70
|
}
|
|
70
|
-
function getMcpToolErrorMessage(value) {
|
|
71
|
-
if (!isRecord(value)) {
|
|
72
|
-
return undefined;
|
|
73
|
-
}
|
|
74
|
-
if (typeof value.error !== "string" || value.error.length === 0) {
|
|
75
|
-
return undefined;
|
|
76
|
-
}
|
|
77
|
-
if (typeof value.message === "string" && value.message.trim().length > 0) {
|
|
78
|
-
return value.message;
|
|
79
|
-
}
|
|
80
|
-
return value.error;
|
|
81
|
-
}
|
|
82
71
|
function logProviderToolPart(partType, part) {
|
|
83
72
|
if (!isAnyDebugEnabled({ get: getHostEnv })) {
|
|
84
73
|
return;
|
|
@@ -668,12 +657,13 @@ export function processStream(result, state, controller, encoder, textPartId, ca
|
|
|
668
657
|
dynamic: typedPart.dynamic,
|
|
669
658
|
});
|
|
670
659
|
const toolResultOutput = resolveToolResultOutput(typedPart);
|
|
671
|
-
const
|
|
672
|
-
const isExplicitError = typedPart.isError === true
|
|
673
|
-
|
|
660
|
+
const inferredToolError = getToolResultError(toolResultOutput);
|
|
661
|
+
const isExplicitError = typedPart.isError === true &&
|
|
662
|
+
!isIntegrationAuthenticationActionResult(toolResultOutput);
|
|
663
|
+
const isError = isExplicitError || inferredToolError !== undefined;
|
|
674
664
|
const toolResultError = isExplicitError
|
|
675
665
|
? toolResultOutput
|
|
676
|
-
:
|
|
666
|
+
: inferredToolError ?? toolResultOutput;
|
|
677
667
|
logProviderToolPart("tool-result", {
|
|
678
668
|
toolCallId: typedPart.toolCallId,
|
|
679
669
|
toolName: typedPart.toolName,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type Message, type MessagePart, type ToolResultPart } from "../types.js";
|
|
2
2
|
import type { ChatStreamState, StreamingToolCall, StreamingToolResult } from "./chat-stream-handler.js";
|
|
3
3
|
import type { RuntimeGenerateToolResult, RuntimeToolSet } from "./runtime-tool-types.js";
|
|
4
|
-
export
|
|
4
|
+
export { getToolResultError } from "../../tool/result.js";
|
|
5
5
|
export declare function createToolResultMessage(toolCallId: string, toolName: string, result: unknown, providerExecuted?: boolean): Message;
|
|
6
6
|
export declare function createToolErrorMessage(toolCallId: string, toolName: string, error: string): Message;
|
|
7
7
|
export declare function getProviderExecutedToolNames(runtimeTools: RuntimeToolSet | undefined): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-result-continuation.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/tool-result-continuation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-result-continuation.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/tool-result-continuation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,37 +1,6 @@
|
|
|
1
1
|
import { stripLeadingEmptyObjectPlaceholder } from "../streaming/data-stream.js";
|
|
2
|
-
import { hasToolExecutionErrorMarker } from "../../tool/result.js";
|
|
3
2
|
import { parseToolArgs } from "./tool-helpers.js";
|
|
4
|
-
|
|
5
|
-
function getMcpToolErrorMessage(result) {
|
|
6
|
-
if (!result || typeof result !== "object" || Array.isArray(result)) {
|
|
7
|
-
return undefined;
|
|
8
|
-
}
|
|
9
|
-
const record = result;
|
|
10
|
-
if (typeof record.error !== "string" || record.error.length === 0) {
|
|
11
|
-
return undefined;
|
|
12
|
-
}
|
|
13
|
-
if (typeof record.message === "string" && record.message.trim().length > 0) {
|
|
14
|
-
return record.message;
|
|
15
|
-
}
|
|
16
|
-
return record.error;
|
|
17
|
-
}
|
|
18
|
-
export function getToolResultError(result) {
|
|
19
|
-
if (!hasToolExecutionErrorMarker(result)) {
|
|
20
|
-
return undefined;
|
|
21
|
-
}
|
|
22
|
-
const mcpToolErrorMessage = getMcpToolErrorMessage(result);
|
|
23
|
-
if (mcpToolErrorMessage !== undefined) {
|
|
24
|
-
return mcpToolErrorMessage;
|
|
25
|
-
}
|
|
26
|
-
const record = result;
|
|
27
|
-
if (typeof record.error === "string") {
|
|
28
|
-
return stringifyToolError(record.error);
|
|
29
|
-
}
|
|
30
|
-
if (typeof record.message === "string" && record.message.trim().length > 0) {
|
|
31
|
-
return record.message;
|
|
32
|
-
}
|
|
33
|
-
return "Tool execution failed";
|
|
34
|
-
}
|
|
3
|
+
export { getToolResultError } from "../../tool/result.js";
|
|
35
4
|
export function createToolResultMessage(toolCallId, toolName, result, providerExecuted = false) {
|
|
36
5
|
return {
|
|
37
6
|
id: `tool_${toolCallId}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-middleware.d.ts","sourceRoot":"","sources":["../../../../src/src/server/runtime-handler/project-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"project-middleware.d.ts","sourceRoot":"","sources":["../../../../src/src/server/runtime-handler/project-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAOtE,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAO3D,KAAK,gBAAgB,GAAG,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;AAEnC,UAAU,+BAA+B;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,+BAA+B;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,IAAI,EAAE,MAAM,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;CAC3C;AAcD,kFAAkF;AAClF,qBAAa,wBAAwB;;gBAIvB,OAAO,GAAE,+BAAoC;IAYzD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAYlD,KAAK,IAAI,IAAI;IAIP,OAAO,CAAC,KAAK,EAAE,+BAA+B,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;CA2GrF;AAED,eAAO,MAAM,wBAAwB,0BAEnC,CAAC;AAEH,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAOR"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isExtendedFSAdapter } from "../../platform/adapters/fs/wrapper.js";
|
|
2
2
|
import { registerLRUCache } from "../../cache/index.js";
|
|
3
|
+
import { isConfigOptionalControlPlaneRunRequest } from "../../channels/control-plane.js";
|
|
3
4
|
import { MiddlewareContext } from "../../middleware/core/context.js";
|
|
4
5
|
import { MiddlewarePipeline } from "../../middleware/core/pipeline/index.js";
|
|
5
6
|
import { getProjectEnvSnapshot } from "../project-env/index.js";
|
|
@@ -50,6 +51,9 @@ export class ProjectMiddlewareRuntime {
|
|
|
50
51
|
}
|
|
51
52
|
async execute(input) {
|
|
52
53
|
const { handlerContext: ctx, isSharedProxy, next, request } = input;
|
|
54
|
+
if (isConfigOptionalControlPlaneRunRequest(request.method, new URL(request.url).pathname)) {
|
|
55
|
+
return next();
|
|
56
|
+
}
|
|
53
57
|
const fs = ctx.adapter.fs;
|
|
54
58
|
if (!isSharedProxy || ctx.isLocalProject || !ctx.projectSlug || !ctx.proxyToken ||
|
|
55
59
|
!isExtendedFSAdapter(fs) || !fs.isMultiProjectMode()) {
|
package/esm/src/tool/result.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
/** Check whether tool execution error marker is present. */
|
|
2
2
|
export declare function hasToolExecutionErrorMarker(value: unknown): boolean;
|
|
3
|
+
/** Check whether a tool result contains a complete deferred OAuth action. */
|
|
4
|
+
export declare function isIntegrationAuthenticationActionResult(value: unknown): boolean;
|
|
5
|
+
/** Return the displayable error for a failed tool result. */
|
|
6
|
+
export declare function getToolResultError(result: unknown): string | undefined;
|
|
3
7
|
/** Result returned from is errored tool execution. */
|
|
4
8
|
export declare function isErroredToolExecutionResult(result: unknown): boolean;
|
|
5
9
|
//# sourceMappingURL=result.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../src/src/tool/result.ts"],"names":[],"mappings":"AAIA,4DAA4D;AAC5D,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMnE;AAED,sDAAsD;AACtD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAUrE"}
|
|
1
|
+
{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../src/src/tool/result.ts"],"names":[],"mappings":"AAIA,4DAA4D;AAC5D,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMnE;AAOD,6EAA6E;AAC7E,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAM/E;AAkBD,6DAA6D;AAC7D,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CA+BtE;AAED,sDAAsD;AACtD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAUrE"}
|
package/esm/src/tool/result.js
CHANGED
|
@@ -8,6 +8,57 @@ export function hasToolExecutionErrorMarker(value) {
|
|
|
8
8
|
}
|
|
9
9
|
return typeof value.error === "string" || value.isError === true;
|
|
10
10
|
}
|
|
11
|
+
function hasIntegrationAuthenticationActionError(value) {
|
|
12
|
+
return isRecord(value) && !Array.isArray(value) &&
|
|
13
|
+
(value.error === "authentication_required" || value.error === "reconnect_required");
|
|
14
|
+
}
|
|
15
|
+
/** Check whether a tool result contains a complete deferred OAuth action. */
|
|
16
|
+
export function isIntegrationAuthenticationActionResult(value) {
|
|
17
|
+
return hasIntegrationAuthenticationActionError(value) &&
|
|
18
|
+
typeof value.integration === "string" &&
|
|
19
|
+
value.integration.trim().length > 0 &&
|
|
20
|
+
typeof value.connectUrl === "string" &&
|
|
21
|
+
value.connectUrl.trim().length > 0;
|
|
22
|
+
}
|
|
23
|
+
function getMcpToolErrorMessage(result) {
|
|
24
|
+
if (!isRecord(result) || Array.isArray(result)) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
if (typeof result.error !== "string" || result.error.length === 0) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
if (typeof result.message === "string" && result.message.trim().length > 0) {
|
|
31
|
+
return result.message;
|
|
32
|
+
}
|
|
33
|
+
return result.error;
|
|
34
|
+
}
|
|
35
|
+
/** Return the displayable error for a failed tool result. */
|
|
36
|
+
export function getToolResultError(result) {
|
|
37
|
+
if (isIntegrationAuthenticationActionResult(result)) {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
if (!hasToolExecutionErrorMarker(result)) {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
if (hasIntegrationAuthenticationActionError(result)) {
|
|
44
|
+
if (typeof result.message === "string" && result.message.trim().length > 0) {
|
|
45
|
+
return result.message;
|
|
46
|
+
}
|
|
47
|
+
return "Integration authentication response is incomplete";
|
|
48
|
+
}
|
|
49
|
+
const mcpToolErrorMessage = getMcpToolErrorMessage(result);
|
|
50
|
+
if (mcpToolErrorMessage !== undefined) {
|
|
51
|
+
return mcpToolErrorMessage;
|
|
52
|
+
}
|
|
53
|
+
const record = result;
|
|
54
|
+
if (typeof record.error === "string") {
|
|
55
|
+
return record.error.length > 0 ? record.error : JSON.stringify(record.error);
|
|
56
|
+
}
|
|
57
|
+
if (typeof record.message === "string" && record.message.trim().length > 0) {
|
|
58
|
+
return record.message;
|
|
59
|
+
}
|
|
60
|
+
return "Tool execution failed";
|
|
61
|
+
}
|
|
11
62
|
/** Result returned from is errored tool execution. */
|
|
12
63
|
export function isErroredToolExecutionResult(result) {
|
|
13
64
|
if (hasToolExecutionErrorMarker(result)) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "veryfront",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.1079",
|
|
4
4
|
"description": "The simplest way to build AI-powered apps",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -328,10 +328,10 @@
|
|
|
328
328
|
"@types/react": "19.2.14",
|
|
329
329
|
"@types/react-dom": "19.2.3",
|
|
330
330
|
"ws": "8.21.0",
|
|
331
|
-
"@veryfront/ext-bundler-esbuild": "0.1.
|
|
332
|
-
"@veryfront/ext-content-mdx": "0.1.
|
|
333
|
-
"@veryfront/ext-css-tailwind": "0.1.
|
|
334
|
-
"@veryfront/ext-parser-babel": "0.1.
|
|
331
|
+
"@veryfront/ext-bundler-esbuild": "0.1.1079",
|
|
332
|
+
"@veryfront/ext-content-mdx": "0.1.1079",
|
|
333
|
+
"@veryfront/ext-css-tailwind": "0.1.1079",
|
|
334
|
+
"@veryfront/ext-parser-babel": "0.1.1079"
|
|
335
335
|
},
|
|
336
336
|
"devDependencies": {
|
|
337
337
|
"@types/node": "20.9.0"
|