@@ -140,7 +140,7 @@ export function PullRequestActionToolbar(props: {
   if (!props.pr && !props.params.initialSummary) return null;
   const primaryDisabled = pendingReview ? false : agent.disabled;
   // Keep the bar for initialSummary, but do not offer Work on PR until detail exists.
-  const showPrimary = pendingReview || canOpenThread;
+  const showPrimary = pendingReview || (props.pr !== null && canOpenThread);
   if (Platform.OS === "android") {
     const primary = (
       <Button
 
@@ -156,7 +156,10 @@ export function threadGitControlsContentKey(props: ThreadGitControlsMenuKeyInput
     status?.sourceControlProvider?.kind ?? "",
     // Script edits keep the same id; include fields so the retained menu runs the new command.
     props.projectScripts
-      .map((script) => `${script.id}\t${script.name}\t${script.command}\t${script.icon}`)
+      .map(
+        (script) =>
+          `${script.id}\t${script.name}\t${script.command}\t${script.icon}\t${script.stopOnSettle ? "1" : "0"}`,
+      )
       .join("\0"),
     props.terminalSessions
       .map(