Add decai timeout, zen provider, improve prompt, custom headers and more

Author: radare

decai/AGENTS.md

@@ -0,0 +1,7 @@
+# Decompiler based AI
+
+## Actions
+
+* Build: `make -C src`
+* Install: `make user-install`
+* Test: `r2 -A -qc "decai -e api=ollamacloud;decai -e model=glm-5;decai -d @ 0x100000924" /bin/ls`

decai/README.md

@@ -59,6 +59,7 @@ decai -e host=http://localhost
 decai -e port=11434
 decai -e prompt=Rewrite this function and respond ONLY with code, NO explanations, NO markdown, Change 'goto' into if/else/for/while, Simplify as much as possible, use better variable names, take function arguments and strings from comments like 'string:'
 decai -e ctxfile=
+decai -e headers=
 decai -e cmds=pdc
 decai -e cache=false
 decai -e lang=C
@@ -106,6 +107,14 @@ openapi
 ...
 ```
 
+Extra headers can be injected globally with `decai -e headers=...` or from the
+environment with `DECAI_HEADERS` / `R2AI_HEADERS`. Use one header per line, for
+example:
+
+```console
+[0x00406cac]> decai -e headers=Authorization: Bearer sk-123\nUser-Agent: curl/8.7.1
+```
+
 ### Example using a local model and ollama
 
 For example, if Ollama serves model codegeex4:latest (`ollama ls`), set decai

decai/decai.r2.js

@@ -11,6 +11,8 @@ const PROVIDER_ENV_MAP: Record<string, string> = {
   xai: "XAI_API_KEY",
   ollama: "OLLAMA_API_KEY",
   ollamacloud: "OLLAMA_API_KEY",
+  opencode: "OPENCODE_API_KEY",
+  zen: "OPENCODE_API_KEY",
 };
 
 export function getApiKey(provider: string, envvar: string): ApiKeyResult {

decai/src/apiKeys.ts

@@ -2,6 +2,7 @@ import { ConfigHandlers } from "./types";
 import { state } from "./state";
 import { listModelsFor } from "./models";
 import { listProviders } from "./providers";
+import { formatHeaders, parseHeaders } from "./headers";
 
 function parseBoolean(value: string): boolean {
   return value === "true" || value === "1";
@@ -53,6 +54,12 @@ export const configHandlers: ConfigHandlers = {
       state.debug = parseBoolean(v);
     },
   },
+  timeout: {
+    get: () => state.timeout,
+    set: (v: string) => {
+      state.timeout = Math.max(0, parseInt(v, 10) || 0);
+    },
+  },
   api: {
     get: () => state.api,
     set: (v: string) => {
@@ -118,6 +125,12 @@ export const configHandlers: ConfigHandlers = {
       state.baseurl = v;
     },
   },
+  headers: {
+    get: () => formatHeaders(state.extraHeaders),
+    set: (v: string) => {
+      state.extraHeaders = parseHeaders(v);
+    },
+  },
   maxtokens: {
     get: () => state.maxInputTokens,
     set: (v: string) => {

decai/src/config.ts

@@ -2,7 +2,7 @@ export const VERSION = "1.3.2";
 export const COMMAND = "decai";
 
 export const DEFAULT_PROMPT =
-  "Transform this pseudocode and respond ONLY with plain code (NO explanations, comments or markdown), Change 'goto' into if/else/for/while, Simplify as much as possible, use better variable names, take function arguments and strings from comments like 'string:', Reduce lines of code and fit everything in a single function, Remove all dead code";
+  "Rewrite this pseudocode into concise and clean code. Output only the provided function. Do not add wrappers, helper examples, test code, or main-like functions. Replace goto with structured control flow, simplify as much as possible, infer types and use better names for variables and parameters, some strings may be appearing as comments, preserve only what is implied by the input, and remove dead code.";
 
 export const HELP_TEXT = {
   decai: `# Using Decai
@@ -27,6 +27,9 @@ These are the most recommended models for decompiling in local:
 
 ## Common Options
 * 'decai -e baseurl=<url>' override default host and port for API endpoint (e.g., 'http://localhost:11434')
