fix: [AI-5975] propagate tool error messages to telemetry across all 25 tools

suryaiyer95 · claude · suryaiyer95 · commit ddf53be8c7ba · 2026-03-24T13:47:13.000-07:00
- Add `?? {}` null guard on `result.data` for all altimate-core tool wrappers
- Extract `result.error ?? data.error` and spread into metadata conditionally
- Add `error: msg` to catch block metadata for impact-analysis, lineage-check
- Fix sql-fix unconditional error spread to conditional `...(result.error &amp;&amp; { error })`
- Add comprehensive test suite (90 tests) covering all error propagation paths

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/packages/opencode/src/altimate/tools/altimate-core-check.ts b/packages/opencode/src/altimate/tools/altimate-core-check.ts
@@ -17,15 +17,16 @@ export const AltimateCoreCheckTool = Tool.define("altimate_core_check", {
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: `Check: ${formatCheckTitle(data)}`,
-        metadata: { success: result.success },
+        metadata: { success: result.success, ...(error && { error }) },
         output: formatCheck(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Check: ERROR", metadata: { success: false }, output: `Failed: ${msg}` }
+      return { title: "Check: ERROR", metadata: { success: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-classify-pii.ts b/packages/opencode/src/altimate/tools/altimate-core-classify-pii.ts
@@ -15,17 +15,18 @@ export const AltimateCoreClassifyPiiTool = Tool.define("altimate_core_classify_p
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const piiColumns = data.columns ?? data.findings ?? []
       const findingCount = piiColumns.length
+      const error = result.error ?? data.error
       return {
         title: `PII Classification: ${findingCount} finding(s)`,
-        metadata: { success: result.success, finding_count: findingCount },
+        metadata: { success: result.success, finding_count: findingCount, ...(error && { error }) },
         output: formatClassifyPii(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "PII Classification: ERROR", metadata: { success: false, finding_count: 0 }, output: `Failed: ${msg}` }
+      return { title: "PII Classification: ERROR", metadata: { success: false, finding_count: 0, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-column-lineage.ts b/packages/opencode/src/altimate/tools/altimate-core-column-lineage.ts
@@ -19,16 +19,17 @@ export const AltimateCoreColumnLineageTool = Tool.define("altimate_core_column_l
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const edgeCount = data.column_lineage?.length ?? 0
+      const error = result.error ?? data.error
       return {
         title: `Column Lineage: ${edgeCount} edge(s)`,
-        metadata: { success: result.success, edge_count: edgeCount },
+        metadata: { success: result.success, edge_count: edgeCount, ...(error && { error }) },
         output: formatColumnLineage(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Column Lineage: ERROR", metadata: { success: false, edge_count: 0 }, output: `Failed: ${msg}` }
+      return { title: "Column Lineage: ERROR", metadata: { success: false, edge_count: 0, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-compare.ts b/packages/opencode/src/altimate/tools/altimate-core-compare.ts
@@ -17,16 +17,17 @@ export const AltimateCoreCompareTool = Tool.define("altimate_core_compare", {
         right_sql: args.right_sql,
         dialect: args.dialect ?? "",
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const diffCount = data.differences?.length ?? 0
+      const error = result.error ?? data.error
       return {
         title: `Compare: ${diffCount === 0 ? "IDENTICAL" : `${diffCount} difference(s)`}`,
-        metadata: { success: result.success, difference_count: diffCount },
+        metadata: { success: result.success, difference_count: diffCount, ...(error && { error }) },
         output: formatCompare(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Compare: ERROR", metadata: { success: false, difference_count: 0 }, output: `Failed: ${msg}` }
+      return { title: "Compare: ERROR", metadata: { success: false, difference_count: 0, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-complete.ts b/packages/opencode/src/altimate/tools/altimate-core-complete.ts
@@ -19,7 +19,7 @@ export const AltimateCoreCompleteTool = Tool.define("altimate_core_complete", {
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const count = data.items?.length ?? data.suggestions?.length ?? 0
       const error = result.error ?? (data as any).error
       return {
diff --git a/packages/opencode/src/altimate/tools/altimate-core-export-ddl.ts b/packages/opencode/src/altimate/tools/altimate-core-export-ddl.ts
@@ -15,15 +15,16 @@ export const AltimateCoreExportDdlTool = Tool.define("altimate_core_export_ddl",
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: "Export DDL: done",
-        metadata: { success: result.success },
+        metadata: { success: result.success, ...(error && { error }) },
         output: data.ddl ?? JSON.stringify(data, null, 2),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Export DDL: ERROR", metadata: { success: false }, output: `Failed: ${msg}` }
+      return { title: "Export DDL: ERROR", metadata: { success: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-extract-metadata.ts b/packages/opencode/src/altimate/tools/altimate-core-extract-metadata.ts
@@ -15,15 +15,16 @@ export const AltimateCoreExtractMetadataTool = Tool.define("altimate_core_extrac
         sql: args.sql,
         dialect: args.dialect ?? "",
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: `Metadata: ${data.tables?.length ?? 0} tables, ${data.columns?.length ?? 0} columns`,
-        metadata: { success: result.success },
+        metadata: { success: result.success, ...(error && { error }) },
         output: formatMetadata(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Metadata: ERROR", metadata: { success: false }, output: `Failed: ${msg}` }
+      return { title: "Metadata: ERROR", metadata: { success: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-fingerprint.ts b/packages/opencode/src/altimate/tools/altimate-core-fingerprint.ts
@@ -15,15 +15,16 @@ export const AltimateCoreFingerprintTool = Tool.define("altimate_core_fingerprin
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: `Fingerprint: ${data.fingerprint?.substring(0, 12) ?? "computed"}...`,
-        metadata: { success: result.success, fingerprint: data.fingerprint },
+        metadata: { success: result.success, fingerprint: data.fingerprint, ...(error && { error }) },
         output: `SHA-256: ${data.fingerprint ?? "unknown"}`,
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Fingerprint: ERROR", metadata: { success: false, fingerprint: null }, output: `Failed: ${msg}` }
+      return { title: "Fingerprint: ERROR", metadata: { success: false, fingerprint: null, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-grade.ts b/packages/opencode/src/altimate/tools/altimate-core-grade.ts
@@ -17,7 +17,7 @@ export const AltimateCoreGradeTool = Tool.define("altimate_core_grade", {
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const grade = data.overall_grade ?? data.grade
       const score = data.scores?.overall != null ? Math.round(data.scores.overall * 100) : data.score
       const error = result.error ?? data.error
diff --git a/packages/opencode/src/altimate/tools/altimate-core-import-ddl.ts b/packages/opencode/src/altimate/tools/altimate-core-import-ddl.ts
@@ -15,15 +15,16 @@ export const AltimateCoreImportDdlTool = Tool.define("altimate_core_import_ddl",
         ddl: args.ddl,
         dialect: args.dialect ?? "",
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: "Import DDL: done",
-        metadata: { success: result.success },
+        metadata: { success: result.success, ...(error && { error }) },
         output: formatImportDdl(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Import DDL: ERROR", metadata: { success: false }, output: `Failed: ${msg}` }
+      return { title: "Import DDL: ERROR", metadata: { success: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-introspection-sql.ts b/packages/opencode/src/altimate/tools/altimate-core-introspection-sql.ts
@@ -17,15 +17,16 @@ export const AltimateCoreIntrospectionSqlTool = Tool.define("altimate_core_intro
         database: args.database,
         schema_name: args.schema_name,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: `Introspection SQL: ${args.db_type}`,
-        metadata: { success: result.success, db_type: args.db_type },
+        metadata: { success: result.success, db_type: args.db_type, ...(error && { error }) },
         output: formatIntrospectionSql(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Introspection SQL: ERROR", metadata: { success: false, db_type: args.db_type }, output: `Failed: ${msg}` }
+      return { title: "Introspection SQL: ERROR", metadata: { success: false, db_type: args.db_type, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-migration.ts b/packages/opencode/src/altimate/tools/altimate-core-migration.ts
@@ -17,16 +17,17 @@ export const AltimateCoreMigrationTool = Tool.define("altimate_core_migration",
         new_ddl: args.new_ddl,
         dialect: args.dialect ?? "",
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const riskCount = data.risks?.length ?? 0
+      const error = result.error ?? data.error
       return {
         title: `Migration: ${riskCount === 0 ? "SAFE" : `${riskCount} risk(s)`}`,
-        metadata: { success: result.success, risk_count: riskCount },
+        metadata: { success: result.success, risk_count: riskCount, ...(error && { error }) },
         output: formatMigration(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Migration: ERROR", metadata: { success: false, risk_count: 0 }, output: `Failed: ${msg}` }
+      return { title: "Migration: ERROR", metadata: { success: false, risk_count: 0, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-optimize-context.ts b/packages/opencode/src/altimate/tools/altimate-core-optimize-context.ts
@@ -15,15 +15,16 @@ export const AltimateCoreOptimizeContextTool = Tool.define("altimate_core_optimi
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: `Optimize Context: ${data.levels?.length ?? 0} level(s)`,
-        metadata: { success: result.success },
+        metadata: { success: result.success, ...(error && { error }) },
         output: formatOptimizeContext(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Optimize Context: ERROR", metadata: { success: false }, output: `Failed: ${msg}` }
+      return { title: "Optimize Context: ERROR", metadata: { success: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-parse-dbt.ts b/packages/opencode/src/altimate/tools/altimate-core-parse-dbt.ts
@@ -13,15 +13,16 @@ export const AltimateCoreParseDbtTool = Tool.define("altimate_core_parse_dbt", {
       const result = await Dispatcher.call("altimate_core.parse_dbt", {
         project_dir: args.project_dir,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: `Parse dbt: ${data.models?.length ?? 0} models`,
-        metadata: { success: result.success },
+        metadata: { success: result.success, ...(error && { error }) },
         output: formatParseDbt(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Parse dbt: ERROR", metadata: { success: false }, output: `Failed: ${msg}` }
+      return { title: "Parse dbt: ERROR", metadata: { success: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-policy.ts b/packages/opencode/src/altimate/tools/altimate-core-policy.ts
@@ -19,15 +19,16 @@ export const AltimateCorePolicyTool = Tool.define("altimate_core_policy", {
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: `Policy: ${data.pass ? "PASS" : "VIOLATIONS FOUND"}`,
-        metadata: { success: result.success, pass: data.pass },
+        metadata: { success: result.success, pass: data.pass, ...(error && { error }) },
         output: formatPolicy(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Policy: ERROR", metadata: { success: false, pass: false }, output: `Failed: ${msg}` }
+      return { title: "Policy: ERROR", metadata: { success: false, pass: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-prune-schema.ts b/packages/opencode/src/altimate/tools/altimate-core-prune-schema.ts
@@ -17,15 +17,16 @@ export const AltimateCorePruneSchemaTool = Tool.define("altimate_core_prune_sche
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
+      const error = result.error ?? data.error
       return {
         title: "Prune Schema: done",
-        metadata: { success: result.success },
+        metadata: { success: result.success, ...(error && { error }) },
         output: formatPruneSchema(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Prune Schema: ERROR", metadata: { success: false }, output: `Failed: ${msg}` }
+      return { title: "Prune Schema: ERROR", metadata: { success: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-query-pii.ts b/packages/opencode/src/altimate/tools/altimate-core-query-pii.ts
@@ -17,17 +17,18 @@ export const AltimateCoreQueryPiiTool = Tool.define("altimate_core_query_pii", {
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const piiCols = data.pii_columns ?? data.exposures ?? []
       const exposureCount = piiCols.length
+      const error = result.error ?? data.error
       return {
         title: `Query PII: ${exposureCount === 0 ? "CLEAN" : `${exposureCount} exposure(s)`}`,
-        metadata: { success: result.success, exposure_count: exposureCount },
+        metadata: { success: result.success, exposure_count: exposureCount, ...(error && { error }) },
         output: formatQueryPii(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Query PII: ERROR", metadata: { success: false, exposure_count: 0 }, output: `Failed: ${msg}` }
+      return { title: "Query PII: ERROR", metadata: { success: false, exposure_count: 0, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-resolve-term.ts b/packages/opencode/src/altimate/tools/altimate-core-resolve-term.ts
@@ -17,16 +17,17 @@ export const AltimateCoreResolveTermTool = Tool.define("altimate_core_resolve_te
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const matchCount = data.matches?.length ?? 0
+      const error = result.error ?? data.error
       return {
         title: `Resolve: ${matchCount} match(es) for "${args.term}"`,
-        metadata: { success: result.success, match_count: matchCount },
+        metadata: { success: result.success, match_count: matchCount, ...(error && { error }) },
         output: formatResolveTerm(data, args.term),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Resolve: ERROR", metadata: { success: false, match_count: 0 }, output: `Failed: ${msg}` }
+      return { title: "Resolve: ERROR", metadata: { success: false, match_count: 0, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-rewrite.ts b/packages/opencode/src/altimate/tools/altimate-core-rewrite.ts
@@ -17,17 +17,18 @@ export const AltimateCoreRewriteTool = Tool.define("altimate_core_rewrite", {
         schema_path: args.schema_path ?? "",
         schema_context: args.schema_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const suggestions = data.suggestions ?? data.rewrites ?? []
       const rewriteCount = suggestions.length || (data.rewritten_sql && data.rewritten_sql !== args.sql ? 1 : 0)
+      const error = result.error ?? data.error
       return {
         title: `Rewrite: ${rewriteCount} suggestion(s)`,
-        metadata: { success: result.success, rewrite_count: rewriteCount },
+        metadata: { success: result.success, rewrite_count: rewriteCount, ...(error && { error }) },
         output: formatRewrite(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Rewrite: ERROR", metadata: { success: false, rewrite_count: 0 }, output: `Failed: ${msg}` }
+      return { title: "Rewrite: ERROR", metadata: { success: false, rewrite_count: 0, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-schema-diff.ts b/packages/opencode/src/altimate/tools/altimate-core-schema-diff.ts
@@ -19,17 +19,18 @@ export const AltimateCoreSchemaDiffTool = Tool.define("altimate_core_schema_diff
         schema1_context: args.schema1_context,
         schema2_context: args.schema2_context,
       })
-      const data = result.data as Record<string, any>
+      const data = (result.data ?? {}) as Record<string, any>
       const changeCount = data.changes?.length ?? 0
       const hasBreaking = data.has_breaking_changes ?? data.has_breaking ?? false
+      const error = result.error ?? data.error
       return {
         title: `Schema Diff: ${changeCount} change(s)${hasBreaking ? " (BREAKING)" : ""}`,
-        metadata: { success: result.success, change_count: changeCount, has_breaking: hasBreaking },
+        metadata: { success: result.success, change_count: changeCount, has_breaking: hasBreaking, ...(error && { error }) },
         output: formatSchemaDiff(data),
       }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e)
-      return { title: "Schema Diff: ERROR", metadata: { success: false, change_count: 0, has_breaking: false }, output: `Failed: ${msg}` }
+      return { title: "Schema Diff: ERROR", metadata: { success: false, change_count: 0, has_breaking: false, error: msg }, output: `Failed: ${msg}` }
     }
   },
 })
diff --git a/packages/opencode/src/altimate/tools/altimate-core-testgen.ts b/packages/opencode/src/altimate/tools/altimate-core-testgen.ts
diff --git a/packages/opencode/src/altimate/tools/altimate-core-track-lineage.ts b/packages/opencode/src/altimate/tools/altimate-core-track-lineage.ts
diff --git a/packages/opencode/src/altimate/tools/impact-analysis.ts b/packages/opencode/src/altimate/tools/impact-analysis.ts
diff --git a/packages/opencode/src/altimate/tools/lineage-check.ts b/packages/opencode/src/altimate/tools/lineage-check.ts
diff --git a/packages/opencode/src/altimate/tools/sql-fix.ts b/packages/opencode/src/altimate/tools/sql-fix.ts
diff --git a/packages/opencode/test/altimate/tool-error-propagation-complete.test.ts b/packages/opencode/test/altimate/tool-error-propagation-complete.test.ts
