@kitman-sh/sdk 0.10.77 → 0.10.78

package/dist/build/index.js

@@ -4,7 +4,7 @@ import {
   KitDigest,
   AgentDeclaration,
   KitDeclarations
-} from "../chunk-g7x3s4x6.js";
+} from "../chunk-r609bz8q.js";
 import {
   digestSha256,
   digestSha512,
@@ -13,7 +13,7 @@ import {
   RunnerRpcProtocolVersion,
   describeFlag2,
   Described2
-} from "../chunk-3qttynnn.js";
+} from "../chunk-7tbysqtf.js";
 
 // packages/core/src/json.ts
 import * as Schema from "effect/Schema";

package/dist/{chunk-3qttynnn.js → chunk-7tbysqtf.js}

@@ -33,7 +33,7 @@ import {
   executeLoop2,
   LoopCheckError2,
   checkLoop2
-} from "./chunk-g7x3s4x6.js";
+} from "./chunk-r609bz8q.js";
 // packages/core/src/agent-environment.ts
 import * as Schema from "effect/Schema";
 var AgentEnvironmentPolicy = Schema.Union([Schema.Literal("recommended"), Schema.Literal("required")]);
@@ -1057,6 +1057,8 @@ class RunnerCapabilityRpcs extends RpcGroup.make(Rpc.make("PutQuestion", {
     runnerChecks: Schema7.optionalKey(Schema7.Array(Schema7.String)),
     approved: Schema7.optionalKey(Schema7.String),
     repository: Schema7.optionalKey(Schema7.String),
+    conflicts: Schema7.optionalKey(Schema7.Boolean),
+    needsRebase: Schema7.optionalKey(Schema7.Boolean),
     target: Schema7.optionalKey(Schema7.Struct({
       branch: Schema7.String,
       head: Schema7.String,

package/dist/{chunk-g7x3s4x6.js → chunk-r609bz8q.js}

@@ -1552,6 +1552,12 @@ var LoopSafeReferenceString = Schema12.String.check(Schema12.isMinLength(1), Sch
 var LoopSafeInternalReferenceString = Schema12.String.check(Schema12.isMinLength(1), Schema12.isMaxLength(240), Schema12.isPattern(new RegExp(LoopSafeInternalReferencePattern, "u")));
 var LoopSafeText = Schema12.String.check(Schema12.isMaxLength(4000), Schema12.isPattern(new RegExp(`^(?![\\s\\S]*(?:${LoopCredentialContentPattern}|[A-Za-z][A-Za-z0-9+.-]*://(?:[^\\s/?#]*@|[^\\s?#]*\\?)))[\\s\\S]*$`, "u")));
 var recommendedDefault = (recommended) => recommended !== undefined && Schema12.is(LoopSafeText)(recommended) ? recommended : undefined;
+var unansweredQuestionLead = "Nobody answers in full auto, and the agent's Question has no answer to take";
+var unansweredQuestionReason2 = (prompt) => {
+  const reason = `${unansweredQuestionLead}: ${prompt}`.slice(0, 4000);
+  return Schema12.is(LoopSafeText)(reason) ? reason : `${unansweredQuestionLead}; its text is on the Run`;
+};
+var isUnansweredQuestion2 = (reason) => reason.startsWith(unansweredQuestionLead);
 var QuestionText = Schema12.String;
 var LoopSafeOutputDataString = Schema12.String.check(Schema12.isMaxLength(4000), Schema12.isPattern(new RegExp(LoopSafeInternalReferencePattern, "u")));
 var LoopSafePackageName = Schema12.String.check(Schema12.isMinLength(1), Schema12.isMaxLength(200), Schema12.isPattern(new RegExp(LoopSafeReferencePattern, "u")));
@@ -3285,6 +3291,8 @@ var PipelineStatus2 = Schema19.Struct({
   runnerChecks: Schema19.optionalKey(Schema19.Array(Schema19.String)),
   approved: Schema19.optionalKey(Schema19.String),
   repository: Schema19.optionalKey(Schema19.String),
+  conflicts: Schema19.optionalKey(Schema19.Boolean),
+  needsRebase: Schema19.optionalKey(Schema19.Boolean),
   target: Schema19.optionalKey(Schema19.Struct({ branch: Schema19.String, head: Schema19.String, jobs: Schema19.Array(PipelineJob2) }))
 });
 var ReviewThread2 = Schema19.Struct({
@@ -4520,4 +4528,4 @@ var continuingBrief2 = (continuing) => [
   "The ChangeRequest's description lists what was left unsettled; settle those first."
 ].join(`
 `);
-export { Numeric, isWholeNumber, guard, Id, Timestamp, canonicalJson, KitDigest, LoopCapabilities2, LoopManifest, AgentDeclaration, KitDeclarations, LoopOutcome2, capabilitiesOf2, defineLoop2, ManifestInvalid2, jsonSchemaOf2, loopManifest2, questionAdvice, EvidenceCheck2, VerifyResult2, OutcomeTable2, failsOn2, testsNotRunReasons2, evidenceGate2, StepFailed2, OutputInvalid2, QuestionRefused2, WaitTimedOut2, ChangeRequestClosed2, ChildFailed2, CapabilityDenied2, DuplicateStep2, InputInvalid2, LoopEvent2, LoopRun2, LoopHost2, agentDeferredNamed2, agentWorkDeferred2, syncDeferred2, answerDeferred2, childDeferred2, eventDeferred2, verifyDeferred2, takeStep2, launch2, agentWork2, agentWorkAs2, agentWorkOnce2, ask2, call2, waitFor2, verify2, suggestVerification2, PlanTicket2, PlanTickets2, BlockingCycle2, planWaves2, ChangeRequestRequest2, ChangeRequestResult2, WriteBackMilestones2, WriteBackRequest2, RunFile2, FileRequest2, ArtifactRequest2, ArtifactResult2, NoteRequest2, CreateTasksRequest2, CreateTasksResult2, AlertTaskRequest2, AlertTaskResult2, IntegrationBranchRequest2, IntegrationBranch2, MergeChangeRequestRequest2, MergeResult2, ApproveChangeRequestRequest2, ApproveChangeRequestResult2, CloseChangeRequestRequest2, CloseChangeRequestResult2, RerunPipelineRequest2, RerunPipelineResult2, ReportPipelineRequest2, ReportPipelineResult2, CommentRequest2, ReleaseRequest2, ReleaseResult2, ChangeRequestReadRequest2, PipelineJob2, PipelineStatus2, ReviewThread2, ReviewThreads2, OpenChangeRequestsRequest2, OpenChangeRequest2, OpenChangeRequests2, OwnChangeRequest2, OwnChangeRequests2, TranscriptPoint2, TranscriptsRequest2, TranscriptsResult2, ProposeRequest2, ProposeResult2, ProjectActivityRequest2, ProjectActivityResult2, DraftUpdateRequest2, DraftUpdateResult2, ChangeRequestActivity2, WriteBackActivity2, ArtifactActivity2, FileActivity2, NoteActivity2, CommentActivity2, CreateTasksActivity2, AlertTaskActivity2, IntegrationBranchActivity2, MergeChangeRequestActivity2, ReleaseActivity2, TranscriptsActivity2, ProposeActivity2, ProjectActivityActivity2, DraftUpdateActivity2, ChangeRequestReadActivity2, changeRequest2, writeBack2, artifact2, file2, note2, comment2, createTasks2, alertTask2, integrationBranch2, mergeChangeRequest2, approveChangeRequest2, closeChangeRequest2, pipelineMoved2, rerunPipeline2, reportPipeline2, release2, transcripts2, propose2, projectActivity2, pipelineStatus2, reviewThreads2, openChangeRequests2, ownChangeRequests2, draftUpdate2, ResourceName, ClaimResult2, claimDeferred2, letGoDeferred2, claim2, letGo2, WorkUnitRepoBinding, ProgramWorkUnit, CheckName2, ApprovedCheck, MeasurePlan2, WorkUnitClaimResult, WorkUnitClaimInput, WorkUnitHeartbeatInput, WorkUnitHeartbeatResult, WorkUnitReleaseInput, WorkUnitCompletion, MetricStats2, MeasureVerdict2, Measurement2, measureDeferred2, noiseFloor2, judgeMeasurement2, measure2, LoopJournal2, ScriptedFailure2, scriptedFailure2, loopWorkflow2, executeLoop2, testLoop2, Severity2, Finding2, MergedFinding2, Rebuttal2, RebuttalVerdict2, ScopeJudgement2, isBlocking2, mergeFindings2, splitDisputed2, settleRound2, rallyStop2, CheckFailed2, StepNamedTwice2, ReplayDiverged2, LoopCheckError2, checkLoop2, defineKit2, BaseSync2, syncBase2, Continuing2, continuingBrief2 };
+export { Numeric, isWholeNumber, guard, Id, Timestamp, canonicalJson, KitDigest, unansweredQuestionReason2, isUnansweredQuestion2, LoopCapabilities2, LoopManifest, AgentDeclaration, KitDeclarations, LoopOutcome2, capabilitiesOf2, defineLoop2, ManifestInvalid2, jsonSchemaOf2, loopManifest2, questionAdvice, EvidenceCheck2, VerifyResult2, OutcomeTable2, failsOn2, testsNotRunReasons2, evidenceGate2, StepFailed2, OutputInvalid2, QuestionRefused2, WaitTimedOut2, ChangeRequestClosed2, ChildFailed2, CapabilityDenied2, DuplicateStep2, InputInvalid2, LoopEvent2, LoopRun2, LoopHost2, agentDeferredNamed2, agentWorkDeferred2, syncDeferred2, answerDeferred2, childDeferred2, eventDeferred2, verifyDeferred2, takeStep2, launch2, agentWork2, agentWorkAs2, agentWorkOnce2, ask2, call2, waitFor2, verify2, suggestVerification2, PlanTicket2, PlanTickets2, BlockingCycle2, planWaves2, ChangeRequestRequest2, ChangeRequestResult2, WriteBackMilestones2, WriteBackRequest2, RunFile2, FileRequest2, ArtifactRequest2, ArtifactResult2, NoteRequest2, CreateTasksRequest2, CreateTasksResult2, AlertTaskRequest2, AlertTaskResult2, IntegrationBranchRequest2, IntegrationBranch2, MergeChangeRequestRequest2, MergeResult2, ApproveChangeRequestRequest2, ApproveChangeRequestResult2, CloseChangeRequestRequest2, CloseChangeRequestResult2, RerunPipelineRequest2, RerunPipelineResult2, ReportPipelineRequest2, ReportPipelineResult2, CommentRequest2, ReleaseRequest2, ReleaseResult2, ChangeRequestReadRequest2, PipelineJob2, PipelineStatus2, ReviewThread2, ReviewThreads2, OpenChangeRequestsRequest2, OpenChangeRequest2, OpenChangeRequests2, OwnChangeRequest2, OwnChangeRequests2, TranscriptPoint2, TranscriptsRequest2, TranscriptsResult2, ProposeRequest2, ProposeResult2, ProjectActivityRequest2, ProjectActivityResult2, DraftUpdateRequest2, DraftUpdateResult2, ChangeRequestActivity2, WriteBackActivity2, ArtifactActivity2, FileActivity2, NoteActivity2, CommentActivity2, CreateTasksActivity2, AlertTaskActivity2, IntegrationBranchActivity2, MergeChangeRequestActivity2, ReleaseActivity2, TranscriptsActivity2, ProposeActivity2, ProjectActivityActivity2, DraftUpdateActivity2, ChangeRequestReadActivity2, changeRequest2, writeBack2, artifact2, file2, note2, comment2, createTasks2, alertTask2, integrationBranch2, mergeChangeRequest2, approveChangeRequest2, closeChangeRequest2, pipelineMoved2, rerunPipeline2, reportPipeline2, release2, transcripts2, propose2, projectActivity2, pipelineStatus2, reviewThreads2, openChangeRequests2, ownChangeRequests2, draftUpdate2, ResourceName, ClaimResult2, claimDeferred2, letGoDeferred2, claim2, letGo2, WorkUnitRepoBinding, ProgramWorkUnit, CheckName2, ApprovedCheck, MeasurePlan2, WorkUnitClaimResult, WorkUnitClaimInput, WorkUnitHeartbeatInput, WorkUnitHeartbeatResult, WorkUnitReleaseInput, WorkUnitCompletion, MetricStats2, MeasureVerdict2, Measurement2, measureDeferred2, noiseFloor2, judgeMeasurement2, measure2, LoopJournal2, ScriptedFailure2, scriptedFailure2, loopWorkflow2, executeLoop2, testLoop2, Severity2, Finding2, MergedFinding2, Rebuttal2, RebuttalVerdict2, ScopeJudgement2, isBlocking2, mergeFindings2, splitDisputed2, settleRound2, rallyStop2, CheckFailed2, StepNamedTwice2, ReplayDiverged2, LoopCheckError2, checkLoop2, defineKit2, BaseSync2, syncBase2, Continuing2, continuingBrief2 };

package/dist/loop/index.js

@@ -1,5 +1,7 @@
 // @bun
 import {
+  unansweredQuestionReason2,
+  isUnansweredQuestion2,
   LoopCapabilities2,
   LoopOutcome2,
   capabilitiesOf2,
@@ -174,7 +176,7 @@ import {
   syncBase2,
   Continuing2,
   continuingBrief2
-} from "../chunk-g7x3s4x6.js";
+} from "../chunk-r609bz8q.js";
 export {
   AlertTaskActivity2 as AlertTaskActivity,
   AlertTaskRequest2 as AlertTaskRequest,
@@ -311,6 +313,7 @@ export {
   file2 as file,
   integrationBranch2 as integrationBranch,
   isBlocking2 as isBlocking,
+  isUnansweredQuestion2 as isUnansweredQuestion,
   jsonSchemaOf2 as jsonSchemaOf,
   judgeMeasurement2 as judgeMeasurement,
   launch2 as launch,
@@ -346,6 +349,7 @@ export {
   testLoop2 as testLoop,
   testsNotRunReasons2 as testsNotRunReasons,
   transcripts2 as transcripts,
+  unansweredQuestionReason2 as unansweredQuestionReason,
   verify2 as verify,
   verifyDeferred2 as verifyDeferred,
   waitFor2 as waitFor,

package/dist/program/index.js

@@ -1,5 +1,5 @@
 // @bun
-import"../chunk-g7x3s4x6.js";
+import"../chunk-r609bz8q.js";
 import {
   JournalWriteFailed2,
   refusedStep2,
@@ -17,7 +17,7 @@ import {
   networkGuard2,
   carriedKits2,
   runKit2
-} from "../chunk-3qttynnn.js";
+} from "../chunk-7tbysqtf.js";
 export {
   Described2 as Described,
   JournalWriteFailed2 as JournalWriteFailed,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitman-sh/sdk",
-  "version": "0.10.77",
+  "version": "0.10.78",
   "type": "module",
   "license": "UNLICENSED",
   "exports": {

package/types/packages/core/src/loop.d.ts

@@ -16,6 +16,10 @@ export declare const LoopSourceMode: Schema.Literals<readonly ["direct", "git_ba
 export declare const LoopCapabilityKind: Schema.Literals<readonly ["read_task", "read_repo_binding", "read_agent_environment", "read_kit", "update_task_status", "read_change_request", "read_change_request_review", "read_task_link", "refresh_change_request_metadata", "record_change_request_review", "record_session_update", "create_task_link", "create_task_dependency", "create_task_asset", "create_follow_up_task", "execute_agent", "read_step_attempt", "record_task_thread_entry", "write_provider_repository", "write_provider_change_request", "publish_provider_check", "write_provider_comment", "request_provider_changes", "approve_provider_change_request", "merge_provider_change_request", "wait_for_event", "request_human_approval", "execute_package_ref", "read_context_feedback", "read_session_update", "read_repo_binding", "read_agent_environment", "read_kit", "read_memory", "read_decision", "create_task_dependency", "propose_memory", "propose_kit", "propose_decision", "propose_agent_environment_policy", "propose_team_context", "propose_context_relevance", "execute_runner_sandbox"]>;
 /** A Question's recommendation as its default, when it can be stored as one: a default must be LoopSafeText. */
 export declare const recommendedDefault: (recommended: string | undefined) => string | undefined;
+/** Why an agent Step ended on a Question in full auto that has neither a default nor a recommendation to take. */
+export declare const unansweredQuestionReason: (prompt: string) => string;
+/** Whether a Step failed because its agent asked a Question in full auto that nothing could answer. */
+export declare const isUnansweredQuestion: (reason: string) => boolean;
 export declare const LoopDataSchemaRef: Schema.Struct<{
     readonly kind: Schema.Literal<"typebox_ref">;
     readonly name: Schema.String;

package/types/packages/live/src/rpc/runner-client.d.ts

@@ -1731,6 +1731,8 @@ export declare const makeProgramRpcClient: (options: ConnectionOptions) => Effec
         readonly runnerChecks?: readonly string[];
         readonly approved?: string;
         readonly repository?: string;
+        readonly conflicts?: boolean;
+        readonly needsRebase?: boolean;
         readonly target?: {
             readonly branch: string;
             readonly head: string;
@@ -1755,6 +1757,8 @@ export declare const makeProgramRpcClient: (options: ConnectionOptions) => Effec
         readonly runnerChecks?: readonly string[];
         readonly approved?: string;
         readonly repository?: string;
+        readonly conflicts?: boolean;
+        readonly needsRebase?: boolean;
         readonly target?: {
             readonly branch: string;
             readonly head: string;

package/types/packages/live/src/rpc/runner-group.d.ts

@@ -123,7 +123,65 @@ export declare const ProgramOutcome: Schema.Union<readonly [Schema.Struct<{
     readonly status: Schema.Literal<"failed">;
     readonly failureSummary: Schema.String;
 }>]>;
-declare const RunnerReplicaRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"AppendTranscript", Schema.Struct<{
+declare const RunnerReplicaRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Signals", Schema.Struct<{
+    runnerReplicaId: Schema.String;
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.TaggedStruct<"WorkAvailable", {}>, Schema.TaggedStruct<"LeaseRevoked", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"Settled", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"Canceled", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"RunSettled", {
+    readonly runId: Schema.String;
+}>, Schema.TaggedStruct<"Steer", {
+    readonly workUnitId: Schema.String;
+    readonly messageId: Schema.String;
+    readonly text: Schema.String;
+}>, Schema.TaggedStruct<"SessionUpdated", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"UpdateAvailable", {
+    readonly version: Schema.String;
+}>]>, typeof RunnerRpcError>, Schema.Never, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateCheckpointFile", Schema.Struct<{
+    lease: Schema.Struct<{
+        readonly workUnitId: Schema.String;
+        readonly leaseOwnerId: Schema.String;
+        readonly runnerReplicaId: Schema.String;
+        readonly leaseId: Schema.String;
+        readonly attempt: Schema.Int;
+        readonly fencingToken: Schema.String;
+        readonly capacitySlot: Schema.String;
+    }>;
+    byteSize: Schema.Int;
+    sha256: Schema.String;
+}>, Schema.Struct<{
+    readonly file: Schema.Struct<{
+        readonly id: Schema.String;
+        readonly runId: Schema.String;
+        readonly step: Schema.String;
+        readonly name: Schema.String;
+        readonly caption: Schema.optionalKey<Schema.String>;
+        readonly contentType: Schema.String;
+        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
+        readonly byteSize: Schema.Int;
+        readonly sha256: Schema.String;
+        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
+    }>;
+    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
+        readonly url: Schema.String;
+        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+        readonly expiresAt: Schema.String;
+        readonly kind: Schema.Literal<"single">;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"multipart">;
+        readonly partSize: Schema.Int;
+        readonly parts: Schema.$Array<Schema.Struct<{
+            readonly url: Schema.String;
+            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+            readonly expiresAt: Schema.String;
+            readonly partNumber: Schema.Int;
+        }>>;
+    }>]>>;
+}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"AppendTranscript", Schema.Struct<{
     workUnitId: Schema.String;
     entries: Schema.$Array<Schema.Struct<{
         readonly sequence: Schema.Int;
@@ -493,47 +551,7 @@ declare const RunnerReplicaRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"AppendTranscrip
     readonly byteSize: Schema.Int;
     readonly sha256: Schema.String;
     readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
-}>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateCheckpointFile", Schema.Struct<{
-    lease: Schema.Struct<{
-        readonly workUnitId: Schema.String;
-        readonly leaseOwnerId: Schema.String;
-        readonly runnerReplicaId: Schema.String;
-        readonly leaseId: Schema.String;
-        readonly attempt: Schema.Int;
-        readonly fencingToken: Schema.String;
-        readonly capacitySlot: Schema.String;
-    }>;
-    byteSize: Schema.Int;
-    sha256: Schema.String;
-}>, Schema.Struct<{
-    readonly file: Schema.Struct<{
-        readonly id: Schema.String;
-        readonly runId: Schema.String;
-        readonly step: Schema.String;
-        readonly name: Schema.String;
-        readonly caption: Schema.optionalKey<Schema.String>;
-        readonly contentType: Schema.String;
-        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
-        readonly byteSize: Schema.Int;
-        readonly sha256: Schema.String;
-        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
-    }>;
-    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
-        readonly url: Schema.String;
-        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-        readonly expiresAt: Schema.String;
-        readonly kind: Schema.Literal<"single">;
-    }>, Schema.Struct<{
-        readonly kind: Schema.Literal<"multipart">;
-        readonly partSize: Schema.Int;
-        readonly parts: Schema.$Array<Schema.Struct<{
-            readonly url: Schema.String;
-            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-            readonly expiresAt: Schema.String;
-            readonly partNumber: Schema.Int;
-        }>>;
-    }>]>>;
-}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"ForgetCheckpoints", Schema.Struct<{
+}>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"ForgetCheckpoints", Schema.Struct<{
     stepAttemptIds: Schema.$Array<Schema.String>;
 }>, Schema.Void, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"GitCredential", Schema.Struct<{
     repoBindingId: Schema.String;
@@ -650,25 +668,7 @@ declare const RunnerReplicaRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"AppendTranscrip
     }>>;
 }>>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"SettledRuns", Schema.Struct<{
     runIds: Schema.$Array<Schema.String>;
-}>, Schema.$Array<Schema.String>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"Signals", Schema.Struct<{
-    runnerReplicaId: Schema.String;
-}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.TaggedStruct<"WorkAvailable", {}>, Schema.TaggedStruct<"LeaseRevoked", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"Settled", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"Canceled", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"RunSettled", {
-    readonly runId: Schema.String;
-}>, Schema.TaggedStruct<"Steer", {
-    readonly workUnitId: Schema.String;
-    readonly messageId: Schema.String;
-    readonly text: Schema.String;
-}>, Schema.TaggedStruct<"SessionUpdated", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"UpdateAvailable", {
-    readonly version: Schema.String;
-}>]>, typeof RunnerRpcError>, Schema.Never, typeof RunnerAuthentication, never>>;
+}>, Schema.$Array<Schema.String>, typeof RunnerRpcError, typeof RunnerAuthentication, never>>;
 /** The Runner process's procedures: Work Unit leases, signals, checkpoints and bundles. */
 export declare class RunnerReplicaRpcs extends RunnerReplicaRpcs_base {
 }
@@ -1043,6 +1043,8 @@ declare const RunnerCapabilityRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild",
     readonly runnerChecks: Schema.optionalKey<Schema.$Array<Schema.String>>;
     readonly approved: Schema.optionalKey<Schema.String>;
     readonly repository: Schema.optionalKey<Schema.String>;
+    readonly conflicts: Schema.optionalKey<Schema.Boolean>;
+    readonly needsRebase: Schema.optionalKey<Schema.Boolean>;
     readonly target: Schema.optionalKey<Schema.Struct<{
         readonly branch: Schema.String;
         readonly head: Schema.String;
@@ -1378,7 +1380,51 @@ declare const RunnerCapabilityRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild",
 /** A program's domain calls. */
 export declare class RunnerCapabilityRpcs extends RunnerCapabilityRpcs_base {
 }
-declare const RunnerRunFileRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"CompleteRunFile", Schema.Struct<{
+declare const RunnerRunFileRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"CreateRunFile", Schema.Struct<{
+    lease: Schema.Struct<{
+        readonly workUnitId: Schema.String;
+        readonly leaseOwnerId: Schema.String;
+        readonly runnerReplicaId: Schema.String;
+        readonly leaseId: Schema.String;
+        readonly attempt: Schema.Int;
+        readonly fencingToken: Schema.String;
+        readonly capacitySlot: Schema.String;
+    }>;
+    step: Schema.String;
+    name: Schema.String;
+    caption: Schema.optional<Schema.String>;
+    contentType: Schema.String;
+    byteSize: Schema.Int;
+    sha256: Schema.String;
+}>, Schema.Struct<{
+    readonly file: Schema.Struct<{
+        readonly id: Schema.String;
+        readonly runId: Schema.String;
+        readonly step: Schema.String;
+        readonly name: Schema.String;
+        readonly caption: Schema.optionalKey<Schema.String>;
+        readonly contentType: Schema.String;
+        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
+        readonly byteSize: Schema.Int;
+        readonly sha256: Schema.String;
+        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
+    }>;
+    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
+        readonly url: Schema.String;
+        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+        readonly expiresAt: Schema.String;
+        readonly kind: Schema.Literal<"single">;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"multipart">;
+        readonly partSize: Schema.Int;
+        readonly parts: Schema.$Array<Schema.Struct<{
+            readonly url: Schema.String;
+            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+            readonly expiresAt: Schema.String;
+            readonly partNumber: Schema.Int;
+        }>>;
+    }>]>>;
+}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"CompleteRunFile", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;
@@ -1404,7 +1450,31 @@ declare const RunnerRunFileRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"CompleteRunFile
     readonly byteSize: Schema.Int;
     readonly sha256: Schema.String;
     readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
-}>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateRunFile", Schema.Struct<{
+}>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"RunFileParts", Schema.Struct<{
+    lease: Schema.Struct<{
+        readonly workUnitId: Schema.String;
+        readonly leaseOwnerId: Schema.String;
+        readonly runnerReplicaId: Schema.String;
+        readonly leaseId: Schema.String;
+        readonly attempt: Schema.Int;
+        readonly fencingToken: Schema.String;
+        readonly capacitySlot: Schema.String;
+    }>;
+    fileId: Schema.String;
+    partNumbers: Schema.$Array<Schema.Int>;
+}>, Schema.Struct<{
+    readonly parts: Schema.$Array<Schema.Struct<{
+        readonly url: Schema.String;
+        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+        readonly expiresAt: Schema.String;
+        readonly partNumber: Schema.Int;
+    }>>;
+}>, typeof RunnerRpcError, typeof RunnerAuthentication, never>>;
+/** Run File uploads, under a program's orchestration lease or the Runner's verification lease. */
+export declare class RunnerRunFileRpcs extends RunnerRunFileRpcs_base {
+}
+/** What a program process may call; its bundle speaks the Runner RPC protocol version through these. */
+export declare const ProgramRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"CreateRunFile", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;
@@ -1448,31 +1518,7 @@ declare const RunnerRunFileRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"CompleteRunFile
             readonly partNumber: Schema.Int;
         }>>;
     }>]>>;
-}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"RunFileParts", Schema.Struct<{
-    lease: Schema.Struct<{
-        readonly workUnitId: Schema.String;
-        readonly leaseOwnerId: Schema.String;
-        readonly runnerReplicaId: Schema.String;
-        readonly leaseId: Schema.String;
-        readonly attempt: Schema.Int;
-        readonly fencingToken: Schema.String;
-        readonly capacitySlot: Schema.String;
-    }>;
-    fileId: Schema.String;
-    partNumbers: Schema.$Array<Schema.Int>;
-}>, Schema.Struct<{
-    readonly parts: Schema.$Array<Schema.Struct<{
-        readonly url: Schema.String;
-        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-        readonly expiresAt: Schema.String;
-        readonly partNumber: Schema.Int;
-    }>>;
-}>, typeof RunnerRpcError, typeof RunnerAuthentication, never>>;
-/** Run File uploads, under a program's orchestration lease or the Runner's verification lease. */
-export declare class RunnerRunFileRpcs extends RunnerRunFileRpcs_base {
-}
-/** What a program process may call; its bundle speaks the Runner RPC protocol version through these. */
-export declare const ProgramRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema.Struct<{
+}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"AdmitChild", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;
@@ -1639,51 +1685,7 @@ export declare const ProgramRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema
 }>, Schema.$Array<Schema.Struct<{
     readonly key: Schema.String;
     readonly taskId: Schema.String;
-}>>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateRunFile", Schema.Struct<{
-    lease: Schema.Struct<{
-        readonly workUnitId: Schema.String;
-        readonly leaseOwnerId: Schema.String;
-        readonly runnerReplicaId: Schema.String;
-        readonly leaseId: Schema.String;
-        readonly attempt: Schema.Int;
-        readonly fencingToken: Schema.String;
-        readonly capacitySlot: Schema.String;
-    }>;
-    step: Schema.String;
-    name: Schema.String;
-    caption: Schema.optional<Schema.String>;
-    contentType: Schema.String;
-    byteSize: Schema.Int;
-    sha256: Schema.String;
-}>, Schema.Struct<{
-    readonly file: Schema.Struct<{
-        readonly id: Schema.String;
-        readonly runId: Schema.String;
-        readonly step: Schema.String;
-        readonly name: Schema.String;
-        readonly caption: Schema.optionalKey<Schema.String>;
-        readonly contentType: Schema.String;
-        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
-        readonly byteSize: Schema.Int;
-        readonly sha256: Schema.String;
-        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
-    }>;
-    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
-        readonly url: Schema.String;
-        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-        readonly expiresAt: Schema.String;
-        readonly kind: Schema.Literal<"single">;
-    }>, Schema.Struct<{
-        readonly kind: Schema.Literal<"multipart">;
-        readonly partSize: Schema.Int;
-        readonly parts: Schema.$Array<Schema.Struct<{
-            readonly url: Schema.String;
-            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-            readonly expiresAt: Schema.String;
-            readonly partNumber: Schema.Int;
-        }>>;
-    }>]>>;
-}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"DeferredDone", Schema.Struct<{
+}>>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"DeferredDone", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;
@@ -1873,6 +1875,8 @@ export declare const ProgramRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema
     readonly runnerChecks: Schema.optionalKey<Schema.$Array<Schema.String>>;
     readonly approved: Schema.optionalKey<Schema.String>;
     readonly repository: Schema.optionalKey<Schema.String>;
