@qduc/term2 0.6.0 → 0.7.0

package/dist/prompts/search-via-shell.test.js

@@ -1,40 +1,43 @@
 import test from 'ava';
 import { getSearchViaShellAddendum } from './search-via-shell.js';
-test('getSearchViaShellAddendum includes rg and fd when both available', (t) => {
+function includesWord(text, word) {
+    return new RegExp(`\\b${word}\\b`, 'i').test(text);
+}
+test('getSearchViaShellAddendum recommends rg and fd when both available', (t) => {
     const result = getSearchViaShellAddendum({
         checkBinary: () => true,
     });
-    t.true(result.includes('`rg`'));
-    t.true(result.includes('`fd`'));
-    t.false(result.includes('`grep`'));
-    t.false(result.includes('`find`'));
+    t.true(includesWord(result, 'rg'));
+    t.true(includesWord(result, 'fd'));
+    t.false(includesWord(result, 'grep'));
+    t.false(includesWord(result, 'find'));
     t.true(result.toLowerCase().includes('hygiene'));
 });
 test('getSearchViaShellAddendum falls back to grep when rg is missing', (t) => {
     const result = getSearchViaShellAddendum({
         checkBinary: (cmd) => cmd === 'fd',
     });
-    t.false(result.includes('`rg`'));
-    t.true(result.includes('`grep`'));
-    t.true(result.includes('`fd`'));
-    t.false(result.includes('`find`'));
+    t.false(includesWord(result, 'rg'));
+    t.true(includesWord(result, 'grep'));
+    t.true(includesWord(result, 'fd'));
+    t.false(includesWord(result, 'find'));
 });
 test('getSearchViaShellAddendum falls back to find when fd is missing', (t) => {
     const result = getSearchViaShellAddendum({
         checkBinary: (cmd) => cmd === 'rg',
     });
-    t.true(result.includes('`rg`'));
-    t.false(result.includes('`fd`'));
-    t.true(result.includes('`find`'));
+    t.true(includesWord(result, 'rg'));
+    t.false(includesWord(result, 'fd'));
+    t.true(includesWord(result, 'find'));
 });
 test('getSearchViaShellAddendum falls back to grep and find when both missing', (t) => {
     const result = getSearchViaShellAddendum({
         checkBinary: () => false,
     });
-    t.false(result.includes('`rg`'));
-    t.true(result.includes('`grep`'));
-    t.false(result.includes('`fd`'));
-    t.true(result.includes('`find`'));
+    t.false(includesWord(result, 'rg'));
+    t.true(includesWord(result, 'grep'));
+    t.false(includesWord(result, 'fd'));
+    t.true(includesWord(result, 'find'));
     t.true(result.toLowerCase().includes('hygiene'));
 });
 //# sourceMappingURL=search-via-shell.test.js.map

package/dist/prompts/search-via-shell.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-via-shell.test.js","sourceRoot":"","sources":["../../source/prompts/search-via-shell.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,IAAI,CAAC,kEAAkE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7E,MAAM,MAAM,GAAG,yBAAyB,CAAC;QACvC,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;KACxB,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC5E,MAAM,MAAM,GAAG,yBAAyB,CAAC;QACvC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI;KACnC,CAAC,CAAC;IAEH,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC5E,MAAM,MAAM,GAAG,yBAAyB,CAAC;QACvC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI;KACnC,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yEAAyE,EAAE,CAAC,CAAC,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,yBAAyB,CAAC;QACvC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;KACzB,CAAC,CAAC;IAEH,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"search-via-shell.test.js","sourceRoot":"","sources":["../../source/prompts/search-via-shell.test.ts"],"names":[],"mappings":"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"}

package/dist/prompts/search-via-shell.test.ts

@@ -1,15 +1,19 @@
 import test from 'ava';
 import { getSearchViaShellAddendum } from './search-via-shell.js';
 
-test('getSearchViaShellAddendum includes rg and fd when both available', (t) => {
+function includesWord(text: string, word: string): boolean {
+  return new RegExp(`\\b${word}\\b`, 'i').test(text);
+}
+
+test('getSearchViaShellAddendum recommends rg and fd when both available', (t) => {
   const result = getSearchViaShellAddendum({
     checkBinary: () => true,
   });
 
-  t.true(result.includes('`rg`'));
-  t.true(result.includes('`fd`'));
-  t.false(result.includes('`grep`'));
-  t.false(result.includes('`find`'));
+  t.true(includesWord(result, 'rg'));
+  t.true(includesWord(result, 'fd'));
+  t.false(includesWord(result, 'grep'));
+  t.false(includesWord(result, 'find'));
   t.true(result.toLowerCase().includes('hygiene'));
 });
 
@@ -18,10 +22,10 @@ test('getSearchViaShellAddendum falls back to grep when rg is missing', (t) => {
     checkBinary: (cmd) => cmd === 'fd',
   });
 
-  t.false(result.includes('`rg`'));
-  t.true(result.includes('`grep`'));
-  t.true(result.includes('`fd`'));
-  t.false(result.includes('`find`'));
+  t.false(includesWord(result, 'rg'));
+  t.true(includesWord(result, 'grep'));
+  t.true(includesWord(result, 'fd'));
+  t.false(includesWord(result, 'find'));
 });
 
 test('getSearchViaShellAddendum falls back to find when fd is missing', (t) => {
@@ -29,9 +33,9 @@ test('getSearchViaShellAddendum falls back to find when fd is missing', (t) => {
     checkBinary: (cmd) => cmd === 'rg',
   });
 
-  t.true(result.includes('`rg`'));
-  t.false(result.includes('`fd`'));
-  t.true(result.includes('`find`'));
+  t.true(includesWord(result, 'rg'));
+  t.false(includesWord(result, 'fd'));
+  t.true(includesWord(result, 'find'));
 });
 
 test('getSearchViaShellAddendum falls back to grep and find when both missing', (t) => {
@@ -39,9 +43,9 @@ test('getSearchViaShellAddendum falls back to grep and find when both missing',
     checkBinary: () => false,
   });
 
-  t.false(result.includes('`rg`'));
-  t.true(result.includes('`grep`'));
-  t.false(result.includes('`fd`'));
-  t.true(result.includes('`find`'));
+  t.false(includesWord(result, 'rg'));
+  t.true(includesWord(result, 'grep'));
+  t.false(includesWord(result, 'fd'));
+  t.true(includesWord(result, 'find'));
   t.true(result.toLowerCase().includes('hygiene'));
 });

