Merge branch 'main' into sb/zen-helpsb/zen-help

- Combine HelpCommand (this branch) with HistoryCommand (main) in zen CLI dispatcher
- Keep filter-aware TuiPickOne rewrite; adopt main's ASCII arrow glyphs in doc comment

1 files changed, 18 insertions, 5 deletions

diff --git a/src/zencompute/runners/localrunner.cpp b/src/zencompute/runners/localrunner.cpp
index 1b748c0e5..259965e23 100644
--- a/src/zencompute/runners/localrunner.cpp
+++ b/src/zencompute/runners/localrunner.cpp
@@ -337,7 +337,7 @@ LocalProcessRunner::PrepareActionSubmission(Ref<RunnerAction> Action)
 SubmitResult
 LocalProcessRunner::SubmitAction(Ref<RunnerAction> Action)
 {
-	// Base class is not directly usable — platform subclasses override this
+	// Base class is not directly usable - platform subclasses override this
 	ZEN_UNUSED(Action);
 	return SubmitResult{.IsAccepted = false};
 }
@@ -357,14 +357,21 @@ LocalProcessRunner::ManifestWorker(const WorkerDesc& Worker)
 
 	std::filesystem::path WorkerDir = m_WorkerPath / fmt::format("runner_{}", Worker.WorkerId);
 
-	if (!std::filesystem::exists(WorkerDir))
+	// worker.zcb is written as the last step of ManifestWorker, so its presence
+	// indicates a complete manifest.  If the directory exists but the marker is
+	// missing, a previous manifest was interrupted and we need to start over.
+	bool NeedsManifest = !std::filesystem::exists(WorkerDir / "worker.zcb");
+
+	if (NeedsManifest)
 	{
 		_.ReleaseNow();
 
 		RwLock::ExclusiveLockScope $(m_WorkerLock);
 
-		if (!std::filesystem::exists(WorkerDir))
+		if (!std::filesystem::exists(WorkerDir / "worker.zcb"))
 		{
+			std::error_code Ec;
+			std::filesystem::remove_all(WorkerDir, Ec);
 			ManifestWorker(Worker.Descriptor, WorkerDir, [](const IoHash&, CompressedBuffer&) {});
 		}
 	}
@@ -613,7 +620,7 @@ LocalProcessRunner::MonitorThreadFunction()
 void
 LocalProcessRunner::CancelRunningActions()
 {
-	// Base class is not directly usable — platform subclasses override this
+	// Base class is not directly usable - platform subclasses override this
 }
 
 void
@@ -673,9 +680,15 @@ LocalProcessRunner::ProcessCompletedActions(std::vector<Ref<RunningAction>>& Com
 			}
 			catch (std::exception& Ex)
 			{
-				ZEN_ERROR("Encountered failure while gathering outputs for action lsn {}, '{}'", ActionLsn, Ex.what());
+				Running->Action->FailureReason = fmt::format("exception gathering outputs: {}", Ex.what());
+				ZEN_ERROR("action {} ({}) failed: {}", Running->Action->ActionId, ActionLsn, Running->Action->FailureReason);
 			}
 		}
+		else
+		{
+			Running->Action->FailureReason = fmt::format("process exited with code {}", Running->ExitCode);
+			ZEN_WARN("action {} ({}) failed: {}", Running->Action->ActionId, ActionLsn, Running->Action->FailureReason);
+		}
 
 		// Failed - clean up the sandbox in the background.