@akagilnc/pi-workflow-roles 0.1.5845 → 0.1.5855

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

@@ -21,10 +21,6 @@ import {
   copyAndRecordHostDossier,
   recordNativeSessionPointer,
 } from "../host-session-record.ts";
-import {
-  NAVIGATOR_OUTPUT_TOOL_NAME,
-  navigatorProseFromUnknown,
-} from "../package-contracts/navigator-output.ts";
 import {
   renderSystemPromptOverride,
   resolveBoundHostSessionId,
@@ -33,54 +29,6 @@ import {
 } from "../prepared-role-turn.ts";
 import { acpModelId, type AcpHostDescription } from "./description.ts";
 
-import { isRecord } from "../unknown-value.ts";
-
-/**
- * #959: collect free-form agent text from ACP session/update stream.
- * Used only when the navigator seat spoke prose without calling the output tool.
- * ACP agent speech is only agent_message / agent_message_chunk — never user,
- * thought, or other *_message kinds (load replay must not poison the bucket).
- *
- * Standard ACP nests under params.update: { sessionUpdate, content }.
- * Flat params.sessionUpdate / string params.update remain accepted for host variants.
- */
-function acpAgentTextChunk(params: Readonly<Record<string, unknown>>): string | undefined {
-  let kind: unknown;
-  let content: unknown;
-  let textFallback: unknown;
-
-  const nested = params.update;
-  if (isRecord(nested)) {
-    const record = nested as Record<string, unknown>;
-    kind = record.sessionUpdate;
-    content = record.content;
-    textFallback = record.text;
-  } else {
-    kind = params.sessionUpdate ?? nested;
-    content = params.content;
-    textFallback = params.text;
-  }
-
-  if (kind !== "agent_message_chunk" && kind !== "agent_message") return undefined;
-  if (typeof content === "string" && content.length > 0) return content;
-  if (isRecord(content)) {
-    const record = content as Record<string, unknown>;
-    if (typeof record.text === "string" && record.text.length > 0) return record.text;
-  }
-  if (Array.isArray(content)) {
-    const parts: string[] = [];
-    for (const part of content) {
-      if (typeof part === "string" && part.length > 0) parts.push(part);
-      else if (typeof part === "object" && part !== null) {
-        const record = part as Record<string, unknown>;
-        if (typeof record.text === "string" && record.text.length > 0) parts.push(record.text);
-      }
-    }
-    if (parts.length > 0) return parts.join("");
-  }
-  if (typeof textFallback === "string" && textFallback.length > 0) return textFallback;
-  return undefined;
-}
 
 /** ACP v1 surface used by the generic ACP adapter. Protocol details stay in this module. */
 export interface AcpConnection {
@@ -279,20 +227,6 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
         params: Readonly<Record<string, unknown>>,
       ): Promise<Readonly<Record<string, unknown>>> => connection!.request(method, params);
 
-      // #959: navigator free-form agent text — only while session/prompt is in flight.
-      // session/load replays history via session/update; those must not enter the bucket
-      // (resume / set_model load would otherwise prepend prior turns as "this turn" prose).
-      const agentProseChunks: string[] = [];
-      let collectAgentProse = false;
-      connection.onNotification?.((method, params) => {
-        const isSessionUpdate = method === "session/update";
-        if (!isSessionUpdate) return;
-        if (collectAgentProse) {
-          const chunk = acpAgentTextChunk(params);
-          if (chunk !== undefined) agentProseChunks.push(chunk);
-        }
-      });
-
       const initialized = await rpc("initialize", {
           protocolVersion: 1,
           clientCapabilities: {},
@@ -387,26 +321,15 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
               outputSchema: deliveredSchema,
             }, "acp-host");
             let result: Readonly<Record<string, unknown>>;
-            // Open the prose gate only for this prompt round; clear any stale chunks first.
-            agentProseChunks.length = 0;
-            collectAgentProse = prepared.terminatingToolName === NAVIGATOR_OUTPUT_TOOL_NAME;
-            try {
-              result = await raceAgainstHostAbort(
-                activeConnection.request("session/prompt", {
-                  sessionId: activeSessionId,
-                  prompt: [{ type: "text", text: prompt }],
-                }),
-                abortSignal,
-                "ACP host aborted",
-              );
-            } catch (error) {
-              collectAgentProse = false;
-              agentProseChunks.length = 0;
-              throw error;
-            }
-            collectAgentProse = false;
+            result = await raceAgainstHostAbort(
+              activeConnection.request("session/prompt", {
+                sessionId: activeSessionId,
+                prompt: [{ type: "text", text: prompt }],
+              }),
+              abortSignal,
+              "ACP host aborted",
+            );
             if (result.stopReason === "refusal") {
-              agentProseChunks.length = 0;
               reportedFailure = { diagnostic: result.stopReason, details: result };
               return {
                 status: "terminal",
@@ -418,18 +341,6 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
                 },
               };
             }
