deepline 0.1.32 → 0.1.35

package/dist/repo/shared_libs/play-runtime/tool-result.ts

@@ -38,6 +38,64 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
 
+export type V2ToolExecuteOutput = {
+  raw: unknown;
+  meta?: Record<string, unknown>;
+};
+
+export function parseV2ToolExecuteOutput(
+  data: Record<string, unknown>,
+): V2ToolExecuteOutput | null {
+  const toolExecutionResult = data.toolExecutionResult;
+  if (!isRecord(toolExecutionResult)) return null;
+  const toolOutput = toolExecutionResult.toolOutput;
+  if (!isRecord(toolOutput)) return null;
+  const meta = isRecord(toolOutput.meta) ? toolOutput.meta : undefined;
+  return {
+    raw: Object.prototype.hasOwnProperty.call(toolOutput, 'raw')
+      ? toolOutput.raw
+      : null,
+    ...(meta ? { meta } : {}),
+  };
+}
+
+export function adaptV2ExecuteResponseToToolResult(
+  data: Record<string, unknown>,
+): { output?: V2ToolExecuteOutput; result: unknown } {
+  const output = parseV2ToolExecuteOutput(data);
+  if (!output) {
+    return { result: data.result ?? data };
+  }
+  return {
+    output,
+    result: {
+      data: output.raw,
+      ...(output.meta ? { meta: output.meta } : {}),
+    },
+  };
+}
+
+export function toV2RawToolOutputPath(path: string): string {
+  const normalized = String(path || '')
+    .trim()
+    .replace(/^\./, '');
+  if (!normalized) return 'toolExecutionResult.toolOutput.raw';
+  if (
+    normalized === 'toolExecutionResult.toolOutput.raw' ||
+    normalized.startsWith('toolExecutionResult.toolOutput.raw.')
+  ) {
+    return normalized;
+  }
+  const rawPath = normalized
+    .replace(/^result\.data\.?/, '')
+    .replace(/^result\.?/, '')
+    .replace(/^data\.?/, '')
+    .replace(/^\./, '');
+  return rawPath
+    ? `toolExecutionResult.toolOutput.raw.${rawPath}`
+    : 'toolExecutionResult.toolOutput.raw';
+}
+
 function isMeaningfulValue(value: unknown): boolean {
   if (value == null) return false;
   if (typeof value === 'string') return value.trim().length > 0;
@@ -123,7 +181,37 @@ function normalizeResultPath(path: string): string {
     .trim()
     .replace(/^\./, '');
   if (!trimmed) return '';
-  return trimmed.startsWith('result.') ? trimmed : `result.${trimmed}`;
+  return toV2RawToolOutputPath(trimmed);
+}
+
+function toV2RawToolOutputPathPreservingProviderData(path: string): string {
+  const normalized = String(path || '')
+    .trim()
+    .replace(/^\./, '');
+  if (!normalized) return 'toolExecutionResult.toolOutput.raw';
+  if (
+    normalized === 'toolExecutionResult.toolOutput.raw' ||
+    normalized.startsWith('toolExecutionResult.toolOutput.raw.')
+  ) {
+    return normalized;
+  }
+  const rawPath = normalized
+    .replace(/^result\.?/, '')
+    .replace(/^\./, '');
+  return rawPath
+    ? `toolExecutionResult.toolOutput.raw.${rawPath}`
+    : 'toolExecutionResult.toolOutput.raw';
+}
+
+function candidateResultPaths(path: string): string[] {
+  const candidates = [
+    normalizeResultPath(path),
+    toV2RawToolOutputPathPreservingProviderData(path),
+  ];
+  return candidates.filter(
+    (candidate, index, all) =>
+      candidate.length > 0 && all.indexOf(candidate) === index,
+  );
 }
 
 function normalizeRelativePath(path: string): string {
@@ -184,10 +272,10 @@ function findFirstTargetByPath(
   paths: readonly string[] | undefined,
 ): ToolResultTargetMetadata | null {
   for (const path of paths ?? []) {
-    const normalizedPath = normalizeResultPath(path);
-    if (!normalizedPath) continue;
-    const match = getFirstMeaningfulValueAtPath(result, normalizedPath);
-    if (match) return match;
+    for (const candidate of candidateResultPaths(path)) {
+      const match = getFirstMeaningfulValueAtPath(result, candidate);
+      if (match) return match;
+    }
   }
   return null;
 }
@@ -244,8 +332,7 @@ function resolveListRows(
     const path = normalizeResultPath(rawPath);
     if (!path) continue;
     const candidates = [
-      path,
-      path.replace(/^result\./, 'result.data.'),
+      ...candidateResultPaths(rawPath),
     ].filter(
       (candidate, index, all) =>
         candidate && all.indexOf(candidate) === index,
@@ -303,29 +390,31 @@ function deriveListKeys(input: {
         .trim()
         .replace(/^\./, '');
       if (!path) continue;
-      const resultPath = normalizeResultPath(path);
-      const directPrefix = `${listPrefix}.`;
-      if (resultPath.startsWith(directPrefix)) {
-        keys[target] = resultPath
-          .slice(directPrefix.length)
-          .replace(/^\[\d+\]\.?/, '');
-        break;
-      }
-      const indexedPrefix = `${listPrefix}[0].`;
-      if (resultPath.startsWith(indexedPrefix)) {
-        keys[target] = resultPath.slice(indexedPrefix.length);
-        break;
-      }
-      const wildcardPrefix = `${listPrefix}[*].`;
-      if (resultPath.startsWith(wildcardPrefix)) {
-        keys[target] = resultPath.slice(wildcardPrefix.length);
-        break;
-      }
-      const dottedIndexPrefix = `${listPrefix}.0.`;
-      if (resultPath.startsWith(dottedIndexPrefix)) {
-        keys[target] = resultPath.slice(dottedIndexPrefix.length);
-        break;
+      for (const resultPath of candidateResultPaths(path)) {
+        const directPrefix = `${listPrefix}.`;
+        if (resultPath.startsWith(directPrefix)) {
+          keys[target] = resultPath
+            .slice(directPrefix.length)
+            .replace(/^\[\d+\]\.?/, '');
+          break;
+        }
+        const indexedPrefix = `${listPrefix}[0].`;
+        if (resultPath.startsWith(indexedPrefix)) {
+          keys[target] = resultPath.slice(indexedPrefix.length);
+          break;
+        }
+        const wildcardPrefix = `${listPrefix}[*].`;
+        if (resultPath.startsWith(wildcardPrefix)) {
+          keys[target] = resultPath.slice(wildcardPrefix.length);
+          break;
+        }
+        const dottedIndexPrefix = `${listPrefix}.0.`;
+        if (resultPath.startsWith(dottedIndexPrefix)) {
+          keys[target] = resultPath.slice(dottedIndexPrefix.length);
+          break;
+        }
       }
+      if (keys[target]) break;
     }
   }
   if (Object.keys(keys).length === 0 && input.rows[0]) {
@@ -438,7 +527,14 @@ export function createToolExecuteResult<TResult = unknown>(input: {
   execution: ToolResultExecutionMetadata;
 }): ToolExecuteResult<TResult> {
   const result = toResultEnvelope(input.result);
-  const resultRoot = { result };
+  const resultRoot = {
+    toolExecutionResult: {
+      toolOutput: {
+        raw: result.data,
+        ...(result.meta ? { meta: result.meta } : {}),
+      },
+    },
+  };
   const targets = buildTargets(
     resultRoot,
     input.metadata.resultIdentityGetters,
@@ -452,9 +548,13 @@ export function createToolExecuteResult<TResult = unknown>(input: {
   };
   const wrapper = {
     status: input.status,
-    result,
-    extracted: buildExtractedAccessors(targets),
-    lists: buildListAccessors(resultRoot, lists),
+    toolOutput: {
+      raw: result.data,
+      ...(result.meta ? { meta: result.meta } : {}),
+    },
+    meta: input.execution,
+    extractedValues: buildExtractedAccessors(targets),
+    extractedLists: buildListAccessors(resultRoot, lists),
   } as ToolExecuteResult<TResult>;
   Object.defineProperty(wrapper, '_metadata', {
     value: metadata,
@@ -471,7 +571,7 @@ export function isToolExecuteResult(
     typeof value.status === 'string' &&
     '_metadata' in value &&
     isRecord(value._metadata) &&
-    'result' in value
+    'toolOutput' in value
   );
 }
 
@@ -481,7 +581,10 @@ export function cloneToolExecuteResultWithExecution<TResult>(
 ): ToolExecuteResult<TResult> {
   return createToolExecuteResult<TResult>({
     status: value.status,
-    result: value.result as TResult,
+    result: {
+      data: value.toolOutput.raw,
+      ...(value.toolOutput.meta ? { meta: value.toolOutput.meta } : {}),
+    } as TResult,
     metadata: {
       toolId: value._metadata.toolId,
       resultIdentityGetters: Object.fromEntries(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepline",
-  "version": "0.1.32",
+  "version": "0.1.35",
   "description": "Deepline SDK + CLI — B2B data enrichment powered by durable cloud execution",
   "license": "MIT",
   "repository": {