+* 'decai -e headers=Authorization: Bearer ...\\nUser-Agent: curl/8.7.1' add or override HTTP headers
+* "export DECAI_HEADERS='Authorization: Bearer ...\\nUser-Agent: curl/8.7.1'" set extra headers from the environment
+* 'decai -e timeout=0' disable curl timeouts, or set a positive number of seconds
 
 * 'decai -e deterministic=true' to remove randomness from decompilation responses
 * 'decai -e lang=Python' to output the decompilation in Python instead of C

decai/src/constants.ts

@@ -1,4 +1,6 @@
 import { HttpResponse } from "./types";
+import { state } from "./state";
+import { mergeHeaders } from "./headers";
 import { debugLog } from "./utils";
 
 interface HttpRequestOptions {
@@ -14,45 +16,42 @@ function shellEscape(arg: string): string {
 
 function executeCurl(options: HttpRequestOptions): string {
   const { method, url, headers, payload } = options;
-  const cmdParts = ["curl", "-s", shellEscape(url)];
-  headers.forEach((h) => cmdParts.push("-H", shellEscape(h)));
-  cmdParts.push("-H", shellEscape("Content-Type: application/json"));
+  const cmdParts = ["curl", "-s"];
+  if (state.timeout > 0) {
+    cmdParts.push("--max-time", String(state.timeout));
+  }
+  const requestHeaders = mergeHeaders(
+    ["Content-Type: application/json"],
+    headers,
+  );
+  requestHeaders.forEach((h) => cmdParts.push("-H", shellEscape(h)));
 
   if (method === "POST") {
     if (!payload) throw new Error("Payload required for POST requests");
     const tmpfile = r2.fdump(payload);
-    cmdParts.push("-d", shellEscape(`@${tmpfile}`));
-    const cmd = cmdParts.join(" ") + " && rm " + shellEscape(tmpfile);
+    cmdParts.push("--data-binary", "@-", shellEscape(url));
+    const cmd = cmdParts.join(" ") + " < " + shellEscape(tmpfile) +
+      " && rm " + shellEscape(tmpfile);
     debugLog(cmd);
     return r2.syscmds(cmd);
   } else {
+    cmdParts.push(shellEscape(url));
     const cmd = cmdParts.join(" ");
     debugLog(cmd);
     return r2.syscmds(cmd);
   }
 }
 
-function parseJson<T>(output: string): T {
-  if (output === "") {
-    throw new Error("empty response");
-  }
-  try {
-    return JSON.parse(output) as T;
-  } catch (e) {
-    const err = e as Error;
-    console.error("output:", output);
-    console.error(err, err.stack);
-    throw new Error(err.message || "JSON parse error");
-  }
-}
-
 export function httpRequest(options: HttpRequestOptions): HttpResponse {
   try {
-    const output = executeCurl(options);
+    const output = executeCurl(options).trim();
+    if (output === "") {
+      return { error: "empty response" };
+    }
     try {
-      return parseJson<HttpResponse>(output);
-    } catch (e) {
-      return { error: (e as Error).message };
+      return JSON.parse(output) as HttpResponse;
+    } catch {
+      return { error: output, rawOutput: output };
     }
   } catch (e) {
     const err = e as Error;

decai/src/http.ts

@@ -0,0 +1,10 @@
+### 3. HTTP Request Patterns
+
+**Location**: `http.ts`, used throughout providers and models
+
+**Problems**:
+
+- Two different curl methods (`curlArgs` vs `curlFile`) with similar but
+  separate logic
+- Error handling in HTTP layer vs. application layer
+- No centralized request/response abstraction

decai/src/httptask.md

@@ -1,4 +1,4 @@
-import { getProvider } from "./providers";
+import { getProvider, listModels } from "./providers";
 
 export function listModelsFor(api: string): void {
   const providerConfig = getProvider(api);
@@ -9,10 +9,7 @@ export function listModelsFor(api: string): void {
   }
 
   try {
-    let models = "";
-    if (providerConfig.listModelsCallback) {
-      models = providerConfig.listModelsCallback(providerConfig);
-    }
+    const models = listModels(api);
 
     if (models) {
       console.log(models);