yaml-flow 8.2.4 → 8.3.0

package/examples/board/server/chat-flow/copilot-chat/assistant.js

@@ -3,9 +3,14 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { execFileSync, spawnSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+
+const HANDLER_DIR = path.dirname(fileURLToPath(import.meta.url));
+const WRAPPER_BAT = path.join(HANDLER_DIR, 'copilot_wrapper.bat');
 
 function readJsonStdin() {
+  if (process.stdin.isTTY) return {};
   try {
     const raw = fs.readFileSync(0, 'utf-8').trim();
     if (!raw) return {};
@@ -16,68 +21,28 @@ function readJsonStdin() {
   }
 }
 
-function resolveChatDir(extra) {
-  if (typeof extra.chatDir === 'string' && extra.chatDir.trim()) return extra.chatDir;
-  if (typeof extra.chatsBlobBasePath === 'string' && typeof extra.chatsKeyPrefix === 'string') {
-    const cardPart = String(extra.chatsKeyPrefix).split('/')[0];
-    return path.join(extra.chatsBlobBasePath, cardPart);
-  }
-  return '';
-}
-
 const extra = readJsonStdin();
-const boardId = typeof extra.boardId === 'string' ? extra.boardId : '';
-const cardId = typeof extra.cardId === 'string' ? extra.cardId : '';
-const boardSetupRoot = typeof extra.boardSetupRoot === 'string' ? extra.boardSetupRoot : '';
-const boardRuntimeDir = typeof extra.boardRuntimeDir === 'string' ? extra.boardRuntimeDir : 'runtime';
-const runtimeStatusDir = typeof extra.runtimeStatusDir === 'string' ? extra.runtimeStatusDir : 'runtime-out';
-const cardsDir = typeof extra.cardsDir === 'string' ? extra.cardsDir : 'cards';
-const projectRoot = typeof extra.projectRoot === 'string' ? extra.projectRoot : '';
-const chatFlowRoot = typeof extra.chatFlowRoot === 'string' ? extra.chatFlowRoot : '';
-const serverUrl = typeof extra.serverUrl === 'string' ? extra.serverUrl.replace(/\/$/, '') : '';
-const apiBasePath = typeof extra.apiBasePath === 'string' ? extra.apiBasePath : '/api/board';
-const lastChatEntryId = typeof extra.lastChatEntryId === 'string' ? extra.lastChatEntryId : '';
-const userText = typeof extra.userText === 'string' ? extra.userText : '';
-const chatCopilotTimeoutMs = Number.isFinite(Number(extra.chatCopilotTimeoutMs)) && Number(extra.chatCopilotTimeoutMs) > 0
-  ? Math.floor(Number(extra.chatCopilotTimeoutMs))
+const {
+  cardId = '',
+  boardSetupRoot = '',
+  boardRuntimeDir = '',
+  runtimeStatusDir = '',
+  cardsDir = '',
+  chatMessages: rawChatMessages = [],
+  userText = 'what is two plus two?',
+  chatCopilotTimeoutMs: rawChatCopilotTimeoutMs = 300000,
+} = extra;
+
+const chatMessages = Array.isArray(rawChatMessages) ? rawChatMessages : [];
+const chatCopilotTimeoutMs = Number.isFinite(Number(rawChatCopilotTimeoutMs)) && Number(rawChatCopilotTimeoutMs) > 0
+  ? Math.floor(Number(rawChatCopilotTimeoutMs))
   : 300000;
 
-if (!boardSetupRoot || !serverUrl || !cardId) {
-  process.stderr.write('missing boardSetupRoot/serverUrl/cardId\n');
-  process.exit(1);
-}
-
-const boardRuntimeDirAbs = path.join(boardSetupRoot, boardRuntimeDir || 'runtime');
-const runtimeStatusDirAbs = path.join(boardSetupRoot, runtimeStatusDir || 'runtime-out');
-const cardsDirAbs = path.join(boardSetupRoot, cardsDir || 'cards');
-
-async function fetchChatMessages() {
-  const chatsUrl = `${serverUrl}${apiBasePath}/cards/${encodeURIComponent(cardId)}/chats`;
-  const res = await fetch(chatsUrl);
-  if (!res.ok) {
-    throw new Error(`could not fetch chat history: HTTP ${res.status}`);
-  }
-  const data = await res.json();
-  return Array.isArray(data?.messages) ? data.messages : [];
-}
-
-function readHistory(messages) {
-  return (Array.isArray(messages) ? messages : [])
-    .filter((message) => typeof message?.role === 'string' && typeof message?.text === 'string')
-    .map((message) => {
-      const role = String(message.role || 'system').replace(/^./, (s) => s.toUpperCase());
-      const text = String(message.text || '').trim();
-      const files = Array.isArray(message.files) && message.files.length > 0
-        ? ` [files: ${message.files.length}]`
-        : '';
-      return `${role}: ${text}${files}`.trim();
-    });
-}
 
-function buildPrompt(cId, history, currentUserText) {
+function buildPrompt(cId, historyDump, currentUserText) {
   const cardSetupDirRel = path.join(cardsDir, cId).replace(/\\/g, '/');
-  const runtimeDirRel = boardRuntimeDir || 'runtime';
-  const statusDirRel = runtimeStatusDir || 'runtime-out';
+  const runtimeDirRel = boardRuntimeDir;
+  const statusDirRel = runtimeStatusDir;
 
   const contextBlock = [
     'We are currently doing a three way orchestration.',
@@ -87,7 +52,7 @@ function buildPrompt(cId, history, currentUserText) {
     'I am just a mediator passing on the query.',
     'The user sees the data available in cards which is rendered, and the status from ' + statusDirRel + '.',
     'Everything else is internal detail not to be exposed to the user.',
-    'The conversation history is provided below as chat messages from the runtime API.',
+    'The conversation history is provided below exactly as received from the runtime API as a string dump.',
     'The current user query is: ' + currentUserText,
     'Return only the assistant response text for the user.',
     'Do not write files, and do not include any internal notes, logs, or orchestration details in the response.',
@@ -96,102 +61,28 @@ function buildPrompt(cId, history, currentUserText) {
   return [
     contextBlock,
     '',
-    ...history,
-    'Assistant:',
+    'Chat history dump:',
+    historyDump,
+    '',
+    'Assistant response:',
   ].join('\n');
 }
 
-function localFallbackReply(currentUserText) {
-  const text = String(currentUserText || '').trim();
-  const normalized = text.toLowerCase();
-  if (normalized.includes('capital of france')) return 'paris';
-  if (normalized.includes('capital of japan')) return 'tokyo';
-  if (!text) return 'I could not determine the user request.';
-  return `Echo: ${text}`;
-}
-
-function isNonInteractiveCopilotError(err) {
-  const detail = [
-    err instanceof Error ? err.message : String(err),
-    typeof err?.stderr === 'string' ? err.stderr : Buffer.isBuffer(err?.stderr) ? err.stderr.toString('utf-8') : '',
-    typeof err?.stdout === 'string' ? err.stdout : Buffer.isBuffer(err?.stdout) ? err.stdout.toString('utf-8') : '',
-  ].join('\n').toLowerCase();
-  return detail.includes('stdout is not a tty') || detail.includes('not a tty');
-}
-
-function runWrapper(prompt, sessionDir, workingDir) {
-  const fallbackProjectRoot = chatFlowRoot ? path.resolve(chatFlowRoot, '..', '..') : process.cwd();
-  const effectiveProjectRoot = projectRoot || fallbackProjectRoot;
-  const wrapperPath = path.resolve(
-    effectiveProjectRoot,
-    'server',
-    'board-worker',
-    'source-def-flows',
-    'copilot-handler',
-    'copilot-wrapper.py',
-  );
-  const python = process.platform === 'win32' ? 'python' : 'python3';
-  const tmpBase = os.tmpdir();
+function runCopilot(prompt, workingDir) {
   const ts = Date.now();
-  const outFile = path.join(tmpBase, 'dch-out-' + cardId + '-' + ts + '.txt');
-  const promptFile = path.join(tmpBase, 'dch-prompt-' + cardId + '-' + ts + '.txt');
-  const windowsWrapperPath = path.resolve(
-    effectiveProjectRoot,
-    '..',
-    'public-examples',
-    'board',
-    'scripts',
-    'copilot_wrapper.bat',
-  );
-
-  fs.mkdirSync(sessionDir, { recursive: true });
+  const promptFile = path.join(os.tmpdir(), `asst-prompt-${ts}.txt`);
+  const outFile = path.join(os.tmpdir(), `asst-out-${ts}.txt`);
   fs.writeFileSync(promptFile, prompt, 'utf-8');
-
-  if (process.platform === 'win32' && fs.existsSync(windowsWrapperPath)) {
-    try {
-      execFileSync('cmd.exe', [
-        '/d', '/c',
-        windowsWrapperPath,
-        outFile,
-        sessionDir,
-        workingDir,
-        '@' + promptFile,
-        'raw',
-        'demo-chat',
-        '',
-        '',
-      ], {
-        encoding: 'utf-8',
-        stdio: ['ignore', 'pipe', 'pipe'],
-        maxBuffer: 10 * 1024 * 1024,
-        timeout: chatCopilotTimeoutMs,
-        windowsHide: true,
-      });
-      return fs.existsSync(outFile) ? fs.readFileSync(outFile, 'utf-8').trim() : '';
-    } finally {
-      try { fs.unlinkSync(promptFile); } catch {}
-      try { fs.unlinkSync(outFile); } catch {}
-    }
-  }
-
-  const pyArgs = [
-    wrapperPath,
-    '--output-file', outFile,
-    '--session-dir', sessionDir,
-    '--cwd', workingDir,
-    '--prompt-file', promptFile,
-    '--result-type', 'raw',
-    '--agent-name', 'demo-chat',
-    '--add-dir', boardRuntimeDirAbs,
-    '--add-dir', runtimeStatusDirAbs,
-    '--add-dir', cardsDirAbs,
-  ];
-
   try {
-    if (!fs.existsSync(wrapperPath)) {
-      throw new Error(`copilot wrapper not found at ${wrapperPath}`);
-    }
-    execFileSync(python, pyArgs, {
+    execFileSync('cmd.exe', [
+      '/d', '/c', WRAPPER_BAT,
+      outFile,
+      os.tmpdir(),
+      workingDir || process.cwd(),
+      '@' + promptFile,
+      'raw',
+      'demo-chat',
+    ], {
       encoding: 'utf-8',
       stdio: ['ignore', 'pipe', 'pipe'],
       maxBuffer: 10 * 1024 * 1024,
@@ -205,47 +96,15 @@ function runWrapper(prompt, sessionDir, workingDir) {
   }
 }
 
-function upsertCardsIfChanged() {
-  const cliJs = process.env.BOARD_LIVE_CARDS_CLI_JS;
-  if (!cliJs || !fs.existsSync(cliJs)) return;
-  const rg = boardRuntimeDirAbs;
-  const glob = path.join(cardsDirAbs, '*.json');
-  try {
-    const result = spawnSync(process.execPath, [cliJs, 'upsert-card', '--rg', rg, '--card-glob', glob], {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      timeout: 30000,
-    });
-    if (result.status !== 0) {
-      const err = (result.stderr || '').toString().trim();
-      if (err) console.error('[copilot-chat-assistant] upsert-card: ' + err);
-    }
-  } catch (err) {
-    console.error('[copilot-chat-assistant] upsert-card failed: ' + (err?.message ?? err));
-  }
-}
-
-const messages = await fetchChatMessages();
-const currentUser = messages.find((message) => typeof message?.id === 'string' && message.id === lastChatEntryId && message.role === 'user');
-const currentUserText = typeof currentUser?.text === 'string' && currentUser.text.trim()
-  ? currentUser.text.trim()
-  : userText.trim();
-const history = readHistory(messages);
-const sessionDir = path.join(os.tmpdir(), 'demo-chat-handler-sessions', boardId + '_' + cardId);
+const historyDump = JSON.stringify(chatMessages, null, 2);
 const workingDir = boardSetupRoot;
-const prompt = buildPrompt(cardId, history, currentUserText);
+const prompt = buildPrompt(cardId, historyDump, userText.trim());
 
 try {
-  let replyText = '';
-  try {
-    replyText = runWrapper(prompt, sessionDir, workingDir).trim();
-  } catch (err) {
-    if (!isNonInteractiveCopilotError(err)) throw err;
-    replyText = localFallbackReply(currentUserText);
-  }
+  const replyText = runCopilot(prompt, workingDir).trim();
   if (!replyText) {
-    throw new Error('Copilot wrapper returned an empty response');
+    throw new Error('Copilot returned an empty response');
   }
-  upsertCardsIfChanged();
   process.stdout.write(JSON.stringify({ replyText }));
 } catch (err) {
   process.stderr.write((err?.message ?? String(err)) + '\n');

package/examples/board/server/chat-flow/copilot-chat/copilot_wrapper.bat

@@ -0,0 +1,157 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Copilot Wrapper - Manages session isolation for GitHub Copilot CLI
+REM Usage: copilot_wrapper.bat <output_file> <session_dir> <working_dir> <request_or_file> <result_type> [agent_name] [model] [result_shape_file]
+REM
+REM If request_or_file starts with @, it's treated as a file path containing the prompt.
+REM Otherwise, it's treated as the prompt string directly.
+REM result_type: "raw" to return plain text, "json" to extract JSON (passed to clean_copilot_output.ps1)
+REM agent_name: name of the agent for log files (optional)
+REM model: passed to copilot with --model flag (optional)
+
+SET "OUTPUT_FILE=%~1"
+SET "SESSION_DIR=%~2"
+SET "WORKING_DIR=%~3"
+SET "REQUEST_OR_FILE=%~4"
+SET "RESULT_TYPE=%~5"
+SET "AGENT_NAME=%~6"
+SET "MODEL=%~7"
+SET "RESULT_SHAPE_FILE=%~8"
+
+if not defined RESULT_TYPE SET "RESULT_TYPE=raw"
+
+SET "PROMPT_FILE="
+SET "REQUEST="
+echo !REQUEST_OR_FILE! | findstr /b "@" >nul
+if !errorlevel! equ 0 (
+    SET "PROMPT_FILE=!REQUEST_OR_FILE:~1!"
+) else (
+    SET "REQUEST=!REQUEST_OR_FILE!"
+)
+
+SET "_WD_HASH=!WORKING_DIR:\=!"
+SET "_WD_HASH=!_WD_HASH:/=!"
+SET "_WD_HASH=!_WD_HASH::=!"
+SET "_WD_HASH=!_WD_HASH:.=!"
+SET "_WD_HASH=!_WD_HASH: =!"
+SET "COPILOT_BASE=%TEMP%\copilot-sessions\!_WD_HASH!"
+SET "COPILOT_CACHE=%COPILOT_BASE%\session-state"
+SET "LOCK_FILE=%COPILOT_BASE%\copilot.lock"
+SET "UUID_FILE=%SESSION_DIR%\session.uuid"
+
+if not exist "%COPILOT_BASE%" mkdir "%COPILOT_BASE%"
+if not exist "%COPILOT_CACHE%" mkdir "%COPILOT_CACHE%"
+if not exist "%SESSION_DIR%" mkdir "%SESSION_DIR%"
+
+if exist "%LOCK_FILE%" (
+    for /f "tokens=*" %%a in ('powershell -NoProfile -Command "if ((Get-Item '%LOCK_FILE%').LastWriteTime -lt (Get-Date).AddMinutes(-20)) { Write-Output 'STALE' }"') do (
+        if "%%a"=="STALE" (
+            del "%LOCK_FILE%" 2>nul
+        )
+    )
+)
+:acquire_lock
+2>nul (
+    >"%LOCK_FILE%" (
+        echo %DATE% %TIME%
+    )
+) || (
+    timeout /t 1 /nobreak >nul
+    goto acquire_lock
+)
+
+SET "SESSION_UUID="
+if exist "%UUID_FILE%" (
+    set /p SESSION_UUID=<"%UUID_FILE%"
+) else (
+    for /f "tokens=*" %%a in ('powershell -NoProfile -Command "[guid]::NewGuid().ToString()"') do (
+        SET "SESSION_UUID=%%a"
+    )
+    echo !SESSION_UUID!>"%UUID_FILE%"
+)
+
+SET "CACHE_SESSION_PATH=%COPILOT_CACHE%\!SESSION_UUID!"
+
+if exist "%SESSION_DIR%\workspace.yaml" (
+    if exist "!CACHE_SESSION_PATH!" rmdir /s /q "!CACHE_SESSION_PATH!" 2>nul
+    mkdir "!CACHE_SESSION_PATH!" 2>nul
+    for %%f in ("%SESSION_DIR%\*") do (
+        if /i not "%%~nxf"=="session.uuid" (
+            move /y "%%f" "!CACHE_SESSION_PATH!\" >nul 2>&1
+        )
+    )
+    for /d %%d in ("%SESSION_DIR%\*") do (
+        robocopy "%%d" "!CACHE_SESSION_PATH!\%%~nxd" /E /MOVE /NFL /NDL /NJH /NJS >nul 2>&1
+    )
+)
+
+cd /d "%WORKING_DIR%"
+
+SET "MODEL_FLAG="
+if defined MODEL (
+    SET "MODEL_FLAG=--model !MODEL!"
+)
+
+if defined PROMPT_FILE (
+    type "!PROMPT_FILE!" | call copilot --allow-all --resume !SESSION_UUID! !MODEL_FLAG! > "%OUTPUT_FILE%" 2>&1
+) else (
+    call copilot -p "%REQUEST%" --allow-all --resume !SESSION_UUID! !MODEL_FLAG! > "%OUTPUT_FILE%" 2>&1
+)
+
+SET "LOG_DIR=%COPILOT_BASE%\copilot-logs"
+if not exist "!LOG_DIR!" mkdir "!LOG_DIR!"
+SET "LOG_AGENT=unknown"
+if defined AGENT_NAME SET "LOG_AGENT=!AGENT_NAME!"
+for /f "tokens=*" %%t in ('powershell -NoProfile -Command "Get-Date -Format 'yyyyMMdd-HHmmss'"') do SET "LOG_TS=%%t"
+SET "LOG_FILE=!LOG_DIR!\!LOG_AGENT!_!LOG_TS!.log"
+echo === PROMPT (!LOG_TS!) === > "!LOG_FILE!"
+echo Agent: !LOG_AGENT! >> "!LOG_FILE!"
+echo ResultType: !RESULT_TYPE! >> "!LOG_FILE!"
+echo Working Dir: %WORKING_DIR% >> "!LOG_FILE!"
+echo --- >> "!LOG_FILE!"
+if defined PROMPT_FILE (
+    type "!PROMPT_FILE!" >> "!LOG_FILE!" 2>nul
+) else (
+    echo %REQUEST% >> "!LOG_FILE!"
+)
+echo. >> "!LOG_FILE!"
+echo === RESPONSE === >> "!LOG_FILE!"
+type "%OUTPUT_FILE%" >> "!LOG_FILE!" 2>nul
+echo. >> "!LOG_FILE!"
+echo === END === >> "!LOG_FILE!"
+for /f "skip=50 tokens=*" %%f in ('dir /b /o-d "!LOG_DIR!\!LOG_AGENT!_*.log" 2^>nul') do (
+    del "!LOG_DIR!\%%f" 2>nul
+)
+
+powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0copilot_wrapper_helper.ps1" "%OUTPUT_FILE%" "!RESULT_TYPE!" "!RESULT_SHAPE_FILE!"
+
+REM If JSON extraction failed (exit 2) and result_type is json, retry once with a
+REM correction prompt in the same session (--resume SESSION_UUID continues the conversation).
+SET "PS1_EXIT=!ERRORLEVEL!"
+if "!PS1_EXIT!"=="2" (
+    SET "RETRY_PROMPT_FILE=%TEMP%\copilot-retry-!RANDOM!.txt"
+    (
+        echo Your previous response did not contain a valid JSON object.
+        echo Please respond with ONLY the JSON object — no markdown, no explanation, no preamble.
+        echo Start your response with { and end with }.
+    ) > "!RETRY_PROMPT_FILE!"
+    type "!RETRY_PROMPT_FILE!" | call copilot --allow-all --resume !SESSION_UUID! !MODEL_FLAG! > "%OUTPUT_FILE%" 2>&1
+    del "!RETRY_PROMPT_FILE!" 2>nul
+    REM Re-run PS1 with -IsRetry so it writes skeleton on second failure rather than exit 2
+    powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0copilot_wrapper_helper.ps1" "%OUTPUT_FILE%" "!RESULT_TYPE!" "!RESULT_SHAPE_FILE!" "-IsRetry"
+)
+
+if exist "!CACHE_SESSION_PATH!" (
+    for %%f in ("!CACHE_SESSION_PATH!\*") do (
+        move /y "%%f" "%SESSION_DIR%\" >nul 2>&1
+    )
+    for /d %%d in ("!CACHE_SESSION_PATH!\*") do (
+        robocopy "%%d" "%SESSION_DIR%\%%~nxd" /E /MOVE /NFL /NDL /NJH /NJS >nul 2>&1
+    )
+    rmdir "!CACHE_SESSION_PATH!" 2>nul
+)
+
+del "%LOCK_FILE%" 2>nul
+
+endlocal

package/examples/board/server/chat-flow/copilot-chat/copilot_wrapper_helper.ps1

@@ -0,0 +1,190 @@
+# clean_copilot_output.ps1
+# Cleans copilot CLI output: filters noise lines and stats footer.
+# Called by copilot_wrapper.bat after copilot runs and after logging (raw log preserved).
+#
+# Usage: clean_copilot_output.ps1 <output_file> <result_type> [result_shape_file]
+#   output_file       - file containing raw copilot output; overwritten with cleaned result
+#   result_type=raw   - strip noise + stats, write plain text back to output_file
+#   result_type=json  - extract first JSON object whose keys match result_shape;
+#                       if result_shape_file is absent, accepts any valid JSON object
+#   result_shape_file - (json result_type only) JSON file whose top-level keys are required in output
+#
+# raw  result_type: right for chat responses and task executor source_defs.
+# json result_type: right for structured calls where the input contained {prompt, result_shape}.
+
+param(
+    [Parameter(Mandatory)][string]$OutputFile,
+    [Parameter(Mandatory)][string]$ResultType,
+    [string]$ResultShapeFile = '',
+    # When $true (retry pass), write shape-skeleton fallback instead of exiting with code 2.
+    # On first pass, exit 2 signals the caller (.bat) to retry with a correction prompt.
+    [switch]$IsRetry
+)
+
+if (-not (Test-Path $OutputFile)) { exit 0 }
+
+$raw = [IO.File]::ReadAllText($OutputFile, [Text.Encoding]::UTF8)
+if ([string]::IsNullOrWhiteSpace($raw)) { exit 0 }
+
+# --- Step 1: Filter noise lines ---
+$lines = $raw -split "`r?`n" | Where-Object {
+    $_ -notmatch "^error: unknown option '--no-warnings'" -and
+    $_ -notmatch "^Try 'copilot --help' for more information"
+}
+$cleaned = ($lines -join "`n").Trim()
+
+# --- Step 1b: Strip copilot-cli tool operation lines ---
+# These are internal tool invocations that leak into output:
+#   ● Create/Read/Edit/List directory/Glob/Check ...
+#   X Read ... (failed tool ops)
+#   $ Get-Content/Set-Content ... (PowerShell invocations)
+#   └ N lines/files found
+#   ├ ... (tree lines)
+#   "The agent decision has been simulated and saved to ..."
+#   session-state file paths
+$noiseLines = New-Object System.Collections.Generic.List[string]
+$contentLines2 = New-Object System.Collections.Generic.List[string]
+foreach ($line in ($cleaned -split "`n")) {
+    $t = $line.TrimStart()
+    if ($t -match '^[\u25cf\u2022] ' -or           # ● bullet tool ops
+        $t -match '^X ' -or                          # X failed tool ops
+        $t -match '^\$ ' -or                         # $ shell commands
+        $t -match '^[\u2514\u251c]' -or              # └ ├ tree lines
+        $t -match 'session-state.*\.json' -or        # session-state file projections
+        $t -match 'agent.decision has been simulated' -or
+        $t -match 'has been simulated and saved' -or
+        $t -match '^\d+ (files?|lines?|matches?) found$' -or  # "3 files found"
+        $t -match '^No matches found$' -or
+        $t -match '^Path does not exist$' -or
+        $t -match '^\d+ lines?( read)?$') {          # "1 line read"
+        $noiseLines.Add($line)
+    } else {
+        $contentLines2.Add($line)
+    }
+}
+$cleaned = ($contentLines2 -join "`n").Trim()
+
+# Write noise to sidecar file for upstream visibility
+$NoiseFile = $OutputFile + '.noise'
+if ($noiseLines.Count -gt 0) {
+    $noiseContent = "STRIPPED_LINES=$($noiseLines.Count)`n" + ($noiseLines -join "`n")
+    [IO.File]::WriteAllText($NoiseFile, $noiseContent, [Text.Encoding]::UTF8)
+} elseif (Test-Path $NoiseFile) {
+    Remove-Item $NoiseFile -Force
+}
+
+# --- Step 2: Strip trailing usage stats ---
+$statsPrefixes = @('Total usage est:', 'API time spent:', 'Total session time:',
+                    'Total code changes:', 'Breakdown by AI model:', 'Session:',
+                    'Changes', 'Requests', 'Tokens')
+$resultLines = New-Object System.Collections.Generic.List[string]
+$hitStats = $false
+foreach ($line in $cleaned -split "`n") {
+    if (-not $hitStats) {
+        foreach ($sp in $statsPrefixes) {
+            if ($line.TrimStart().StartsWith($sp)) { $hitStats = $true; break }
+        }
+    }
+    if (-not $hitStats) { $resultLines.Add($line) }
+}
+$cleaned = ($resultLines -join "`n").Trim()
+
+# --- raw result_type: write cleaned plain text and exit ---
+if ($ResultType -eq 'raw') {
+    if ([string]::IsNullOrWhiteSpace($cleaned)) {
+        [IO.File]::WriteAllText($OutputFile, '', [Text.Encoding]::UTF8)
+    } else {
+        [IO.File]::WriteAllText($OutputFile, $cleaned, [Text.Encoding]::UTF8)
+    }
+    exit 0
+}
+
+# --- json result_type: extract JSON object matching result_shape ---
+
+# Load result_shape keys (if provided) to use as required-key filter
+$shapeKeys = @()
+if ($ResultShapeFile -and (Test-Path $ResultShapeFile)) {
+    try {
+        $shape = [IO.File]::ReadAllText($ResultShapeFile, [Text.Encoding]::UTF8) | ConvertFrom-Json -ErrorAction Stop
+        $shapeKeys = @($shape.PSObject.Properties.Name)
+    } catch {}
+}
+
+if ([string]::IsNullOrWhiteSpace($cleaned)) {
+    $fallback = if ($shapeKeys.Count -gt 0) {
+        $obj = [ordered]@{}
+        foreach ($k in $shapeKeys) { $obj[$k] = $null }
+        $obj | ConvertTo-Json -Depth 2 -Compress
+    } else { '{}' }
+    [IO.File]::WriteAllText($OutputFile, $fallback, [Text.Encoding]::UTF8)
+    exit 0
+}
+
+# Helper: check if a parsed object has all required shape keys
+function Test-ShapeMatch($obj) {
+    if ($shapeKeys.Count -eq 0) { return $true }  # no shape constraint — accept any JSON object
+    foreach ($k in $shapeKeys) {
+        if (-not $obj.PSObject.Properties[$k]) { return $false }
+    }
+    return $true
+}
+
+$foundJson = $null
+
+# 1: Look in ```json fenced blocks first
+if ($cleaned -match '(?s)```json\s*(.*?)```') {
+    try {
+        $obj = $Matches[1].Trim() | ConvertFrom-Json -ErrorAction Stop
+        if (Test-ShapeMatch $obj) { $foundJson = $Matches[1].Trim() }
+    } catch {}
+}
+
+# 2: Scan for bare JSON objects
+if (-not $foundJson) {
+    $depth = 0; $start = -1
+    for ($i = 0; $i -lt $cleaned.Length; $i++) {
+        if ($cleaned[$i] -eq '{') {
+            if ($depth -eq 0) { $start = $i }
+            $depth++
+        } elseif ($cleaned[$i] -eq '}') {
+            $depth--
+            if ($depth -eq 0 -and $start -ge 0) {
+                $candidate = $cleaned.Substring($start, $i - $start + 1)
+                try {
+                    $obj = $candidate | ConvertFrom-Json -ErrorAction Stop
+                    if (Test-ShapeMatch $obj) {
+                        $foundJson = $candidate
+                        break
+                    }
+                } catch {}
+                $start = -1
+            }
+        }
+    }
+}
+
+if ($foundJson) {
+    [IO.File]::WriteAllText($OutputFile, $foundJson, [Text.Encoding]::UTF8)
+} else {
+    # No matching JSON found — record raw in noise file for upstream visibility
+    $NoiseFile = $OutputFile + '.noise'
+    $fallbackNoise = "FALLBACK=no_json_match`nSHAPE_KEYS=$($shapeKeys -join ',')`nRAW_LENGTH=$($cleaned.Length)`n---`n$cleaned"
+    if (Test-Path $NoiseFile) {
+        $existing = [IO.File]::ReadAllText($NoiseFile, [Text.Encoding]::UTF8)
+        [IO.File]::WriteAllText($NoiseFile, "$existing`n$fallbackNoise", [Text.Encoding]::UTF8)
+    } else {
+        [IO.File]::WriteAllText($NoiseFile, $fallbackNoise, [Text.Encoding]::UTF8)
+    }
+    if ($IsRetry) {
+        # Second pass — write shape-skeleton so the card gets a structured (empty) result
+        $fallback = if ($shapeKeys.Count -gt 0) {
+            $obj = [ordered]@{}
+            foreach ($k in $shapeKeys) { $obj[$k] = $null }
+            $obj | ConvertTo-Json -Depth 2 -Compress
+        } else { '{}' }
+        [IO.File]::WriteAllText($OutputFile, $fallback, [Text.Encoding]::UTF8)
+    } else {
+        # First pass — exit 2 to signal the caller (.bat) to retry with a correction prompt
+        exit 2
+    }
+}