-            // #959: navigator prose exit when the model spoke without the output tool.
-            // Tool path still wins via MCP; ingest is a no-op once the tool already sealed.
-            // Emptiness via shared projector; payload keeps original bytes (LLM 原话过手).
-            if (prepared.terminatingToolName === NAVIGATOR_OUTPUT_TOOL_NAME) {
-              const prose = agentProseChunks.join("");
-              agentProseChunks.length = 0;
-              if (navigatorProseFromUnknown(prose) !== undefined) {
-                await prepared.ingestStructuredOutput({ prose });
-              }
-            } else {
-              agentProseChunks.length = 0;
-            }
             return { status: "delivered", stderr: activeConnection.stderr?.() ?? "" };
           },
           async afterAccepted() {

package/src/headless-host/description.ts

@@ -433,8 +433,6 @@ export function codexTurnArgs(options: {
   /**
    * Absolute path for the native `--output-schema` flag.
    * File holds the Codex-strict transport projection of the open declaration (#1148).
-   * Optional: omit for direct navigator prose exit (#959); attendance byStatus
-   * prepare mounts it via RoleTurnRequest.navigatorByStatusPrepare (#1160).
    */
   readonly outputSchemaPath?: string;
   readonly mcpServers: readonly Readonly<Record<string, unknown>>[];

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

@@ -46,7 +46,6 @@ import {
   isCodexExecDescription,
   type HeadlessHostDescription,
 } from "./description.ts";
-import { NAVIGATOR_OUTPUT_TOOL_NAME } from "../package-contracts/navigator-output.ts";
 
 import { errorText, isRecord } from "../unknown-value.ts";
 
@@ -392,7 +391,7 @@ function terminalFromSpawned(
 function buildTurnArgs(options: {
   readonly description: HeadlessHostDescription;
   readonly systemPromptPath: string;
-  /** Open schema for Claude --json-schema; omit for #959 navigator prose-exit seats. */
+  /** Open schema for Claude --json-schema. */
   readonly jsonSchema?: Readonly<Record<string, unknown>>;
   readonly mcpServers: readonly Readonly<Record<string, unknown>>[];
   readonly mcpConfigPath?: string;
@@ -408,7 +407,6 @@ function buildTurnArgs(options: {
     if (options.sessionKind === "resume" && !options.sessionId) {
       throw new Error("codex resume requires a bound thread_id");
     }
-    // Codex always mounts --output-schema when the path is supplied (incl. navigator byStatus #1160).
     return codexTurnArgs({
       systemPromptPath: options.systemPromptPath,
       ...(options.outputSchemaPath === undefined ? {} : { outputSchemaPath: options.outputSchemaPath }),
@@ -429,7 +427,6 @@ function buildTurnArgs(options: {
   return headlessTurnArgs({
     description: options.description,
     systemPromptPath: options.systemPromptPath,
-    // #959: navigator omits --json-schema so free-form prose is a lawful exit.
     ...(options.jsonSchema === undefined ? {} : { jsonSchema: options.jsonSchema }),
     mcpConfigPath: options.mcpConfigPath,
     ...(options.model === undefined ? {} : { model: options.model }),
@@ -444,11 +441,6 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
     const prepared = await config.prepare(request);
     const systemPrompt = renderSystemPromptOverride(prepared.systemPrompt);
     const codex = isCodexExecDescription(config.description);
-    // #1160: one exit-mode decision per turn — direct navigator free prose vs structured.
-    // Attendance sets request.navigatorByStatusPrepare; direct ak-role navigator does not.
-    const navigatorProseExit =
-      prepared.terminatingToolName === NAVIGATOR_OUTPUT_TOOL_NAME
-      && request.navigatorByStatusPrepare !== true;
     let outcome: RoleTurnResult = failure("session", "HeadlessNoOutcome", "no-outcome");
     try {
       // Claude mints a package UUID for --session-id; codex waits for thread.started.
@@ -490,11 +482,9 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
         if (codex) {
           // #1148: Codex --output-schema requires a native strict transport schema.
           // Project from the unique open declaration; do not alter package receipt rules.
-          if (!navigatorProseExit) {
-            outputSchemaPath = join(inputsDirectory, "output-schema.json");
-            deliveredSchema = closeJsonSchemaForCodex(prepared.jsonSchema);
-            await writeFile(outputSchemaPath, `${JSON.stringify(deliveredSchema, null, 2)}\n`, "utf8");
-          }
+          outputSchemaPath = join(inputsDirectory, "output-schema.json");
+          deliveredSchema = closeJsonSchemaForCodex(prepared.jsonSchema);
+          await writeFile(outputSchemaPath, `${JSON.stringify(deliveredSchema, null, 2)}\n`, "utf8");
         } else {
           mcpConfigPath = join(inputsDirectory, "mcp-config.json");
           await writeFile(
@@ -502,7 +492,7 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
             `${JSON.stringify(headlessMcpConfigDocument(prepared.mcpServers), null, 2)}\n`,
             "utf8",
           );
-          if (!navigatorProseExit) deliveredSchema = prepared.jsonSchema;
+          deliveredSchema = prepared.jsonSchema;
         }
         startedWithSchema = deliveredSchema;
       } catch (setupError) {
@@ -530,8 +520,7 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
             args = buildTurnArgs({
               description: config.description,
               systemPromptPath,
-              // Direct navigator prose exit omits --json-schema; byStatus prepare mounts it.
-              ...(navigatorProseExit ? {} : { jsonSchema: prepared.jsonSchema }),
+              jsonSchema: prepared.jsonSchema,
               mcpServers: prepared.mcpServers,
               ...(mcpConfigPath === undefined ? {} : { mcpConfigPath }),
               ...(outputSchemaPath === undefined ? {} : { outputSchemaPath }),
@@ -669,13 +658,7 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
 
             const deliverReply = async (): Promise<ReturnType<typeof deliveredFromSpawned> | undefined> => {
               if (!observation.turnCompleted || observation.finalMessage === undefined) return undefined;
-              if (navigatorProseExit) {
-                // Direct ak-role navigator: free-form agent_message is the prose body.
-                if (observation.finalMessage.trim() === "") return undefined;
-                await prepared.ingestStructuredOutput({ prose: observation.finalMessage });
-                return deliveredFromSpawned(spawned);
-              }
-              // Structured seats (incl. #1160 byStatus prepare): native JSON receipt.
+              // Native JSON receipt.
               let receipt: unknown;
               try {
                 receipt = JSON.parse(observation.finalMessage);
@@ -723,14 +706,6 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
 
           if (envelope.structured_output !== undefined) {
             await prepared.ingestStructuredOutput(envelope.structured_output);
-          } else if (
-            navigatorProseExit
-            && typeof envelope.result === "string"
-            && envelope.result.trim() !== ""
-          ) {
-            // #959: direct navigator prose exit — free-form result text is the body
-            // when structured_output is absent (json-schema omitted).
-            await prepared.ingestStructuredOutput({ prose: envelope.result });
           }
           return deliveredFromSpawned(spawned);
           } catch (error) {

package/src/host-contracts.ts

@@ -134,7 +134,11 @@ export type RoleTurnActivation =
     }
   | { readonly role: "inspector"; readonly sourceRun?: string }
   | { readonly role: "gatekeeper" }
-  | { readonly role: "navigator" }
+  | {
+      readonly role: "navigator";
+      /** Structured target seat for the lookup run (#1192); absent = whole table. */
+      readonly forRole?: string;
+    }
   | { readonly role: "auditor" }
   | { readonly role: "diarist" }
   | { readonly role: "secretariat" };
@@ -199,12 +203,6 @@ export type RoleTurnRequest = {
   readonly host?: string;
   /** Station child role run (#840): omit automatic navigator attendance. */
   readonly stationChild?: boolean;
-  /**
-   * #1160 attendance auto-prepare: host mounts native structured schema so
-   * byStatus returns as structured fields. Direct `ak-role navigator` omits
-   * this and keeps the free-form prose exit (#959).
-   */
-  readonly navigatorByStatusPrepare?: boolean;
   /**
    * #1132: the effective delivery-request ceiling resolved once by the caller
    * from the single configured `autoResumeLimit` value and projected here, so