gaoding-cli 1.0.0-alpha.15 → 1.0.0-alpha.16

package/dist/src/features/tool/tool-api-adapter.js

@@ -47,6 +47,21 @@ function parseIntent(value) {
         arguments: parseRecord(nonBlank(value.arguments))
     };
 }
+function isEmptyOptionalMedia(value) {
+    return value === undefined
+        || value === null
+        || value === ""
+        || (Array.isArray(value) && value.length === 0)
+        || (typeof value === "string" && value.trim() === "[]");
+}
+function withoutEmptyOptionalMedia(value, optionalMediaParameters) {
+    const normalized = { ...value };
+    for (const name of optionalMediaParameters) {
+        if (isEmptyOptionalMedia(normalized[name]))
+            delete normalized[name];
+    }
+    return normalized;
+}
 function submittedTask(value) {
     if (!isRecord(value) || !isRecord(value.result))
         return protocolFailure(value);
@@ -143,6 +158,17 @@ function optionalInnerDifyTaskId(value) {
         return undefined;
     }
 }
+function isJsonRpcError(value) {
+    if (value.jsonrpc !== "2.0"
+        || Object.prototype.hasOwnProperty.call(value, "result")
+        || !isRecord(value.error)) {
+        return false;
+    }
+    return typeof value.error.code === "number"
+        && Number.isInteger(value.error.code)
+        && typeof value.error.message === "string"
+        && value.error.message.trim() !== "";
+}
 function pollResult(value, taskId) {
     if (!Array.isArray(value))
         return protocolFailure(value);
@@ -175,6 +201,11 @@ function pollResult(value, taskId) {
         && (typeof difyTaskId !== "string" || difyTaskId.trim() === "")) {
         return protocolFailure(inner);
     }
+    if (Object.prototype.hasOwnProperty.call(inner, "error")) {
+        return isJsonRpcError(inner)
+            ? failedPoll(new ToolTaskFailedError(remoteErrorEvidence(inner)), difyTaskId)
+            : failedPoll(new RemoteProtocolError(remoteErrorEvidence(inner)), difyTaskId);
+    }
     if (!isRecord(inner.result)) {
         return failedPoll(new RemoteProtocolError(remoteErrorEvidence(inner)), difyTaskId);
     }
@@ -240,17 +271,25 @@ export function createToolApiAdapter(dependencies) {
         async execute({ invocation, access, signal }) {
             signal.throwIfAborted();
             const managedContentId = contentId(createContentId());
-            const intent = await dependencies.telemetry.stage("intent", async () => parseIntent(await safePost(dependencies.transport, {
-                path: "/ai-agent/v1/tool-intent",
-                body: {
-                    prompt: invocation.prompt,
-                    scene_code: invocation.model,
-                    parameters: invocation.parameters
-                },
-                credential: access.credential,
-                organizationId: access.organizationId,
-                signal
-            })));
+            const resolved = invocation.kind === "direct"
+                ? { name: invocation.name, arguments: invocation.arguments }
+                : await dependencies.telemetry.stage("intent", async () => {
+                    const intent = parseIntent(await safePost(dependencies.transport, {
+                        path: "/ai-agent/v1/tool-intent",
+                        body: {
+                            prompt: invocation.prompt,
+                            scene_code: invocation.model,
+                            parameters: invocation.parameters
+                        },
+                        credential: access.credential,
+                        organizationId: access.organizationId,
+                        signal
+                    }));
+                    return {
+                        ...intent,
+                        arguments: withoutEmptyOptionalMedia(intent.arguments, invocation.optionalMediaParameters)
+                    };
+                });
             signal.throwIfAborted();
             const taskId = await dependencies.telemetry.stage("submit", async () => {
                 dependencies.telemetry.annotate({ content_id: managedContentId });
@@ -261,8 +300,8 @@ export function createToolApiAdapter(dependencies) {
                         id: 0,
                         method: "tools/call",
                         params: {
-                            name: intent.name,
-                            arguments: { ...intent.arguments, content_id: managedContentId }
+                            name: resolved.name,
+                            arguments: { ...resolved.arguments, content_id: managedContentId }
                         }
                     },
                     credential: access.credential,

package/dist/src/features/tool/use-cases.js

@@ -86,6 +86,7 @@ export function createToolUseCases(dependencies) {
             });
             const prompt = [];
             const requestParameters = {};
+            const directArguments = {};
             const prepare = async () => {
                 for (const parameter of model.parameters) {
                     signal.throwIfAborted();
@@ -95,14 +96,17 @@ export function createToolUseCases(dependencies) {
                     if (parameter.type === "string") {
                         if (parameter.name === "prompt") {
                             prompt.push({ type: "text", content: value });
+                            directArguments[parameter.name] = value;
                         }
                         else {
                             requestParameters[parameter.name] = value;
+                            directArguments[parameter.name] = value;
                         }
                         continue;
                     }
                     if (parameter.type === "number") {
                         requestParameters[parameter.name] = value;
+                        directArguments[parameter.name] = value;
                         continue;
                     }
                     const values = parameter.type === "uri[]" ? value : [value];
@@ -138,8 +142,26 @@ export function createToolUseCases(dependencies) {
                 await prepare();
             }
             signal.throwIfAborted();
+            const requiresIntent = prompt.some((item) => item.type === "media")
+                || Object.values(requestParameters).some((value) => value === "");
+            const invocation = requiresIntent
+                ? {
+                    kind: "intent",
+                    model: model.model,
+                    prompt,
+                    parameters: requestParameters,
+                    optionalMediaParameters: model.parameters
+                        .filter((parameter) => ((parameter.type === "uri" || parameter.type === "uri[]")
+                        && !parameter.required))
+                        .map((parameter) => parameter.name)
+                }
+                : {
+                    kind: "direct",
+                    name: model.model,
+                    arguments: directArguments
+                };
             const content = await dependencies.execution.execute({
-                invocation: { model: model.model, prompt, parameters: requestParameters },
+                invocation,
                 access,
                 signal
             });

package/dist/src/platform/remote-error-evidence.js

@@ -3,7 +3,7 @@ const maximumLength = 8_192;
 const truncationMarker = "[TRUNCATED]";
 export function remoteErrorEvidence(value) {
     const normalized = parseJson(value);
-    const remoteCode = topLevelCode(normalized);
+    const remoteCode = topLevelCode(normalized) ?? jsonRpcErrorCode(normalized);
     const sanitized = sanitize(normalized);
     if (sanitized === undefined) {
         return remoteCode === undefined ? {} : { remoteCode };
@@ -31,7 +31,21 @@ function topLevelCode(value) {
         return undefined;
     if (!Object.prototype.hasOwnProperty.call(value, "code"))
         return undefined;
-    const code = value.code;
+    return normalizeCode(value.code);
+}
+function jsonRpcErrorCode(value) {
+    if (value === null || typeof value !== "object" || Array.isArray(value))
+        return undefined;
+    const record = value;
+    if (record.jsonrpc !== "2.0"
+        || record.error === null
+        || typeof record.error !== "object"
+        || Array.isArray(record.error)) {
+        return undefined;
+    }
+    return normalizeCode(record.error.code);
+}
+function normalizeCode(code) {
     if (typeof code === "string")
         return redactRemoteText(code);
     return typeof code === "number" ? String(code) : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gaoding-cli",
-  "version": "1.0.0-alpha.15",
+  "version": "1.0.0-alpha.16",
   "description": "Gaoding command-line interface for agents and people.",
   "type": "module",
   "license": "MIT",