@sublang/playbook 13.0.0 → 13.2.0

package/reference/sdlc/branch.playbook/branch.playbook.ts

@@ -0,0 +1,217 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2026 SubLang International <https://sublang.ai>
+//
+// Generated by slc/link.md (FSM-to-Runtime linker).
+// Source FSM:    ./branch.fsm.ts
+// Role metadata: Coder→coder (canonical local role)
+// Boss event:    deterministic START_BRANCH entry; exact Boss text becomes
+//                callerInput; pending Coder questions retain BOSS_REPLY
+// Adjudication:  LLM judge for the one Coder state; coderOutput is carried
+//                verbatim; baseRevision is receipt-owned effect evidence —
+//                the unchanged receipt's observed HEAD — never taken from
+//                Coder's prose
+// Compat:        artifact schema 3 / runtime ABI 1
+
+import {
+  createXStatePlaybookRuntime,
+  composePlayerContinuation,
+  snapshotJsonValue,
+  type PlaybookPlayerInput,
+  type XStatePlaybookRuntimeFactory,
+  type XStatePlaybookRuntimeConstruction,
+  type XStatePlaybookRuntimeSpecV3,
+} from '@sublang/playbook/xstate-runtime';
+import {
+  branchMachine,
+  type BranchInput,
+  type PlayerInput,
+} from './branch.fsm.js';
+import type { PlaybookHostConstructionCapabilities } from '../code.playbook/playbook-captain.js';
+import type {
+  CaptainCallOptions,
+  CaptainResult,
+  JsonValue,
+  NormalizedError,
+  PlayerCallOptions,
+  PlaybookCallRequest,
+  PlaybookCallResult,
+  PlaybookCallStart,
+  PlaybookControlReceipt,
+  PlaybookControlView,
+  PlaybookPendingCall,
+  PlaybookPorts,
+  PlaybookRunResult,
+  PlaybookRuntime,
+  PlaybookRuntimeFactory,
+  PlaybookRuntimeSnapshot,
+  PlaybookSession,
+  PlaybookState,
+  PlaybookStateValue,
+  PlaybookTraceEvent,
+  PlaybookTraceType,
+  PlayerResult,
+  PlayerSessionStore,
+} from '@sublang/playbook/runtime';
+
+export type {
+  CaptainCallOptions,
+  CaptainResult,
+  JsonValue,
+  NormalizedError,
+  PlayerCallOptions,
+  PlaybookCallRequest,
+  PlaybookCallResult,
+  PlaybookCallStart,
+  PlaybookControlReceipt,
+  PlaybookControlView,
+  PlaybookPendingCall,
+  PlaybookPorts,
+  PlaybookRunResult,
+  PlaybookRuntime,
+  PlaybookRuntimeFactory,
+  PlaybookRuntimeSnapshot,
+  PlaybookSession,
+  PlaybookState,
+  PlaybookStateValue,
+  PlaybookTraceEvent,
+  PlaybookTraceType,
+  PlayerResult,
+  PlayerSessionStore,
+};
+
+export type BranchPlaybookOptions = BranchInput;
+export type BranchPlaybookHostCapabilities =
+  PlaybookHostConstructionCapabilities &
+    XStatePlaybookRuntimeConstruction<BranchPlaybookOptions, object>['hostCapabilities'];
+
+const PLACEHOLDER = /<(#|[A-Za-z_$][A-Za-z0-9_$-]*)>/g;
+
+const VERBATIM_PAYLOAD_FIELDS: ReadonlySet<string> = new Set([
+  'coderOutput',
+]);
+const UNFINISHED_FINAL_STATE_IDS: ReadonlySet<string> = new Set(['refused']);
+
+function snapshotBranchOptions(value: unknown): BranchPlaybookOptions {
+  const captured = snapshotJsonValue(value, 'BRANCH runtime options');
+  if (
+    captured === null ||
+    typeof captured !== 'object' ||
+    Array.isArray(captured)
+  ) {
+    throw new TypeError('BRANCH runtime options must be an object');
+  }
+  const record = captured as Readonly<Record<string, JsonValue>>;
+  for (const key of Object.keys(record)) {
+    throw new TypeError(`BRANCH runtime options.${key} is not declared`);
+  }
+  return captured as unknown as BranchPlaybookOptions;
+}
+
+function placeholderField(token: string): string {
+  if (token === '#') return 'irNumber';
+  return token.replace(/-([A-Za-z0-9_$])/g, (_match, next: string) =>
+    next.toUpperCase(),
+  );
+}
+
+function quotedContinuation(value: string): string {
+  return value.replaceAll('\n', '\n> ');
+}
+
+/**
+ * Preserve authored Markdown quote markers around every line of relayed
+ * runtime text. The generic composer preserves the marker itself; BRANCH's
+ * override additionally keeps a multiline caller input inside that quote.
+ */
+function composePlayerPrompt(input: PlayerInput, resuming = false): string {
+  const fields = input as unknown as Record<string, unknown>;
+  const body = input.prompt.replace(
+    PLACEHOLDER,
+    (match: string, token: string, offset: number, source: string) => {
+      const value = fields[placeholderField(token)];
+      if (typeof value !== 'string') return match;
+      const lineStart = source.lastIndexOf('\n', offset - 1) + 1;
+      const literal = source.slice(lineStart, offset);
+      return literal.startsWith('> ') ? quotedContinuation(value) : value;
+    },
+  );
+  return composePlayerContinuation(input, body, resuming);
+}
+
+export const _internal = {
+  composePlayerPrompt,
+  VERBATIM_PAYLOAD_FIELDS,
+  UNFINISHED_FINAL_STATE_IDS,
+};
+
+const runtimeSpec = {
+  label: 'BRANCH',
+  // DR-022 / slc/link.md: the declaration carries the value current at link
+  // time — a literal, never the loading engine's RUNTIME_ABI self-report,
+  // which would follow whatever engine loads the module and make the
+  // factory's skew check compare that engine with itself.
+  compat: { artifactSchema: 3, runtimeAbi: 1 },
+  snapshotOptions: snapshotBranchOptions,
+  entryEvent: {
+    type: 'START_BRANCH',
+    textField: 'callerInput',
+    // `startBranch` copies the entry text here, so the failure-state retry
+    // reads it back from the persisted machine snapshot and survives a
+    // continued session (DR-034).
+    contextField: 'callerInput',
+  },
+  roleStates: {
+    createBranch: {
+      role: 'coder',
+      label:
+        'Coder is reading the named issue and creating and checking out a new branch at the current commit.',
+    },
+  },
+  // DR-050: BRANCH owns no repository commit — every Coder outcome, including
+  // the Boss question for an ambiguous request, is governed with the
+  // `unchanged` repository disposition, because a new branch at the current
+  // commit changes neither HEAD's OID nor the worktree projection.
+  outcomeAuthority: {
+    governedPlayerStates: {
+      createBranch: {
+        branched: {
+          fields: {
+            branch: 'semantic',
+            // DR-045: the unchanged receipt observes the commit the branch
+            // was created from as HEAD; the reconciler injects it here.
+            baseRevision: 'effect',
+            issueSummary: 'semantic',
+          },
+          repositoryDisposition: 'unchanged',
+        },
+        refused: {
+          fields: { coderOutput: 'presentation' },
+          repositoryDisposition: 'unchanged',
+        },
+        needsBossReply: {
+          fields: { question: 'presentation' },
+          repositoryDisposition: 'unchanged',
+        },
+      },
+    },
+  },
+  composePlayerPrompt: (input: PlaybookPlayerInput, _identity, resuming) =>
+    composePlayerPrompt(input as PlayerInput, resuming),
+  verbatimPayloadFields: VERBATIM_PAYLOAD_FIELDS,
+  controlContextFields: [],
+  unfinishedFinalStateIds: UNFINISHED_FINAL_STATE_IDS,
+  transitionEventFields: ['callerInput', 'answer', 'questionId'],
+} satisfies XStatePlaybookRuntimeSpecV3<BranchPlaybookOptions>;
+
+const createPlaybookRuntime: XStatePlaybookRuntimeFactory<
+  XStatePlaybookRuntimeConstruction<
+    BranchPlaybookOptions,
+    BranchPlaybookHostCapabilities
+  >,
+  3
+> = createXStatePlaybookRuntime<
+  BranchPlaybookOptions,
+  BranchPlaybookHostCapabilities
+>(branchMachine, runtimeSpec);
+
+export default createPlaybookRuntime;

package/reference/sdlc/branch.playbook/branch.registry.d.ts

@@ -0,0 +1,40 @@
+import { type BranchPlaybookHostCapabilities, type PlaybookRuntime } from './branch.playbook.js';
+export interface PlaybookSummaryPolicy {
+    stateCountLabels: Readonly<Record<string, string>>;
+    copyPasteGuardNames: readonly string[];
+    savedCountsLine(counts: {
+        interruptions: number;
+        copyPastes: number;
+    }, rounds: number): string;
+}
+export type BranchOptions = Readonly<Record<string, never>>;
+export interface BranchPlaybookRegistryEntry {
+    id: 'branch';
+    command: 'branch';
+    intent: string;
+    artifactSchema: 3;
+    runtimeProfile: {
+        readonly kind: 'shared-factory';
+        readonly compat: {
+            readonly artifactSchema: 3;
+            readonly runtimeAbi: number;
+        };
+    };
+    requiredRoleIds: readonly ['coder'];
+    concurrentRoleSets: readonly [];
+    summaryPolicy: PlaybookSummaryPolicy;
+    validateOptions(optionSlice: unknown): BranchOptions;
+    createRuntime(options: BranchOptions, hostCapabilities: BranchPlaybookHostCapabilities): PlaybookRuntime;
+}
+export declare const branchStateCountLabels: {
+    readonly createBranch: "branching round";
+};
+export declare const branchCopyPasteGuardNames: readonly ["branched"];
+export declare function branchSavedCountsLine(counts: {
+    interruptions: number;
+    copyPastes: number;
+}, rounds: number): string;
+export declare const branchSummaryPolicy: PlaybookSummaryPolicy;
+export declare function validateBranchOptions(optionSlice: unknown): BranchOptions;
+export declare const branchPlaybookRegistryEntry: BranchPlaybookRegistryEntry;
+export default branchPlaybookRegistryEntry;

package/reference/sdlc/branch.playbook/branch.registry.js

@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2026 SubLang International <https://sublang.ai>
+import createPlaybookRuntime from './branch.playbook.js';
+// BRANCH's one Coder call is its only round: the branching call that reads
+// the issue and creates and checks out the branch.
+export const branchStateCountLabels = {
+    createBranch: 'branching round',
+};
+export const branchCopyPasteGuardNames = ['branched'];
+function countNoun(count, singular, plural = `${singular}s`) {
+    return `${count} ${count === 1 ? singular : plural}`;
+}
+export function branchSavedCountsLine(counts, rounds) {
+    return [
+        'Saved you',
+        countNoun(counts.interruptions, 'interruption'),
+        'and',
+        countNoun(counts.copyPastes, 'copy-paste'),
+        'across',
+        countNoun(rounds, 'round'),
+        'of branching.',
+    ].join(' ');
+}
+export const branchSummaryPolicy = {
+    stateCountLabels: branchStateCountLabels,
+    copyPasteGuardNames: branchCopyPasteGuardNames,
+    savedCountsLine: branchSavedCountsLine,
+};
+export function validateBranchOptions(optionSlice) {
+    if (optionSlice === undefined)
+        return Object.freeze({});
+    if (optionSlice === null ||
+        typeof optionSlice !== 'object' ||
+        Array.isArray(optionSlice)) {
+        throw new Error('captain.options.playbooks.branch.options must be an object');
+    }
+    const keys = Object.keys(optionSlice);
+    if (keys.length > 0) {
+        throw new Error(`Unknown config field captain.options.playbooks.branch.options.${keys[0]}`);
+    }
+    return Object.freeze({});
+}
+export const branchPlaybookRegistryEntry = {
+    id: 'branch',
+    command: 'branch',
+    intent: 'create and check out a new branch for a GitHub issue or request before pull-request delivery',
+    artifactSchema: 3,
+    runtimeProfile: Object.freeze({
+        kind: 'shared-factory',
+        compat: createPlaybookRuntime.compat,
+    }),
+    requiredRoleIds: ['coder'],
+    concurrentRoleSets: [],
+    summaryPolicy: branchSummaryPolicy,
+    validateOptions: validateBranchOptions,
+    createRuntime(options, hostCapabilities) {
+        return createPlaybookRuntime({
+            configuredOptions: options,
+            hostCapabilities,
+        });
+    },
+};
+export default branchPlaybookRegistryEntry;

package/reference/sdlc/branch.playbook/branch.registry.ts

@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2026 SubLang International <https://sublang.ai>
+
+import createPlaybookRuntime, {
+  type BranchPlaybookHostCapabilities,
+  type PlaybookRuntime,
+} from './branch.playbook.js';
+
+export interface PlaybookSummaryPolicy {
+  stateCountLabels: Readonly<Record<string, string>>;
+  copyPasteGuardNames: readonly string[];
+  savedCountsLine(
+    counts: { interruptions: number; copyPastes: number },
+    rounds: number,
+  ): string;
+}
+
+export type BranchOptions = Readonly<Record<string, never>>;
+
+export interface BranchPlaybookRegistryEntry {
+  id: 'branch';
+  command: 'branch';
+  intent: string;
+  artifactSchema: 3;
+  runtimeProfile: {
+    readonly kind: 'shared-factory';
+    readonly compat: {
+      readonly artifactSchema: 3;
+      readonly runtimeAbi: number;
+    };
+  };
+  requiredRoleIds: readonly ['coder'];
+  concurrentRoleSets: readonly [];
+  summaryPolicy: PlaybookSummaryPolicy;
+  validateOptions(optionSlice: unknown): BranchOptions;
+  createRuntime(
+    options: BranchOptions,
+    hostCapabilities: BranchPlaybookHostCapabilities,
+  ): PlaybookRuntime;
+}
+
+// BRANCH's one Coder call is its only round: the branching call that reads
+// the issue and creates and checks out the branch.
+export const branchStateCountLabels = {
+  createBranch: 'branching round',
+} as const;
+
+export const branchCopyPasteGuardNames = ['branched'] as const;
+
+function countNoun(
+  count: number,
+  singular: string,
+  plural = `${singular}s`,
+): string {
+  return `${count} ${count === 1 ? singular : plural}`;
+}
+
+export function branchSavedCountsLine(
+  counts: { interruptions: number; copyPastes: number },
+  rounds: number,
+): string {
+  return [
+    'Saved you',
+    countNoun(counts.interruptions, 'interruption'),
+    'and',
+    countNoun(counts.copyPastes, 'copy-paste'),
+    'across',
+    countNoun(rounds, 'round'),
+    'of branching.',
+  ].join(' ');
+}
+
+export const branchSummaryPolicy: PlaybookSummaryPolicy = {
+  stateCountLabels: branchStateCountLabels,
+  copyPasteGuardNames: branchCopyPasteGuardNames,
+  savedCountsLine: branchSavedCountsLine,
+};
+
+export function validateBranchOptions(optionSlice: unknown): BranchOptions {
+  if (optionSlice === undefined) return Object.freeze({});
+  if (
+    optionSlice === null ||
+    typeof optionSlice !== 'object' ||
+    Array.isArray(optionSlice)
+  ) {
+    throw new Error(
+      'captain.options.playbooks.branch.options must be an object',
+    );
+  }
+  const keys = Object.keys(optionSlice);
+  if (keys.length > 0) {
+    throw new Error(
+      `Unknown config field captain.options.playbooks.branch.options.${keys[0]}`,
+    );
+  }
+  return Object.freeze({});
+}
+
+export const branchPlaybookRegistryEntry: BranchPlaybookRegistryEntry = {
+  id: 'branch',
+  command: 'branch',
+  intent:
+    'create and check out a new branch for a GitHub issue or request before pull-request delivery',
+  artifactSchema: 3,
+  runtimeProfile: Object.freeze({
+    kind: 'shared-factory',
+    compat: createPlaybookRuntime.compat,
+  }),
+  requiredRoleIds: ['coder'],
+  concurrentRoleSets: [],
+  summaryPolicy: branchSummaryPolicy,
+  validateOptions: validateBranchOptions,
+  createRuntime(options, hostCapabilities) {
+    return createPlaybookRuntime({
+      configuredOptions: options,
+      hostCapabilities,
+    });
+  },
+};
+
+export default branchPlaybookRegistryEntry;

package/reference/sdlc/code.md

@@ -25,6 +25,9 @@ When the nested `review` call fails outside that authored result contract, `code
 
 At the start of the first phase, Captain shall relay to Coder the complete caller input and any relevant run results in quotes (`>`), along with the following instruction:
 
+> Original request: <caller-input>
+> Run results: <run-results>
+
 ```markdown
 First determine whether the coding request starts a new coding intent or continues an existing IR with unfinished work.
 If the request may continue an existing IR but does not identify it unambiguously, ask Boss before changing files.
@@ -44,6 +47,10 @@ Consult @specs/map.md for relevant context and @specs/meta.md for spec requireme
 
 At the start of every later IR-task phase, Captain shall relay to Coder the original caller input, the IR identity, and any relevant run results in quotes (`>`), along with the following instruction:
 
+> Original request: <caller-input>
+> IR number: <ir-number>
+> Run results: <run-results>
+
 ```markdown
 Read the identified IR and implement exactly its next unfinished task, including corresponding tests or specs if any.
 Do not implement a later task in this phase.

package/reference/sdlc/code.playbook/code.fsm.js

@@ -12,8 +12,8 @@ const APPENDED_PHASE_PROMPT = [
     'Coder is <coder-llm>.',
 ];
 const FIRST_PHASE_PROMPT = [
-    '> <caller-input>',
-    '> <run-results>',
+    '> Original request: <caller-input>',
+    '> Run results: <run-results>',
     '',
     'First determine whether the coding request starts a new coding intent or continues an existing IR with unfinished work.',
     'If the request may continue an existing IR but does not identify it unambiguously, ask Boss before changing files.',
@@ -33,9 +33,9 @@ const FIRST_PHASE_PROMPT = [
     ...APPENDED_PHASE_PROMPT,
 ].join('\n');
 const IR_TASK_PROMPT = [
-    '> <caller-input>',
-    '> <ir-number>',
-    '> <run-results>',
+    '> Original request: <caller-input>',
+    '> IR number: <ir-number>',
+    '> Run results: <run-results>',
     '',
     'Read the identified IR and implement exactly its next unfinished task, including corresponding tests or specs if any.',
     'Do not implement a later task in this phase.',

package/reference/sdlc/code.playbook/code.fsm.ts

@@ -156,8 +156,8 @@ const APPENDED_PHASE_PROMPT = [
 ];
 
 const FIRST_PHASE_PROMPT = [
-  '> <caller-input>',
-  '> <run-results>',
+  '> Original request: <caller-input>',
+  '> Run results: <run-results>',
   '',
   'First determine whether the coding request starts a new coding intent or continues an existing IR with unfinished work.',
   'If the request may continue an existing IR but does not identify it unambiguously, ask Boss before changing files.',
@@ -178,9 +178,9 @@ const FIRST_PHASE_PROMPT = [
 ].join('\n');
 
 const IR_TASK_PROMPT = [
-  '> <caller-input>',
-  '> <ir-number>',
-  '> <run-results>',
+  '> Original request: <caller-input>',
+  '> IR number: <ir-number>',
+  '> Run results: <run-results>',
   '',
   'Read the identified IR and implement exactly its next unfinished task, including corresponding tests or specs if any.',
   'Do not implement a later task in this phase.',

package/reference/sdlc/code.playbook/code.gears.md

@@ -13,8 +13,8 @@ Roles:
 
 When the first coding phase begins, Captain shall prompt Coder:
 
-> > <caller-input>
-> > <run-results>
+> > Original request: <caller-input>
+> > Run results: <run-results>
 >
 > First determine whether the coding request starts a new coding intent or continues an existing IR with unfinished work.
 > If the request may continue an existing IR but does not identify it unambiguously, ask Boss before changing files.
@@ -63,9 +63,9 @@ Workflow outcomes:
 
 When a later IR-task phase begins, Captain shall prompt Coder:
 
-> > <caller-input>
-> > <ir-number>
-> > <run-results>
+> > Original request: <caller-input>
+> > IR number: <ir-number>
+> > Run results: <run-results>
 >
 > Read the identified IR and implement exactly its next unfinished task, including corresponding tests or specs if any.
 > Do not implement a later task in this phase.

package/reference/sdlc/code.playbook/code.playbook.d.ts

@@ -10,7 +10,7 @@ export type CodePlaybookHostCapabilities = PlaybookHostConstructionCapabilities
  * runtime text. The generic composer preserves the marker itself; CODE's
  * override additionally keeps a multiline value inside that quote.
  */
-declare function composePlayerPrompt(input: PlayerInput, promptIdentity: XStatePromptIdentity): string;
+declare function composePlayerPrompt(input: PlayerInput, promptIdentity: XStatePromptIdentity, resuming?: boolean): string;
 export declare const _internal: {
     composePlayerPrompt: typeof composePlayerPrompt;
     VERBATIM_PAYLOAD_FIELDS: ReadonlySet<string>;

package/reference/sdlc/code.playbook/code.playbook.js

@@ -10,11 +10,10 @@
 //                the first phase decides among four semantic outcomes
 // Nested call:   literal review target through the shared bridge
 // Compat:        artifact schema 3 / runtime ABI 1
-import { createXStatePlaybookRuntime, snapshotJsonValue, } from '@sublang/playbook/xstate-runtime';
+import { createXStatePlaybookRuntime, composePlayerContinuation, snapshotJsonValue, } from '@sublang/playbook/xstate-runtime';
 import { codingMachine, } from './code.fsm.js';
 const OPTION_KEYS = new Set(['runResults']);
 const PLACEHOLDER = /<(#|[A-Za-z_$][A-Za-z0-9_$-]*)>/g;
-const CONTINUATION_PREAMBLE = 'You previously paused this task to ask Boss a question; Boss has now replied. Continue the same task using the reply below.';
 const VERBATIM_PAYLOAD_FIELDS = new Set([
     'coderOutput',
 ]);
@@ -52,11 +51,11 @@ function quoteContinuation(value) {
  * runtime text. The generic composer preserves the marker itself; CODE's
  * override additionally keeps a multiline value inside that quote.
  */
-function composePlayerPrompt(input, promptIdentity) {
+function composePlayerPrompt(input, promptIdentity, resuming = false) {
     const fields = input;
     const template = input.prompt
         .split('\n')
-        .filter((line) => !(line === '> <run-results>' && input.runResults.length === 0))
+        .filter((line) => !(line === '> Run results: <run-results>' && input.runResults.length === 0))
         .join('\n');
     const body = template.replace(PLACEHOLDER, (match, token, offset, source) => {
         const value = token === 'coder-llm'
@@ -66,18 +65,9 @@ function composePlayerPrompt(input, promptIdentity) {
             return match;
         const lineStart = source.lastIndexOf('\n', offset - 1) + 1;
         const literal = source.slice(lineStart, offset);
-        return literal === '> ' ? quoteContinuation(value) : value;
+        return literal.startsWith('> ') ? quoteContinuation(value) : value;
     });
-    if (input.pendingBossQuestion === undefined ||
-        input.bossReply === undefined) {
-        return body;
-    }
-    return [
-        CONTINUATION_PREAMBLE,
-        `Boss question:\n${input.pendingBossQuestion.question}`,
-        `Boss reply:\n${input.bossReply}`,
-        body,
-    ].join('\n\n');
+    return composePlayerContinuation(input, body, resuming);
 }
 export const _internal = {
     composePlayerPrompt,
@@ -177,7 +167,7 @@ const runtimeSpec = {
             },
         },
     },
-    composePlayerPrompt: (input, promptIdentity) => composePlayerPrompt(input, promptIdentity),
+    composePlayerPrompt: (input, promptIdentity, resuming) => composePlayerPrompt(input, promptIdentity, resuming),
     verbatimPayloadFields: VERBATIM_PAYLOAD_FIELDS,
     controlContextFields: ['phase'],
     unfinishedFinalStateIds: UNFINISHED_FINAL_STATE_IDS,

package/reference/sdlc/code.playbook/code.playbook.ts

@@ -13,6 +13,7 @@
 
 import {
   createXStatePlaybookRuntime,
+  composePlayerContinuation,
   snapshotJsonValue,
   type PlaybookPlayerInput,
   type XStatePlaybookRuntimeFactory,
@@ -85,8 +86,6 @@ export type CodePlaybookHostCapabilities =
 
 const OPTION_KEYS = new Set(['runResults']);
 const PLACEHOLDER = /<(#|[A-Za-z_$][A-Za-z0-9_$-]*)>/g;
-const CONTINUATION_PREAMBLE =
-  'You previously paused this task to ask Boss a question; Boss has now replied. Continue the same task using the reply below.';
 
 const VERBATIM_PAYLOAD_FIELDS: ReadonlySet<string> = new Set([
   'coderOutput',
@@ -135,12 +134,13 @@ function quoteContinuation(value: string): string {
 function composePlayerPrompt(
   input: PlayerInput,
   promptIdentity: XStatePromptIdentity,
+  resuming = false,
 ): string {
   const fields = input as unknown as Record<string, unknown>;
   const template = input.prompt
     .split('\n')
     .filter(
-      (line) => !(line === '> <run-results>' && input.runResults.length === 0),
+      (line) => !(line === '> Run results: <run-results>' && input.runResults.length === 0),
     )
     .join('\n');
   const body = template.replace(
@@ -153,21 +153,10 @@ function composePlayerPrompt(
       if (typeof value !== 'string') return match;
       const lineStart = source.lastIndexOf('\n', offset - 1) + 1;
       const literal = source.slice(lineStart, offset);
-      return literal === '> ' ? quoteContinuation(value) : value;
+      return literal.startsWith('> ') ? quoteContinuation(value) : value;
     },
   );
-  if (
-    input.pendingBossQuestion === undefined ||
-    input.bossReply === undefined
-  ) {
-    return body;
-  }
-  return [
-    CONTINUATION_PREAMBLE,
-    `Boss question:\n${input.pendingBossQuestion.question}`,
-    `Boss reply:\n${input.bossReply}`,
-    body,
-  ].join('\n\n');
+  return composePlayerContinuation(input, body, resuming);
 }
 
 export const _internal = {
@@ -273,7 +262,8 @@ const runtimeSpec = {
   composePlayerPrompt: (
     input: PlaybookPlayerInput,
     promptIdentity: XStatePromptIdentity,
-  ) => composePlayerPrompt(input as PlayerInput, promptIdentity),
+    resuming?: boolean,
+  ) => composePlayerPrompt(input as PlayerInput, promptIdentity, resuming),
   verbatimPayloadFields: VERBATIM_PAYLOAD_FIELDS,
   controlContextFields: ['phase'],
   unfinishedFinalStateIds: UNFINISHED_FINAL_STATE_IDS,