prizmkit 1.1.62 → 1.1.64

package/bundled/dev-pipeline-windows/lib/branch.ps1

@@ -0,0 +1,222 @@
+Set-StrictMode -Version 2.0
+$ErrorActionPreference = 'Stop'
+
+function Get-PrizmCurrentBranch {
+  param([string]$ProjectRoot)
+  $branch = & git -C $ProjectRoot rev-parse --abbrev-ref HEAD 2>$null
+  if ($LASTEXITCODE -eq 0 -and $branch) { return [string]($branch | Select-Object -First 1) }
+  return ''
+}
+
+function Test-PrizmTrackedDirty {
+  param([string]$ProjectRoot)
+  $trackedDirty = & git -C $ProjectRoot diff --name-only 2>$null
+  $stagedDirty = & git -C $ProjectRoot diff --cached --name-only 2>$null
+  return -not [string]::IsNullOrWhiteSpace((@($trackedDirty) + @($stagedDirty) -join "`n"))
+}
+
+function New-PrizmDevBranch {
+  param(
+    [string]$ProjectRoot,
+    [string]$DevBranch,
+    [string]$SourceBranch
+  )
+
+  if (-not $DevBranch -or -not $SourceBranch) { return $false }
+
+  & git -C $ProjectRoot rev-parse --verify $DevBranch *> $null
+  if ($LASTEXITCODE -eq 0) {
+    Write-PrizmInfo "Branch already exists: $DevBranch - checking out"
+    & git -C $ProjectRoot checkout $DevBranch *> $null
+    if ($LASTEXITCODE -ne 0) {
+      Write-PrizmError "Failed to checkout existing branch: $DevBranch"
+      return $false
+    }
+    return $true
+  }
+
+  & git -C $ProjectRoot checkout -b $DevBranch $SourceBranch *> $null
+  if ($LASTEXITCODE -ne 0) {
+    Write-PrizmWarn "Failed to create branch: $DevBranch from $SourceBranch"
+    return $false
+  }
+
+  Write-PrizmInfo "Created and checked out branch: $DevBranch (from $SourceBranch)"
+  return $true
+}
+
+function Switch-PrizmOriginalBranch {
+  param(
+    [string]$ProjectRoot,
+    [string]$OriginalBranch
+  )
+
+  if (-not $OriginalBranch) { return $false }
+  $currentBranch = Get-PrizmCurrentBranch $ProjectRoot
+  if ($currentBranch -eq $OriginalBranch) { return $true }
+
+  & git -C $ProjectRoot checkout $OriginalBranch *> $null
+  if ($LASTEXITCODE -ne 0) {
+    Write-PrizmError "Failed to checkout original branch: $OriginalBranch"
+    return $false
+  }
+
+  Write-PrizmInfo "Returned to branch: $OriginalBranch"
+  return $true
+}
+
+function Save-PrizmBranchWip {
+  param(
+    [string]$ProjectRoot,
+    [string]$DevBranch
+  )
+
+  if (-not $DevBranch) { return $true }
+
+  $currentBranch = Get-PrizmCurrentBranch $ProjectRoot
+  if ($currentBranch -ne $DevBranch) { return $true }
+
+  $changes = & git -C $ProjectRoot status --porcelain 2>$null
+  if ([string]::IsNullOrWhiteSpace(($changes -join "`n"))) { return $true }
+
+  Write-PrizmWarn "Saving uncommitted work-in-progress on branch: $DevBranch"
+  & git -C $ProjectRoot add -A *> $null
+  if ($LASTEXITCODE -ne 0) {
+    Write-PrizmWarn "git add -A failed - uncommitted work may remain on $DevBranch"
+    return $true
+  }
+
+  & git -C $ProjectRoot commit --no-verify `
+    -m "wip($DevBranch): interrupted - uncommitted work saved" `
+    -m "Pipeline was interrupted or failed. This commit preserves work-in-progress." `
+    -m "To resume: git checkout $DevBranch" *> $null
+
+  if ($LASTEXITCODE -eq 0) {
+    Write-PrizmInfo "Saved uncommitted work on branch $DevBranch"
+  } else {
+    Write-PrizmWarn "git commit failed - uncommitted work may remain on $DevBranch"
+  }
+
+  return $true
+}
+
+function Merge-PrizmDevBranch {
+  param(
+    [string]$ProjectRoot,
+    [string]$DevBranch,
+    [string]$OriginalBranch,
+    [bool]$AutoPush = $false
+  )
+
+  if (-not $DevBranch -or -not $OriginalBranch) { return $false }
+
+  $hadStash = $false
+  if (Test-PrizmTrackedDirty $ProjectRoot) {
+    & git -C $ProjectRoot stash push -m 'pipeline-merge-stash' *> $null
+    if ($LASTEXITCODE -eq 0) {
+      $hadStash = $true
+    } else {
+      Write-PrizmWarn "git stash failed - tracked changes may block branch merge"
+    }
+  }
+
+  Write-PrizmInfo "Merging $DevBranch into $OriginalBranch..."
+  & git -C $ProjectRoot rebase $OriginalBranch $DevBranch
+  if ($LASTEXITCODE -ne 0) {
+    Write-PrizmError "Rebase of $DevBranch onto $OriginalBranch failed - resolve manually"
+    & git -C $ProjectRoot rebase --abort *> $null
+    if ($hadStash) {
+      & git -C $ProjectRoot stash pop *> $null
+      if ($LASTEXITCODE -ne 0) { Write-PrizmWarn "git stash pop failed after rebase abort" }
+    }
+    return $false
+  }
+
+  & git -C $ProjectRoot checkout $OriginalBranch *> $null
+  if ($LASTEXITCODE -ne 0) {
+    Write-PrizmError "Failed to checkout $OriginalBranch for merge"
+    if ($hadStash) {
+      & git -C $ProjectRoot stash pop *> $null
+      if ($LASTEXITCODE -ne 0) { Write-PrizmWarn "git stash pop failed after checkout failure" }
+    }
+    return $false
+  }
+
+  & git -C $ProjectRoot merge --ff-only $DevBranch
+  if ($LASTEXITCODE -ne 0) {
+    Write-PrizmError "Merge failed after rebase - resolve manually"
+    if ($hadStash) {
+      & git -C $ProjectRoot stash pop *> $null
+      if ($LASTEXITCODE -ne 0) { Write-PrizmWarn "git stash pop failed after merge failure" }
+    }
+    return $false
+  }
+
+  Write-PrizmSuccess "Merged $DevBranch into $OriginalBranch"
+
+  if ($AutoPush) {
+    Write-PrizmInfo "Pushing $OriginalBranch to remote..."
+    & git -C $ProjectRoot push *> $null
+    if ($LASTEXITCODE -eq 0) {
+      Write-PrizmSuccess "Pushed $OriginalBranch to remote"
+    } else {
+      Write-PrizmWarn "Push failed - run git push manually"
+    }
+  }
+
+  & git -C $ProjectRoot branch -d $DevBranch *> $null
+  if ($LASTEXITCODE -eq 0) { Write-PrizmInfo "Deleted merged branch: $DevBranch" }
+
+  if ($hadStash) {
+    & git -C $ProjectRoot stash pop *> $null
+    if ($LASTEXITCODE -ne 0) { Write-PrizmWarn "git stash pop failed after merge" }
+  }
+
+  return $true
+}
+
+function Restore-PrizmOriginalBranch {
+  param(
+    [string]$ProjectRoot,
+    [string]$OriginalBranch,
+    [string]$DevBranch = ''
+  )
+
+  if (-not $OriginalBranch) { return $true }
+
+  & git -C $ProjectRoot rebase --show-current-patch *> $null
+  if ($LASTEXITCODE -eq 0) {
+    Write-PrizmWarn "Aborting in-progress rebase..."
+    & git -C $ProjectRoot rebase --abort *> $null
+  }
+
+  $currentBranch = Get-PrizmCurrentBranch $ProjectRoot
+  if ($currentBranch -eq $OriginalBranch) { return $true }
+
+  $wipBranch = if ($DevBranch) { $DevBranch } else { $currentBranch }
+  if ($wipBranch -and $wipBranch -ne $OriginalBranch) {
+    Save-PrizmBranchWip $ProjectRoot $wipBranch | Out-Null
+  }
+
+  Write-PrizmInfo "Ensuring return to original branch: $OriginalBranch (currently on: $currentBranch)"
+
+  $hadStash = $false
+  if (Test-PrizmTrackedDirty $ProjectRoot) {
+    & git -C $ProjectRoot stash push -m 'pipeline-ensure-return-stash' *> $null
+    if ($LASTEXITCODE -eq 0) { $hadStash = $true }
+  }
+
+  & git -C $ProjectRoot checkout $OriginalBranch *> $null
+  if ($LASTEXITCODE -eq 0) {
+    Write-PrizmInfo "Returned to branch: $OriginalBranch"
+  } else {
+    Write-PrizmError "Failed to checkout $OriginalBranch - manual recovery needed"
+  }
+
+  if ($hadStash) {
+    & git -C $ProjectRoot stash pop *> $null
+    if ($LASTEXITCODE -ne 0) { Write-PrizmWarn "git stash pop failed during branch return" }
+  }
+
+  return $true
+}

package/bundled/dev-pipeline-windows/lib/common.ps1

@@ -298,6 +298,90 @@ function Get-PrizmSessionPlatform {
   return Get-PrizmPlatformFromCli $CliCommand
 }
 
+function Get-PrizmCodexSubagentTimeoutSeconds {
+  $configuredTimeout = 0
+  if ([int]::TryParse($env:CODEX_SUBAGENT_TIMEOUT_SECONDS, [ref]$configuredTimeout) -and $configuredTimeout -gt 0) {
+    return $configuredTimeout
+  }
+
+  $outerThreshold = 0
+  $outerThresholdText = if ($env:STALE_KILL_THRESHOLD) { $env:STALE_KILL_THRESHOLD } else { $env:SESSION_TIMEOUT }
+  if ([int]::TryParse($outerThresholdText, [ref]$outerThreshold) -and $outerThreshold -gt 120) {
+    return ($outerThreshold - 60)
+  }
+
+  return 840
+}
+
+function Test-PrizmCodexJsonSupport {
+  param([string]$CliExecutable)
+  try {
+    $helpOutput = & $CliExecutable exec --help 2>&1
+    return (($helpOutput -join "`n") -match '--json')
+  } catch {
+    return $false
+  }
+}
+
+function Test-PrizmStreamJsonSupport {
+  param([string]$CliCommand)
+  $sessionPlatform = Get-PrizmSessionPlatform $CliCommand
+  $parsedCli = Split-PrizmCommandLine $CliCommand
+
+  if ($sessionPlatform -eq 'codebuddy') { return $true }
+  if ($sessionPlatform -eq 'codex') { return (Test-PrizmCodexJsonSupport $parsedCli.Command) }
+
+  try {
+    $helpOutput = & $parsedCli.Command --help 2>&1
+    return (($helpOutput -join "`n") -match 'stream-json')
+  } catch {
+    return $false
+  }
+}
+
+function Start-PrizmProgressParser {
+  param(
+    [string[]]$PythonCommand,
+    [string]$ScriptsDir,
+    [string]$SessionLog,
+    [string]$ProgressFile,
+    [string]$CliCommand
+  )
+
+  if (-not (Test-PrizmStreamJsonSupport $CliCommand)) { return $null }
+
+  $parserScript = Join-Path $ScriptsDir 'parse-stream-progress.py'
+  if (-not (Test-Path $parserScript)) { return $null }
+
+  $cmd = $PythonCommand[0]
+  $prefix = @()
+  if ($PythonCommand.Count -gt 1) { $prefix = $PythonCommand[1..($PythonCommand.Count - 1)] }
+
+  $progressDir = Split-Path $ProgressFile -Parent
+  if ($progressDir) { New-Item -ItemType Directory -Force -Path $progressDir | Out-Null }
+
+  $psi = [System.Diagnostics.ProcessStartInfo]::new()
+  $psi.UseShellExecute = $false
+  $psi.CreateNoWindow = $true
+  $psi.FileName = $cmd
+  $psi.Arguments = Join-PrizmProcessArguments ($prefix + @($parserScript, '--session-log', $SessionLog, '--progress-file', $ProgressFile))
+  return [System.Diagnostics.Process]::Start($psi)
+}
+
+function Stop-PrizmProgressParser {
+  param($Process)
+  if ($Process -eq $null) { return }
+  try {
+    if (-not $Process.HasExited) {
+      try {
+        $Process.Kill($true)
+      } catch {
+        Stop-PrizmProcessTreeById -ProcessId ([int]$Process.Id)
+      }
+    }
+  } catch {}
+}
+
 function Stop-PrizmProcessTreeById {
   param([int]$ProcessId)
   if ($ProcessId -le 0) { return }
@@ -328,6 +412,28 @@ function Stop-PrizmProcessTreeById {
   }
 }
 
