open-azdo 0.2.4 → 0.2.6

package/README.md

@@ -77,7 +77,7 @@ pool:
   vmImage: ubuntu-latest
 
 variables:
-  OpenCodeModel: openai/gpt-5.4
+  OpenCodeModel: openai/gpt-5.4-mini
   OpenCodeThinking: high
 
 steps:

package/dist/open-azdo.js

@@ -46932,17 +46932,17 @@ var runGit = (workspace, operation, args2, allowNonZeroExit = false) => exports_
     allowNonZeroExit
   });
 });
+var resolveHeadReviewedSourceCommitCandidate = (workspace) => runGit(workspace, "Git.resolveReviewedSourceCommit.revList", ["rev-list", "--parents", "-n", "1", "HEAD"]).pipe(exports_Effect.map((result4) => {
+  const hashes = result4.stdout.trim().split(/\s+/);
+  return hashes.length === 3 ? "HEAD^2" : "HEAD";
+}));
 var resolveReviewedSourceCommit = ({ workspace, sourceCommitId }) => exports_Effect.gen(function* () {
-  const candidate = sourceCommitId ?? (yield* runGit(workspace, "Git.resolveReviewedSourceCommit.revList", [
-    "rev-list",
-    "--parents",
-    "-n",
-    "1",
-    "HEAD"
-  ]).pipe(exports_Effect.map((result4) => {
-    const hashes = result4.stdout.trim().split(/\s+/);
-    return hashes.length === 3 ? "HEAD^2" : "HEAD";
-  })));
+  const fallbackCandidate = yield* resolveHeadReviewedSourceCommitCandidate(workspace);
+  let candidate = fallbackCandidate;
+  if (sourceCommitId !== undefined) {
+    const explicitCandidate = yield* runGit(workspace, "Git.resolveReviewedSourceCommit.verifyExplicit", ["rev-parse", "--verify", `${sourceCommitId}^{commit}`], true);
+    candidate = explicitCandidate.exitCode === 0 ? sourceCommitId : fallbackCandidate;
+  }
   const resolved = yield* runGit(workspace, "Git.resolveReviewedSourceCommit.revParse", [
     "rev-parse",
     "--verify",
@@ -47044,6 +47044,26 @@ var resolvePullRequestDiff = (input) => exports_Effect.gen(function* () {
 // ../../packages/core/src/platform/Services/ProcessRunner.ts
 class ProcessRunner extends exports_ServiceMap.Service()("open-azdo/platform/ProcessRunner") {
 }
+// ../../packages/core/src/format-unknown.ts
+var formatUnknownDetail = (value3) => {
+  if (typeof value3 === "string") {
+    return value3;
+  }
+  if (value3 instanceof Error) {
+    return value3.message;
+  }
+  if (typeof value3 === "number" || typeof value3 === "boolean" || typeof value3 === "bigint") {
+    return String(value3);
+  }
+  if (value3 === undefined) {
+    return "undefined";
+  }
+  if (value3 === null) {
+    return "null";
+  }
+  return stringifyJson2(value3);
+};
+
 // ../../packages/core/src/platform/Layers/ProcessRunner.ts
 var DEFAULT_TIMEOUT = seconds(30);
 var DEFAULT_MAX_OUTPUT_BYTES = 1e6;
@@ -47113,7 +47133,7 @@ var makeProcessRunner = exports_Effect.gen(function* () {
       stderr: "pipe"
     });
     return yield* exports_Effect.gen(function* () {
-      const handle = yield* spawner.spawn(command).pipe(exports_Effect.mapError((error2) => toCommandExecutionError(input, `Failed to start ${commandLabel(input)}: ${String(error2)}`)));
+      const handle = yield* spawner.spawn(command).pipe(exports_Effect.mapError((error2) => toCommandExecutionError(input, `Failed to start ${commandLabel(input)}: ${formatUnknownDetail(error2)}`)));
       const [stdout, stderr, exitCode] = yield* exports_Effect.all([
         collectOutput(input, handle.stdout, "stdout", maxOutputBytes),
         collectOutput(input, handle.stderr, "stderr", maxOutputBytes),
@@ -47181,6 +47201,7 @@ var GitExecLive = exports_Layer.effect(GitExec, makeGitExec);
 class OpenCodeRunner extends exports_ServiceMap.Service()("open-azdo/opencode/OpenCodeRunner") {
 }
 // ../../packages/core/src/opencode/Layers/OpenCodeRunner.ts
+var OPENCODE_MAX_OUTPUT_BYTES = 1e7;
 var buildOpenCodeConfig = (agentName) => ({
   $schema: "https://opencode.ai/config.json",
   permission: {
@@ -47233,10 +47254,68 @@ var buildOpenCodeArgs = (request3) => [
   ...request3.variant ? ["--variant", request3.variant] : [],
   REVIEW_TRIGGER_MESSAGE
 ];
-var extractFinalResponse = (output) => {
+var isRecord = (value3) => typeof value3 === "object" && value3 !== null && !Array.isArray(value3);
+var toNumberOrUndefined = (value3) => typeof value3 === "number" && Number.isFinite(value3) ? value3 : undefined;
+var parseTokenUsage = (value3) => {
+  if (!isRecord(value3)) {
+    return;
+  }
+  const input = toNumberOrUndefined(value3.input);
+  const output = toNumberOrUndefined(value3.output);
+  if (input === undefined || output === undefined) {
+    return;
+  }
+  return {
+    input,
+    output,
+    reasoning: toNumberOrUndefined(value3.reasoning) ?? 0,
+    cacheRead: toNumberOrUndefined(value3.cacheRead) ?? 0,
+    cacheWrite: toNumberOrUndefined(value3.cacheWrite) ?? 0
+  };
+};
+var buildUsage = ({
+  costUsd,
+  tokens
+}) => {
+  if (costUsd === undefined && tokens === undefined) {
+    return;
+  }
+  return {
+    ...costUsd !== undefined ? { costUsd } : {},
+    ...tokens ? { tokens } : {}
+  };
+};
+var parsePartUsage = (value3) => {
+  if (!isRecord(value3) || value3.type !== "step-finish") {
+    return;
+  }
+  return buildUsage({
+    costUsd: toNumberOrUndefined(value3.cost),
+    tokens: parseTokenUsage(value3.tokens)
+  });
+};
+var parseAssistantUsage = (value3) => {
+  if (!isRecord(value3)) {
+    return;
+  }
+  const candidate = isRecord(value3.info) ? value3.info : value3;
+  return buildUsage({
+    costUsd: toNumberOrUndefined(candidate.cost),
+    tokens: parseTokenUsage(candidate.tokens)
+  });
+};
+var extractOpenCodeRunResult = (output) => {
   const texts = [];
   const structuredCandidates = [];
   const reportedErrors = [];
+  let sessionId;
+  let stepFinishUsage;
+  let assistantUsage;
+  const buildRunResult = (response2) => ({
+    response: response2,
+    ...sessionId ? { sessionId } : {},
+    ...stepFinishUsage || assistantUsage ? { usage: stepFinishUsage ?? assistantUsage } : {}
+  });
   const describeError = (value3) => {
     if (value3 === null || value3 === undefined) {
       return;
@@ -47245,19 +47324,21 @@ var extractFinalResponse = (output) => {
       const trimmed = value3.trim();
       return trimmed.length > 0 ? trimmed : undefined;
     }
-    if (typeof value3 !== "object" || Array.isArray(value3)) {
+    if (typeof value3 === "number" || typeof value3 === "boolean" || typeof value3 === "bigint") {
       return String(value3);
     }
-    const record3 = value3;
-    const message = describeError(record3.message) ?? describeError(record3.detail) ?? describeError(record3.data) ?? describeError(record3.error) ?? describeError(record3.cause);
+    if (!isRecord(value3)) {
+      return;
+    }
+    const message = describeError(value3.message) ?? describeError(value3.detail) ?? describeError(value3.data) ?? describeError(value3.error) ?? describeError(value3.cause);
     if (!message) {
-      return stringifyJson2(record3);
+      return stringifyJson2(value3);
     }
-    const name = typeof record3.name === "string" ? record3.name.trim() : "";
+    const name = typeof value3.name === "string" ? value3.name.trim() : "";
     return name.length > 0 && !message.startsWith(`${name}:`) ? `${name}: ${message}` : message;
   };
   const maybeCollectStructuredCandidate = (value3) => {
-    if (!value3 || typeof value3 !== "object" || Array.isArray(value3)) {
+    if (!isRecord(value3)) {
       return;
     }
     if ("summary" in value3 && "verdict" in value3 && "findings" in value3) {
@@ -47285,10 +47366,21 @@ var extractFinalResponse = (output) => {
       }
       return;
     }
-    if (typeof value3 !== "object") {
+    if (!isRecord(value3)) {
       return;
     }
     maybeCollectStructuredCandidate(value3);
+    const usageFromPart = parsePartUsage(value3);
+    if (usageFromPart) {
+      stepFinishUsage = usageFromPart;
+    }
+    const usageFromAssistant = parseAssistantUsage(value3);
+    if (usageFromAssistant) {
+      assistantUsage = usageFromAssistant;
+    }
+    if (typeof value3.sessionID === "string") {
+      sessionId = value3.sessionID;
+    }
     if ("type" in value3 && value3.type === "text" && "text" in value3 && typeof value3.text === "string") {
       texts.push(value3.text.trim());
     }
@@ -47323,7 +47415,7 @@ var extractFinalResponse = (output) => {
   }
   const structuredResponse = structuredCandidates.at(-1)?.trim();
   if (structuredResponse) {
-    return structuredResponse;
+    return buildRunResult(structuredResponse);
   }
   const response = texts.join(`
 `).trim();
@@ -47333,7 +47425,7 @@ var extractFinalResponse = (output) => {
       output
     });
   }
-  return response;
+  return buildRunResult(response);
 };
 var makeOpenCodeRunner = exports_Effect.gen(function* () {
   const runner = yield* ProcessRunner;
@@ -47349,7 +47441,7 @@ var makeOpenCodeRunner = exports_Effect.gen(function* () {
       });
       const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "open-azdo-opencode-" }).pipe(exports_Effect.mapError((error2) => new OpenCodeOutputError({
         message: "Failed to create OpenCode temp directory.",
-        output: String(error2)
+        output: formatUnknownDetail(error2)
       })));
       const configPath = path3.join(tempDir, "opencode.json");
       const promptPath = path3.join(tempDir, "agent-prompt.md");
@@ -47358,7 +47450,7 @@ var makeOpenCodeRunner = exports_Effect.gen(function* () {
         fileSystem.writeFileString(configPath, stringifyJson2(buildOpenCodeConfig(request3.agent)))
       ], { concurrency: "unbounded" }).pipe(exports_Effect.mapError((error2) => new OpenCodeOutputError({
         message: "Failed to write temporary OpenCode configuration.",
-        output: String(error2)
+        output: formatUnknownDetail(error2)
       })));
       yield* logInfo2("Prepared temporary OpenCode files.", {
         tempDir,
@@ -47371,6 +47463,7 @@ var makeOpenCodeRunner = exports_Effect.gen(function* () {
         args: buildOpenCodeArgs(request3),
         cwd: request3.workspace,
         timeout: request3.timeout,
+        maxOutputBytes: OPENCODE_MAX_OUTPUT_BYTES,
         env: {
           ...request3.inheritedEnv,
           OPENCODE_CONFIG: configPath,
@@ -47398,11 +47491,11 @@ var makeOpenCodeRunner = exports_Effect.gen(function* () {
           exitCode: result4.exitCode
         });
       }
-      const response = yield* exports_Effect.try({
-        try: () => extractFinalResponse(result4.stdout),
+      const runResult = yield* exports_Effect.try({
+        try: () => extractOpenCodeRunResult(result4.stdout),
         catch: (error2) => error2 instanceof OpenCodeOutputError ? error2 : new OpenCodeOutputError({
           message: "OpenCode did not return a valid final response.",
-          output: String(error2)
+          output: formatUnknownDetail(error2)
         })
       }).pipe(exports_Effect.tapError((error2) => logError2("Failed to extract final OpenCode response.", {
         stdoutPreview: truncateForLog(result4.stdout),
@@ -47410,10 +47503,14 @@ var makeOpenCodeRunner = exports_Effect.gen(function* () {
         detail: error2.message
       })));
       yield* logInfo2("Extracted final OpenCode response.", {
-        responseChars: response.length,
-        responsePreview: truncateForLog(response)
+        responseChars: runResult.response.length,
+        responsePreview: truncateForLog(runResult.response),
+        sessionId: runResult.sessionId,
+        costUsd: runResult.usage?.costUsd,
+        inputTokens: runResult.usage?.tokens?.input,
+        outputTokens: runResult.usage?.tokens?.output
       });
-      return response;
+      return runResult;
     }).pipe(exports_Effect.scoped);
   });
   return {
@@ -47512,6 +47609,24 @@ var SeverityCountsSchema = exports_Schema.Struct({
   high: exports_Schema.Int,
   critical: exports_Schema.Int
 });
+var ReviewHistoryTokensSchema = exports_Schema.Struct({
+  input: exports_Schema.Int,
+  output: exports_Schema.Int,
+  reasoning: exports_Schema.Int,
+  cacheRead: exports_Schema.Int,
+  cacheWrite: exports_Schema.Int
+});
+var ReviewHistoryEntrySchema = exports_Schema.Struct({
+  reviewedCommit: exports_Schema.String,
+  reviewMode: exports_Schema.Literals(["full", "follow-up"]),
+  model: exports_Schema.String,
+  variant: exports_Schema.optionalKey(exports_Schema.String),
+  buildNumber: exports_Schema.optionalKey(exports_Schema.String),
+  buildId: exports_Schema.optionalKey(exports_Schema.String),
+  buildLink: exports_Schema.optionalKey(exports_Schema.String),
+  costUsd: exports_Schema.optionalKey(exports_Schema.Number),
+  tokens: exports_Schema.optionalKey(ReviewHistoryTokensSchema)
+});
 var ManagedReviewStateSchema = exports_Schema.Struct({
   schemaVersion: exports_Schema.Int,
   reviewedCommit: exports_Schema.String,
@@ -47520,10 +47635,11 @@ var ManagedReviewStateSchema = exports_Schema.Struct({
   severityCounts: SeverityCountsSchema,
   findingsCount: exports_Schema.Int,
   inlineFindingsCount: exports_Schema.Int,
-  unmappedNotesCount: exports_Schema.Int
+  unmappedNotesCount: exports_Schema.Int,
+  reviewHistory: exports_Schema.optionalKey(exports_Schema.Array(ReviewHistoryEntrySchema))
 });
 var isActiveThreadStatus = (status) => status === 1 || status === "active" || status === "pending";
-var STATE_SCHEMA_VERSION = 1;
+var STATE_SCHEMA_VERSION = 2;
 var FINDING_MARKER_PREFIX = "<!-- open-azdo:";
 var SUMMARY_STATE_PREFIX = "<!-- open-azdo-review:";
 var COMMENT_SUFFIX = " -->";
@@ -47568,7 +47684,8 @@ var fingerprintFinding = (finding) => {
 var buildManagedReviewState = ({
   reviewedCommit,
   pullRequestBaseRef,
-  reviewResult
+  reviewResult,
+  reviewHistory
 }) => ({
   schemaVersion: STATE_SCHEMA_VERSION,
   reviewedCommit,
@@ -47577,8 +47694,56 @@ var buildManagedReviewState = ({
   severityCounts: countBySeverity(reviewResult.findings),
   findingsCount: reviewResult.findings.length,
   inlineFindingsCount: reviewResult.inlineFindings?.length ?? 0,
-  unmappedNotesCount: reviewResult.unmappedNotes.length
-});
+  unmappedNotesCount: reviewResult.unmappedNotes.length,
+  ...reviewHistory && reviewHistory.length > 0 ? { reviewHistory: [...reviewHistory] } : {}
+});
+var shortCommit = (value3) => value3.slice(0, 12);
+var formatInteger = (value3) => new Intl.NumberFormat("en-US").format(value3);
+var formatCostUsd = (value3) => new Intl.NumberFormat("en-US", {
+  style: "currency",
+  currency: "USD",
+  minimumFractionDigits: 4,
+  maximumFractionDigits: 4
+}).format(value3);
+var escapeTableCell = (value3) => value3.replaceAll("|", "\\|").replaceAll(`
+`, "<br>");
+var formatReviewLabel = (entry) => {
+  const buildLabel = entry.buildNumber ? `Build ${entry.buildNumber}` : entry.buildId ? `Build ${entry.buildId}` : undefined;
+  const commitLabel = shortCommit(entry.reviewedCommit);
+  if (buildLabel && entry.buildLink) {
+    return `[${buildLabel}](${entry.buildLink}) \xB7 ${commitLabel}`;
+  }
+  if (buildLabel) {
+    return `${buildLabel} \xB7 ${commitLabel}`;
+  }
+  return commitLabel;
+};
+var formatTokenBreakdown = (tokens) => {
+  if (!tokens) {
+    return "-";
+  }
+  const segments = [`input ${formatInteger(tokens.input)}`, `output ${formatInteger(tokens.output)}`];
+  if (tokens.reasoning > 0) {
+    segments.push(`reasoning ${formatInteger(tokens.reasoning)}`);
+  }
+  if (tokens.cacheRead > 0) {
+    segments.push(`cache read ${formatInteger(tokens.cacheRead)}`);
+  }
+  if (tokens.cacheWrite > 0) {
+    segments.push(`cache write ${formatInteger(tokens.cacheWrite)}`);
+  }
+  return segments.join(", ");
+};
+var formatModelLabel = (entry) => entry.variant ? `${entry.model} (${entry.variant})` : entry.model;
+var appendReviewHistorySection = (lines, reviewHistory) => {
+  if (reviewHistory.length === 0) {
+    return;
+  }
+  lines.push("", "Review cost history:", "", "| Review | Mode | Model | Tokens | Cost |", "| --- | --- | --- | --- | --- |");
+  for (const entry of reviewHistory) {
+    lines.push(`| ${escapeTableCell(formatReviewLabel(entry))} | ${escapeTableCell(entry.reviewMode)} | ${escapeTableCell(formatModelLabel(entry))} | ${escapeTableCell(formatTokenBreakdown(entry.tokens))} | ${escapeTableCell(entry.costUsd !== undefined ? formatCostUsd(entry.costUsd) : "-")} |`);
+  }
+};
 var buildSummaryComment = (snapshot) => {
   const lines = [
     `Verdict: **${snapshot.verdict}**`,
@@ -47596,6 +47761,7 @@ var buildSummaryComment = (snapshot) => {
   if (snapshot.buildLink) {
     lines.push("", `Build: ${snapshot.buildLink}`);
   }
+  appendReviewHistorySection(lines, snapshot.persistedState?.reviewHistory ?? []);
   if (snapshot.persistedState) {
     lines.push("", encodeManagedReviewState(snapshot.persistedState));
   }
@@ -48017,6 +48183,50 @@ var decodeOpenCodeResult = (rawResult) => parseJsonUnknown(rawResult).pipe(expor
   }),
   onSuccess: (decodedJson) => decodedJson
 }));
+var mapUsageTokens = (usage) => usage?.tokens ? {
+  input: usage.tokens.input,
+  output: usage.tokens.output,
+  reasoning: usage.tokens.reasoning,
+  cacheRead: usage.tokens.cacheRead,
+  cacheWrite: usage.tokens.cacheWrite
+} : undefined;
+var buildReviewHistoryEntry = ({
+  reviewedCommit,
+  reviewMode,
+  config,
+  buildLink,
+  usage
+}) => {
+  const tokens = mapUsageTokens(usage);
+  return {
+    reviewedCommit,
+    reviewMode,
+    model: config.model,
+    ...config.opencodeVariant ? { variant: config.opencodeVariant } : {},
+    ...config.buildNumber ? { buildNumber: config.buildNumber } : {},
+    ...config.buildId ? { buildId: config.buildId } : {},
+    ...buildLink ? { buildLink } : {},
+    ...usage?.costUsd !== undefined ? { costUsd: usage.costUsd } : {},
+    ...tokens ? { tokens } : {}
+  };
+};
+var appendReviewHistoryEntry = ({
+  previousSummaryState,
+  reviewedCommit,
+  reviewMode,
+  config,
+  buildLink,
+  usage
+}) => [
+  ...previousSummaryState?.reviewHistory ?? [],
+  buildReviewHistoryEntry({
+    reviewedCommit,
+    reviewMode,
+    config,
+    buildLink,
+    usage
+  })
+];
 var writeReviewWorkflowOutput = (config, output) => {
   if (config.json) {
     return writeStdout(`${stringifyJson2({
@@ -48133,7 +48343,7 @@ var runReviewWithResolvedConfig = (config, azureContext, buildLink) => exports_E
   yield* logInfo2("Built review prompt.", {
     promptChars: prompt.length
   });
-  const rawResult = yield* openCodeRunner.run({
+  const openCodeResult = yield* openCodeRunner.run({
     workspace: config.workspace,
     model: config.model,
     agent: config.agent,
@@ -48143,9 +48353,13 @@ var runReviewWithResolvedConfig = (config, azureContext, buildLink) => exports_E
     inheritedEnv: config.inheritedEnv
   });
   yield* logInfo2("Received OpenCode response.", {
-    responseChars: rawResult.length
+    responseChars: openCodeResult.response.length,
+    sessionId: openCodeResult.sessionId,
+    costUsd: openCodeResult.usage?.costUsd,
+    inputTokens: openCodeResult.usage?.tokens?.input,
+    outputTokens: openCodeResult.usage?.tokens?.output
   });
-  const reviewResult = yield* decodeOpenCodeResult(rawResult).pipe(exports_Effect.flatMap((decodedJson) => decodeReviewResult(decodedJson, scopedDiff.changedLinesByFile)));
+  const reviewResult = yield* decodeOpenCodeResult(openCodeResult.response).pipe(exports_Effect.flatMap((decodedJson) => decodeReviewResult(decodedJson, scopedDiff.changedLinesByFile)));
   yield* logInfo2("Decoded review result.", {
     reviewMode,
     verdict: reviewResult.verdict,
@@ -48160,10 +48374,19 @@ var runReviewWithResolvedConfig = (config, azureContext, buildLink) => exports_E
     scopedDeletedLinesByFile: scopedDiff.deletedLinesByFile,
     reviewResult
   }) : reviewResult;
+  const reviewHistory = appendReviewHistoryEntry({
+    previousSummaryState,
+    reviewedCommit: reviewedSourceCommit,
+    reviewMode,
+    config,
+    buildLink,
+    usage: openCodeResult.usage
+  });
   const summaryState = buildManagedReviewState({
     reviewedCommit: reviewedSourceCommit,
     pullRequestBaseRef: fullPullRequestDiff.baseRef,
-    reviewResult: outstandingReviewResult
+    reviewResult: outstandingReviewResult,
+    reviewHistory
   });
   const summaryContent = buildSummaryComment({
     verdict: summaryState.verdict,
@@ -48471,7 +48694,7 @@ var reviewCommandConfig = {
 var reviewCommand = make33("review", reviewCommandConfig).pipe(withDescription3("Review an Azure DevOps pull request with OpenCode."), withHandler((input) => runReviewCommand(input)));
 var openAzdoCli = make33("open-azdo").pipe(withDescription3("Secure Azure DevOps pull-request review CLI powered by OpenCode."), withSubcommands([reviewCommand]));
 // package.json
-var version2 = "0.2.4";
+var version2 = "0.2.6";
 
 // src/Main.ts
 var cliProgram = run3(openAzdoCli, { version: version2 }).pipe(exports_Effect.scoped, exports_Effect.provide(BaseRuntimeLayer));
@@ -48480,4 +48703,4 @@ var main = () => runMain2(cliProgram, { disableErrorReporting: true });
 // bin/open-azdo.ts
 main();
 
-//# debugId=7528100F803103A764756E2164756E21
+//# debugId=151A25C3CC4015FB64756E2164756E21