@sublang/playbook 12.3.0 → 13.1.0

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,

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

@@ -35,6 +35,11 @@ interface PlaybookCaptainUnresolvedEffectSettlementInput {
 type SnapshotAgentEnvelope = DeepReadonly<Omit<SessionAgent, 'model' | 'effort' | 'fastMode'>>;
 type PlayerLedgerSnapshotEntry = DeepReadonly<PlayerLedgerEntry>;
 export interface PlaybookCaptainDeps {
+    continuity?: {
+        beforeCall(participantId: string): Promise<void>;
+        acknowledged(participantId: string, token: string): void;
+        reset(participantId: string, reason: 'missing_hint' | 'rejected_hint'): Promise<void>;
+    };
     loadModule?: (specifier: string) => Promise<unknown>;
     createSessionId?: () => string;
     hostCapabilities?: Readonly<Record<string, PlaybookHostConstructionCapabilities>>;

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

@@ -949,6 +949,7 @@ function normalizeHostPlayerResult(value, expectedPlayerId) {
         'resumeToken',
         'finalText',
         'error',
+        'errorCode',
     ]);
     const normalized = {};
     for (const key of Reflect.ownKeys(descriptors)) {
@@ -970,11 +971,16 @@ function normalizeHostPlayerResult(value, expectedPlayerId) {
             normalized[key] = descriptor.value;
     }
     const record = snapshotRecord(snapshotJsonValue(normalized, path), path);
-    rejectSnapshotKeys(record, ['status', 'playerId', 'turnId', 'resumeToken', 'finalText', 'error'], path);
+    rejectSnapshotKeys(record, ['status', 'playerId', 'turnId', 'resumeToken', 'finalText', 'error', 'errorCode'], path);
     if (record.playerId !== expectedPlayerId) {
         throw new TypeError(`${path}.playerId does not match the requested player`);
     }
     snapshotInteger(record.turnId, `${path}.turnId`, 1);
+    if (record.errorCode !== undefined &&
+        (record.errorCode !== 'SESSION_RESUME_REJECTED' ||
+            record.status !== 'error' || record.resumeToken !== undefined)) {
+        throw new TypeError(`${path}.errorCode is not a definite resume rejection`);
+    }
     return validatePlayerResult({
         status: record.status,
         ...(record.resumeToken === undefined
@@ -1629,6 +1635,7 @@ export function createPlaybookCaptainShell(options, deps = {}) {
     const createSessionId = deps.createSessionId ?? randomUUID;
     const createCaptainRuntime = deps.createCaptainRuntime ?? createDefaultCaptainRuntime;
     const unresolvedEffectSettlement = deps.unresolvedEffectSettlement;
+    const continuity = deps.continuity;
     let pendingHostCapabilities = deps.hostCapabilities;
     let currentEffectLedger = () => emptyPlaybookEffectLedger();
     // The returned shell must not retain the caller's aggregate dependency
@@ -2592,6 +2599,9 @@ export function createPlaybookCaptainShell(options, deps = {}) {
             if (!ledger) {
                 throw new Error(`${frameLabel(frame)} resolved absent session player ${JSON.stringify(binding.playerId)}`);
             }
+            if (options.freshPrompt !== undefined && typeof options.freshPrompt !== 'string') {
+                throw new TypeError('player freshPrompt must be a string');
+            }
             const expectedResume = ledger.resumeToken ?? false;
             if (options.resume !== expectedResume) {
                 throw new Error(`${frameLabel(frame)} player continuation changed before dispatch`);
@@ -2615,11 +2625,32 @@ export function createPlaybookCaptainShell(options, deps = {}) {
             try {
                 let rawResult;
                 try {
-                    rawResult = await trackHostCall(frame, classifySettingsCall(() => context.callPlayer(binding.playerId, prompt, {
-                        resume: options.resume,
-                        settings,
-                    })));
-                    hostResolved = true;
+                    const call = async (resume) => {
+                        await continuity?.beforeCall(binding.playerId);
+                        signal.throwIfAborted();
+                        const raw = await trackHostCall(frame, classifySettingsCall(() => context.callPlayer(binding.playerId, resume === false ? options.freshPrompt ?? prompt : prompt, { resume, settings })));
+                        hostResolved = true;
+                        return raw;
+                    };
+                    if (options.resume === false) {
+                        await continuity?.reset(binding.playerId, 'missing_hint');
+                    }
+                    rawResult = await call(options.resume);
+                    normalizeHostPlayerResult(rawResult, binding.playerId);
+                    if (typeof options.resume === 'string' && options.resume.length > 0 &&
+                        Object.getOwnPropertyDescriptor(rawResult, 'errorCode')?.value ===
+                            'SESSION_RESUME_REJECTED') {
+                        if (playerTransactions.get(binding.playerId) !== calling ||
+                            calling.abandoned || signal.aborted || activeTurn !== admittedTurn ||
+                            frame.playerCallScope !== scope || !frames.includes(frame)) {
+                            signal.throwIfAborted();
+                            throw new Error(`${frameLabel(frame)} player rejection arrived after its runtime operation ended`);
+                        }
+                        delete ledger.resumeToken;
+                        await continuity?.reset(binding.playerId, 'rejected_hint');
+                        hostResolved = false;
+                        rawResult = await call(false);
+                    }
                 }
                 catch (error) {
                     if (error instanceof AgentSettingsPreflightError) {
@@ -2914,6 +2945,9 @@ export function createPlaybookCaptainShell(options, deps = {}) {
                     delete ledger.resumeToken;
                 else
                     ledger.resumeToken = resumeToken;
+                if (pending.status === 'ok' && resumeToken !== undefined) {
+                    continuity?.acknowledged(binding.playerId, resumeToken);
+                }
             }
             finally {
                 playerTransactions.delete(binding.playerId);
@@ -4109,7 +4143,7 @@ export function createPlaybookCaptainShell(options, deps = {}) {
     };
     class CaptainContinuityError extends Error {
         constructor(cause) {
-            super('the session Captain conversation could not be resynchronized after one reseeded re-issue', { cause });
+            super('the session Captain conversation lost continuity', { cause });
             this.name = 'CaptainContinuityError';
         }
     }
@@ -4121,6 +4155,8 @@ export function createPlaybookCaptainShell(options, deps = {}) {
     }
     const rawDurableCall = async (context, prompt, resume, attempt) => {
         const queued = captainQueue.add(async () => {
+            context.signal.throwIfAborted();
+            await continuity?.beforeCall('captain');
             context.signal.throwIfAborted();
             attempt.providerBoundaryEntered = true;
             const result = await classifySettingsCall(() => context.callCaptain(prompt, {
@@ -4134,11 +4170,8 @@ export function createPlaybookCaptainShell(options, deps = {}) {
         });
         return trackTurnCall(queued);
     };
-    // CAPTAIN-35: unsynchronized when the call throws, returns non-`ok`, or
-    // returns `ok` without a token. Exactly one re-issue on a fresh conversation
-    // seeded with the reseed digest plus the current ControlView digest. A
-    // conversation that is owed a reseed carries the digest on its very next
-    // call, so the turn after a failed reseed starts seeded rather than blank.
+    // Only proven pre-execution rejection permits an immediate fresh call.
+    // Other continuity loss leaves the journal reseed for the next Boss turn.
     const durableCall = async (context, compose) => {
         const startingConversation = conversation;
         const resume = startingConversation.kind === 'pinned'
@@ -4153,6 +4186,8 @@ export function createPlaybookCaptainShell(options, deps = {}) {
         let result;
         let failure;
         try {
+            if (resume === false)
+                await continuity?.reset('captain', 'missing_hint');
             result = await rawDurableCall(context, compose(seedFirstCall
                 ? { reseedDigest: reseedDigest() }
                 : startingConversation.kind === 'needsCatchUp'
@@ -4187,9 +4222,10 @@ export function createPlaybookCaptainShell(options, deps = {}) {
         const unsynchronized = failure !== undefined ||
             result === undefined ||
             result.status !== 'ok' ||
-            result.resumeToken === undefined;
+            typeof result.resumeToken !== 'string' || result.resumeToken.trim().length === 0;
         if (!unsynchronized) {
             conversation = { kind: 'pinned', token: result.resumeToken };
+            continuity?.acknowledged('captain', result.resumeToken);
             if (activeTurn) {
                 activeTurn.captainSyncedJournalSeq = representedJournalSeq;
             }
@@ -4205,6 +4241,11 @@ export function createPlaybookCaptainShell(options, deps = {}) {
         // stays `needsSeeding` until a call comes back with a token, so a reseed
         // that itself fails leaves the obligation standing for the next turn.
         conversation = { kind: 'needsSeeding' };
+        if (typeof resume !== 'string' || resume.length === 0 ||
+            result?.status !== 'error' || result.errorCode !== 'SESSION_RESUME_REJECTED') {
+            throw markControlFailure(new CaptainContinuityError(failure ?? result?.error ?? 'callCaptain did not establish continuation'));
+        }
+        await continuity?.reset('captain', 'rejected_hint');
         const recap = reseedDigest();
         let reissued;
         const reissueAttempt = { providerBoundaryEntered: false };
@@ -4221,11 +4262,12 @@ export function createPlaybookCaptainShell(options, deps = {}) {
             }
             throw markControlFailure(new CaptainContinuityError(error));
         }
-        if (reissued.status !== 'ok' || reissued.resumeToken === undefined) {
+        if (reissued.status !== 'ok' || typeof reissued.resumeToken !== 'string' || reissued.resumeToken.trim().length === 0) {
             throw markControlFailure(new CaptainContinuityError(reissued.error ??
                 `callCaptain status "${reissued.status}" without a resume token`));
         }
         conversation = { kind: 'pinned', token: reissued.resumeToken };
+        continuity?.acknowledged('captain', reissued.resumeToken);
         if (activeTurn)
             activeTurn.captainSyncedJournalSeq = journalSeq;
         return {

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

@@ -103,6 +103,11 @@ type SnapshotAgentEnvelope = DeepReadonly<
 type PlayerLedgerSnapshotEntry = DeepReadonly<PlayerLedgerEntry>;
 
 export interface PlaybookCaptainDeps {
+  continuity?: {
+    beforeCall(participantId: string): Promise<void>;
+    acknowledged(participantId: string, token: string): void;
+    reset(participantId: string, reason: 'missing_hint' | 'rejected_hint'): Promise<void>;
+  };
   loadModule?: (specifier: string) => Promise<unknown>;
   createSessionId?: () => string;
   hostCapabilities?: Readonly<
@@ -1819,6 +1824,7 @@ function normalizeHostPlayerResult(
     'resumeToken',
     'finalText',
     'error',
+    'errorCode',
   ]);
   const normalized: Record<string, unknown> = {};
   for (const key of Reflect.ownKeys(descriptors)) {
@@ -1841,13 +1847,18 @@ function normalizeHostPlayerResult(
   const record = snapshotRecord(snapshotJsonValue(normalized, path), path);
   rejectSnapshotKeys(
     record,
-    ['status', 'playerId', 'turnId', 'resumeToken', 'finalText', 'error'],
+    ['status', 'playerId', 'turnId', 'resumeToken', 'finalText', 'error', 'errorCode'],
     path,
   );
   if (record.playerId !== expectedPlayerId) {
     throw new TypeError(`${path}.playerId does not match the requested player`);
   }
   snapshotInteger(record.turnId, `${path}.turnId`, 1);
+  if (record.errorCode !== undefined &&
+      (record.errorCode !== 'SESSION_RESUME_REJECTED' ||
+       record.status !== 'error' || record.resumeToken !== undefined)) {
+    throw new TypeError(`${path}.errorCode is not a definite resume rejection`);
+  }
   return validatePlayerResult(
     {
       status: record.status,
@@ -2988,6 +2999,7 @@ export function createPlaybookCaptainShell(
     PlaybookCaptainDeps['createCaptainRuntime']
   > = deps.createCaptainRuntime ?? createDefaultCaptainRuntime;
   const unresolvedEffectSettlement = deps.unresolvedEffectSettlement;
+  const continuity = deps.continuity;
   let pendingHostCapabilities = deps.hostCapabilities;
   let currentEffectLedger = () => emptyPlaybookEffectLedger();
   // The returned shell must not retain the caller's aggregate dependency
@@ -4349,6 +4361,9 @@ export function createPlaybookCaptainShell(
           `${frameLabel(frame)} resolved absent session player ${JSON.stringify(binding.playerId)}`,
         );
       }
+      if (options.freshPrompt !== undefined && typeof options.freshPrompt !== 'string') {
+        throw new TypeError('player freshPrompt must be a string');
+      }
       const expectedResume = ledger.resumeToken ?? false;
       if (options.resume !== expectedResume) {
         throw new Error(
@@ -4376,16 +4391,37 @@ export function createPlaybookCaptainShell(
       try {
         let rawResult: unknown;
         try {
-          rawResult = await trackHostCall(
-            frame,
-            classifySettingsCall(() =>
-              context.callPlayer(binding.playerId, prompt, {
-                resume: options.resume,
-                settings,
-              }),
-            ),
-          );
-          hostResolved = true;
+          const call = async (resume: string | false): Promise<unknown> => {
+            await continuity?.beforeCall(binding.playerId);
+            signal.throwIfAborted();
+            const raw = await trackHostCall(
+              frame,
+              classifySettingsCall(() =>
+                context.callPlayer(binding.playerId, resume === false ? options.freshPrompt ?? prompt : prompt, { resume, settings }),
+              ),
+            );
+            hostResolved = true;
+            return raw;
+          };
+          if (options.resume === false) {
+            await continuity?.reset(binding.playerId, 'missing_hint');
+          }
+          rawResult = await call(options.resume);
+          normalizeHostPlayerResult(rawResult, binding.playerId);
+          if (typeof options.resume === 'string' && options.resume.length > 0 &&
+              Object.getOwnPropertyDescriptor(rawResult as object, 'errorCode')?.value ===
+                'SESSION_RESUME_REJECTED') {
+            if (playerTransactions.get(binding.playerId) !== calling ||
+                calling.abandoned || signal.aborted || activeTurn !== admittedTurn ||
+                frame.playerCallScope !== scope || !frames.includes(frame)) {
+              signal.throwIfAborted();
+              throw new Error(`${frameLabel(frame)} player rejection arrived after its runtime operation ended`);
+            }
+            delete ledger.resumeToken;
+            await continuity?.reset(binding.playerId, 'rejected_hint');
+            hostResolved = false;
+            rawResult = await call(false);
+          }
         } catch (error) {
           if (error instanceof AgentSettingsPreflightError) {
             if (
@@ -4739,6 +4775,9 @@ export function createPlaybookCaptainShell(
       try {
         if (resumeToken === undefined) delete ledger.resumeToken;
         else ledger.resumeToken = resumeToken;
+        if (pending.status === 'ok' && resumeToken !== undefined) {
+          continuity?.acknowledged(binding.playerId, resumeToken);
+        }
       } finally {
         playerTransactions.delete(binding.playerId);
       }
@@ -6161,7 +6200,7 @@ export function createPlaybookCaptainShell(
   class CaptainContinuityError extends Error {
     constructor(cause: unknown) {
       super(
-        'the session Captain conversation could not be resynchronized after one reseeded re-issue',
+        'the session Captain conversation lost continuity',
         { cause },
       );
       this.name = 'CaptainContinuityError';
@@ -6185,8 +6224,11 @@ export function createPlaybookCaptainShell(
     finalText?: string;
     resumeToken?: string;
     error?: string;
+    errorCode?: 'SESSION_RESUME_REJECTED';
   }> => {
     const queued = captainQueue.add(async () => {
+      context.signal.throwIfAborted();
+      await continuity?.beforeCall('captain');
       context.signal.throwIfAborted();
       attempt.providerBoundaryEntered = true;
       const result = await classifySettingsCall(() =>
@@ -6205,14 +6247,12 @@ export function createPlaybookCaptainShell(
       finalText?: string;
       resumeToken?: string;
       error?: string;
+      errorCode?: 'SESSION_RESUME_REJECTED';
     }>;
   };
 
-  // CAPTAIN-35: unsynchronized when the call throws, returns non-`ok`, or
-  // returns `ok` without a token. Exactly one re-issue on a fresh conversation
-  // seeded with the reseed digest plus the current ControlView digest. A
-  // conversation that is owed a reseed carries the digest on its very next
-  // call, so the turn after a failed reseed starts seeded rather than blank.
+  // Only proven pre-execution rejection permits an immediate fresh call.
+  // Other continuity loss leaves the journal reseed for the next Boss turn.
   const durableCall = async (
     context: CaptainContext,
     compose: (options: { reseedDigest?: string }) => string,
@@ -6229,10 +6269,11 @@ export function createPlaybookCaptainShell(
     const representedJournalSeq = journalSeq;
     const firstAttempt = { providerBoundaryEntered: false };
     let result:
-      | { status: string; finalText?: string; resumeToken?: string; error?: string }
+      | { status: string; finalText?: string; resumeToken?: string; error?: string; errorCode?: 'SESSION_RESUME_REJECTED' }
       | undefined;
     let failure: unknown;
     try {
+      if (resume === false) await continuity?.reset('captain', 'missing_hint');
       result = await rawDurableCall(
         context,
         compose(
@@ -6279,9 +6320,10 @@ export function createPlaybookCaptainShell(
       failure !== undefined ||
       result === undefined ||
       result.status !== 'ok' ||
-      result.resumeToken === undefined;
+      typeof result.resumeToken !== 'string' || result.resumeToken.trim().length === 0;
     if (!unsynchronized) {
       conversation = { kind: 'pinned', token: result!.resumeToken! };
+      continuity?.acknowledged('captain', result!.resumeToken!);
       if (activeTurn) {
         activeTurn.captainSyncedJournalSeq = representedJournalSeq;
       }
@@ -6297,9 +6339,16 @@ export function createPlaybookCaptainShell(
     // stays `needsSeeding` until a call comes back with a token, so a reseed
     // that itself fails leaves the obligation standing for the next turn.
     conversation = { kind: 'needsSeeding' };
+    if (typeof resume !== 'string' || resume.length === 0 ||
+        result?.status !== 'error' || result.errorCode !== 'SESSION_RESUME_REJECTED') {
+      throw markControlFailure(new CaptainContinuityError(
+        failure ?? result?.error ?? 'callCaptain did not establish continuation',
+      ));
+    }
+    await continuity?.reset('captain', 'rejected_hint');
     const recap = reseedDigest();
     let reissued:
-      | { status: string; finalText?: string; resumeToken?: string; error?: string }
+      | { status: string; finalText?: string; resumeToken?: string; error?: string; errorCode?: 'SESSION_RESUME_REJECTED' }
       | undefined;
     const reissueAttempt = { providerBoundaryEntered: false };
     try {
@@ -6319,7 +6368,7 @@ export function createPlaybookCaptainShell(
       }
       throw markControlFailure(new CaptainContinuityError(error));
     }
-    if (reissued.status !== 'ok' || reissued.resumeToken === undefined) {
+    if (reissued.status !== 'ok' || typeof reissued.resumeToken !== 'string' || reissued.resumeToken.trim().length === 0) {
       throw markControlFailure(
         new CaptainContinuityError(
           reissued.error ??
@@ -6328,6 +6377,7 @@ export function createPlaybookCaptainShell(
       );
     }
     conversation = { kind: 'pinned', token: reissued.resumeToken };
+    continuity?.acknowledged('captain', reissued.resumeToken);
     if (activeTurn) activeTurn.captainSyncedJournalSeq = journalSeq;
     return {
       ...(reissued.finalText !== undefined