+function Stop-PrizmSessionProcess {
+  param([string]$PidPath)
+  if (-not (Test-Path $PidPath)) { return }
+  $rawPid = Get-Content $PidPath -ErrorAction SilentlyContinue | Select-Object -First 1
+  $aiPid = 0
+  if ([int]::TryParse($rawPid, [ref]$aiPid)) {
+    Stop-PrizmProcessTreeById -ProcessId $aiPid
+  }
+}
+
+function Write-PrizmStaleKillMarker {
+  param([string]$MarkerPath, [int]$StaleSeconds, [int]$Threshold)
+  $markerDir = Split-Path $MarkerPath -Parent
+  if ($markerDir) { New-Item -ItemType Directory -Force -Path $markerDir | Out-Null }
+  [ordered]@{
+    killed_at = (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ')
+    reason = 'stale_session'
+    stale_seconds = $StaleSeconds
+    threshold = $Threshold
+  } | ConvertTo-Json -Compress | Set-Content -Path $MarkerPath -Encoding UTF8
+}
+
 function Invoke-PrizmAiSession {
   param(
     [string]$CliCommand,
@@ -352,16 +458,27 @@ function Invoke-PrizmAiSession {
   $parsedCli = Split-PrizmCommandLine $CliCommand
   $cliExecutable = $parsedCli.Command
   $sessionPlatform = Get-PrizmSessionPlatform $CliCommand
+  $useStreamJson = Test-PrizmStreamJsonSupport $CliCommand
 
   if ($sessionPlatform -eq 'claude') {
     $cliArgs += @('-p', '--dangerously-skip-permissions')
+    if ($env:VERBOSE -in @('1','true','yes','on') -or $useStreamJson) { $cliArgs += '--verbose' }
+    if ($useStreamJson) { $cliArgs += @('--output-format', 'stream-json') }
     if ($Model) { $cliArgs += @('--model', $Model) }
   } elseif ($sessionPlatform -eq 'codex') {
-    $cliArgs += @('--ask-for-approval', 'never', '--sandbox', 'danger-full-access', 'exec', '--cd', $ProjectRoot, '--skip-git-repo-check')
+    $cliArgs += @('--ask-for-approval', 'never', '--sandbox', 'danger-full-access')
+    $codexSubagentTimeout = Get-PrizmCodexSubagentTimeoutSeconds
+    if ($codexSubagentTimeout -gt 0) {
+      $cliArgs += @('--config', "agents.job_max_runtime_seconds=$codexSubagentTimeout")
+    }
+    $cliArgs += @('exec', '--cd', $ProjectRoot, '--skip-git-repo-check')
+    if ($useStreamJson) { $cliArgs += '--json' }
     if ($Model) { $cliArgs += @('--model', $Model) }
     $cliArgs += '-'
   } else {
     $cliArgs += @('--print', '-y')
+    if ($env:VERBOSE -in @('1','true','yes','on')) { $cliArgs += '--verbose' }
+    if ($useStreamJson) { $cliArgs += @('--output-format', 'stream-json') }
     if ($Model) { $cliArgs += @('--model', $Model) }
   }
   $generatedArgs = (($cliArgs | ForEach-Object { ConvertTo-PrizmProcessArgument $_ }) -join ' ')
@@ -390,20 +507,53 @@ function Invoke-PrizmAiSession {
 
   $process = [System.Diagnostics.Process]::Start($psi)
   $script:PrizmAiProcess = $process
+  $logWriter = [System.IO.StreamWriter]::new($LogPath, $false, [System.Text.UTF8Encoding]::new($false))
+  $logLock = [object]::new()
+  $outputHandler = [System.Diagnostics.DataReceivedEventHandler]{
+    param($sender, $eventArgs)
+    if ($eventArgs.Data -ne $null) {
+      [System.Threading.Monitor]::Enter($logLock)
+      try {
+        $logWriter.WriteLine($eventArgs.Data)
+        $logWriter.Flush()
+      } finally {
+        [System.Threading.Monitor]::Exit($logLock)
+      }
+    }
+  }
+  $errorHandler = [System.Diagnostics.DataReceivedEventHandler]{
+    param($sender, $eventArgs)
+    if ($eventArgs.Data -ne $null) {
+      [System.Threading.Monitor]::Enter($logLock)
+      try {
+        $logWriter.WriteLine($eventArgs.Data)
+        $logWriter.Flush()
+      } finally {
+        [System.Threading.Monitor]::Exit($logLock)
+      }
+    }
+  }
+  $process.add_OutputDataReceived($outputHandler)
+  $process.add_ErrorDataReceived($errorHandler)
   if ($PidPath) {
     $pidDir = Split-Path $PidPath -Parent
     if ($pidDir) { New-Item -ItemType Directory -Force -Path $pidDir | Out-Null }
     Set-Content -Path $PidPath -Value ([string]$process.Id) -Encoding UTF8
   }
-  $process.StandardInput.Write($prompt)
-  $process.StandardInput.Close()
-  $stdoutTask = $process.StandardOutput.ReadToEndAsync()
-  $stderrTask = $process.StandardError.ReadToEndAsync()
-  $process.WaitForExit()
-  $stdout = $stdoutTask.Result
-  $stderr = $stderrTask.Result
-  Set-Content -Path $LogPath -Value ($stdout + $stderr) -Encoding UTF8
-  return $process.ExitCode
+  try {
+    $process.BeginOutputReadLine()
+    $process.BeginErrorReadLine()
+    $process.StandardInput.Write($prompt)
+    $process.StandardInput.Close()
+    $process.WaitForExit()
+    $process.WaitForExit()
+    return $process.ExitCode
+  } finally {
+    $process.remove_OutputDataReceived($outputHandler)
+    $process.remove_ErrorDataReceived($errorHandler)
+    $logWriter.Close()
+    $logWriter.Dispose()
+  }
 }
 
 function New-PrizmSessionId {