package/dist/prompts/subagent-delegation.test.js

@@ -1,17 +1,19 @@
 import test from 'ava';
 import { getSubagentDelegationAddendum } from './subagent-delegation.js';
-import { getSubagentsRolesSection } from '../tools/run-subagent.js';
-test('getSubagentDelegationAddendum returns delegation prompt structure', (t) => {
+test('getSubagentDelegationAddendum returns non-empty delegation guidance', (t) => {
     const result = getSubagentDelegationAddendum();
     t.is(typeof result, 'string');
-    t.true(result.length > 500);
-    // Verify it contains structural Markdown headers
-    t.true(result.includes('### Delegating to subagents'));
-    t.true(result.includes('## Roles'));
+    t.true(result.length > 0);
+    t.true(result.includes('Delegating to subagents'));
+    t.true(result.includes('run_subagent'));
 });
-test('getSubagentDelegationAddendum embeds the generated roles section', (t) => {
-    const result = getSubagentDelegationAddendum();
-    const rolesSection = getSubagentsRolesSection();
-    t.true(result.includes(rolesSection), 'Should dynamically embed the roles section');
+test('getSubagentDelegationAddendum includes orchestrator-specific text when orchestratorMode is true', (t) => {
+    const result = getSubagentDelegationAddendum({ orchestratorMode: true });
+    t.true(result.includes('Orchestrator mode'));
+    t.true(result.includes('delegate workspace inspection'));
+});
+test('getSubagentDelegationAddendum includes self-service fallback when orchestratorMode is false', (t) => {
+    const result = getSubagentDelegationAddendum({ orchestratorMode: false });
+    t.true(result.includes('just do it yourself'));
 });
 //# sourceMappingURL=subagent-delegation.test.js.map

package/dist/prompts/subagent-delegation.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-delegation.test.js","sourceRoot":"","sources":["../../source/prompts/subagent-delegation.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,IAAI,CAAC,mEAAmE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9E,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAAC;IAE/C,CAAC,CAAC,EAAE,CAAC,OAAO,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;IAE5B,iDAAiD;IACjD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;AACtC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kEAAkE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7E,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAAC;IAC/C,MAAM,YAAY,GAAG,wBAAwB,EAAE,CAAC;IAEhD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,4CAA4C,CAAC,CAAC;AACtF,CAAC,CAAC,CAAC"}
+{"version":3,"file":"subagent-delegation.test.js","sourceRoot":"","sources":["../../source/prompts/subagent-delegation.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAEzE,IAAI,CAAC,qEAAqE,EAAE,CAAC,CAAC,EAAE,EAAE;IAChF,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAAC;IAE/C,CAAC,CAAC,EAAE,CAAC,OAAO,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC1B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iGAAiG,EAAE,CAAC,CAAC,EAAE,EAAE;IAC5G,MAAM,MAAM,GAAG,6BAA6B,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6FAA6F,EAAE,CAAC,CAAC,EAAE,EAAE;IACxG,MAAM,MAAM,GAAG,6BAA6B,CAAC,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;IAE1E,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC"}

package/dist/prompts/subagent-delegation.test.ts

@@ -1,21 +1,24 @@
 import test from 'ava';
 import { getSubagentDelegationAddendum } from './subagent-delegation.js';
-import { getSubagentsRolesSection } from '../tools/run-subagent.js';
 
-test('getSubagentDelegationAddendum returns delegation prompt structure', (t) => {
+test('getSubagentDelegationAddendum returns non-empty delegation guidance', (t) => {
   const result = getSubagentDelegationAddendum();
 
   t.is(typeof result, 'string');
-  t.true(result.length > 500);
+  t.true(result.length > 0);
+  t.true(result.includes('Delegating to subagents'));
+  t.true(result.includes('run_subagent'));
+});
+
+test('getSubagentDelegationAddendum includes orchestrator-specific text when orchestratorMode is true', (t) => {
+  const result = getSubagentDelegationAddendum({ orchestratorMode: true });
 
-  // Verify it contains structural Markdown headers
-  t.true(result.includes('### Delegating to subagents'));
-  t.true(result.includes('## Roles'));
+  t.true(result.includes('Orchestrator mode'));
+  t.true(result.includes('delegate workspace inspection'));
 });
 
-test('getSubagentDelegationAddendum embeds the generated roles section', (t) => {
-  const result = getSubagentDelegationAddendum();
-  const rolesSection = getSubagentsRolesSection();
+test('getSubagentDelegationAddendum includes self-service fallback when orchestratorMode is false', (t) => {
+  const result = getSubagentDelegationAddendum({ orchestratorMode: false });
 
-  t.true(result.includes(rolesSection), 'Should dynamically embed the roles section');
+  t.true(result.includes('just do it yourself'));
 });

package/dist/prompts/worktree-hygiene.md

@@ -0,0 +1,9 @@
+## Worktree And Test Baseline
+
+- Before making any code changes, inspect the repo worktree.
+- Run `git status --short` or an equivalent read-only git status command, and note any files that are already dirty.
+- Treat pre-existing dirty files as off-limits unless the user explicitly asks you to work in them.
+- Before editing code, run the smallest relevant available test, lint, typecheck, or validation command as a baseline.
+- Note the exact command run and any pre-existing failures.
+- After your changes, rerun the same command and compare the results to distinguish pre-existing failures from regressions introduced by your changes.
+- If no relevant validation command is available or practical, say so before editing.

package/dist/providers/ai-sdk-logging-fetch.d.ts

@@ -3,7 +3,7 @@ type FetchLike = typeof fetch;
 type CreateAiSdkLoggingFetchOptions = {
     provider: string;
     model: string;
-    loggingService: Pick<ILoggingService, 'debug' | 'error' | 'getCorrelationId'>;
+    loggingService: Pick<ILoggingService, 'debug' | 'error' | 'getCorrelationId' | 'getTrafficContext'>;
     fetchImpl?: FetchLike;
 };
 export declare function createAiSdkLoggingFetch({ provider, model, loggingService, fetchImpl, }: CreateAiSdkLoggingFetchOptions): FetchLike;

package/dist/providers/ai-sdk-logging-fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-logging-fetch.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-logging-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGzE,KAAK,SAAS,GAAG,OAAO,KAAK,CAAC;AAE9B,KAAK,8BAA8B,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,OAAO,GAAG,kBAAkB,CAAC,CAAC;IAC9E,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAqEF,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,KAAK,EACL,cAAc,EACd,SAAiB,GAClB,EAAE,8BAA8B,GAAG,SAAS,CAqE5C"}
+{"version":3,"file":"ai-sdk-logging-fetch.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-logging-fetch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAiEzE,KAAK,SAAS,GAAG,OAAO,KAAK,CAAC;AAE9B,KAAK,8BAA8B,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,OAAO,GAAG,kBAAkB,GAAG,mBAAmB,CAAC,CAAC;IACpG,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AA8EF,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,KAAK,EACL,cAAc,EACd,SAAiB,GAClB,EAAE,8BAA8B,GAAG,SAAS,CAsG5C"}

package/dist/providers/ai-sdk-logging-fetch.js

@@ -1,4 +1,63 @@
-import { truncateLogText } from '../utils/log-truncation.js';
+import { randomUUID } from 'node:crypto';
+import { summarizeReceivedTraffic } from '../services/provider-traffic.js';
+import { describeError } from '../utils/error-helpers.js';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+import os from 'node:os';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+let installationVersion = '0.6.1';
+try {
+    const packageJsonPath = join(__dirname, '../../package.json');
+    const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+    if (pkg && typeof pkg.version === 'string') {
+        installationVersion = pkg.version;
+    }
+}
+catch {
+    // fallback
+}
+function injectHeaders(initHeaders, newHeaders) {
+    if (!initHeaders) {
+        return newHeaders;
+    }
+    if (typeof Headers !== 'undefined' && initHeaders instanceof Headers) {
+        const headers = new Headers(initHeaders);
+        for (const [key, value] of Object.entries(newHeaders)) {
+            if (value) {
+                headers.set(key, value);
+            }
+        }
+        return headers;
+    }
+    if (Array.isArray(initHeaders)) {
+        const headers = [...initHeaders];
+        for (const [key, value] of Object.entries(newHeaders)) {
+            if (value) {
+                const idx = headers.findIndex(([k]) => k.toLowerCase() === key.toLowerCase());
+                if (idx !== -1) {
+                    headers[idx] = [key, value];
+                }
+                else {
+                    headers.push([key, value]);
+                }
+            }
+        }
+        return headers;
+    }
+    const headers = { ...initHeaders };
+    for (const [key, value] of Object.entries(newHeaders)) {
+        if (value) {
+            const existingKey = Object.keys(headers).find((k) => k.toLowerCase() === key.toLowerCase());
+            if (existingKey) {
+                delete headers[existingKey];
+            }
+            headers[key] = value;
+        }
+    }
+    return headers;
+}
 const toRecord = (value) => {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         return null;
@@ -13,27 +72,14 @@ const parseJsonObject = (raw) => {
         return null;
     }
 };
-const readRequestBody = async (input, init) => {
-    if (typeof init?.body === 'string') {
-        return init.body;
-    }
-    if (init?.body instanceof URLSearchParams) {
-        return init.body.toString();
-    }
-    if (input instanceof Request) {
-        try {
-            return await input.clone().text();
-        }
-        catch {
-            return null;
-        }
-    }
-    return null;
-};
 const extractResponseText = (body) => {
-    const outputText = body.output_text;
-    if (typeof outputText === 'string') {
-        return outputText;
+    if (!body)
+        return undefined;
+    if (typeof body.output_text === 'string') {
+        return body.output_text;
+    }
+    if (typeof body.text === 'string') {
+        return body.text;
     }
     const choices = body.choices;
     if (Array.isArray(choices)) {
@@ -42,6 +88,10 @@ const extractResponseText = (body) => {
         if (typeof message?.content === 'string') {
             return message.content;
         }
+        const delta = toRecord(firstChoice?.delta);
+        if (typeof delta?.content === 'string') {
+            return delta.content;
+        }
         if (typeof firstChoice?.text === 'string') {
             return firstChoice.text;
         }
@@ -49,65 +99,115 @@ const extractResponseText = (body) => {
     return undefined;
 };
 const extractToolCalls = (body) => {
+    if (!body)
+        return undefined;
     const choices = body.choices;
     if (!Array.isArray(choices)) {
         return undefined;
     }
     const firstChoice = toRecord(choices[0]);
     const message = toRecord(firstChoice?.message);
-    return message?.tool_calls;
+    const delta = toRecord(firstChoice?.delta);
+    return message?.tool_calls ?? delta?.tool_calls;
+};
+const readRequestBody = async (input, init) => {
+    if (typeof init?.body === 'string') {
+        return init.body;
+    }
+    if (init?.body instanceof URLSearchParams) {
+        return init.body.toString();
+    }
+    if (input instanceof Request) {
+        try {
+            return await input.clone().text();
+        }
+        catch {
+            return null;
+        }
+    }
+    return null;
 };
 export function createAiSdkLoggingFetch({ provider, model, loggingService, fetchImpl = fetch, }) {
     return async (input, init) => {
         const requestBody = await readRequestBody(input, init);
         const parsedRequest = requestBody ? parseJsonObject(requestBody) : null;
         const requestModel = typeof parsedRequest?.model === 'string' ? parsedRequest.model : model;
+        const requestId = randomUUID();
+        const trafficContext = loggingService.getTrafficContext?.() ?? null;
+        const baseMeta = {
+            requestId,
+            traceId: trafficContext?.traceId ?? loggingService.getCorrelationId?.(),
+            sessionId: trafficContext?.sessionId,
+            sessionStartedAt: trafficContext?.sessionStartedAt,
+            firstUserMessagePreview: trafficContext?.firstUserMessagePreview,
+            mode: trafficContext?.mode,
+            provider,
+            model: requestModel,
+        };
+        const isEvaluator = trafficContext?.evaluator === true;
+        const eventPrefix = isEvaluator ? 'evaluator' : 'provider';
         loggingService.debug(`${provider} ai sdk request`, {
-            eventType: 'provider.request.started',
+            eventType: `${eventPrefix}.request.started`,
             category: 'provider',
             phase: 'request_start',
             direction: 'sent',
-            traceId: loggingService.getCorrelationId?.(),
-            provider,
-            model: requestModel,
+            ...baseMeta,
             messageCount: Array.isArray(parsedRequest?.messages) ? parsedRequest.messages.length : undefined,
             messages: parsedRequest?.messages,
             toolsCount: Array.isArray(parsedRequest?.tools) ? parsedRequest.tools.length : undefined,
+            payload: parsedRequest ?? undefined,
         });
+        let nextInit = init;
+        if (provider === 'codex') {
+            const originator = 'term2';
+            const userAgent = `term2/${installationVersion} (${os.platform()} ${os.release()}; ${os.arch()})`;
+            const sessionId = trafficContext?.sessionId;
+            const extraHeaders = {
+                originator: originator,
+                'User-Agent': userAgent,
+            };
+            if (sessionId) {
+                extraHeaders['session_id'] = sessionId;
+            }
+            nextInit = {
+                ...init,
+                headers: injectHeaders(init?.headers, extraHeaders),
+            };
+        }
         let response;
         try {
-            response = await fetchImpl(input, init);
+            response = await fetchImpl(input, nextInit);
         }
         catch (error) {
             loggingService.error(`${provider} ai sdk request failed`, {
                 eventType: 'provider.response.failed',
                 category: 'provider',
                 phase: 'provider_response',
-                traceId: loggingService.getCorrelationId?.(),
-                provider,
-                model: requestModel,
-                error: error instanceof Error ? error.message : String(error),
+                ...baseMeta,
+                error: describeError(error),
             });
             throw error;
         }
-        response
-            .clone()
-            .text()
-            .then((rawResponse) => {
-            const parsedResponse = rawResponse ? parseJsonObject(rawResponse) : null;
-            const responseText = parsedResponse ? extractResponseText(parsedResponse) : truncateLogText(rawResponse);
+        Promise.resolve()
+            .then(async () => {
+            const summary = await summarizeReceivedTraffic(response.clone());
+            const summaryPayload = toRecord(summary.payload);
+            const responseText = summaryPayload
+                ? extractResponseText(summaryPayload)
+                : typeof summary.fallbackBody === 'string'
+                    ? summary.fallbackBody
+                    : undefined;
+            const toolCalls = extractToolCalls(summaryPayload);
             loggingService.debug(`${provider} ai sdk response`, {
-                eventType: 'provider.response.received',
+                eventType: `${eventPrefix}.response.received`,
                 category: 'provider',
                 phase: 'provider_response',
                 direction: 'received',
-                traceId: loggingService.getCorrelationId?.(),
-                provider,
-                model: requestModel,
+                ...baseMeta,
                 status: response.status,
                 text: responseText,
-                toolCalls: parsedResponse ? extractToolCalls(parsedResponse) : undefined,
-                payload: parsedResponse ?? { rawPreview: truncateLogText(rawResponse) },
+                toolCalls,
+                payload: summary,
             });
         })
             .catch((error) => {
@@ -115,10 +215,8 @@ export function createAiSdkLoggingFetch({ provider, model, loggingService, fetch
                 eventType: 'provider.response.log_failed',
                 category: 'provider',
                 phase: 'provider_response',
-                traceId: loggingService.getCorrelationId?.(),
-                provider,
-                model: requestModel,
-                error: error instanceof Error ? error.message : String(error),
+                ...baseMeta,
+                error: describeError(error),
             });
         });
         return response;

package/dist/providers/ai-sdk-logging-fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-logging-fetch.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-logging-fetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ai-sdk-logging-fetch.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-logging-fetch.ts"],"names":[],"mappings":"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"}