@akagilnc/pi-workflow-roles 0.1.5775 → 0.1.5797

package/src/external-host-turn-loop.ts

@@ -129,7 +129,10 @@ export async function recordTurnDelivery(
   }
 }
 
-export type ExternalPreparedTurn = Pick<PreparedRoleTurn, "prompt" | "abortSignal" | "closeRound">;
+export type ExternalPreparedTurn = Pick<
+  PreparedRoleTurn,
+  "prompt" | "abortSignal" | "closeRound" | "recordSentInstruction"
+>;
 
 export type ExternalHostRoundOutcome =
   | {
@@ -318,6 +321,9 @@ export async function driveExternalRoleTurnRounds(
       }
     }
     prompt = closure.retry.message;
+    // #1199: same-envelope 催交 / correctable retry — progress instruction is
+    // the bytes actually sent this round, not the first-mint summons.
+    prepared.recordSentInstruction?.(prompt);
     driver.afterRetry?.();
   }
 

package/src/host-contracts.ts

@@ -264,7 +264,7 @@ export interface DurablePrincipalAuthority {
 type HostSessionManager = { getLeafEntry(): HostSessionEntry | undefined; getLeafId(): string | null | undefined; getEntries(): Iterable<HostSessionEntry>; getSessionDir(): string; getSessionFile(): string | undefined; getHeader?(): { readonly type: string; readonly id?: string } | null; setSessionFile?(path: string): void; appendCustomEntry?(customType: string, data?: unknown): unknown; };
 
 /** Context supplied by a host for one activation and its interceptable events. */
-export type HostContext = { cwd: string; mode: string; model: { readonly provider: string } | undefined; sessionManager: HostSessionManager; /** Per-turn admitted run directory (#879); never process-global env. */ runDirectory?: string; /** Per-turn court attempt (#879); never process-global env. */ courtAttemptId?: string; /** Public-invocation scope (#537); never process-global env. */ invocationScopeId?: string; /** Selected host axis (#537 / ADR 0082); never process-global env invent. */ host?: string; signal?: AbortSignal | undefined; ui?: { notify?(message: string, type?: "info" | "warning" | "error"): void }; transcript?(): string; abort(): void; };
+export type HostContext = { cwd: string; mode: string; model: { readonly provider: string } | undefined; sessionManager: HostSessionManager; /** Per-turn admitted run directory (#879); never process-global env. */ runDirectory?: string; /** Per-turn court attempt (#879); never process-global env. */ courtAttemptId?: string; /** Public-invocation scope (#537); never process-global env. */ invocationScopeId?: string; /** Selected host axis (#537 / ADR 0082); never process-global env invent. */ host?: string; /** #1199 bytes actually sent to the seat this turn (progress instruction); input-seam / in-process only — never env/argv body. */ summonsInstruction?: string; signal?: AbortSignal | undefined; ui?: { notify?(message: string, type?: "info" | "warning" | "error"): void }; transcript?(): string; abort(): void; };
 
 /** Per-turn run directory; adapters must project any child-process identity. */
 export function runDirectoryFromHostContext(context: HostContext): string | undefined {

package/src/pi/adapter.ts

@@ -45,44 +45,6 @@ export function createPiRoleRuntimeExtension(
   return (pi) => createRoleRuntimeExtension(dependencies)(createPiRoleHostAdapter(pi, options));
 }
 
-/** Project Pi's activation context onto the package-owned host contract. */
-function projectPiContext(context: ExtensionContext, transcriptFromContext?: (context: ExtensionContext) => string): HostContext {
-  const sessionManager = context.sessionManager as SessionManager;
-  const host: HostContext = {
-    cwd: context.cwd,
-    mode: context.mode,
-    model: context.model === undefined ? undefined : { provider: context.model.provider },
-    ...(typeof process.env.AK_ROLE_RUN_DIR === "string" && process.env.AK_ROLE_RUN_DIR.trim() !== ""
-      ? { runDirectory: process.env.AK_ROLE_RUN_DIR }
-      : {}),
-    ...(typeof process.env.AK_ROLE_COURT_ATTEMPT === "string" && process.env.AK_ROLE_COURT_ATTEMPT.trim() !== ""
-      ? { courtAttemptId: process.env.AK_ROLE_COURT_ATTEMPT }
-      : {}),
-    ...(typeof process.env.AK_ROLE_INVOCATION_SCOPE === "string" && process.env.AK_ROLE_INVOCATION_SCOPE.trim() !== ""
-      ? { invocationScopeId: process.env.AK_ROLE_INVOCATION_SCOPE }
-      : {}),
-    ...(typeof process.env.AK_ROLE_HOST === "string" && process.env.AK_ROLE_HOST.trim() !== ""
-      ? { host: process.env.AK_ROLE_HOST.trim() }
-      : {}),
-    sessionManager: {
-      getLeafEntry: () => context.sessionManager.getLeafEntry(),
-      getLeafId: () => context.sessionManager.getLeafId(),
-      getEntries: () => context.sessionManager.getEntries(),
-      getSessionDir: () => context.sessionManager.getSessionDir(),
-      getSessionFile: () => context.sessionManager.getSessionFile(),
-      getHeader: () => context.sessionManager.getHeader(),
-      setSessionFile: (path) => sessionManager.setSessionFile(path),
-      appendCustomEntry: (customType, data) => sessionManager.appendCustomEntry(customType, data),
-    },
-    ...(context.signal === undefined ? {} : { signal: context.signal }),
-    ...(context.ui === undefined ? {} : { ui: { notify: (message, type) => context.ui.notify(message, type) } }),
-    ...(transcriptFromContext === undefined ? {} : { transcript: () => transcriptFromContext(context) }),
-    abort: () => context.abort(),
-  };
-  piContexts.set(host, context);
-  return host;
-}
-
 /** Recover the Pi context only at the Pi composition boundary. */
 export function toPiContext(context: HostContext): ExtensionContext {
   const piContext = piContexts.get(context);
@@ -158,10 +120,63 @@ export function createPiRoleHostAdapter(
   let beforeAgentStartHandlers = 0;
   // Parameters of registered terminating tools — the schema Pi was handed.
   const registeredToolParameters = new Map<string, unknown>();
-  // Decode transport exactly once before Pi's native handler chain. Pi retains
-  // its own transform/image propagation and per-handler error isolation.
+  // Pi createContext() is fresh per emit/tool (runner.js). Do not cache HostContext by
+  // ExtensionContext identity. Share only this-turn 传召词 / 催交 on the adapter instance;
+  // model and identity pointers stay live on each fresh projection (#1199).
+  let turnSummonsInstruction: string | undefined;
+  const transcriptFromContext = options.transcriptFromContext;
+  const projectPiContext = (context: ExtensionContext): HostContext => {
+    const sessionManager = context.sessionManager as SessionManager;
+    const host: HostContext = {
+      cwd: context.cwd,
+      mode: context.mode,
+      model: context.model === undefined ? undefined : { provider: context.model.provider },
+      ...(typeof process.env.AK_ROLE_RUN_DIR === "string" && process.env.AK_ROLE_RUN_DIR.trim() !== ""
+        ? { runDirectory: process.env.AK_ROLE_RUN_DIR }
+        : {}),
+      ...(typeof process.env.AK_ROLE_COURT_ATTEMPT === "string" && process.env.AK_ROLE_COURT_ATTEMPT.trim() !== ""
+        ? { courtAttemptId: process.env.AK_ROLE_COURT_ATTEMPT }
+        : {}),
+      ...(typeof process.env.AK_ROLE_INVOCATION_SCOPE === "string" && process.env.AK_ROLE_INVOCATION_SCOPE.trim() !== ""
+        ? { invocationScopeId: process.env.AK_ROLE_INVOCATION_SCOPE }
+        : {}),
+      ...(typeof process.env.AK_ROLE_HOST === "string" && process.env.AK_ROLE_HOST.trim() !== ""
+        ? { host: process.env.AK_ROLE_HOST.trim() }
+        : {}),
+      sessionManager: {
+        getLeafEntry: () => context.sessionManager.getLeafEntry(),
+        getLeafId: () => context.sessionManager.getLeafId(),
+        getEntries: () => context.sessionManager.getEntries(),
+        getSessionDir: () => context.sessionManager.getSessionDir(),
+        getSessionFile: () => context.sessionManager.getSessionFile(),
+        getHeader: () => context.sessionManager.getHeader(),
+        setSessionFile: (path) => sessionManager.setSessionFile(path),
+        appendCustomEntry: (customType, data) => sessionManager.appendCustomEntry(customType, data),
+      },
+      ...(context.signal === undefined ? {} : { signal: context.signal }),
+      ...(context.ui === undefined ? {} : { ui: { notify: (message, type) => context.ui.notify(message, type) } }),
+      ...(transcriptFromContext === undefined ? {} : { transcript: () => transcriptFromContext(context) }),
+      abort: () => context.abort(),
+    };
+    // exactOptionalPropertyTypes: wire via accessors so undefined stays "absent value"
+    // while every fresh projection shares the adapter-instance turn field.
+    Object.defineProperty(host, "summonsInstruction", {
+      enumerable: true,
+      configurable: true,
+      get: () => turnSummonsInstruction,
+      set: (value: string | undefined) => {
+        turnSummonsInstruction = value;
+      },
+    });
+    piContexts.set(host, context);
+    return host;
+  };
+  // Decode transport exactly once before Pi's native handler chain. Progress
+  // instruction is the model-facing body (what the seat actually receives) —
+  // no parallel 传召词 channel. Every input refreshes the turn field.
   pi.on("input", (value) => {
     const text = readUserDialogueStdin(value.text);
+    turnSummonsInstruction = text;
     return text === value.text ? { action: "continue" } : { action: "transform", text };
   });
   const host: RoleHost = {
@@ -172,10 +187,7 @@ export function createPiRoleHostAdapter(
     getFlag: (name) => pi.getFlag(name),
     registerTool: (tool) => {
       registeredToolParameters.set(tool.name, tool.parameters);
-      return pi.registerTool(toPiToolDefinition(
-        tool,
-        (context) => projectPiContext(context, options.transcriptFromContext),
-      ));
+      return pi.registerTool(toPiToolDefinition(tool, projectPiContext));
     },
     getAllTools: () => pi.getAllTools().map(({ name, sourceInfo }) => ({
       name,
@@ -184,7 +196,7 @@ export function createPiRoleHostAdapter(
     setActiveTools: (names) => pi.setActiveTools(names),
     getActiveTools: () => pi.getActiveTools(),
     on(...registration: HostEventRegistration) {
-      const context = (value: ExtensionContext) => projectPiContext(value, options.transcriptFromContext);
+      const context = projectPiContext;
       if (registration[0] === "before_agent_start") {
         const [, handler] = registration;
         const position = beforeAgentStartHandlers;

package/src/pi/role-turn-host.ts

@@ -438,7 +438,9 @@ export function createPiRoleTurnHost(config: PiRoleTurnHostConfig): RoleTurnHost
         config.extraPiArgs ?? [],
       );
       const args = buildExplicitInternalActivationArgs(roleEntry, extraArgs);
-      const stdin = encodeUserDialogueStdin(piUserDialogueBody(turnRequest));
+      const transportBody = piUserDialogueBody(turnRequest);
+      // #1199: progress instruction is these same body bytes (actual seat input).
+      const stdin = encodeUserDialogueStdin(transportBody);
       // Shared envelope isolates this call's court identity: omitting courtAttemptId
       // must not inherit a parent process.env.AK_ROLE_COURT_ATTEMPT (#637).
       const env: NodeJS.ProcessEnv = {
@@ -458,6 +460,9 @@ export function createPiRoleTurnHost(config: PiRoleTurnHostConfig): RoleTurnHost
       // Selected host axis (#537 / ADR 0082): omit must not inherit a parent env value.
       if (request.host === undefined || request.host.trim() === "") delete env.AK_ROLE_HOST;
       else env.AK_ROLE_HOST = request.host.trim();
+      // #1199: 传召词 is unknown-length body — never argv/env (execve ARG_MAX / E2BIG).
+      // Typed stdin envelope carries dialogue + optional progress 传召词.
+      delete env.AK_ROLE_SUMMONS_INSTRUCTION;
       // #1132: the one effective delivery-request ceiling travels to the child
       // on its own env so the in-child role runtime and the worker submission
       // gate count with the same configured number the AK seam resolved. Omit

package/src/prepared-role-turn.ts

@@ -15,6 +15,12 @@ export type PreparedRoleTurn = Readonly<{
   systemPrompt: { readonly body: string; readonly materials: readonly unknown[] };
   /** Effective user prompt after host-side input transform (canonical Skill invocation). */
   prompt: string;
+  /**
+   * #1199: book the bytes actually sent this round as progress instruction
+   * (same-envelope 催交 / correctable retry). Production prepareRoleEnvelope
+   * always provides this; test stubs may omit.
+   */
+  recordSentInstruction?(text: string): void;
   /**
    * Host abort signal armed only by typed infrastructure failure (envelope
    * rememberInfrastructureFailure / non-correctable MCP catch). Lawful

package/src/public-cli/instruction-seat-run.ts

@@ -585,7 +585,10 @@ export async function resolveReviewSeatDialogueBody(input: {
   return await loadLedgerPeerBody(sourceRunPath, input.projectRoot, input.home);
 }
 
-async function resolveInitialPrompt(
+/**
+ * Initial host prompt for this turn (#1199: progress instruction = these bytes).
+ */
+async function resolveInitialTurnPrompt(
   admitted: AdmittedRoleInvocation,
   env: InstructionSeatRunEnv,
 ): Promise<string> {
@@ -726,7 +729,7 @@ async function dispatchAdmitted(
     if (activeEnv.correlationId !== undefined && activeEnv.correlationId.trim() !== "") {
       await recordAdmittedCorrelation(admitted, activeEnv.correlationId);
     }
-    const initialPromptText = await resolveInitialPrompt(admitted, activeEnv);
+    const initialPrompt = await resolveInitialTurnPrompt(admitted, activeEnv);
     const auto = "inCallAutoResume" in record && record.inCallAutoResume === true;
     if (auto) {
       // #1208: auto-resume resends this turn's actual content, never a filler phrase.
@@ -738,14 +741,14 @@ async function dispatchAdmitted(
           admitted,
           roleTurnOptions(activeEnv, admitted, {
             kind: "initial",
-            prompt: initialPromptText,
+            prompt: initialPrompt,
           }),
         ),
         buildResumeRequest: () => buildInstructionSeatTurnRequest(
           admitted,
           roleTurnOptions(activeEnv, admitted, {
             kind: "resume",
-            prompt: initialPromptText,
+            prompt: initialPrompt,
           }),
         ),
         adapters,
@@ -760,7 +763,7 @@ async function dispatchAdmitted(
         admitted,
         roleTurnOptions(activeEnv, admitted, {
           kind: "initial",
-          prompt: initialPromptText,
+          prompt: initialPrompt,
         }),
       ),
       adapters,
@@ -899,7 +902,7 @@ function resumeSameParentInstructionSeat(input: {
 }
 
 /**
- * Same delivery rule as resolveInitialPrompt for same-parent resume summons.
+ * Same delivery rule as resolveInitialTurnPrompt for same-parent resume summons.
  * Shared resolver owns the input choice — callers only pass env fields.
  */
 async function sameParentDialogue(
@@ -1005,7 +1008,7 @@ async function runCountersignBody(
       // #1208 C1 / #1166 J11: one shared initial-prompt seam (incl. file flags).
       const turnProjection = roleTurnOptions(env, admitted, {
         kind: "initial",
-        prompt: await resolveInitialPrompt(admitted, env),
+        prompt: await resolveInitialTurnPrompt(admitted, env),
       });
       const turnRequest = buildInstructionSeatTurnRequest(admitted, turnProjection);
       const result = await runPostAdmissionOneShot({

package/src/public-cli/invocation.ts

@@ -23,12 +23,14 @@ import { resolveBookKeyFromGit } from "../activation-ledger-git.ts";
 import {
   ensureRoleRunDirectory,
   ensureRoleRunPlacement,
-  formatRunLeaf,
   isUnboundRunDirectory,
   listBookRunDirectories,
   roleRunPlacement,
+  sessionDirectoryOf,
+  sessionFileIn,
   type RoleRunSubject,
 } from "../role-run-placement.ts";
+import { relocateTicketProgressForLeg } from "../ticket-progress.ts";
 import type {
   DurablePrincipal,
   DurablePrincipalAuthority,
@@ -580,15 +582,101 @@ export async function recordAdmittedCorrelation(
   mutable.correlationIds = correlationIds;
 }
 
+/**
+ * #1199 R2: registered 起居郎 legs that already belong on this ticket.
+ * Unbound source → whole-leg rename + publish; already under ticket → publish
+ * leftover staging only. No scan of unregistered siblings.
+ */
+async function relocateRegisteredChildDiarists(input: {
+  readonly parentRunDirectory: string;
+  readonly bookKey: string;
+  readonly ticketNumber: number;
+  readonly projectRoot: string;
+  readonly ledgerHome: string;
+  readonly authority: DurablePrincipalAuthority;
+}): Promise<void> {
+  const childRunIds = readPageSync(input.parentRunDirectory, "admitted")?.childDiaristRunIds;
+  for (const childRunId of Array.isArray(childRunIds) ? childRunIds : []) {
+    if (typeof childRunId !== "string") continue;
+    const childTarget = roleRunPlacement(input.ledgerHome, {
+      bookKey: input.bookKey,
+      subject: { ticketNumber: input.ticketNumber },
+      runId: childRunId,
+      role: "diarist",
+    });
+    const unboundChildDirectory = roleRunPlacement(input.ledgerHome, {
+      bookKey: input.bookKey,
+      subject: { unbound: true },
+      runId: childRunId,
+      role: "diarist",
+    }).runDirectory;
+
+    if (existsSync(unboundChildDirectory)) {
+      input.authority.seal(childTarget);
+      await bindTicketNumberOnRunDirectory(unboundChildDirectory, input.ticketNumber);
+      await rehomeUnboundTicketProvenance(
+        unboundChildDirectory,
+        input.ticketNumber,
+        input.projectRoot,
+        homeFromRunDirectory(input.parentRunDirectory),
+      );
+      ensureRoleRunDirectory(input.ledgerHome, dirname(childTarget.runDirectory));
+      // #1199: whole-leg rename first; originals travel with the directory.
+      await rename(unboundChildDirectory, childTarget.runDirectory);
+      relocateTicketProgressForLeg({
+        runDirectory: childTarget.runDirectory,
+      });
+      // Finished child legs will not settle again; refresh derived host.original
+      // after the rename commit. A derived render fault must not undo or block
+      // the committed placement (#1161 L1) — note and keep the true cause.
+      try {
+        renderCurrentSync(childTarget.runDirectory);
+      } catch (error) {
+        process.stderr.write(
+          `[invocation] current.json render refused after child relocate; placement kept: ${childTarget.runDirectory}: ${errorText(error)}\n`,
+        );
+      }
+      continue;
+    }
+
+    // Prior partial relocate left the child under the ticket with staging still held.
+    if (existsSync(childTarget.runDirectory)) {
+      relocateTicketProgressForLeg({
+        runDirectory: childTarget.runDirectory,
+      });
+    }
+  }
+}
+
 /** File a role run under its latest typed ticket identity. */
 export async function relocateAdmittedRunToTicket(
   admitted: AdmittedRoleInvocation,
   authority: DurablePrincipalAuthority,
   heldLease?: { relocate(runDirectory: string): void },
 ): Promise<RunDirectoryRelocation | undefined> {
-  if (admitted.ticketNumber === undefined || !isUnboundRunDirectory(admitted.runDirectory)) return undefined;
+  if (admitted.ticketNumber === undefined) return undefined;
+
+  const ledgerHome = resolveActivationLedgerHome(homeFromRunDirectory(admitted.runDirectory));
+
+  // Already under the ticket: publish leftover progress.jsonl (self + registered children).
+  if (!isUnboundRunDirectory(admitted.runDirectory)) {
+    relocateTicketProgressForLeg({
+      runDirectory: admitted.runDirectory,
+    });
+    if (admitted.role !== "diarist") {
+      await relocateRegisteredChildDiarists({
+        parentRunDirectory: admitted.runDirectory,
+        bookKey: admitted.bookKey,
+        ticketNumber: admitted.ticketNumber,
+        projectRoot: admitted.projectRoot,
+        ledgerHome,
+        authority,
+      });
+    }
+    return undefined;
+  }
+
   const oldRunDirectory = admitted.runDirectory;
-  const ledgerHome = resolveActivationLedgerHome(homeFromRunDirectory(oldRunDirectory));
   const target = roleRunPlacement(ledgerHome, {
     bookKey: admitted.bookKey,
     subject: { ticketNumber: admitted.ticketNumber },
@@ -596,39 +684,18 @@ export async function relocateAdmittedRunToTicket(
     role: admitted.role,
   });
   ensureRoleRunDirectory(ledgerHome, dirname(target.runDirectory));
-  // Host sealing is pure identity projection, but may reject the coordinates.
-  // Keep that failure before the filesystem commit point.
-  const principal = authority.seal(target);
+  // Pre-flight seal; final seal after the filesystem commit.
+  authority.seal(target);
 
   if (admitted.role !== "diarist") {
-    const childRunIds = readPageSync(oldRunDirectory, "admitted")?.childDiaristRunIds;
-    for (const childRunId of Array.isArray(childRunIds) ? childRunIds : []) {
-      if (typeof childRunId !== "string") continue;
-      const childDirectory = join(dirname(oldRunDirectory), formatRunLeaf(childRunId, "diarist"));
-      // A child that already filed under a ticket keeps its own assertion.
-      if (!existsSync(childDirectory)) continue;
-      const childTarget = roleRunPlacement(ledgerHome, {
-        bookKey: admitted.bookKey,
-        subject: { ticketNumber: admitted.ticketNumber },
-        runId: childRunId,
-        role: "diarist",
-      });
-      authority.seal(childTarget);
-      await bindTicketNumberOnRunDirectory(childDirectory, admitted.ticketNumber);
-      await rehomeUnboundTicketProvenance(childDirectory, admitted.ticketNumber, admitted.projectRoot, homeFromRunDirectory(oldRunDirectory));
-      ensureRoleRunDirectory(ledgerHome, dirname(childTarget.runDirectory));
-      await rename(childDirectory, childTarget.runDirectory);
-      // Finished child legs will not settle again; refresh derived host.original
-      // after the rename commit. A derived render fault must not undo or block
-      // the committed placement (#1161 L1) — note and keep the true cause.
-      try {
-        renderCurrentSync(childTarget.runDirectory);
-      } catch (error) {
-        process.stderr.write(
-          `[invocation] current.json render refused after child relocate; placement kept: ${childTarget.runDirectory}: ${errorText(error)}\n`,
-        );
-      }
-    }
+    await relocateRegisteredChildDiarists({
+      parentRunDirectory: oldRunDirectory,
+      bookKey: admitted.bookKey,
+      ticketNumber: admitted.ticketNumber,
+      projectRoot: admitted.projectRoot,
+      ledgerHome,
+      authority,
+    });
   }
 
   // The first ticket assignment moves only an unbound diarist's own diary.
@@ -637,21 +704,32 @@ export async function relocateAdmittedRunToTicket(
   }
 
   // Rename commits the run placement. Diary assignment above is a Sitian append
-  // outside the atomic directory move.
-  // Persisted paths are resolved from typed run identity on read.
+  // outside the atomic directory move. Session/receipts/progress travel with the leg.
   await rename(oldRunDirectory, target.runDirectory);
 
   // rename moved the open lock inode with the directory. Transfer cleanup and
-  // admitted path ownership immediately after the commit — before any derived
-  // render that may refuse (#1161 L1 / BASE order).
+  // live path ownership immediately after the commit — before final seal/render
+  // (#1161 L1 / BASE order). Live handles first so mid-turn setSessionFile sees
+  // the ticket leaf; final seal uses the post-move existence landing.
   heldLease?.relocate(target.runDirectory);
 
+  const actualSessionDirectory = sessionDirectoryOf(target.runDirectory);
+  const principal = authority.seal({
+    sessionDirectory: actualSessionDirectory,
+    sessionFile: sessionFileIn(actualSessionDirectory),
+  });
+
   rewriteAdmittedRoleRunPage(
     admitted as unknown as Record<string, unknown>,
     [{ oldRunDirectory, newRunDirectory: target.runDirectory }],
   );
   (admitted as { principal: DurablePrincipal }).principal = principal;
 
+  // After whole-leg rename + live-handle handoff: fill rounds and append ticket current.
+  relocateTicketProgressForLeg({
+    runDirectory: target.runDirectory,
+  });
+
   // current.json projects host.original from this run directory. Ownership is
   // already transferred; a refuse still carries the true cause to the caller
   // (#1161 L1) without leaving the leg under the unbound path.

package/src/public-cli/post-admission.ts

@@ -835,6 +835,7 @@ function buildReceiptDeliveryRequest(input: {
   receiptDelivery: ReturnType<typeof createReceiptDeliveryPolicy>;
 }): RoleTurnRequest {
   const { request, receiptDelivery } = input;
+  // #1199: progress instruction is this turn's prompt (envelope books continuation.prompt).
   return {
     ...request,
     continuation: {
@@ -1696,6 +1697,7 @@ export function resumeTurnRequestProjectionOptions(
   const officerDialogue = isStationChildOfficerDialogue(admitted.role, env);
   const fileFlags = summonsPrepared?.attachments ?? [];
   let prompt: string;
+  // #1199: progress instruction = this prompt (actual seat input, file flags included).
   if (request.message !== undefined) {
     if (summonsPrepared !== undefined) {
       // #755: same-ticket review / open-court — caller words + caller file flags.
@@ -1743,7 +1745,7 @@ export function resumeTurnRequestProjectionOptions(
 /** Shared new-turn and in-call auto-resume projection. Seat code supplies prompt and activation. */
 export function roleTurnOptions(
   env: PostAdmissionEnv,
-  admitted: { readonly correlationId?: string },
+  admitted: { readonly correlationId?: string; readonly instruction?: string },
   continuation: RoleTurnRequest["continuation"],
 ): RoleTurnRequestProjectionOptions {
   const correlationId = env.correlationId ?? admitted.correlationId;

package/src/public-cli/run-lifecycle.ts

@@ -28,7 +28,7 @@ import type { NotarySourceRunLocator } from "../notary-contracts.ts";
 import {
   retainedRunPathsMatch,
   rewriteAdmittedRoleRunPage,
-  rewriteRunDirectoryPathValue,
+  rewritePrincipalSessionPaths,
 } from "../role-run-relocation.ts";
 import type { PublicThinkingLevel } from "./registry.ts";
 import {
@@ -290,14 +290,16 @@ async function readRoleRunStateDisk(
       : runDirectory;
   const runDir = runDirectory;
   // Principal wire stays uninterpreted — authority owns legacy sessionFile fallback.
+  // #1199: leg-local session/ moves with the run-prefix rewrite.
+  const principalCoords = {
+    sessionDirectory: record.sessionDirectory,
+    ...(typeof record.sessionFile === "string" ? { sessionFile: record.sessionFile } : {}),
+  };
+  rewritePrincipalSessionPaths(principalCoords, storedRunDirectory, runDirectory);
   const principalWire: RoleRunPrincipalWire = {
-    sessionDirectory: rewriteRunDirectoryPathValue(
-      record.sessionDirectory,
-      storedRunDirectory,
-      runDirectory,
-    ) as string,
-    ...(typeof record.sessionFile === "string"
-      ? { sessionFile: rewriteRunDirectoryPathValue(record.sessionFile, storedRunDirectory, runDirectory) as string }
+    sessionDirectory: principalCoords.sessionDirectory as string,
+    ...(typeof principalCoords.sessionFile === "string"
+      ? { sessionFile: principalCoords.sessionFile }
       : {}),
   };
   const phase =

package/src/public-cli/turn-request.ts

@@ -131,6 +131,9 @@ export function projectRoleTurnRequest(
     ...(options.deliveryRequestLimit === undefined
       ? {}
       : { deliveryRequestLimit: options.deliveryRequestLimit }),
+    ...(options.host === undefined || options.host.trim() === ""
+      ? {}
+      : { host: options.host.trim() }),
   };
 }
 

package/src/report-ticket-tool.ts

@@ -141,6 +141,7 @@ export async function reportTicketFromHostContext(
     if (process.env.AK_ROLE_RUN_DIR === runDirectory) {
       process.env.AK_ROLE_RUN_DIR = nextDirectory;
     }
+    // Leg-local session/: rewrite the open handle under the renamed run prefix.
     const projectedSessionFile = typeof priorSessionFile === "string" && priorSessionFile.trim() !== ""
       ? rewriteRunDirectoryPathValue(priorSessionFile, runDirectory, nextDirectory)
       : sessionFileOf(nextDirectory);
@@ -148,9 +149,12 @@ export async function reportTicketFromHostContext(
       context.sessionManager.setSessionFile?.(projectedSessionFile);
     }
   };
-  const relocation = alreadyPlaced
-    ? undefined
-    : await relocateAdmittedRunToTicket(admitted, authority, { relocate: applyLiveHandles });
+  // Always enter relocate: unbound→rename+publish; already-on-ticket→publish leftover staging.
+  const relocation = await relocateAdmittedRunToTicket(
+    admitted,
+    authority,
+    alreadyPlaced ? undefined : { relocate: applyLiveHandles },
+  );
   const nextDirectory = relocation?.newRunDirectory ?? admitted.runDirectory;
   if (relocation === undefined) applyLiveHandles(nextDirectory);
 

package/src/role-envelope.ts

@@ -704,6 +704,8 @@ export async function prepareRoleEnvelope(options: {
       const record = value as Record<string, unknown>;
       if (record.action === "transform" && typeof record.text === "string") prompt = record.text;
     }
+    // #1199: progress instruction = bytes actually handed to the seat this turn.
+    context.summonsInstruction = prompt;
     // Book the user assignment so judge audit subjects recover it from parent books.
     if (typeof prompt === "string" && prompt.trim() !== "") {
       sessionEntries.push({
@@ -751,6 +753,9 @@ export async function prepareRoleEnvelope(options: {
       }],
       systemPrompt: { body: systemPromptBody, materials: readingMaterials },
       prompt,
+      recordSentInstruction(text: string) {
+        context.summonsInstruction = text;
+      },
       abortSignal: hostAbort.signal,
       closeRound,
       dispose,

package/src/role-run-placement.ts

@@ -34,12 +34,28 @@ export function parseRunLeaf(name: string): { readonly runId: string; readonly r
   return { runId: name.slice(0, at), role: name.slice(at + 1) };
 }
 
+export const ROLE_RUN_SESSION_FILENAME = "session.jsonl";
+
+/**
+ * Ticket or unbound subject directory owning a run under `<subject>/runs/<leaf>`.
+ * Used by ticket-progress relative paths — not a second session landing.
+ */
+export function subjectDirectoryOfRun(runDirectory: string): string | undefined {
+  const runsParent = dirname(runDirectory);
+  if (basename(runsParent) !== "runs") return undefined;
+  const subjectDirectory = dirname(runsParent);
+  const subjectName = basename(subjectDirectory);
+  if (subjectName === "unbound" || /^[1-9]\d*$/.test(subjectName)) {
+    return subjectDirectory;
+  }
+  return undefined;
+}
+
+/** #1199 / main: session originals stay under the leg — `<run>/session`. */
 export function sessionDirectoryOf(runDirectory: string): string {
   return join(runDirectory, "session");
 }
 
-export const ROLE_RUN_SESSION_FILENAME = "session.jsonl";
-
 export function sessionFileIn(sessionDirectory: string): string {
   return join(sessionDirectory, ROLE_RUN_SESSION_FILENAME);
 }
@@ -177,5 +193,6 @@ export function ensureRoleRunPlacement(
   ledgerHome: string,
   placement: RoleRunPlacement,
 ): void {
+  ensureRoleRunDirectory(ledgerHome, placement.runDirectory);
   ensureRoleRunDirectory(ledgerHome, placement.sessionDirectory);
 }

package/src/role-run-relocation.ts

@@ -13,7 +13,7 @@ import { dirname, join } from "node:path";
 import { activationBookDirectory, physicalPathIdentity } from "./activation-ledger-topology.ts";
 import { AUDITOR_PARENT_ATTEMPT_BINDING_ENTRY_TYPE } from "./compliance-transport.ts";
 import { readRoleRunIdentity } from "./public-cli/run-lifecycle.ts";
-import { roleRunPlacement } from "./role-run-placement.ts";
+import { roleRunPlacement, sessionDirectoryOf } from "./role-run-placement.ts";
 import {
   INVOCATION_PAGE_PATH_FIELDS,
   PRINCIPAL_SESSION_PATH_FIELDS,
@@ -267,7 +267,7 @@ async function rewriteNestedMachinePathPages(
   pagesDirectory: string,
   rewrites: readonly RunDirectoryPathRewrite[],
 ): Promise<void> {
-  const sessionRoot = join(pagesDirectory, "session");
+  const sessionRoot = sessionDirectoryOf(pagesDirectory);
   async function walk(directory: string): Promise<void> {
     let entries;
     try {