Merge pull request #241 from Agoric/gibson-2025-05-agd-debugging

chore(synthetic-chain): Improve output for debugging `agd` invocations

Author: turadg

.changeset/giant-jeans-jump.md

@@ -0,0 +1,5 @@
+---
+'@agoric/synthetic-chain': patch
+---
+
+Improve output for debugging `agd` invocations

packages/synthetic-chain/src/lib/agd-lib.ts

@@ -35,7 +35,17 @@ export const makeAgd = ({
     const exec = (
       args: string[],
       opts?: ExecFileSyncOptionsWithStringEncoding,
-    ) => execFileSync(agdBinary, args, opts).toString();
+    ) => {
+      console.warn(
+        '# invoking agd:',
+        ...[agdBinary, ...args].map(arg =>
+          arg.match(/[^a-zA-Z0-9,._+:@%/-]/)
+            ? `'${arg.replaceAll(`'`, `'\\''`)}'`
+            : arg,
+        ),
+      );
+      return execFileSync(agdBinary, args, opts).toString();
+    };
 
     const outJson = ['--output', 'json'];
 

packages/synthetic-chain/src/lib/cliHelper.ts

@@ -1,16 +1,23 @@
 import { $, execaCommand } from 'execa';
 import { BINARY, SDK_ROOT } from './constants.js';
+import type { Options as ExecaOptions } from 'execa';
 
 export const executeCommand = async (
   command: string,
   params: string[],
-  options = {},
+  options: Omit<
+    ExecaOptions,
+    'buffer' | 'encoding' | 'lines' | 'stdio' | 'stdout'
+  > = {},
 ) => {
-  const { stdout } = await execaCommand(
-    `${command} ${params.join(' ')}`,
-    options,
-  );
-  return stdout;
+  const invocation = `${command} ${params.join(' ')}`;
+  console.warn('# invoking:', invocation);
+  const result = await execaCommand(invocation, options);
+  if (!options.stderr) {
+    const { stderr } = result;
+    if (stderr) console.warn(stderr);
+  }
+  return result.stdout;
 };
 
 export const agd = {

packages/synthetic-chain/src/lib/core-eval-support.ts

@@ -46,8 +46,8 @@ export const flags = (record: Record<string, string>): string[] => {
 };
 
 export const txAbbr = (tx: any) => {
-  const { txhash, code, height, gas_used } = tx;
-  return { txhash, code, height, gas_used };
+  const { txhash, codespace, code, height, gas_used } = tx;
+  return { txhash, codespace, code, height, gas_used };
 };
 
 export const loadedBundleIds = (swingstore: any) => {

packages/synthetic-chain/src/lib/core-eval.ts

@@ -170,7 +170,7 @@ export const passCoreEvalProposal = async (
           ['swingset', 'install-bundle', `@${bundleRd}`],
           { from, chainId, yes: true },
         );
-        console.log(txAbbr(result));
+        console.log(result.code === 0 ? txAbbr(result) : result);
         assert.equal(result.code, 0);
 
         const info = await getContractInfo('bundles', { agoric, prefix: '' });