fixup! fix(server-utils): Read pi-durable 1.2.0 tool results from output

Author: JPeer264

dev-packages/e2e-tests/test-applications/cloudflare-pi-durable/package.json

@@ -12,8 +12,8 @@
     "test:assert": "playwright test"
   },
   "dependencies": {
-    "@earendil-works/pi-ai": "1.0.0",
-    "@earendil-works/pi-durable": "1.0.0",
+    "@earendil-works/pi-ai": "1.2.0",
+    "@earendil-works/pi-durable": "1.2.0",
     "@sentry/cloudflare": "file:../../packed/sentry-cloudflare-packed.tgz",
     "agents": "0.26.0"
   },

dev-packages/e2e-tests/test-applications/cloudflare-pi-durable/src/assistant.ts

@@ -6,15 +6,6 @@ import * as Sentry from '@sentry/cloudflare';
 import { Agent } from 'agents';
 import { PiHarness } from 'agents/harness/pi';
 
-type TextBlock = { type: 'text'; text: string };
-
-// pi-durable 1.2.0 renamed the tool result field `content` to `output`. The app runs on 1.0.0 and on the
-// latest version, so its tool results set both.
-function textResult(text: string): { output: TextBlock[]; content: TextBlock[] } {
-  const blocks: TextBlock[] = [{ type: 'text', text }];
-  return { output: blocks, content: blocks };
-}
-
 /**
  * pi-durable hosted by the Agents SDK `PiHarness`: pi keeps its state in this object's SQLite
  * database, and the harness reopens pi when the object restarts. Nothing wires Sentry into
@@ -55,9 +46,9 @@ export class Assistant extends Agent<Env> {
             parameters: Type.Object({ city: Type.String() }),
             // The manual span should nest under the SDK's `execute_tool` span.
             execute: async args =>
-              Sentry.startSpan({ name: 'resolve-weather', attributes: { 'weather.city': args.city } }, () =>
-                textResult(`It is 21 degrees and sunny in ${args.city}.`),
-              ),
+              Sentry.startSpan({ name: 'resolve-weather', attributes: { 'weather.city': args.city } }, () => ({
+                output: [{ type: 'text', text: `It is 21 degrees and sunny in ${args.city}.` }],
+              })),
           }),
           defineTool({
             name: 'fail_now',
@@ -76,7 +67,7 @@ export class Assistant extends Agent<Env> {
             execute: async args => {
               const marker = `crashed:${args.job}`;
               if (await this.ctx.storage.get(marker)) {
-                return textResult(`Step of job ${args.job} completed.`);
+                return { output: [{ type: 'text', text: `Step of job ${args.job} completed.` }] };
               }
               await this.ctx.storage.put(marker, true);
               await this.ctx.storage.sync();

dev-packages/e2e-tests/test-applications/node-pi-durable/package.json

@@ -11,9 +11,9 @@
     "test:assert": "OPENROUTER_API_KEY=$E2E_OPENROUTER_API_KEY playwright test"
   },
   "dependencies": {
-    "@earendil-works/chord": "1.0.0",
-    "@earendil-works/pi-ai": "1.0.0",
-    "@earendil-works/pi-durable": "1.0.0",
+    "@earendil-works/chord": "1.2.0",
+    "@earendil-works/pi-ai": "1.2.0",
+    "@earendil-works/pi-durable": "1.2.0",
     "@sentry/node": "file:../../packed/sentry-node-packed.tgz"
   },
   "devDependencies": {

dev-packages/e2e-tests/test-applications/node-pi-durable/src/server.mjs

@@ -24,13 +24,6 @@ if (!process.env.OPENROUTER_API_KEY) {
   throw new Error('OPENROUTER_API_KEY is not set (E2E_OPENROUTER_API_KEY in the e2e-tests .env)');
 }
 
-// pi-durable 1.2.0 renamed the tool result field `content` to `output`. The app runs on 1.0.0 and on the
-// latest version, so its tool results set both.
-const textResult = text => {
-  const blocks = [{ type: 'text', text }];
-  return { output: blocks, content: blocks };
-};
-
 const dataDir = fileURLToPath(new URL('../.data/', import.meta.url));
 mkdirSync(dataDir, { recursive: true });
 
@@ -44,9 +37,9 @@ const tools = [
     parameters: Type.Object({ city: Type.String() }),
     // The manual span should nest under the SDK's `execute_tool` span.
     execute: async args =>
-      Sentry.startSpan({ name: 'resolve-weather', attributes: { 'weather.city': args.city } }, () =>
-        textResult(`It is 21 degrees and sunny in ${args.city}.`),
-      ),
+      Sentry.startSpan({ name: 'resolve-weather', attributes: { 'weather.city': args.city } }, () => ({
+        output: [{ type: 'text', text: `It is 21 degrees and sunny in ${args.city}.` }],
+      })),
   }),
   defineTool({
     name: 'fail_now',
@@ -67,7 +60,7 @@ const tools = [
       try {
         writeFileSync(`${dataDir}crashed-${args.job}`, 'crashed once', { flag: 'wx' });
       } catch {
-        return textResult(`Step of job ${args.job} completed.`);
+        return { output: [{ type: 'text', text: `Step of job ${args.job} completed.` }] };
       }
       process.exit(CRASH_EXIT_CODE);
     },
@@ -87,14 +80,14 @@ const tools = [
       const request = { type: 'input', content: args.task, requestId: `delegate:${api.taskId}` };
       const settled = await (await child.submit(request, toolContext)).wait(toolContext);
       if (settled.status !== 'done') {
-        return { isError: true, ...textResult(`Subagent ended: ${settled.reason}`) };
+        return { isError: true, output: [{ type: 'text', text: `Subagent ended: ${settled.reason}` }] };
       }
       const answer = await api.commit(tx => tx.entry(AssistantEntry, settled.answer), toolContext);
       const text = (answer?.model?.[0]?.content ?? [])
         .filter(part => part.type === 'text')
         .map(part => part.text)
         .join('');
-      return textResult(text);
+      return { output: [{ type: 'text', text }] };
     },
   }),
 ];