open-azdo 0.1.3 → 0.1.5

package/README.md

@@ -37,6 +37,7 @@ Common Azure Pipeline defaults:
 
 Optional flags:
 
+- `--opencode-timeout-ms <milliseconds>` default `300000`
 - `--workspace <path>`
 - `--organization <name>`
 - `--project <name>`
@@ -96,6 +97,7 @@ steps:
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       OPENAI_API_KEY: $(OpenAIApiKey)
+      OPEN_AZDO_OPENCODE_TIMEOUT_MS: "300000"
 ```
 
 ## Development

package/dist/open-azdo.js

@@ -26790,6 +26790,7 @@ var ReviewConfigValue = Service("open-azdo/ReviewConfigValue");
 var RawReviewConfigSchema = exports_Schema.Struct({
   command: exports_Schema.Literal("review"),
   model: NonEmptyString2,
+  opencodeTimeoutMs: PositiveInt,
   workspace: NonEmptyString2,
   organization: NonEmptyString2,
   project: NonEmptyString2,
@@ -26821,6 +26822,7 @@ var loadReviewConfig = exports_Effect.fn("config.loadReviewConfig")(function* (a
     try: () => exports_Schema.decodeUnknownSync(RawReviewConfigSchema)(compactOptionalKeys({
       command: "review",
       model: readStringFlag(parsedArgs.flags, "model") ?? env.OPEN_AZDO_MODEL,
+      opencodeTimeoutMs: toPositiveInt(readStringFlag(parsedArgs.flags, "opencode-timeout-ms") ?? env.OPEN_AZDO_OPENCODE_TIMEOUT_MS ?? "300000"),
       workspace: readStringFlag(parsedArgs.flags, "workspace") ?? env.OPEN_AZDO_WORKSPACE ?? env.BUILD_SOURCESDIRECTORY,
       organization,
       project: readStringFlag(parsedArgs.flags, "project") ?? env.OPEN_AZDO_PROJECT ?? env.SYSTEM_TEAMPROJECT,
@@ -26902,6 +26904,7 @@ var parseArgs = (argv) => {
 var toReviewConfig = (rawConfig) => ({
   command: rawConfig.command,
   model: rawConfig.model,
+  opencodeTimeoutMs: rawConfig.opencodeTimeoutMs,
   workspace: rawConfig.workspace,
   organization: rawConfig.organization,
   project: rawConfig.project,
@@ -28473,6 +28476,49 @@ var buildOpenCodeConfig = (agentName) => ({
 });
 var extractFinalResponse = (output) => {
   const texts = [];
+  const structuredCandidates = [];
+  const maybeCollectStructuredCandidate = (value3) => {
+    if (!value3 || typeof value3 !== "object" || Array.isArray(value3)) {
+      return;
+    }
+    if ("summary" in value3 && "verdict" in value3 && "findings" in value3) {
+      structuredCandidates.push(JSON.stringify(value3));
+    }
+  };
+  const collectTextCandidates = (value3) => {
+    if (!value3) {
+      return;
+    }
+    if (typeof value3 === "string") {
+      const trimmed = value3.trim();
+      if (!trimmed) {
+        return;
+      }
+      texts.push(trimmed);
+      try {
+        maybeCollectStructuredCandidate(JSON.parse(trimmed));
+      } catch {}
+      return;
+    }
+    if (Array.isArray(value3)) {
+      for (const entry of value3) {
+        collectTextCandidates(entry);
+      }
+      return;
+    }
+    if (typeof value3 !== "object") {
+      return;
+    }
+    maybeCollectStructuredCandidate(value3);
+    if ("type" in value3 && value3.type === "text" && "text" in value3 && typeof value3.text === "string") {
+      texts.push(value3.text.trim());
+    }
+    for (const [key, nested] of Object.entries(value3)) {
+      if ((key === "text" || key === "content" || key === "message" || key === "part" || key === "parts" || key === "delta" || key === "textDelta" || key === "response" || key === "result" || key === "data" || key === "info") && nested !== undefined) {
+        collectTextCandidates(nested);
+      }
+    }
+  };
   for (const line of output.split(`
 `)) {
     const trimmed = line.trim();
@@ -28485,23 +28531,15 @@ var extractFinalResponse = (output) => {
         texts.push(event);
         continue;
       }
-      if (typeof event.text === "string") {
-        texts.push(event.text);
-      }
-      if (typeof event.content === "string") {
-        texts.push(event.content);
-      }
-      if (Array.isArray(event.content)) {
-        for (const part of event.content) {
-          if (part && typeof part.text === "string") {
-            texts.push(part.text);
-          }
-        }
-      }
+      collectTextCandidates(event);
     } catch {
       texts.push(trimmed);
     }
   }
+  const structuredResponse = structuredCandidates.at(-1)?.trim();
+  if (structuredResponse) {
+    return structuredResponse;
+  }
   const response = texts.join(`
 `).trim();
   if (!response) {
@@ -28552,6 +28590,7 @@ class OpenCodeService extends Service()("open-azdo/OpenCodeService") {
           command: "opencode",
           args: ["run", "--format", "json", "--agent", config.agent, "--model", config.model, prompt],
           cwd: config.workspace,
+          timeoutMs: config.opencodeTimeoutMs,
           env: {
             ...runtimeInput.env,
             OPENCODE_CONFIG: configPath,
@@ -28585,7 +28624,11 @@ class OpenCodeService extends Service()("open-azdo/OpenCodeService") {
             message: "OpenCode did not return a valid final response.",
             output: String(error)
           })
-        });
+        }).pipe(exports_Effect.tapError((error) => logError2("Failed to extract final OpenCode response.", {
+          stdoutPreview: truncateForLog(result3.stdout),
+          stderrPreview: truncateForLog(result3.stderr),
+          detail: error.message
+        })));
         yield* logInfo2("Extracted final OpenCode response.", {
           responseChars: response.length,
           responsePreview: truncateForLog(response)
@@ -28668,6 +28711,7 @@ var writeStdout = exports_Effect.fn("cli.writeStdout")(function* (text) {
 var reviewLogFields = (config) => ({
   command: config.command,
   model: config.model,
+  opencodeTimeoutMs: config.opencodeTimeoutMs,
   workspace: config.workspace,
   organization: config.organization,
   project: config.project,
@@ -29935,4 +29979,4 @@ var main = async (argv, env) => await exports_Effect.runPromise(runCliWithExitHa
 // bin/open-azdo.ts
 process.exitCode = await main(process.argv.slice(2), process.env);
 
-//# debugId=3D47738376EA848764756E2164756E21
+//# debugId=126A3153D9BFAE4A64756E2164756E21