+    readonly conflicts: Schema.optionalKey<Schema.Boolean>;
+    readonly needsRebase: Schema.optionalKey<Schema.Boolean>;
     readonly target: Schema.optionalKey<Schema.Struct<{
         readonly branch: Schema.String;
         readonly head: Schema.String;
@@ -2261,7 +2265,109 @@ export declare const ProgramRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema
     }>;
 }>, Schema.Void, typeof RunnerRpcError, typeof RunnerAuthentication, never>>;
 /** Every group, served on the one Runner RPC endpoint; a request names its procedure by tag alone. */
-export declare const RunnerRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema.Struct<{
+export declare const RunnerRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"Signals", Schema.Struct<{
+    runnerReplicaId: Schema.String;
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.TaggedStruct<"WorkAvailable", {}>, Schema.TaggedStruct<"LeaseRevoked", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"Settled", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"Canceled", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"RunSettled", {
+    readonly runId: Schema.String;
+}>, Schema.TaggedStruct<"Steer", {
+    readonly workUnitId: Schema.String;
+    readonly messageId: Schema.String;
+    readonly text: Schema.String;
+}>, Schema.TaggedStruct<"SessionUpdated", {
+    readonly workUnitId: Schema.String;
+}>, Schema.TaggedStruct<"UpdateAvailable", {
+    readonly version: Schema.String;
+}>]>, typeof RunnerRpcError>, Schema.Never, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateCheckpointFile", Schema.Struct<{
+    lease: Schema.Struct<{
+        readonly workUnitId: Schema.String;
+        readonly leaseOwnerId: Schema.String;
+        readonly runnerReplicaId: Schema.String;
+        readonly leaseId: Schema.String;
+        readonly attempt: Schema.Int;
+        readonly fencingToken: Schema.String;
+        readonly capacitySlot: Schema.String;
+    }>;
+    byteSize: Schema.Int;
+    sha256: Schema.String;
+}>, Schema.Struct<{
+    readonly file: Schema.Struct<{
+        readonly id: Schema.String;
+        readonly runId: Schema.String;
+        readonly step: Schema.String;
+        readonly name: Schema.String;
+        readonly caption: Schema.optionalKey<Schema.String>;
+        readonly contentType: Schema.String;
+        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
+        readonly byteSize: Schema.Int;
+        readonly sha256: Schema.String;
+        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
+    }>;
+    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
+        readonly url: Schema.String;
+        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+        readonly expiresAt: Schema.String;
+        readonly kind: Schema.Literal<"single">;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"multipart">;
+        readonly partSize: Schema.Int;
+        readonly parts: Schema.$Array<Schema.Struct<{
+            readonly url: Schema.String;
+            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+            readonly expiresAt: Schema.String;
+            readonly partNumber: Schema.Int;
+        }>>;
+    }>]>>;
+}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateRunFile", Schema.Struct<{
+    lease: Schema.Struct<{
+        readonly workUnitId: Schema.String;
+        readonly leaseOwnerId: Schema.String;
+        readonly runnerReplicaId: Schema.String;
+        readonly leaseId: Schema.String;
+        readonly attempt: Schema.Int;
+        readonly fencingToken: Schema.String;
+        readonly capacitySlot: Schema.String;
+    }>;
+    step: Schema.String;
+    name: Schema.String;
+    caption: Schema.optional<Schema.String>;
+    contentType: Schema.String;
+    byteSize: Schema.Int;
+    sha256: Schema.String;
+}>, Schema.Struct<{
+    readonly file: Schema.Struct<{
+        readonly id: Schema.String;
+        readonly runId: Schema.String;
+        readonly step: Schema.String;
+        readonly name: Schema.String;
+        readonly caption: Schema.optionalKey<Schema.String>;
+        readonly contentType: Schema.String;
+        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
+        readonly byteSize: Schema.Int;
+        readonly sha256: Schema.String;
+        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
+    }>;
+    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
+        readonly url: Schema.String;
+        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+        readonly expiresAt: Schema.String;
+        readonly kind: Schema.Literal<"single">;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"multipart">;
+        readonly partSize: Schema.Int;
+        readonly parts: Schema.$Array<Schema.Struct<{
+            readonly url: Schema.String;
+            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
+            readonly expiresAt: Schema.String;
+            readonly partNumber: Schema.Int;
+        }>>;
+    }>]>>;
+}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"AdmitChild", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;
@@ -2776,47 +2882,7 @@ export declare const RunnerRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema.
     readonly byteSize: Schema.Int;
     readonly sha256: Schema.String;
     readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
