From cbce6324011879464ffcaae6378ae97f44c6815a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Arrufat?= <adria.arrufat@gmail.com>
Date: Mon, 27 Jul 2026 12:07:28 +0200
Subject: [PATCH] Replace @cImport with build-system translateC

Zig 0.17 removes @cImport in favor of translate-c steps in the build
system. Each library's link function now creates an addTranslateC step
exposed as a module import: curl and isocline translate their headers
straight from the dependency tree, while sqlite3 uses the artifact's
emitted include tree since the amalgamation lives in a sub-dependency.

Terminal.zig and prompt_assist.zig previously instantiated two
independent @cImport namespaces for isocline; they now share one
translated module, so its types are identical across both files.
---
 build.zig                     | 23 +++++++++++++++++++++++
 src/agent/Terminal.zig        |  4 +---
 src/agent/prompt_assist.zig   |  4 +---
 src/storage/sqlite/Sqlite.zig |  2 +-
 src/sys/libcurl.zig           |  4 +---
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/build.zig b/build.zig
index b87fc0be6..92609cc9c 100644
--- a/build.zig
+++ b/build.zig
@@ -325,6 +325,13 @@ fn linkSqlite(b: *Build, mod: *Build.Module, enable_csan: ?std.zig.SanitizeC, is
     }
 
     mod.linkLibrary(lib);
+
+    const translate_c = b.addTranslateC(.{
+        .root_source_file = lib.getEmittedIncludeTree().path(b, "sqlite3.h"),
+        .target = mod.resolved_target.?,
+        .optimize = mod.optimize.?,
+    });
+    mod.addImport("sqlite3", translate_c.createModule());
 }
 
 fn linkCurl(b: *Build, mod: *Build.Module, is_tsan: bool) !void {
@@ -333,6 +340,15 @@ fn linkCurl(b: *Build, mod: *Build.Module, is_tsan: bool) !void {
     const curl = buildCurl(b, target, mod.optimize.?, is_tsan);
     mod.linkLibrary(curl);
 
+    const dep = b.dependency("curl", .{});
+    const translate_c = b.addTranslateC(.{
+        .root_source_file = dep.path("include/curl/curl.h"),
+        .target = target,
+        .optimize = mod.optimize.?,
+    });
+    translate_c.addIncludePath(dep.path("include"));
+    mod.addImport("curl", translate_c.createModule());
+
     const zlib = buildZlib(b, target, mod.optimize.?, is_tsan);
     curl.root_module.linkLibrary(zlib);
 
@@ -833,6 +849,13 @@ fn linkIsocline(b: *Build, mod: *Build.Module) void {
     mod.addCSourceFile(.{
         .file = dep.path("src/isocline.c"),
     });
+
+    const translate_c = b.addTranslateC(.{
+        .root_source_file = dep.path("include/isocline.h"),
+        .target = mod.resolved_target.?,
+        .optimize = mod.optimize.?,
+    });
+    mod.addImport("isocline", translate_c.createModule());
 }
 
 /// Resolves the semantic version of the build.
diff --git a/src/agent/Terminal.zig b/src/agent/Terminal.zig
index 044bc3a0d..e7f6479a6 100644
--- a/src/agent/Terminal.zig
+++ b/src/agent/Terminal.zig
@@ -25,9 +25,7 @@ const Spinner = @import("Spinner.zig");
 const md_term = @import("md_term.zig");
 const prompt_assist = @import("prompt_assist.zig");
 const ansi = @import("ansi.zig");
-const c = @cImport({
-    @cInclude("isocline.h");
-});
+const c = @import("isocline");
 
 const Terminal = @This();
 
diff --git a/src/agent/prompt_assist.zig b/src/agent/prompt_assist.zig
index 5c6b1c6a3..f8cb27fa4 100644
--- a/src/agent/prompt_assist.zig
+++ b/src/agent/prompt_assist.zig
@@ -27,9 +27,7 @@ const browser_tools = lp.tools;
 const Schema = lp.Schema;
 const SlashCommand = @import("SlashCommand.zig");
 const js_highlight = @import("js_highlight.zig");
-const c = @cImport({
-    @cInclude("isocline.h");
-});
+const c = @import("isocline");
 
 const style_slash = "ps-slash";
 const style_string = "ps-string";
diff --git a/src/storage/sqlite/Sqlite.zig b/src/storage/sqlite/Sqlite.zig
index 2578131d1..6a8098fac 100644
--- a/src/storage/sqlite/Sqlite.zig
+++ b/src/storage/sqlite/Sqlite.zig
@@ -20,7 +20,7 @@ const std = @import("std");
 const lp = @import("lightpanda");
 
 const Pool = @import("Pool.zig");
-pub const c = @cImport(@cInclude("sqlite3.h"));
+pub const c = @import("sqlite3");
 
 const log = lp.log;
 const Allocator = std.mem.Allocator;
diff --git a/src/sys/libcurl.zig b/src/sys/libcurl.zig
index 347fa6c27..2027174a1 100644
--- a/src/sys/libcurl.zig
+++ b/src/sys/libcurl.zig
@@ -21,9 +21,7 @@ const builtin = @import("builtin");
 
 const crypto = @import("libcrypto.zig");
 
-const c = @cImport({
-    @cInclude("curl/curl.h");
-});
+const c = @import("curl");
 
 const IS_DEBUG = builtin.mode == .Debug;