pr feedback

dist/index.js

@@ -4414,9 +4414,7 @@ class KubernetesTaskRunner {
             cloud_runner_logger_1.default.log(`Streaming logs from pod: ${podName} container: ${containerName} namespace: ${namespace} ${cloud_runner_1.default.buildParameters.kubeVolumeSize}/${cloud_runner_1.default.buildParameters.containerCpu}/${cloud_runner_1.default.buildParameters.containerMemory}`);
             const isRunning = await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient);
             let extraFlags = ``;
-            extraFlags += isRunning
-                ? ` -f -c ${containerName} -n ${namespace}`
-                : ` --previous -n ${namespace}`;
+            extraFlags += isRunning ? ` -f -c ${containerName} -n ${namespace}` : ` --previous -n ${namespace}`;
             const callback = (outputChunk) => {
                 output += outputChunk;
                 // split output chunk and handle per line
@@ -4436,10 +4434,29 @@ class KubernetesTaskRunner {
                     cloud_runner_logger_1.default.log(`Previous container not found, trying current container logs...`);
                     try {
                         await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName} -c ${containerName} -n ${namespace}`, false, true, callback);
+                        // If we successfully got logs, check for end of transmission
+                        if (follow_log_stream_service_1.FollowLogStreamService.DidReceiveEndOfTransmission) {
+                            cloud_runner_logger_1.default.log('end of log stream');
+                            break;
+                        }
+                        // If we got logs but no end marker, continue trying (might be more logs)
+                        if (retriesAfterFinish < KubernetesTaskRunner.maxRetry) {
+                            retriesAfterFinish++;
+                            continue;
+                        }
+                        // If we've exhausted retries, break
+                        break;
                     }
                     catch (fallbackError) {
                         cloud_runner_logger_1.default.log(`Fallback log fetch also failed: ${fallbackError}`);
-                        // If both fail, continue - we'll get what we can from pod status
+                        // If both fail, continue retrying if we haven't exhausted retries
+                        if (retriesAfterFinish < KubernetesTaskRunner.maxRetry) {
+                            retriesAfterFinish++;
+                            continue;
+                        }
+                        // Only break if we've exhausted all retries
+                        cloud_runner_logger_1.default.logWarning(`Could not fetch any container logs after ${KubernetesTaskRunner.maxRetry} retries`);
+                        break;
                     }
                 }
                 if (continueStreaming) {
@@ -4449,12 +4466,13 @@ class KubernetesTaskRunner {
                     retriesAfterFinish++;
                     continue;
                 }
-                // Don't throw if we're just missing previous container logs - this is non-fatal
-                if (error?.message?.includes('previous terminated container')) {
-                    cloud_runner_logger_1.default.logWarning(`Could not fetch previous container logs, but continuing...`);
-                    break;
+                // If we've exhausted retries and it's not a previous container issue, throw
+                if (!error?.message?.includes('previous terminated container')) {
+                    throw error;
                 }
-                throw error;
+                // For previous container errors, we've already tried fallback, so just break
+                cloud_runner_logger_1.default.logWarning(`Could not fetch previous container logs after retries, but continuing with available logs`);
+                break;
             }
             if (follow_log_stream_service_1.FollowLogStreamService.DidReceiveEndOfTransmission) {
                 cloud_runner_logger_1.default.log('end of log stream');