-}>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateCheckpointFile", Schema.Struct<{
-    lease: Schema.Struct<{
-        readonly workUnitId: Schema.String;
-        readonly leaseOwnerId: Schema.String;
-        readonly runnerReplicaId: Schema.String;
-        readonly leaseId: Schema.String;
-        readonly attempt: Schema.Int;
-        readonly fencingToken: Schema.String;
-        readonly capacitySlot: Schema.String;
-    }>;
-    byteSize: Schema.Int;
-    sha256: Schema.String;
-}>, Schema.Struct<{
-    readonly file: Schema.Struct<{
-        readonly id: Schema.String;
-        readonly runId: Schema.String;
-        readonly step: Schema.String;
-        readonly name: Schema.String;
-        readonly caption: Schema.optionalKey<Schema.String>;
-        readonly contentType: Schema.String;
-        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
-        readonly byteSize: Schema.Int;
-        readonly sha256: Schema.String;
-        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
-    }>;
-    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
-        readonly url: Schema.String;
-        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-        readonly expiresAt: Schema.String;
-        readonly kind: Schema.Literal<"single">;
-    }>, Schema.Struct<{
-        readonly kind: Schema.Literal<"multipart">;
-        readonly partSize: Schema.Int;
-        readonly parts: Schema.$Array<Schema.Struct<{
-            readonly url: Schema.String;
-            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-            readonly expiresAt: Schema.String;
-            readonly partNumber: Schema.Int;
-        }>>;
-    }>]>>;
-}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreatePlanTasks", Schema.Struct<{
+}>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreatePlanTasks", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;
@@ -2838,51 +2904,7 @@ export declare const RunnerRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema.
 }>, Schema.$Array<Schema.Struct<{
     readonly key: Schema.String;
     readonly taskId: Schema.String;
-}>>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"CreateRunFile", Schema.Struct<{
-    lease: Schema.Struct<{
-        readonly workUnitId: Schema.String;
-        readonly leaseOwnerId: Schema.String;
-        readonly runnerReplicaId: Schema.String;
-        readonly leaseId: Schema.String;
-        readonly attempt: Schema.Int;
-        readonly fencingToken: Schema.String;
-        readonly capacitySlot: Schema.String;
-    }>;
-    step: Schema.String;
-    name: Schema.String;
-    caption: Schema.optional<Schema.String>;
-    contentType: Schema.String;
-    byteSize: Schema.Int;
-    sha256: Schema.String;
-}>, Schema.Struct<{
-    readonly file: Schema.Struct<{
-        readonly id: Schema.String;
-        readonly runId: Schema.String;
-        readonly step: Schema.String;
-        readonly name: Schema.String;
-        readonly caption: Schema.optionalKey<Schema.String>;
-        readonly contentType: Schema.String;
-        readonly kind: Schema.Literals<readonly ["image", "video", "html", "text", "other"]>;
-        readonly byteSize: Schema.Int;
-        readonly sha256: Schema.String;
-        readonly status: Schema.Literals<readonly ["uploading", "available", "rejected", "refused", "removing", "removed", "expired"]>;
-    }>;
-    readonly upload: Schema.optional<Schema.Union<readonly [Schema.Struct<{
-        readonly url: Schema.String;
-        readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-        readonly expiresAt: Schema.String;
-        readonly kind: Schema.Literal<"single">;
-    }>, Schema.Struct<{
-        readonly kind: Schema.Literal<"multipart">;
-        readonly partSize: Schema.Int;
-        readonly parts: Schema.$Array<Schema.Struct<{
-            readonly url: Schema.String;
-            readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
-            readonly expiresAt: Schema.String;
-            readonly partNumber: Schema.Int;
-        }>>;
-    }>]>>;
-}>, Schema.Union<readonly [typeof RunnerRpcError, typeof RunFileRefused]>, typeof RunnerAuthentication, never> | Rpc.Rpc<"DeferredDone", Schema.Struct<{
+}>>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"DeferredDone", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;
@@ -3115,6 +3137,8 @@ export declare const RunnerRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema.
     readonly runnerChecks: Schema.optionalKey<Schema.$Array<Schema.String>>;
     readonly approved: Schema.optionalKey<Schema.String>;
     readonly repository: Schema.optionalKey<Schema.String>;
+    readonly conflicts: Schema.optionalKey<Schema.Boolean>;
+    readonly needsRebase: Schema.optionalKey<Schema.Boolean>;
     readonly target: Schema.optionalKey<Schema.Struct<{
         readonly branch: Schema.String;
         readonly head: Schema.String;
@@ -3479,25 +3503,7 @@ export declare const RunnerRpcs: RpcGroup.RpcGroup<Rpc.Rpc<"AdmitChild", Schema.
     }>>;
 }>>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"SettledRuns", Schema.Struct<{
     runIds: Schema.$Array<Schema.String>;
-}>, Schema.$Array<Schema.String>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"Signals", Schema.Struct<{
-    runnerReplicaId: Schema.String;
-}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.TaggedStruct<"WorkAvailable", {}>, Schema.TaggedStruct<"LeaseRevoked", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"Settled", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"Canceled", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"RunSettled", {
-    readonly runId: Schema.String;
-}>, Schema.TaggedStruct<"Steer", {
-    readonly workUnitId: Schema.String;
-    readonly messageId: Schema.String;
-    readonly text: Schema.String;
-}>, Schema.TaggedStruct<"SessionUpdated", {
-    readonly workUnitId: Schema.String;
-}>, Schema.TaggedStruct<"UpdateAvailable", {
-    readonly version: Schema.String;
-}>]>, typeof RunnerRpcError>, Schema.Never, typeof RunnerAuthentication, never> | Rpc.Rpc<"StartAgentStep", Schema.Struct<{
+}>, Schema.$Array<Schema.String>, typeof RunnerRpcError, typeof RunnerAuthentication, never> | Rpc.Rpc<"StartAgentStep", Schema.Struct<{
     lease: Schema.Struct<{
         readonly workUnitId: Schema.String;
         readonly leaseOwnerId: Schema.String;

package/types/packages/sdk/src/loop/activities.d.ts

@@ -265,9 +265,13 @@ export declare const PipelineStatus: Schema.Struct<{
     readonly approved: Schema.optionalKey<Schema.String>;
     /** The ChangeRequest's RepoBinding. */
     readonly repository: Schema.optionalKey<Schema.String>;
+    /** The forge says the ChangeRequest conflicts with its target; left out while it has not worked that out. */
+    readonly conflicts: Schema.optionalKey<Schema.Boolean>;
+    /** The forge says the branch must take its target in before it can merge, as a semi-linear project does. */
+    readonly needsRebase: Schema.optionalKey<Schema.Boolean>;
     /**
-     * While the pipeline fails: the head of the ChangeRequest's target branch and the forge's checks on it, none where
-     * the forge runs no pipeline. Left out when the forge could not say.
+     * While the pipeline fails, or the forge says the ChangeRequest conflicts or needs rebase: the head of its target
+     * branch and the forge's checks on it, none where the forge runs no pipeline. Left out when the forge could not say.
      */
     readonly target: Schema.optionalKey<Schema.Struct<{
         readonly branch: Schema.String;
@@ -750,6 +754,8 @@ export declare const pipelineStatus: (name: string, request: typeof ChangeReques
     readonly runnerChecks?: readonly string[];
     readonly approved?: string;
     readonly repository?: string;
+    readonly conflicts?: boolean;
+    readonly needsRebase?: boolean;
     readonly target?: {
         readonly branch: string;
         readonly head: string;

package/types/packages/sdk/src/loop/index.d.ts

@@ -13,3 +13,4 @@ export * from './measure';
 export * from './claims';
 /** What a verification is called, as a Loop's Output names one. */
 export { CheckName } from '../../../core/src/work-unit';
+export { isUnansweredQuestion, unansweredQuestionReason } from '../../../core/src/loop';